/*
* Geeqie
* (C) 2006 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
#include "main.h"
#include "view_file_icon.h"
+#include "bar.h"
#include "cellrenderericon.h"
#include "collect.h"
#include "collect-io.h"
#include "collect-table.h"
-#include "debug.h"
#include "dnd.h"
#include "editors.h"
#include "img-view.h"
-#include "info.h"
-#include "filelist.h"
+#include "filedata.h"
#include "layout.h"
#include "layout_image.h"
#include "menu.h"
+#include "metadata.h"
#include "thumb.h"
#include "utilops.h"
-#include "ui_bookmark.h"
#include "ui_fileops.h"
#include "ui_menu.h"
#include "ui_tree_edit.h"
-
+#include "uri_utils.h"
+#include "view_file.h"
#include <gdk/gdkkeysyms.h> /* for keyboard values */
-#define VFICON_INFO_POINTER(_vf_) ((ViewFileInfoIcon *)(_vf_->info))
-#define VFICON_INFO(_vf_, _part_) (VFICON_INFO_POINTER(_vf_)->_part_)
/* between these, the icon width is increased by thumb_max_width / 2 */
#define THUMB_MIN_ICON_WIDTH 128
struct _IconData
{
SelectionType selected;
- gint row;
FileData *fd;
};
-static gint vficon_index_by_id(ViewFileIcon *vfi, IconData *in_id);
+static gint vficon_index_by_id(ViewFile *vf, IconData *in_id);
-static IconData *vficon_icon_data(ViewFileIcon *vfi, FileData *fd)
+static IconData *vficon_icon_data(ViewFile *vf, FileData *fd)
{
IconData *id = NULL;
GList *work;
if (!fd) return NULL;
- work = vfi->list;
+ work = vf->list;
while (work && !id)
{
IconData *chk = work->data;
return id;
}
-
-static gint iconlist_read(const gchar *path, GList **list)
-{
- GList *temp;
- GList *work;
-
- if (!filelist_read(path, &temp, NULL)) return FALSE;
-
- work = temp;
- while (work)
- {
- FileData *fd;
- IconData *id;
-
- fd = work->data;
- g_assert(fd->magick == 0x12345678);
- id = g_new0(IconData, 1);
-
- id->selected = SELECTION_NONE;
- id->row = -1;
- id->fd = fd;
-
- work->data = id;
- work = work->next;
- }
-
- *list = temp;
-
- return TRUE;
-}
-
static void iconlist_free(GList *list)
{
GList *work = list;
}
-gint iconlist_sort_file_cb(void *a, void *b)
+gint iconlist_sort_file_cb(gpointer a, gpointer b)
{
IconData *ida = a;
IconData *idb = b;
return filelist_sort_compare_filedata(ida->fd, idb->fd);
}
-GList *iconlist_sort(GList *list, SortType method, gint ascend)
+
+GList *iconlist_sort(GList *list, SortType method, gboolean ascend)
{
return filelist_sort_full(list, method, ascend, (GCompareFunc) iconlist_sort_file_cb);
}
-GList *iconlist_insert_sort(GList *list, IconData *id, SortType method, gint ascend)
+GList *iconlist_insert_sort(GList *list, IconData *id, SortType method, gboolean ascend)
{
return filelist_insert_sort_full(list, id, method, ascend, (GCompareFunc) iconlist_sort_file_cb);
}
-static void vficon_toggle_filenames(ViewFileIcon *vfi);
-static void vficon_selection_remove(ViewFileIcon *vfi, IconData *id, SelectionType mask, GtkTreeIter *iter);
-static void vficon_move_focus(ViewFileIcon *vfi, gint row, gint col, gint relative);
-static void vficon_set_focus(ViewFileIcon *vfi, IconData *id);
-static void vficon_thumb_update(ViewFileIcon *vfi);
-static void vficon_populate_at_new_size(ViewFileIcon *vfi, gint w, gint h, gint force);
+static void vficon_toggle_filenames(ViewFile *vf);
+static void vficon_selection_remove(ViewFile *vf, IconData *id, SelectionType mask, GtkTreeIter *iter);
+static void vficon_move_focus(ViewFile *vf, gint row, gint col, gboolean relative);
+static void vficon_set_focus(ViewFile *vf, IconData *id);
+static void vficon_populate_at_new_size(ViewFile *vf, gint w, gint h, gboolean force);
/*
*-----------------------------------------------------------------------------
*/
-static GList *vficon_pop_menu_file_list(ViewFileIcon *vfi)
+GList *vficon_selection_get_one(ViewFile *vf, FileData *fd)
{
- if (!vfi->click_id) return NULL;
-
- if (vfi->click_id->selected & SELECTION_SELECTED)
- {
- return vficon_selection_get_list(vfi);
- }
-
- return g_list_append(NULL, file_data_ref(vfi->click_id->fd));
+ return g_list_prepend(filelist_copy(fd->sidecar_files), file_data_ref(fd));
}
-static void vficon_pop_menu_edit_cb(GtkWidget *widget, gpointer data)
+GList *vficon_pop_menu_file_list(ViewFile *vf)
{
- ViewFileIcon *vfi;
- gint n;
- GList *list;
-
- vfi = submenu_item_get_data(widget);
- n = GPOINTER_TO_INT(data);
-
- if (!vfi) return;
-
- list = vficon_pop_menu_file_list(vfi);
- start_editor_from_filelist(n, list);
- filelist_free(list);
-}
+ if (!VFICON(vf)->click_id) return NULL;
-static void vficon_pop_menu_info_cb(GtkWidget *widget, gpointer data)
-{
- ViewFileIcon *vfi = data;
+ if (VFICON(vf)->click_id->selected & SELECTION_SELECTED)
+ {
+ return vf_selection_get_list(vf);
+ }
- info_window_new(NULL, vficon_pop_menu_file_list(vfi), NULL);
+ return vficon_selection_get_one(vf, VFICON(vf)->click_id->fd);
}
-static void vficon_pop_menu_view_cb(GtkWidget *widget, gpointer data)
+void vficon_pop_menu_view_cb(GtkWidget *widget, gpointer data)
{
- ViewFileIcon *vfi = data;
+ ViewFile *vf = data;
- if (!vfi->click_id) return;
+ if (!VFICON(vf)->click_id) return;
- if (vfi->click_id->selected & SELECTION_SELECTED)
+ if (VFICON(vf)->click_id->selected & SELECTION_SELECTED)
{
GList *list;
- list = vficon_selection_get_list(vfi);
+ list = vf_selection_get_list(vf);
view_window_new_from_list(list);
filelist_free(list);
}
else
{
- view_window_new(vfi->click_id->fd);
- }
-}
-
-static void vficon_pop_menu_copy_cb(GtkWidget *widget, gpointer data)
-{
- ViewFileIcon *vfi = data;
-
- file_util_copy(NULL, vficon_pop_menu_file_list(vfi), NULL, vfi->listview);
-}
-
-static void vficon_pop_menu_move_cb(GtkWidget *widget, gpointer data)
-{
- ViewFileIcon *vfi = data;
-
- file_util_move(NULL, vficon_pop_menu_file_list(vfi), NULL, vfi->listview);
-}
-
-static void vficon_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
-{
- ViewFileIcon *vfi = data;
-
- file_util_rename(NULL, vficon_pop_menu_file_list(vfi), vfi->listview);
-}
-
-static void vficon_pop_menu_delete_cb(GtkWidget *widget, gpointer data)
-{
- ViewFileIcon *vfi = data;
-
- file_util_delete(NULL, vficon_pop_menu_file_list(vfi), vfi->listview);
-}
-
-static void vficon_pop_menu_copy_path_cb(GtkWidget *widget, gpointer data)
-{
- ViewFileIcon *vfi = data;
-
- file_util_copy_path_list_to_clipboard(vficon_pop_menu_file_list(vfi));
-}
-
-static void vficon_pop_menu_sort_cb(GtkWidget *widget, gpointer data)
-{
- ViewFileIcon *vfi;
- SortType type;
-
- if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return;
-
- vfi = submenu_item_get_data(widget);
- if (!vfi) return;
-
- type = (SortType)GPOINTER_TO_INT(data);
-
- if (vfi->layout)
- {
- layout_sort_set(vfi->layout, type, vfi->sort_ascend);
- }
- else
- {
- vficon_sort_set(vfi, type, vfi->sort_ascend);
- }
-}
-
-static void vficon_pop_menu_sort_ascend_cb(GtkWidget *widget, gpointer data)
-{
- ViewFileIcon *vfi = data;
-
- if (vfi->layout)
- {
- layout_sort_set(vfi->layout, vfi->sort_method, !vfi->sort_ascend);
- }
- else
- {
- vficon_sort_set(vfi, vfi->sort_method, !vfi->sort_ascend);
+ view_window_new(VFICON(vf)->click_id->fd);
}
}
-static void vficon_pop_menu_list_cb(GtkWidget *widget, gpointer data)
+void vficon_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
{
- ViewFileIcon *vfi = data;
+ ViewFile *vf = data;
- if (vfi->layout) layout_views_set(vfi->layout, vfi->layout->dir_view_type, FALSE);
+ file_util_rename(NULL, vf_pop_menu_file_list(vf), vf->listview);
}
-static void vficon_pop_menu_show_names_cb(GtkWidget *widget, gpointer data)
+void vficon_pop_menu_show_names_cb(GtkWidget *widget, gpointer data)
{
- ViewFileIcon *vfi = data;
+ ViewFile *vf = data;
- vficon_toggle_filenames(vfi);
+ vficon_toggle_filenames(vf);
}
-static void vficon_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
+void vficon_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
{
- ViewFileIcon *vfi = data;
+ ViewFile *vf = data;
- vficon_refresh(vfi);
+ vf_refresh(vf);
}
-static void vficon_popup_destroy_cb(GtkWidget *widget, gpointer data)
+void vficon_popup_destroy_cb(GtkWidget *widget, gpointer data)
{
- ViewFileIcon *vfi = data;
- vficon_selection_remove(vfi, vfi->click_id, SELECTION_PRELIGHT, NULL);
- vfi->click_id = NULL;
- vfi->popup = NULL;
-}
-
-static GtkWidget *vficon_pop_menu(ViewFileIcon *vfi, gint active)
-{
- GtkWidget *menu;
- GtkWidget *item;
- GtkWidget *submenu;
-
- menu = popup_menu_short_lived();
-
- g_signal_connect(G_OBJECT(menu), "destroy",
- G_CALLBACK(vficon_popup_destroy_cb), vfi);
-
- submenu_add_edit(menu, &item, G_CALLBACK(vficon_pop_menu_edit_cb), vfi);
- gtk_widget_set_sensitive(item, active);
-
- menu_item_add_stock_sensitive(menu, _("_Properties"), GTK_STOCK_PROPERTIES, active,
- G_CALLBACK(vficon_pop_menu_info_cb), vfi);
-
- menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, active,
- G_CALLBACK(vficon_pop_menu_view_cb), vfi);
- menu_item_add_divider(menu);
-
- menu_item_add_stock_sensitive(menu, _("_Copy..."), GTK_STOCK_COPY, active,
- G_CALLBACK(vficon_pop_menu_copy_cb), vfi);
- menu_item_add_sensitive(menu, _("_Move..."), active,
- G_CALLBACK(vficon_pop_menu_move_cb), vfi);
- menu_item_add_sensitive(menu, _("_Rename..."), active,
- G_CALLBACK(vficon_pop_menu_rename_cb), vfi);
- menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, active,
- G_CALLBACK(vficon_pop_menu_delete_cb), vfi);
- if (options->show_copy_path)
- menu_item_add_sensitive(menu, _("_Copy path"), active,
- G_CALLBACK(vficon_pop_menu_copy_path_cb), vfi);
- menu_item_add_divider(menu);
-
- submenu = submenu_add_sort(NULL, G_CALLBACK(vficon_pop_menu_sort_cb), vfi,
- FALSE, FALSE, TRUE, vfi->sort_method);
- menu_item_add_divider(submenu);
- menu_item_add_check(submenu, _("Ascending"), vfi->sort_ascend,
- G_CALLBACK(vficon_pop_menu_sort_ascend_cb), vfi);
-
- item = menu_item_add(menu, _("_Sort"), NULL, NULL);
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
-
- menu_item_add_check(menu, _("View as _icons"), TRUE,
- G_CALLBACK(vficon_pop_menu_list_cb), vfi);
- menu_item_add_check(menu, _("Show filename _text"), vfi->show_text,
- G_CALLBACK(vficon_pop_menu_show_names_cb), vfi);
- menu_item_add_stock(menu, _("Re_fresh"), GTK_STOCK_REFRESH, G_CALLBACK(vficon_pop_menu_refresh_cb), vfi);
-
- return menu;
+ ViewFile *vf = data;
+ vficon_selection_remove(vf, VFICON(vf)->click_id, SELECTION_PRELIGHT, NULL);
+ VFICON(vf)->click_id = NULL;
+ vf->popup = NULL;
}
/*
*-------------------------------------------------------------------
*/
-static void vficon_send_update(ViewFileIcon *vfi)
-{
- if (vfi->func_status) vfi->func_status(vfi, vfi->data_status);
-}
-
-static void vficon_send_layout_select(ViewFileIcon *vfi, IconData *id)
+static void vficon_send_layout_select(ViewFile *vf, IconData *id)
{
FileData *read_ahead_fd = NULL;
FileData *sel_fd;
FileData *cur_fd;
- if (!vfi->layout || !id || !id->fd) return;
+ if (!vf->layout || !id || !id->fd) return;
sel_fd = id->fd;
- cur_fd = layout_image_get_fd(vfi->layout);
+ cur_fd = layout_image_get_fd(vf->layout);
if (sel_fd == cur_fd) return; /* no change */
if (options->image.enable_read_ahead)
{
gint row;
- row = g_list_index(vfi->list, id);
- if (row > vficon_index_by_fd(vfi, cur_fd) &&
- row + 1 < vficon_count(vfi, NULL))
+ row = g_list_index(vf->list, id);
+ if (row > vficon_index_by_fd(vf, cur_fd) &&
+ (guint) (row + 1) < vf_count(vf, NULL))
{
- read_ahead_fd = vficon_index_get_data(vfi, row + 1);
+ read_ahead_fd = vf_index_get_data(vf, row + 1);
}
else if (row > 0)
{
- read_ahead_fd = vficon_index_get_data(vfi, row - 1);
+ read_ahead_fd = vf_index_get_data(vf, row - 1);
}
}
- layout_image_set_with_ahead(vfi->layout, sel_fd, read_ahead_fd);
+ layout_image_set_with_ahead(vf->layout, sel_fd, read_ahead_fd);
}
-static void vficon_toggle_filenames(ViewFileIcon *vfi)
+static void vficon_toggle_filenames(ViewFile *vf)
{
- vfi->show_text = !vfi->show_text;
- options->show_icon_names = vfi->show_text;
+ GtkAllocation allocation;
+ VFICON(vf)->show_text = !VFICON(vf)->show_text;
+ options->show_icon_names = VFICON(vf)->show_text;
- vficon_populate_at_new_size(vfi, vfi->listview->allocation.width, vfi->listview->allocation.height, TRUE);
+ gtk_widget_get_allocation(vf->listview, &allocation);
+ vficon_populate_at_new_size(vf, allocation.width, allocation.height, TRUE);
}
-static gint vficon_get_icon_width(ViewFileIcon *vfi)
+static gint vficon_get_icon_width(ViewFile *vf)
{
gint width;
- if (!vfi->show_text) return options->thumbnails.max_width;
+ if (!VFICON(vf)->show_text) return options->thumbnails.max_width;
width = options->thumbnails.max_width + options->thumbnails.max_width / 2;
if (width < THUMB_MIN_ICON_WIDTH) width = THUMB_MIN_ICON_WIDTH;
*-------------------------------------------------------------------
*/
-static gint vficon_find_position(ViewFileIcon *vfi, IconData *id, gint *row, gint *col)
+static gboolean vficon_find_position(ViewFile *vf, IconData *id, gint *row, gint *col)
{
gint n;
- n = g_list_index(vfi->list, id);
+ n = g_list_index(vf->list, id);
if (n < 0) return FALSE;
- *row = n / vfi->columns;
- *col = n - (*row * vfi->columns);
+ *row = n / VFICON(vf)->columns;
+ *col = n - (*row * VFICON(vf)->columns);
return TRUE;
}
-static gint vficon_find_iter(ViewFileIcon *vfi, IconData *id, GtkTreeIter *iter, gint *column)
+static gboolean vficon_find_iter(ViewFile *vf, IconData *id, GtkTreeIter *iter, gint *column)
{
GtkTreeModel *store;
gint row, col;
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(vfi->listview));
- if (!vficon_find_position(vfi, id, &row, &col)) return FALSE;
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
+ if (!vficon_find_position(vf, id, &row, &col)) return FALSE;
if (!gtk_tree_model_iter_nth_child(store, iter, NULL, row)) return FALSE;
if (column) *column = col;
return TRUE;
}
-static IconData *vficon_find_data(ViewFileIcon *vfi, gint row, gint col, GtkTreeIter *iter)
+static IconData *vficon_find_data(ViewFile *vf, gint row, gint col, GtkTreeIter *iter)
{
GtkTreeModel *store;
GtkTreeIter p;
if (row < 0 || col < 0) return NULL;
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(vfi->listview));
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
if (gtk_tree_model_iter_nth_child(store, &p, NULL, row))
{
GList *list;
return NULL;
}
-static IconData *vficon_find_data_by_coord(ViewFileIcon *vfi, gint x, gint y, GtkTreeIter *iter)
+static IconData *vficon_find_data_by_coord(ViewFile *vf, gint x, gint y, GtkTreeIter *iter)
{
GtkTreePath *tpath;
GtkTreeViewColumn *column;
- if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vfi->listview), x, y,
+ if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf->listview), x, y,
&tpath, &column, NULL, NULL))
{
GtkTreeModel *store;
GList *list;
gint n;
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(vfi->listview));
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
gtk_tree_model_get_iter(store, &row, tpath);
gtk_tree_path_free(tpath);
return NULL;
}
+static void vficon_mark_toggled_cb(GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
+{
+ ViewFile *vf = data;
+ GtkTreeModel *store;
+ GtkTreePath *path = gtk_tree_path_new_from_string(path_str);
+ GtkTreeIter row;
+ gint column;
+ GList *list;
+ guint toggled_mark;
+ IconData *id;
+
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
+ if (!path || !gtk_tree_model_get_iter(store, &row, path))
+ return;
+
+ gtk_tree_model_get(store, &row, FILE_COLUMN_POINTER, &list, -1);
+
+ column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell), "column_number"));
+ g_object_get(G_OBJECT(cell), "toggled_mark", &toggled_mark, NULL);
+
+ id = g_list_nth_data(list, column);
+ if (id)
+ {
+ FileData *fd = id->fd;
+ file_data_set_mark(fd, toggled_mark, !file_data_get_mark(fd, toggled_mark));
+ }
+}
+
+
/*
*-------------------------------------------------------------------
* tooltip type window
*-------------------------------------------------------------------
*/
-static void tip_show(ViewFileIcon *vfi)
+static void tip_show(ViewFile *vf)
{
GtkWidget *label;
gint x, y;
- if (vfi->tip_window) return;
+ if (VFICON(vf)->tip_window) return;
- gdk_window_get_pointer(gtk_tree_view_get_bin_window(GTK_TREE_VIEW(vfi->listview)), &x, &y, NULL);
+ gdk_window_get_pointer(gtk_tree_view_get_bin_window(GTK_TREE_VIEW(vf->listview)), &x, &y, NULL);
- vfi->tip_id = vficon_find_data_by_coord(vfi, x, y, NULL);
- if (!vfi->tip_id) return;
+ VFICON(vf)->tip_id = vficon_find_data_by_coord(vf, x, y, NULL);
+ if (!VFICON(vf)->tip_id) return;
- vfi->tip_window = gtk_window_new(GTK_WINDOW_POPUP);
- gtk_window_set_resizable(GTK_WINDOW(vfi->tip_window), FALSE);
- gtk_container_set_border_width(GTK_CONTAINER(vfi->tip_window), 2);
+ VFICON(vf)->tip_window = gtk_window_new(GTK_WINDOW_POPUP);
+ gtk_window_set_resizable(GTK_WINDOW(VFICON(vf)->tip_window), FALSE);
+ gtk_container_set_border_width(GTK_CONTAINER(VFICON(vf)->tip_window), 2);
- label = gtk_label_new(vfi->tip_id->fd->name);
+ label = gtk_label_new(VFICON(vf)->tip_id->fd->name);
- g_object_set_data(G_OBJECT(vfi->tip_window), "tip_label", label);
- gtk_container_add(GTK_CONTAINER(vfi->tip_window), label);
+ g_object_set_data(G_OBJECT(VFICON(vf)->tip_window), "tip_label", label);
+ gtk_container_add(GTK_CONTAINER(VFICON(vf)->tip_window), label);
gtk_widget_show(label);
gdk_window_get_pointer(NULL, &x, &y, NULL);
- if (!GTK_WIDGET_REALIZED(vfi->tip_window)) gtk_widget_realize(vfi->tip_window);
- gtk_window_move(GTK_WINDOW(vfi->tip_window), x + 16, y + 16);
- gtk_widget_show(vfi->tip_window);
+ if (!gtk_widget_get_realized(VFICON(vf)->tip_window)) gtk_widget_realize(VFICON(vf)->tip_window);
+ gtk_window_move(GTK_WINDOW(VFICON(vf)->tip_window), x + 16, y + 16);
+ gtk_widget_show(VFICON(vf)->tip_window);
}
-static void tip_hide(ViewFileIcon *vfi)
+static void tip_hide(ViewFile *vf)
{
- if (vfi->tip_window) gtk_widget_destroy(vfi->tip_window);
- vfi->tip_window = NULL;
+ if (VFICON(vf)->tip_window) gtk_widget_destroy(VFICON(vf)->tip_window);
+ VFICON(vf)->tip_window = NULL;
}
-static gint tip_schedule_cb(gpointer data)
+static gboolean tip_schedule_cb(gpointer data)
{
- ViewFileIcon *vfi = data;
+ ViewFile *vf = data;
GtkWidget *window;
- if (vfi->tip_delay_id == -1) return FALSE;
+ if (!VFICON(vf)->tip_delay_id) return FALSE;
- window = gtk_widget_get_toplevel(vfi->listview);
+ window = gtk_widget_get_toplevel(vf->listview);
- if (GTK_WIDGET_SENSITIVE(window) &&
- GTK_WINDOW(window)->has_focus)
+ if (gtk_widget_get_sensitive(window) &&
+ gtk_window_has_toplevel_focus(GTK_WINDOW(window)))
{
- tip_show(vfi);
+ tip_show(vf);
}
- vfi->tip_delay_id = -1;
+ VFICON(vf)->tip_delay_id = 0;
return FALSE;
}
-static void tip_schedule(ViewFileIcon *vfi)
+static void tip_schedule(ViewFile *vf)
{
- tip_hide(vfi);
+ tip_hide(vf);
- if (vfi->tip_delay_id != -1)
+ if (VFICON(vf)->tip_delay_id)
{
- g_source_remove(vfi->tip_delay_id);
- vfi->tip_delay_id = -1;
+ g_source_remove(VFICON(vf)->tip_delay_id);
+ VFICON(vf)->tip_delay_id = 0;
}
- if (!vfi->show_text)
+ if (!VFICON(vf)->show_text)
{
- vfi->tip_delay_id = g_timeout_add(VFICON_TIP_DELAY, tip_schedule_cb, vfi);
+ VFICON(vf)->tip_delay_id = g_timeout_add(VFICON_TIP_DELAY, tip_schedule_cb, vf);
}
}
-static void tip_unschedule(ViewFileIcon *vfi)
+static void tip_unschedule(ViewFile *vf)
{
- tip_hide(vfi);
+ tip_hide(vf);
- if (vfi->tip_delay_id != -1) g_source_remove(vfi->tip_delay_id);
- vfi->tip_delay_id = -1;
+ if (VFICON(vf)->tip_delay_id)
+ {
+ g_source_remove(VFICON(vf)->tip_delay_id);
+ VFICON(vf)->tip_delay_id = 0;
+ }
}
-static void tip_update(ViewFileIcon *vfi, IconData *id)
+static void tip_update(ViewFile *vf, IconData *id)
{
- if (vfi->tip_window)
+ if (VFICON(vf)->tip_window)
{
gint x, y;
gdk_window_get_pointer(NULL, &x, &y, NULL);
- gtk_window_move(GTK_WINDOW(vfi->tip_window), x + 16, y + 16);
+ gtk_window_move(GTK_WINDOW(VFICON(vf)->tip_window), x + 16, y + 16);
- if (id != vfi->tip_id)
+ if (id != VFICON(vf)->tip_id)
{
GtkWidget *label;
- vfi->tip_id = id;
+ VFICON(vf)->tip_id = id;
- if (!vfi->tip_id)
+ if (!VFICON(vf)->tip_id)
{
- tip_hide(vfi);
- tip_schedule(vfi);
+ tip_hide(vf);
+ tip_schedule(vf);
return;
}
- label = g_object_get_data(G_OBJECT(vfi->tip_window), "tip_label");
- gtk_label_set_text(GTK_LABEL(label), vfi->tip_id->fd->name);
+ label = g_object_get_data(G_OBJECT(VFICON(vf)->tip_window), "tip_label");
+ gtk_label_set_text(GTK_LABEL(label), VFICON(vf)->tip_id->fd->name);
}
}
else
{
- tip_schedule(vfi);
+ tip_schedule(vf);
}
}
GtkSelectionData *selection_data, guint info,
guint time, gpointer data)
{
- ViewFileIcon *vfi = data;
+ ViewFile *vf = data;
GList *list = NULL;
- gchar *uri_text = NULL;
- gint total;
- if (!vfi->click_id) return;
+ if (!VFICON(vf)->click_id) return;
- if (vfi->click_id->selected & SELECTION_SELECTED)
+ if (VFICON(vf)->click_id->selected & SELECTION_SELECTED)
{
- list = vficon_selection_get_list(vfi);
+ list = vf_selection_get_list(vf);
}
else
{
- list = g_list_append(NULL, file_data_ref(vfi->click_id->fd));
+ list = g_list_append(NULL, file_data_ref(VFICON(vf)->click_id->fd));
}
if (!list) return;
- uri_text = uri_text_from_filelist(list, &total, (info == TARGET_TEXT_PLAIN));
+ uri_selection_data_set_uris_from_filelist(selection_data, list);
filelist_free(list);
+}
+
+static void vficon_drag_data_received(GtkWidget *entry_widget, GdkDragContext *context,
+ int x, int y, GtkSelectionData *selection,
+ guint info, guint time, gpointer data)
+{
+ ViewFile *vf = data;
- DEBUG_1(uri_text);
+ if (info == TARGET_TEXT_PLAIN) {
+ IconData *id = vficon_find_data_by_coord(vf, x, y, NULL);
- gtk_selection_data_set(selection_data, selection_data->target,
- 8, (guchar *)uri_text, total);
- g_free(uri_text);
+ if (id && id->fd) {
+ /* Add keywords to file */
+ FileData *fd = id->fd;
+ gchar *str = (gchar *) gtk_selection_data_get_text(selection);
+ GList *kw_list = string_to_keywords_list(str);
+
+ metadata_append_list(fd, KEYWORD_KEY, kw_list);
+ string_list_free(kw_list);
+ g_free(str);
+ }
+ }
}
static void vficon_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data)
{
- ViewFileIcon *vfi = data;
+ ViewFile *vf = data;
- tip_unschedule(vfi);
+ tip_unschedule(vf);
- if (vfi->click_id && vfi->click_id->fd->pixbuf)
+ if (VFICON(vf)->click_id && VFICON(vf)->click_id->fd->thumb_pixbuf)
{
gint items;
- if (vfi->click_id->selected & SELECTION_SELECTED)
- items = g_list_length(vfi->selection);
+ if (VFICON(vf)->click_id->selected & SELECTION_SELECTED)
+ items = g_list_length(VFICON(vf)->selection);
else
items = 1;
- dnd_set_drag_icon(widget, context, vfi->click_id->fd->pixbuf, items);
+ dnd_set_drag_icon(widget, context, VFICON(vf)->click_id->fd->thumb_pixbuf, items);
}
}
static void vficon_dnd_end(GtkWidget *widget, GdkDragContext *context, gpointer data)
{
- ViewFileIcon *vfi = data;
+ ViewFile *vf = data;
- vficon_selection_remove(vfi, vfi->click_id, SELECTION_PRELIGHT, NULL);
+ vficon_selection_remove(vf, VFICON(vf)->click_id, SELECTION_PRELIGHT, NULL);
- if (context->action == GDK_ACTION_MOVE)
+ if (gdk_drag_context_get_selected_action(context) == GDK_ACTION_MOVE)
{
- vficon_refresh(vfi);
+ vf_refresh(vf);
}
- tip_unschedule(vfi);
+ tip_unschedule(vf);
}
-static void vficon_dnd_init(ViewFileIcon *vfi)
+void vficon_dnd_init(ViewFile *vf)
{
- gtk_drag_source_set(vfi->listview, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
+ gtk_drag_source_set(vf->listview, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
+ dnd_file_drag_types, dnd_file_drag_types_count,
+ GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
+ gtk_drag_dest_set(vf->listview, GTK_DEST_DEFAULT_ALL,
dnd_file_drag_types, dnd_file_drag_types_count,
GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
- g_signal_connect(G_OBJECT(vfi->listview), "drag_data_get",
- G_CALLBACK(vficon_dnd_get), vfi);
- g_signal_connect(G_OBJECT(vfi->listview), "drag_begin",
- G_CALLBACK(vficon_dnd_begin), vfi);
- g_signal_connect(G_OBJECT(vfi->listview), "drag_end",
- G_CALLBACK(vficon_dnd_end), vfi);
+
+ g_signal_connect(G_OBJECT(vf->listview), "drag_data_get",
+ G_CALLBACK(vficon_dnd_get), vf);
+ g_signal_connect(G_OBJECT(vf->listview), "drag_begin",
+ G_CALLBACK(vficon_dnd_begin), vf);
+ g_signal_connect(G_OBJECT(vf->listview), "drag_end",
+ G_CALLBACK(vficon_dnd_end), vf);
+ g_signal_connect(G_OBJECT(vf->listview), "drag_data_received",
+ G_CALLBACK(vficon_drag_data_received), vf);
}
/*
*-------------------------------------------------------------------
*/
-static void vficon_selection_set(ViewFileIcon *vfi, IconData *id, SelectionType value, GtkTreeIter *iter)
+static void vficon_selection_set(ViewFile *vf, IconData *id, SelectionType value, GtkTreeIter *iter)
{
GtkTreeModel *store;
GList *list;
if (id->selected == value) return;
id->selected = value;
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(vfi->listview));
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
if (iter)
{
gtk_tree_model_get(store, iter, FILE_COLUMN_POINTER, &list, -1);
{
GtkTreeIter row;
- if (vficon_find_iter(vfi, id, &row, NULL))
+ if (vficon_find_iter(vf, id, &row, NULL))
{
gtk_tree_model_get(store, &row, FILE_COLUMN_POINTER, &list, -1);
if (list) gtk_list_store_set(GTK_LIST_STORE(store), &row, FILE_COLUMN_POINTER, list, -1);
}
}
-static void vficon_selection_add(ViewFileIcon *vfi, IconData *id, SelectionType mask, GtkTreeIter *iter)
+static void vficon_selection_add(ViewFile *vf, IconData *id, SelectionType mask, GtkTreeIter *iter)
{
if (!id) return;
- vficon_selection_set(vfi, id, id->selected | mask, iter);
+ vficon_selection_set(vf, id, id->selected | mask, iter);
}
-static void vficon_selection_remove(ViewFileIcon *vfi, IconData *id, SelectionType mask, GtkTreeIter *iter)
+static void vficon_selection_remove(ViewFile *vf, IconData *id, SelectionType mask, GtkTreeIter *iter)
{
if (!id) return;
- vficon_selection_set(vfi, id, id->selected & ~mask, iter);
+ vficon_selection_set(vf, id, id->selected & ~mask, iter);
+}
+
+void vficon_marks_set(ViewFile *vf, gint enable)
+{
+ GtkAllocation allocation;
+ gtk_widget_get_allocation(vf->listview, &allocation);
+ vficon_populate_at_new_size(vf, allocation.width, allocation.height, TRUE);
}
/*
*-------------------------------------------------------------------
*/
-static void vficon_verify_selections(ViewFileIcon *vfi)
+static void vficon_verify_selections(ViewFile *vf)
{
GList *work;
- work = vfi->selection;
+ work = VFICON(vf)->selection;
while (work)
{
IconData *id = work->data;
work = work->next;
- if (vficon_index_by_id(vfi, id) < 0)
- {
- vfi->selection = g_list_remove(vfi->selection, id);
- }
+
+ if (vficon_index_by_id(vf, id) >= 0) continue;
+
+ VFICON(vf)->selection = g_list_remove(VFICON(vf)->selection, id);
}
}
-void vficon_select_all(ViewFileIcon *vfi)
+void vficon_select_all(ViewFile *vf)
{
GList *work;
- g_list_free(vfi->selection);
- vfi->selection = NULL;
+ g_list_free(VFICON(vf)->selection);
+ VFICON(vf)->selection = NULL;
- work = vfi->list;
+ work = vf->list;
while (work)
{
IconData *id = work->data;
- vfi->selection = g_list_append(vfi->selection, id);
- vficon_selection_add(vfi, work->data, SELECTION_SELECTED, NULL);
work = work->next;
+
+ VFICON(vf)->selection = g_list_append(VFICON(vf)->selection, id);
+ vficon_selection_add(vf, id, SELECTION_SELECTED, NULL);
}
- vficon_send_update(vfi);
+ vf_send_update(vf);
}
-void vficon_select_none(ViewFileIcon *vfi)
+void vficon_select_none(ViewFile *vf)
{
GList *work;
- work = vfi->selection;
+ work = VFICON(vf)->selection;
while (work)
{
- vficon_selection_remove(vfi, work->data, SELECTION_SELECTED, NULL);
+ IconData *id = work->data;
work = work->next;
+
+ vficon_selection_remove(vf, id, SELECTION_SELECTED, NULL);
}
- g_list_free(vfi->selection);
- vfi->selection = NULL;
+ g_list_free(VFICON(vf)->selection);
+ VFICON(vf)->selection = NULL;
+
+ vf_send_update(vf);
+}
+
+void vficon_select_invert(ViewFile *vf)
+{
+ GList *work;
+
+ work = vf->list;
+ while (work)
+ {
+ IconData *id = work->data;
+ work = work->next;
+
+ if (id->selected & SELECTION_SELECTED)
+ {
+ VFICON(vf)->selection = g_list_remove(VFICON(vf)->selection, id);
+ vficon_selection_remove(vf, id, SELECTION_SELECTED, NULL);
+ }
+ else
+ {
+ VFICON(vf)->selection = g_list_append(VFICON(vf)->selection, id);
+ vficon_selection_add(vf, id, SELECTION_SELECTED, NULL);
+ }
+ }
- vficon_send_update(vfi);
+ vf_send_update(vf);
}
-static void vficon_select(ViewFileIcon *vfi, IconData *id)
+static void vficon_select(ViewFile *vf, IconData *id)
{
- vfi->prev_selection = id;
+ VFICON(vf)->prev_selection = id;
if (!id || id->selected & SELECTION_SELECTED) return;
- vfi->selection = g_list_append(vfi->selection, id);
- vficon_selection_add(vfi, id, SELECTION_SELECTED, NULL);
+ VFICON(vf)->selection = g_list_append(VFICON(vf)->selection, id);
+ vficon_selection_add(vf, id, SELECTION_SELECTED, NULL);
- vficon_send_update(vfi);
+ vf_send_update(vf);
}
-static void vficon_unselect(ViewFileIcon *vfi, IconData *id)
+static void vficon_unselect(ViewFile *vf, IconData *id)
{
- vfi->prev_selection = id;
+ VFICON(vf)->prev_selection = id;
if (!id || !(id->selected & SELECTION_SELECTED) ) return;
- vfi->selection = g_list_remove(vfi->selection, id);
- vficon_selection_remove(vfi, id, SELECTION_SELECTED, NULL);
+ VFICON(vf)->selection = g_list_remove(VFICON(vf)->selection, id);
+ vficon_selection_remove(vf, id, SELECTION_SELECTED, NULL);
- vficon_send_update(vfi);
+ vf_send_update(vf);
}
-static void vficon_select_util(ViewFileIcon *vfi, IconData *id, gint select)
+static void vficon_select_util(ViewFile *vf, IconData *id, gboolean select)
{
if (select)
{
- vficon_select(vfi, id);
+ vficon_select(vf, id);
}
else
{
- vficon_unselect(vfi, id);
+ vficon_unselect(vf, id);
}
}
-static void vficon_select_region_util(ViewFileIcon *vfi, IconData *start, IconData *end, gint select)
+static void vficon_select_region_util(ViewFile *vf, IconData *start, IconData *end, gboolean select)
{
gint row1, col1;
gint row2, col2;
gint t;
gint i, j;
- if (!vficon_find_position(vfi, start, &row1, &col1) ||
- !vficon_find_position(vfi, end, &row2, &col2) ) return;
+ if (!vficon_find_position(vf, start, &row1, &col1) ||
+ !vficon_find_position(vf, end, &row2, &col2) ) return;
- vfi->prev_selection = end;
+ VFICON(vf)->prev_selection = end;
if (!options->collections.rectangular_selection)
{
GList *work;
IconData *id;
- if (g_list_index(vfi->list, start) > g_list_index(vfi->list, end))
+ if (g_list_index(vf->list, start) > g_list_index(vf->list, end))
{
id = start;
start = end;
end = id;
}
- work = g_list_find(vfi->list, start);
+ work = g_list_find(vf->list, start);
while (work)
{
id = work->data;
- vficon_select_util(vfi, id, select);
+ vficon_select_util(vf, id, select);
if (work->data != end)
work = work->next;
{
for (j = col1; j <= col2; j++)
{
- IconData *id = vficon_find_data(vfi, i, j, NULL);
- if (id) vficon_select_util(vfi, id, select);
+ IconData *id = vficon_find_data(vf, i, j, NULL);
+ if (id) vficon_select_util(vf, id, select);
}
}
}
-gint vficon_index_is_selected(ViewFileIcon *vfi, gint row)
+gboolean vficon_index_is_selected(ViewFile *vf, gint row)
{
- IconData *id = g_list_nth_data(vfi->list, row);
+ IconData *id = g_list_nth_data(vf->list, row);
if (!id) return FALSE;
return (id->selected & SELECTION_SELECTED);
}
-gint vficon_selection_count(ViewFileIcon *vfi, gint64 *bytes)
+guint vficon_selection_count(ViewFile *vf, gint64 *bytes)
{
if (bytes)
{
gint64 b = 0;
GList *work;
- work = vfi->selection;
+ work = VFICON(vf)->selection;
while (work)
{
IconData *id = work->data;
FileData *fd = id->fd;
- g_assert(fd->magick == 0x12345678);
+ g_assert(fd->magick == FD_MAGICK);
b += fd->size;
work = work->next;
*bytes = b;
}
- return g_list_length(vfi->selection);
+ return g_list_length(VFICON(vf)->selection);
}
-GList *vficon_selection_get_list(ViewFileIcon *vfi)
+GList *vficon_selection_get_list(ViewFile *vf)
{
GList *list = NULL;
- GList *work;
+ GList *work, *work2;
- work = vfi->selection;
+ work = VFICON(vf)->selection;
while (work)
{
IconData *id = work->data;
FileData *fd = id->fd;
- g_assert(fd->magick == 0x12345678);
+ g_assert(fd->magick == FD_MAGICK);
list = g_list_prepend(list, file_data_ref(fd));
+
+ work2 = fd->sidecar_files;
+ while (work2)
+ {
+ fd = work2->data;
+ list = g_list_prepend(list, file_data_ref(fd));
+ work2 = work2->next;
+ }
work = work->next;
}
return list;
}
-GList *vficon_selection_get_list_by_index(ViewFileIcon *vfi)
+GList *vficon_selection_get_list_by_index(ViewFile *vf)
{
GList *list = NULL;
GList *work;
- work = vfi->selection;
+ work = VFICON(vf)->selection;
while (work)
{
- list = g_list_prepend(list, GINT_TO_POINTER(g_list_index(vfi->list, work->data)));
+ list = g_list_prepend(list, GINT_TO_POINTER(g_list_index(vf->list, work->data)));
work = work->next;
}
return g_list_reverse(list);
}
-static void vficon_select_by_id(ViewFileIcon *vfi, IconData *id)
+static void vficon_select_by_id(ViewFile *vf, IconData *id)
{
if (!id) return;
if (!(id->selected & SELECTION_SELECTED))
{
- vficon_select_none(vfi);
- vficon_select(vfi, id);
+ vf_select_none(vf);
+ vficon_select(vf, id);
}
- vficon_set_focus(vfi, id);
-}
-
-
-void vficon_select_by_path(ViewFileIcon *vfi, const gchar *path)
-{
- IconData *id = NULL;
- GList *work;
-
- if (!path) return;
-
- work = vfi->list;
- while (work && !id)
- {
- IconData *chk = work->data;
- work = work->next;
- if (strcmp(chk->fd->path, path) == 0) id = chk;
- }
- vficon_select_by_id(vfi, id);
+ vficon_set_focus(vf, id);
}
-void vficon_select_by_fd(ViewFileIcon *vfi, FileData *fd)
+void vficon_select_by_fd(ViewFile *vf, FileData *fd)
{
IconData *id = NULL;
GList *work;
if (!fd) return;
- work = vfi->list;
+ work = vf->list;
while (work && !id)
{
IconData *chk = work->data;
work = work->next;
if (chk->fd == fd) id = chk;
}
- vficon_select_by_id(vfi, id);
+ vficon_select_by_id(vf, id);
}
-void vficon_mark_to_selection(ViewFileIcon *vfi, gint mark, MarkToSelectionMode mode)
+void vficon_mark_to_selection(ViewFile *vf, gint mark, MarkToSelectionMode mode)
{
GList *work;
+ gint n = mark - 1;
- work = vfi->list;
+ g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE);
+
+ work = vf->list;
while (work)
{
IconData *id = work->data;
FileData *fd = id->fd;
gboolean mark_val, selected;
- g_assert(fd->magick == 0x12345678);
+ g_assert(fd->magick == FD_MAGICK);
- mark_val = fd->marks[mark];
+ mark_val = file_data_get_mark(fd, n);
selected = (id->selected & SELECTION_SELECTED);
switch (mode)
{
case MTS_MODE_SET: selected = mark_val;
break;
- case MTS_MODE_OR: selected = mark_val | selected;
+ case MTS_MODE_OR: selected = mark_val || selected;
break;
- case MTS_MODE_AND: selected = mark_val & selected;
+ case MTS_MODE_AND: selected = mark_val && selected;
break;
- case MTS_MODE_MINUS: selected = !mark_val & selected;
+ case MTS_MODE_MINUS: selected = !mark_val && selected;
break;
}
- vficon_select_util(vfi, id, selected);
+ vficon_select_util(vf, id, selected);
work = work->next;
}
}
-void vficon_selection_to_mark(ViewFileIcon *vfi, gint mark, SelectionToMarkMode mode)
+void vficon_selection_to_mark(ViewFile *vf, gint mark, SelectionToMarkMode mode)
{
GList *slist;
GList *work;
+ gint n = mark -1;
- g_assert(mark >= 0 && mark < FILEDATA_MARKS_SIZE);
+ g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE);
- slist = vficon_selection_get_list(vfi);
+ slist = vf_selection_get_list(vf);
work = slist;
while (work)
{
switch (mode)
{
- case STM_MODE_SET: fd->marks[mark] = 1;
+ case STM_MODE_SET: file_data_set_mark(fd, n, 1);
break;
- case STM_MODE_RESET: fd->marks[mark] = 0;
+ case STM_MODE_RESET: file_data_set_mark(fd, n, 0);
break;
- case STM_MODE_TOGGLE: fd->marks[mark] = !fd->marks[mark];
+ case STM_MODE_TOGGLE: file_data_set_mark(fd, n, !file_data_get_mark(fd, n));
break;
}
-
work = work->next;
}
filelist_free(slist);
}
+static void vficon_select_closest(ViewFile *vf, FileData *sel_fd)
+{
+ GList *work;
+ IconData *id = NULL;
+
+ if (sel_fd->parent) sel_fd = sel_fd->parent;
+ work = vf->list;
+
+ while (work)
+ {
+ gint match;
+ FileData *fd;
+
+ id = work->data;
+ fd = id->fd;
+ work = work->next;
+
+ match = filelist_sort_compare_filedata_full(fd, sel_fd, vf->sort_method, vf->sort_ascend);
+
+ if (match >= 0) break;
+ }
+
+ if (id)
+ {
+ vficon_select(vf, id);
+ vficon_send_layout_select(vf, id);
+ }
+}
+
/*
*-------------------------------------------------------------------
*-------------------------------------------------------------------
*/
-static void vficon_move_focus(ViewFileIcon *vfi, gint row, gint col, gint relative)
+static void vficon_move_focus(ViewFile *vf, gint row, gint col, gboolean relative)
{
gint new_row;
gint new_col;
if (relative)
{
- new_row = vfi->focus_row;
- new_col = vfi->focus_column;
+ new_row = VFICON(vf)->focus_row;
+ new_col = VFICON(vf)->focus_column;
new_row += row;
if (new_row < 0) new_row = 0;
- if (new_row >= vfi->rows) new_row = vfi->rows - 1;
+ if (new_row >= VFICON(vf)->rows) new_row = VFICON(vf)->rows - 1;
while (col != 0)
{
if (new_row > 0)
{
new_row--;
- new_col = vfi->columns - 1;
+ new_col = VFICON(vf)->columns - 1;
}
else
{
new_col = 0;
}
}
- if (new_col >= vfi->columns)
+ if (new_col >= VFICON(vf)->columns)
{
- if (new_row < vfi->rows - 1)
+ if (new_row < VFICON(vf)->rows - 1)
{
new_row++;
new_col = 0;
}
else
{
- new_col = vfi->columns - 1;
+ new_col = VFICON(vf)->columns - 1;
}
}
}
new_row = row;
new_col = col;
- if (new_row >= vfi->rows)
+ if (new_row >= VFICON(vf)->rows)
{
- if (vfi->rows > 0)
- new_row = vfi->rows - 1;
+ if (VFICON(vf)->rows > 0)
+ new_row = VFICON(vf)->rows - 1;
else
new_row = 0;
- new_col = vfi->columns - 1;
+ new_col = VFICON(vf)->columns - 1;
}
- if (new_col >= vfi->columns) new_col = vfi->columns - 1;
+ if (new_col >= VFICON(vf)->columns) new_col = VFICON(vf)->columns - 1;
}
- if (new_row == vfi->rows - 1)
+ if (new_row == VFICON(vf)->rows - 1)
{
gint l;
/* if we moved beyond the last image, go to the last image */
- l = g_list_length(vfi->list);
- if (vfi->rows > 1) l -= (vfi->rows - 1) * vfi->columns;
+ l = g_list_length(vf->list);
+ if (VFICON(vf)->rows > 1) l -= (VFICON(vf)->rows - 1) * VFICON(vf)->columns;
if (new_col >= l) new_col = l - 1;
}
- vficon_set_focus(vfi, vficon_find_data(vfi, new_row, new_col, NULL));
+ vficon_set_focus(vf, vficon_find_data(vf, new_row, new_col, NULL));
}
-static void vficon_set_focus(ViewFileIcon *vfi, IconData *id)
+static void vficon_set_focus(ViewFile *vf, IconData *id)
{
GtkTreeIter iter;
gint row, col;
- if (g_list_find(vfi->list, vfi->focus_id))
+ if (g_list_find(vf->list, VFICON(vf)->focus_id))
{
- if (id == vfi->focus_id)
+ if (id == VFICON(vf)->focus_id)
{
/* ensure focus row col are correct */
- vficon_find_position(vfi, vfi->focus_id, &vfi->focus_row, &vfi->focus_column);
+ vficon_find_position(vf, VFICON(vf)->focus_id, &VFICON(vf)->focus_row, &VFICON(vf)->focus_column);
return;
}
- vficon_selection_remove(vfi, vfi->focus_id, SELECTION_FOCUS, NULL);
+ vficon_selection_remove(vf, VFICON(vf)->focus_id, SELECTION_FOCUS, NULL);
}
- if (!vficon_find_position(vfi, id, &row, &col))
+ if (!vficon_find_position(vf, id, &row, &col))
{
- vfi->focus_id = NULL;
- vfi->focus_row = -1;
- vfi->focus_column = -1;
+ VFICON(vf)->focus_id = NULL;
+ VFICON(vf)->focus_row = -1;
+ VFICON(vf)->focus_column = -1;
return;
}
- vfi->focus_id = id;
- vfi->focus_row = row;
- vfi->focus_column = col;
- vficon_selection_add(vfi, vfi->focus_id, SELECTION_FOCUS, NULL);
+ VFICON(vf)->focus_id = id;
+ VFICON(vf)->focus_row = row;
+ VFICON(vf)->focus_column = col;
+ vficon_selection_add(vf, VFICON(vf)->focus_id, SELECTION_FOCUS, NULL);
- if (vficon_find_iter(vfi, vfi->focus_id, &iter, NULL))
+ if (vficon_find_iter(vf, VFICON(vf)->focus_id, &iter, NULL))
{
GtkTreePath *tpath;
GtkTreeViewColumn *column;
GtkTreeModel *store;
- tree_view_row_make_visible(GTK_TREE_VIEW(vfi->listview), &iter, FALSE);
+ tree_view_row_make_visible(GTK_TREE_VIEW(vf->listview), &iter, FALSE);
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(vfi->listview));
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
tpath = gtk_tree_model_get_path(store, &iter);
/* focus is set to an extra column with 0 width to hide focus, we draw it ourself */
- column = gtk_tree_view_get_column(GTK_TREE_VIEW(vfi->listview), VFICON_MAX_COLUMNS);
- gtk_tree_view_set_cursor(GTK_TREE_VIEW(vfi->listview), tpath, column, FALSE);
+ column = gtk_tree_view_get_column(GTK_TREE_VIEW(vf->listview), VFICON_MAX_COLUMNS);
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(vf->listview), tpath, column, FALSE);
gtk_tree_path_free(tpath);
}
}
-static void vficon_update_focus(ViewFileIcon *vfi)
-{
- gint new_row = 0;
- gint new_col = 0;
-
- if (vfi->focus_id && vficon_find_position(vfi, vfi->focus_id, &new_row, &new_col))
- {
- /* first find the old focus, if it exists and is valid */
- }
- else
- {
- /* (try to) stay where we were */
- new_row = vfi->focus_row;
- new_col = vfi->focus_column;
- }
-
- vficon_move_focus(vfi, new_row, new_col, FALSE);
-}
-
/* used to figure the page up/down distances */
-static gint page_height(ViewFileIcon *vfi)
+static gint page_height(ViewFile *vf)
{
GtkAdjustment *adj;
gint page_size;
gint row_height;
gint ret;
- adj = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(vfi->listview));
- page_size = (gint)adj->page_increment;
+ adj = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(vf->listview));
+ page_size = (gint)gtk_adjustment_get_page_increment(adj);
row_height = options->thumbnails.max_height + THUMB_BORDER_PADDING * 2;
- if (vfi->show_text) row_height += options->thumbnails.max_height / 3;
+ if (VFICON(vf)->show_text) row_height += options->thumbnails.max_height / 3;
ret = page_size / row_height;
if (ret < 1) ret = 1;
static void vfi_menu_position_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
{
- ViewFileIcon *vfi = data;
+ ViewFile *vf = data;
GtkTreeModel *store;
GtkTreeIter iter;
gint column;
GtkTreePath *tpath;
gint cw, ch;
- if (!vficon_find_iter(vfi, vfi->click_id, &iter, &column)) return;
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(vfi->listview));
+ if (!vficon_find_iter(vf, VFICON(vf)->click_id, &iter, &column)) return;
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
tpath = gtk_tree_model_get_path(store, &iter);
- tree_view_get_cell_clamped(GTK_TREE_VIEW(vfi->listview), tpath, column, FALSE, x, y, &cw, &ch);
+ tree_view_get_cell_clamped(GTK_TREE_VIEW(vf->listview), tpath, column, FALSE, x, y, &cw, &ch);
gtk_tree_path_free(tpath);
*y += ch;
popup_menu_position_clamp(menu, x, y, 0);
}
-static gint vficon_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+gboolean vficon_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- ViewFileIcon *vfi = data;
+ ViewFile *vf = data;
gint focus_row = 0;
gint focus_col = 0;
IconData *id;
- gint stop_signal;
+ gboolean stop_signal;
stop_signal = TRUE;
switch (event->keyval)
{
- case GDK_Left: case GDK_KP_Left:
+ case GDK_KEY_Left: case GDK_KEY_KP_Left:
focus_col = -1;
break;
- case GDK_Right: case GDK_KP_Right:
+ case GDK_KEY_Right: case GDK_KEY_KP_Right:
focus_col = 1;
break;
- case GDK_Up: case GDK_KP_Up:
+ case GDK_KEY_Up: case GDK_KEY_KP_Up:
focus_row = -1;
break;
- case GDK_Down: case GDK_KP_Down:
+ case GDK_KEY_Down: case GDK_KEY_KP_Down:
focus_row = 1;
break;
- case GDK_Page_Up: case GDK_KP_Page_Up:
- focus_row = -page_height(vfi);
+ case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
+ focus_row = -page_height(vf);
break;
- case GDK_Page_Down: case GDK_KP_Page_Down:
- focus_row = page_height(vfi);
+ case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
+ focus_row = page_height(vf);
break;
- case GDK_Home: case GDK_KP_Home:
- focus_row = -vfi->focus_row;
- focus_col = -vfi->focus_column;
+ case GDK_KEY_Home: case GDK_KEY_KP_Home:
+ focus_row = -VFICON(vf)->focus_row;
+ focus_col = -VFICON(vf)->focus_column;
break;
- case GDK_End: case GDK_KP_End:
- focus_row = vfi->rows - 1 - vfi->focus_row;
- focus_col = vfi->columns - 1 - vfi->focus_column;
+ case GDK_KEY_End: case GDK_KEY_KP_End:
+ focus_row = VFICON(vf)->rows - 1 - VFICON(vf)->focus_row;
+ focus_col = VFICON(vf)->columns - 1 - VFICON(vf)->focus_column;
break;
- case GDK_space:
- id = vficon_find_data(vfi, vfi->focus_row, vfi->focus_column, NULL);
+ case GDK_KEY_space:
+ id = vficon_find_data(vf, VFICON(vf)->focus_row, VFICON(vf)->focus_column, NULL);
if (id)
{
- vfi->click_id = id;
+ VFICON(vf)->click_id = id;
if (event->state & GDK_CONTROL_MASK)
{
gint selected;
selected = id->selected & SELECTION_SELECTED;
if (selected)
{
- vficon_unselect(vfi, id);
+ vficon_unselect(vf, id);
}
else
{
- vficon_select(vfi, id);
- vficon_send_layout_select(vfi, id);
+ vficon_select(vf, id);
+ vficon_send_layout_select(vf, id);
}
}
else
{
- vficon_select_none(vfi);
- vficon_select(vfi, id);
- vficon_send_layout_select(vfi, id);
+ vf_select_none(vf);
+ vficon_select(vf, id);
+ vficon_send_layout_select(vf, id);
}
}
break;
- case GDK_Menu:
- id = vficon_find_data(vfi, vfi->focus_row, vfi->focus_column, NULL);
- vfi->click_id = id;
+ case GDK_KEY_Menu:
+ id = vficon_find_data(vf, VFICON(vf)->focus_row, VFICON(vf)->focus_column, NULL);
+ VFICON(vf)->click_id = id;
- vficon_selection_add(vfi, vfi->click_id, SELECTION_PRELIGHT, NULL);
- tip_unschedule(vfi);
+ vficon_selection_add(vf, VFICON(vf)->click_id, SELECTION_PRELIGHT, NULL);
+ tip_unschedule(vf);
- vfi->popup = vficon_pop_menu(vfi, (id != NULL));
- gtk_menu_popup(GTK_MENU(vfi->popup), NULL, NULL, vfi_menu_position_cb, vfi, 0, GDK_CURRENT_TIME);
+ vf->popup = vf_pop_menu(vf);
+ gtk_menu_popup(GTK_MENU(vf->popup), NULL, NULL, vfi_menu_position_cb, vf, 0, GDK_CURRENT_TIME);
break;
default:
stop_signal = FALSE;
IconData *new_id;
IconData *old_id;
- old_id = vficon_find_data(vfi, vfi->focus_row, vfi->focus_column, NULL);
- vficon_move_focus(vfi, focus_row, focus_col, TRUE);
- new_id = vficon_find_data(vfi, vfi->focus_row, vfi->focus_column, NULL);
+ old_id = vficon_find_data(vf, VFICON(vf)->focus_row, VFICON(vf)->focus_column, NULL);
+ vficon_move_focus(vf, focus_row, focus_col, TRUE);
+ new_id = vficon_find_data(vf, VFICON(vf)->focus_row, VFICON(vf)->focus_column, NULL);
if (new_id != old_id)
{
{
if (!options->collections.rectangular_selection)
{
- vficon_select_region_util(vfi, old_id, new_id, FALSE);
+ vficon_select_region_util(vf, old_id, new_id, FALSE);
}
else
{
- vficon_select_region_util(vfi, vfi->click_id, old_id, FALSE);
+ vficon_select_region_util(vf, VFICON(vf)->click_id, old_id, FALSE);
}
- vficon_select_region_util(vfi, vfi->click_id, new_id, TRUE);
- vficon_send_layout_select(vfi, new_id);
+ vficon_select_region_util(vf, VFICON(vf)->click_id, new_id, TRUE);
+ vficon_send_layout_select(vf, new_id);
}
else if (event->state & GDK_CONTROL_MASK)
{
- vfi->click_id = new_id;
+ VFICON(vf)->click_id = new_id;
}
else
{
- vfi->click_id = new_id;
- vficon_select_none(vfi);
- vficon_select(vfi, new_id);
- vficon_send_layout_select(vfi, new_id);
+ VFICON(vf)->click_id = new_id;
+ vf_select_none(vf);
+ vficon_select(vf, new_id);
+ vficon_send_layout_select(vf, new_id);
}
}
}
if (stop_signal)
{
-#if 0
- g_signal_stop_emission_by_name(GTK_OBJECT(widget), "key_press_event");
-#endif
- tip_unschedule(vfi);
+ tip_unschedule(vf);
}
return stop_signal;
*-------------------------------------------------------------------
*/
-static gint vficon_motion_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+static gboolean vficon_motion_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
- ViewFileIcon *vfi = data;
+ ViewFile *vf = data;
IconData *id;
- id = vficon_find_data_by_coord(vfi, (gint)bevent->x, (gint)bevent->y, NULL);
- tip_update(vfi, id);
+ id = vficon_find_data_by_coord(vf, (gint)bevent->x, (gint)bevent->y, NULL);
+ tip_update(vf, id);
return FALSE;
}
-static gint vficon_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+gboolean vficon_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
- ViewFileIcon *vfi = data;
+ ViewFile *vf = data;
GtkTreeIter iter;
IconData *id;
- tip_unschedule(vfi);
+ tip_unschedule(vf);
- id = vficon_find_data_by_coord(vfi, (gint)bevent->x, (gint)bevent->y, &iter);
+ id = vficon_find_data_by_coord(vf, (gint)bevent->x, (gint)bevent->y, &iter);
- vfi->click_id = id;
- vficon_selection_add(vfi, vfi->click_id, SELECTION_PRELIGHT, &iter);
+ VFICON(vf)->click_id = id;
+ vficon_selection_add(vf, VFICON(vf)->click_id, SELECTION_PRELIGHT, &iter);
switch (bevent->button)
{
case MOUSE_BUTTON_LEFT:
- if (!GTK_WIDGET_HAS_FOCUS(vfi->listview))
+ if (!gtk_widget_has_focus(vf->listview))
{
- gtk_widget_grab_focus(vfi->listview);
+ gtk_widget_grab_focus(vf->listview);
}
-#if 0
+
if (bevent->type == GDK_2BUTTON_PRESS &&
- vfi->layout)
+ vf->layout)
{
- vficon_selection_remove(vfi, vfi->click_id, SELECTION_PRELIGHT, &iter);
- layout_image_full_screen_start(vfi->layout);
+ vficon_selection_remove(vf, VFICON(vf)->click_id, SELECTION_PRELIGHT, &iter);
+ layout_image_full_screen_start(vf->layout);
}
-#endif
break;
case MOUSE_BUTTON_RIGHT:
- vfi->popup = vficon_pop_menu(vfi, (id != NULL));
- gtk_menu_popup(GTK_MENU(vfi->popup), NULL, NULL, NULL, NULL, bevent->button, bevent->time);
+ vf->popup = vf_pop_menu(vf);
+ gtk_menu_popup(GTK_MENU(vf->popup), NULL, NULL, NULL, NULL, bevent->button, bevent->time);
break;
default:
break;
}
- return TRUE;
+ return FALSE;
}
-static gint vficon_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+gboolean vficon_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
- ViewFileIcon *vfi = data;
+ ViewFile *vf = data;
GtkTreeIter iter;
IconData *id = NULL;
- gint was_selected = FALSE;
+ gboolean was_selected;
- tip_schedule(vfi);
+ tip_schedule(vf);
- if ((gint)bevent->x != 0 || (gint) bevent->y != 0)
+ if ((gint)bevent->x != 0 || (gint)bevent->y != 0)
{
- id = vficon_find_data_by_coord(vfi, (gint)bevent->x, (gint)bevent->y, &iter);
+ id = vficon_find_data_by_coord(vf, (gint)bevent->x, (gint)bevent->y, &iter);
}
- if (vfi->click_id)
+ if (VFICON(vf)->click_id)
{
- vficon_selection_remove(vfi, vfi->click_id, SELECTION_PRELIGHT, NULL);
+ vficon_selection_remove(vf, VFICON(vf)->click_id, SELECTION_PRELIGHT, NULL);
}
- if (id) was_selected = (id->selected & SELECTION_SELECTED);
+ if (!id || VFICON(vf)->click_id != id) return TRUE;
- if (bevent->button == MOUSE_BUTTON_LEFT &&
- id && vfi->click_id == id)
- {
- vficon_set_focus(vfi, id);
+ was_selected = !!(id->selected & SELECTION_SELECTED);
- if (bevent->state & GDK_CONTROL_MASK)
+ switch (bevent->button)
+ {
+ case MOUSE_BUTTON_LEFT:
{
- gint select;
+ vficon_set_focus(vf, id);
- select = !(id->selected & SELECTION_SELECTED);
- if ((bevent->state & GDK_SHIFT_MASK) && vfi->prev_selection)
+ if (bevent->state & GDK_CONTROL_MASK)
{
- vficon_select_region_util(vfi, vfi->prev_selection, id, select);
+ gboolean select;
+
+ select = !(id->selected & SELECTION_SELECTED);
+ if ((bevent->state & GDK_SHIFT_MASK) && VFICON(vf)->prev_selection)
+ {
+ vficon_select_region_util(vf, VFICON(vf)->prev_selection, id, select);
+ }
+ else
+ {
+ vficon_select_util(vf, id, select);
+ }
}
else
{
- vficon_select_util(vfi, id, select);
+ vf_select_none(vf);
+
+ if ((bevent->state & GDK_SHIFT_MASK) && VFICON(vf)->prev_selection)
+ {
+ vficon_select_region_util(vf, VFICON(vf)->prev_selection, id, TRUE);
+ }
+ else
+ {
+ vficon_select_util(vf, id, TRUE);
+ was_selected = FALSE;
+ }
}
}
- else
+ break;
+ case MOUSE_BUTTON_MIDDLE:
{
- vficon_select_none(vfi);
-
- if ((bevent->state & GDK_SHIFT_MASK) &&
- vfi->prev_selection)
- {
- vficon_select_region_util(vfi, vfi->prev_selection, id, TRUE);
- }
- else
- {
- vficon_select_util(vfi, id, TRUE);
- was_selected = FALSE;
- }
+ vficon_select_util(vf, id, !(id->selected & SELECTION_SELECTED));
}
- }
- else if (bevent->button == MOUSE_BUTTON_MIDDLE &&
- id && vfi->click_id == id)
- {
- vficon_select_util(vfi, id, !(id->selected & SELECTION_SELECTED));
+ break;
+ default:
+ break;
}
- if (id && !was_selected &&
- (id->selected & SELECTION_SELECTED))
+ if (!was_selected && (id->selected & SELECTION_SELECTED))
{
- vficon_send_layout_select(vfi, id);
+ vficon_send_layout_select(vf, id);
}
return TRUE;
}
-static gint vficon_leave_cb(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
+static gboolean vficon_leave_cb(GtkWidget *widget, GdkEventCrossing *event, gpointer data)
{
- ViewFileIcon *vfi = data;
+ ViewFile *vf = data;
- tip_unschedule(vfi);
+ tip_unschedule(vf);
return FALSE;
}
GList *list;
gtk_tree_model_get(store, iter, FILE_COLUMN_POINTER, &list, -1);
+
+ /* it seems that gtk_list_store_clear may call some callbacks
+ that use the column. Set the pointer to NULL to be safe. */
+ gtk_list_store_set(GTK_LIST_STORE(store), iter, FILE_COLUMN_POINTER, NULL, -1);
g_list_free(list);
return FALSE;
}
-static void vficon_clear_store(ViewFileIcon *vfi)
+static void vficon_clear_store(ViewFile *vf)
{
GtkTreeModel *store;
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(vfi->listview));
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
gtk_tree_model_foreach(store, vficon_destroy_node_cb, NULL);
gtk_list_store_clear(GTK_LIST_STORE(store));
}
-static void vficon_set_thumb(ViewFileIcon *vfi, FileData *fd, GdkPixbuf *pb)
-{
- GtkTreeModel *store;
- GtkTreeIter iter;
- GList *list;
-
- if (!vficon_find_iter(vfi, vficon_icon_data(vfi, fd), &iter, NULL)) return;
-
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(vfi->listview));
-
- if (pb) g_object_ref(pb);
- if (fd->pixbuf) g_object_unref(fd->pixbuf);
- fd->pixbuf = pb;
-
- gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1);
- gtk_list_store_set(GTK_LIST_STORE(store), &iter, FILE_COLUMN_POINTER, list, -1);
-}
-
-static GList *vficon_add_row(ViewFileIcon *vfi, GtkTreeIter *iter)
+static GList *vficon_add_row(ViewFile *vf, GtkTreeIter *iter)
{
GtkListStore *store;
GList *list = NULL;
gint i;
- for (i = 0; i < vfi->columns; i++) list = g_list_prepend(list, NULL);
+ for (i = 0; i < VFICON(vf)->columns; i++) list = g_list_prepend(list, NULL);
- store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vfi->listview)));
+ store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)));
gtk_list_store_append(store, iter);
gtk_list_store_set(store, iter, FILE_COLUMN_POINTER, list, -1);
return list;
}
-static void vficon_populate(ViewFileIcon *vfi, gint resize, gint keep_position)
+static void vficon_populate(ViewFile *vf, gboolean resize, gboolean keep_position)
{
GtkTreeModel *store;
GtkTreePath *tpath;
- gint row;
GList *work;
IconData *visible_id = NULL;
+ gint r, c;
+ gboolean valid;
+ GtkTreeIter iter;
- vficon_verify_selections(vfi);
+ vficon_verify_selections(vf);
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(vfi->listview));
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
- if (keep_position && GTK_WIDGET_REALIZED(vfi->listview) &&
- gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vfi->listview), 0, 0, &tpath, NULL, NULL, NULL))
+ if (keep_position && gtk_widget_get_realized(vf->listview) &&
+ gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf->listview), 0, 0, &tpath, NULL, NULL, NULL))
{
GtkTreeIter iter;
GList *list;
if (list) visible_id = list->data;
}
- vficon_clear_store(vfi);
if (resize)
{
gint i;
gint thumb_width;
+
+ vficon_clear_store(vf);
- thumb_width = vficon_get_icon_width(vfi);
+ thumb_width = vficon_get_icon_width(vf);
for (i = 0; i < VFICON_MAX_COLUMNS; i++)
{
GtkCellRenderer *cell;
GList *list;
- column = gtk_tree_view_get_column(GTK_TREE_VIEW(vfi->listview), i);
- gtk_tree_view_column_set_visible(column, (i < vfi->columns));
+ column = gtk_tree_view_get_column(GTK_TREE_VIEW(vf->listview), i);
+ gtk_tree_view_column_set_visible(column, (i < VFICON(vf)->columns));
gtk_tree_view_column_set_fixed_width(column, thumb_width + (THUMB_BORDER_PADDING * 6));
- list = gtk_tree_view_column_get_cell_renderers(column);
+ list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
cell = (list) ? list->data : NULL;
g_list_free(list);
{
g_object_set(G_OBJECT(cell), "fixed_width", thumb_width,
"fixed_height", options->thumbnails.max_height,
- "show_text", vfi->show_text, NULL);
+ "show_text", VFICON(vf)->show_text,
+ "show_marks", vf->marks_enabled,
+ "num_marks", FILEDATA_MARKS_SIZE,
+ NULL);
}
}
- if (GTK_WIDGET_REALIZED(vfi->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vfi->listview));
+ if (gtk_widget_get_realized(vf->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vf->listview));
}
- row = -1;
- work = vfi->list;
+ r = -1;
+ c = 0;
+
+ valid = gtk_tree_model_iter_children(store, &iter, NULL);
+
+ work = vf->list;
while (work)
{
GList *list;
- GtkTreeIter iter;
-
- row++;
+ r++;
+ c = 0;
+ if (valid)
+ {
+ gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1);
+ gtk_list_store_set(GTK_LIST_STORE(store), &iter, FILE_COLUMN_POINTER, list, -1);
+ }
+ else
+ {
+ list = vficon_add_row(vf, &iter);
+ }
- list = vficon_add_row(vfi, &iter);
- while (work && list)
- {
- IconData *id;
-
- id = work->data;
- id->row = row;
-
- list->data = work->data;
- list = list->next;
- work = work->next;
- }
- }
-
- if (visible_id &&
- gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vfi->listview), 0, 0, &tpath, NULL, NULL, NULL))
- {
- GtkTreeIter iter;
- GList *list;
-
- gtk_tree_model_get_iter(store, &iter, tpath);
- gtk_tree_path_free(tpath);
-
- gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1);
- if (g_list_find(list, visible_id) == NULL &&
- vficon_find_iter(vfi, visible_id, &iter, NULL))
- {
- tree_view_row_make_visible(GTK_TREE_VIEW(vfi->listview), &iter, FALSE);
- }
- }
-
- vfi->rows = row + 1;
-
- vficon_send_update(vfi);
- vficon_thumb_update(vfi);
-}
-
-static void vficon_populate_at_new_size(ViewFileIcon *vfi, gint w, gint h, gint force)
-{
- gint new_cols;
- gint thumb_width;
-
- thumb_width = vficon_get_icon_width(vfi);
-
- new_cols = w / (thumb_width + (THUMB_BORDER_PADDING * 6));
- if (new_cols < 1) new_cols = 1;
-
- if (!force && new_cols == vfi->columns) return;
-
- vfi->columns = new_cols;
-
- vficon_populate(vfi, TRUE, TRUE);
-
- DEBUG_1("col tab pop cols=%d rows=%d", vfi->columns, vfi->rows);
-}
-
-static void vficon_sync(ViewFileIcon *vfi)
-{
- GtkTreeModel *store;
- GtkTreeIter iter;
- GList *work;
- gint r, c;
-
- if (vfi->rows == 0) return;
-
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(vfi->listview));
-
- r = -1;
- c = 0;
-
- work = vfi->list;
- while (work)
- {
- GList *list;
- r++;
- c = 0;
- if (gtk_tree_model_iter_nth_child(store, &iter, NULL, r))
- {
- gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1);
- gtk_list_store_set(GTK_LIST_STORE(store), &iter, FILE_COLUMN_POINTER, list, -1);
- }
- else
- {
- list = vficon_add_row(vfi, &iter);
- }
-
- while (list)
+ while (list)
{
IconData *id;
id = work->data;
work = work->next;
c++;
-
- id->row = r;
}
else
{
list->data = id;
list = list->next;
}
+ if (valid) valid = gtk_tree_model_iter_next(store, &iter);
}
r++;
- while (gtk_tree_model_iter_nth_child(store, &iter, NULL, r))
+ while (valid)
{
GList *list;
gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1);
- gtk_list_store_remove(GTK_LIST_STORE(store), &iter);
+ valid = gtk_list_store_remove(GTK_LIST_STORE(store), &iter);
g_list_free(list);
}
- vfi->rows = r;
+ VFICON(vf)->rows = r;
- vficon_update_focus(vfi);
-}
+ if (visible_id &&
+ gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf->listview), 0, 0, &tpath, NULL, NULL, NULL))
+ {
+ GtkTreeIter iter;
+ GList *list;
-static gint vficon_sync_idle_cb(gpointer data)
-{
- ViewFileIcon *vfi = data;
+ gtk_tree_model_get_iter(store, &iter, tpath);
+ gtk_tree_path_free(tpath);
+
+ gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1);
+ if (g_list_find(list, visible_id) == NULL &&
+ vficon_find_iter(vf, visible_id, &iter, NULL))
+ {
+ tree_view_row_make_visible(GTK_TREE_VIEW(vf->listview), &iter, FALSE);
+ }
+ }
- if (vfi->sync_idle_id == -1) return FALSE;
- vfi->sync_idle_id = -1;
- vficon_sync(vfi);
- return FALSE;
+ vf_send_update(vf);
+ vf_thumb_update(vf);
}
-static void vficon_sync_idle(ViewFileIcon *vfi)
+static void vficon_populate_at_new_size(ViewFile *vf, gint w, gint h, gboolean force)
{
- if (vfi->sync_idle_id == -1)
- {
- /* high priority, the view needs to be resynced before a redraw
- * may contain invalid pointers at this time
- */
- vfi->sync_idle_id = g_idle_add_full(G_PRIORITY_HIGH, vficon_sync_idle_cb, vfi, NULL);
- }
+ gint new_cols;
+ gint thumb_width;
+
+ thumb_width = vficon_get_icon_width(vf);
+
+ new_cols = w / (thumb_width + (THUMB_BORDER_PADDING * 6));
+ if (new_cols < 1) new_cols = 1;
+
+ if (!force && new_cols == VFICON(vf)->columns) return;
+
+ VFICON(vf)->columns = new_cols;
+
+ vficon_populate(vf, TRUE, TRUE);
+
+ DEBUG_1("col tab pop cols=%d rows=%d", VFICON(vf)->columns, VFICON(vf)->rows);
}
static void vficon_sized_cb(GtkWidget *widget, GtkAllocation *allocation, gpointer data)
{
- ViewFileIcon *vfi = data;
+ ViewFile *vf = data;
- vficon_populate_at_new_size(vfi, allocation->width, allocation->height, FALSE);
+ vficon_populate_at_new_size(vf, allocation->width, allocation->height, FALSE);
}
/*
*-----------------------------------------------------------------------------
*/
-void vficon_sort_set(ViewFileIcon *vfi, SortType type, gint ascend)
+void vficon_sort_set(ViewFile *vf, SortType type, gboolean ascend)
{
- if (vfi->sort_method == type && vfi->sort_ascend == ascend) return;
+ if (vf->sort_method == type && vf->sort_ascend == ascend) return;
- vfi->sort_method = type;
- vfi->sort_ascend = ascend;
+ vf->sort_method = type;
+ vf->sort_ascend = ascend;
- if (!vfi->list) return;
+ if (!vf->list) return;
- vfi->list = iconlist_sort(vfi->list, vfi->sort_method, vfi->sort_ascend);
- vficon_sync(vfi);
+ vf_refresh(vf);
}
/*
*-----------------------------------------------------------------------------
*/
-static gint vficon_thumb_next(ViewFileIcon *vfi);
-
-static void vficon_thumb_status(ViewFileIcon *vfi, gdouble val, const gchar *text)
+void vficon_thumb_progress_count(GList *list, gint *count, gint *done)
{
- if (vfi->func_thumb_status)
+ GList *work = list;
+ while (work)
{
- vfi->func_thumb_status(vfi, val, text, vfi->data_thumb_status);
- }
-}
-
-static void vficon_thumb_cleanup(ViewFileIcon *vfi)
-{
- vficon_thumb_status(vfi, 0.0, NULL);
-
- vfi->thumbs_count = 0;
- vfi->thumbs_running = FALSE;
-
- thumb_loader_free(vfi->thumbs_loader);
- vfi->thumbs_loader = NULL;
-
- vfi->thumbs_fd = NULL;
-}
+ IconData *id = work->data;
+ FileData *fd = id->fd;
+ work = work->next;
-static void vficon_thumb_stop(ViewFileIcon *vfi)
-{
- if (vfi->thumbs_running) vficon_thumb_cleanup(vfi);
+ if (fd->thumb_pixbuf) (*done)++;
+ (*count)++;
+ }
}
-static void vficon_thumb_do(ViewFileIcon *vfi, ThumbLoader *tl, FileData *fd)
+void vficon_set_thumb_fd(ViewFile *vf, FileData *fd)
{
- GdkPixbuf *pixbuf;
+ GtkTreeModel *store;
+ GtkTreeIter iter;
+ GList *list;
- if (!fd) return;
+ if (!vficon_find_iter(vf, vficon_icon_data(vf, fd), &iter, NULL)) return;
- pixbuf = thumb_loader_get_pixbuf(tl, TRUE);
- vficon_set_thumb(vfi, fd, pixbuf);
- g_object_unref(pixbuf);
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
- vficon_thumb_status(vfi, (gdouble)(vfi->thumbs_count) / g_list_length(vfi->list), _("Loading thumbs..."));
+ gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1);
+ gtk_list_store_set(GTK_LIST_STORE(store), &iter, FILE_COLUMN_POINTER, list, -1);
}
-static void vficon_thumb_error_cb(ThumbLoader *tl, gpointer data)
-{
- ViewFileIcon *vfi = data;
-
- if (vfi->thumbs_fd && vfi->thumbs_loader == tl)
- {
- vficon_thumb_do(vfi, tl, vfi->thumbs_fd);
- }
-
- while (vficon_thumb_next(vfi));
-}
-static void vficon_thumb_done_cb(ThumbLoader *tl, gpointer data)
-{
- ViewFileIcon *vfi = data;
-
- if (vfi->thumbs_fd && vfi->thumbs_loader == tl)
- {
- vficon_thumb_do(vfi, tl, vfi->thumbs_fd);
- }
-
- while (vficon_thumb_next(vfi));
-}
-
-static gint vficon_thumb_next(ViewFileIcon *vfi)
+FileData *vficon_thumb_next_fd(ViewFile *vf)
{
GtkTreePath *tpath;
FileData *fd = NULL;
- if (!GTK_WIDGET_REALIZED(vfi->listview))
- {
- vficon_thumb_status(vfi, 0.0, NULL);
- return FALSE;
- }
-
- if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vfi->listview), 0, 0, &tpath, NULL, NULL, NULL))
+ if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf->listview), 0, 0, &tpath, NULL, NULL, NULL))
{
GtkTreeModel *store;
GtkTreeIter iter;
- gint valid = TRUE;
+ gboolean valid = TRUE;
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(vfi->listview));
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));
gtk_tree_model_get_iter(store, &iter, tpath);
gtk_tree_path_free(tpath);
- while (!fd && valid && tree_view_row_get_visibility(GTK_TREE_VIEW(vfi->listview), &iter, FALSE) == 0)
+ while (!fd && valid && tree_view_row_get_visibility(GTK_TREE_VIEW(vf->listview), &iter, FALSE) == 0)
{
GList *list;
while (!fd && list)
{
IconData *id = list->data;
- if (id && !id->fd->pixbuf) fd = id->fd;
+ if (id && !id->fd->thumb_pixbuf) fd = id->fd;
list = list->next;
}
if (!fd)
{
- GList *work = vfi->list;
+ GList *work = vf->list;
while (work && !fd)
{
IconData *id = work->data;
FileData *fd_p = id->fd;
work = work->next;
- if (!fd_p->pixbuf) fd = fd_p;
+ if (!fd_p->thumb_pixbuf) fd = fd_p;
}
}
- if (!fd)
- {
- /* done */
- vficon_thumb_cleanup(vfi);
- return FALSE;
- }
-
- vfi->thumbs_count++;
-
- vfi->thumbs_fd = fd;
-
- thumb_loader_free(vfi->thumbs_loader);
+ return fd;
+}
- vfi->thumbs_loader = thumb_loader_new(options->thumbnails.max_width, options->thumbnails.max_height);
- thumb_loader_set_callbacks(vfi->thumbs_loader,
- vficon_thumb_done_cb,
- vficon_thumb_error_cb,
- NULL,
- vfi);
+void vficon_thumb_reset_all(ViewFile *vf)
+{
+ GList *work = vf->list;
- if (!thumb_loader_start(vfi->thumbs_loader, fd->path))
+ while (work)
{
- /* set icon to unknown, continue */
- DEBUG_1("thumb loader start failed %s", vfi->thumbs_loader->path);
- vficon_thumb_do(vfi, vfi->thumbs_loader, fd);
-
- return TRUE;
+ IconData *id = work->data;
+ FileData *fd = id->fd;
+ if (fd->thumb_pixbuf)
+ {
+ g_object_unref(fd->thumb_pixbuf);
+ fd->thumb_pixbuf = NULL;
+ }
+ work = work->next;
}
-
- return FALSE;
}
-static void vficon_thumb_update(ViewFileIcon *vfi)
-{
- vficon_thumb_stop(vfi);
-
- vficon_thumb_status(vfi, 0.0, _("Loading thumbs..."));
- vfi->thumbs_running = TRUE;
-
- while (vficon_thumb_next(vfi));
-}
/*
*-----------------------------------------------------------------------------
*-----------------------------------------------------------------------------
*/
-FileData *vficon_index_get_data(ViewFileIcon *vfi, gint row)
+FileData *vficon_index_get_data(ViewFile *vf, gint row)
{
IconData *id;
- id = g_list_nth_data(vfi->list, row);
+ id = g_list_nth_data(vf->list, row);
return id ? id->fd : NULL;
}
-gchar *vficon_index_get_path(ViewFileIcon *vfi, gint row)
-{
- FileData *fd;
- IconData *id;
-
- id = g_list_nth_data(vfi->list, row);
- fd = id ? id->fd : NULL;
-
- return (fd ? fd->path : NULL);
-}
-
-gint vficon_index_by_path(ViewFileIcon *vfi, const gchar *path)
-{
- gint p = 0;
- GList *work;
-
- if (!path) return -1;
-
- work = vfi->list;
- while (work)
- {
- IconData *id = work->data;
- FileData *fd = id->fd;
- if (strcmp(path, fd->path) == 0) return p;
- work = work->next;
- p++;
- }
-
- return -1;
-}
-gint vficon_index_by_fd(ViewFileIcon *vfi, FileData *in_fd)
+gint vficon_index_by_fd(ViewFile *vf, FileData *in_fd)
{
gint p = 0;
GList *work;
if (!in_fd) return -1;
- work = vfi->list;
+ work = vf->list;
while (work)
{
IconData *id = work->data;
return -1;
}
-static gint vficon_index_by_id(ViewFileIcon *vfi, IconData *in_id)
+static gint vficon_index_by_id(ViewFile *vf, IconData *in_id)
{
gint p = 0;
GList *work;
if (!in_id) return -1;
- work = vfi->list;
+ work = vf->list;
while (work)
{
IconData *id = work->data;
return -1;
}
-gint vficon_count(ViewFileIcon *vfi, gint64 *bytes)
+guint vficon_count(ViewFile *vf, gint64 *bytes)
{
if (bytes)
{
gint64 b = 0;
GList *work;
- work = vfi->list;
+ work = vf->list;
while (work)
{
-
IconData *id = work->data;
FileData *fd = id->fd;
work = work->next;
+
b += fd->size;
}
*bytes = b;
}
- return g_list_length(vfi->list);
+ return g_list_length(vf->list);
}
-GList *vficon_get_list(ViewFileIcon *vfi)
+GList *vficon_get_list(ViewFile *vf)
{
GList *list = NULL;
GList *work;
- work = vfi->list;
+ work = vf->list;
while (work)
{
IconData *id = work->data;
*-----------------------------------------------------------------------------
*/
-static gint vficon_refresh_real(ViewFileIcon *vfi, gint keep_position)
+static gboolean vficon_refresh_real(ViewFile *vf, gboolean keep_position)
{
- gint ret = TRUE;
- GList *old_list;
- GList *work;
+ gboolean ret = TRUE;
+ GList *work, *work_fd;
IconData *focus_id;
+ GList *new_filelist = NULL;
+ FileData *first_selected = NULL;
+ GList *new_iconlist = NULL;
- focus_id = vfi->focus_id;
-
- old_list = vfi->list;
- vfi->list = NULL;
+ focus_id = VFICON(vf)->focus_id;
- if (vfi->path)
+ if (vf->dir_fd)
{
- ret = iconlist_read(vfi->path, &vfi->list);
+ ret = filelist_read(vf->dir_fd, &new_filelist, NULL);
+ new_filelist = file_data_filter_marks_list(new_filelist, vf_marks_get_filter(vf));
}
- /* check for same files from old_list */
- work = old_list;
- while (work)
- {
- IconData *id;
- FileData *fd;
+ vf->list = iconlist_sort(vf->list, vf->sort_method, vf->sort_ascend); /* the list might not be sorted if there were renames */
+ new_filelist = filelist_sort(new_filelist, vf->sort_method, vf->sort_ascend);
- GList *needle;
+ if (VFICON(vf)->selection)
+ {
+ first_selected = ((IconData *)(VFICON(vf)->selection->data))->fd;
+ file_data_ref(first_selected);
+ g_list_free(VFICON(vf)->selection);
+ VFICON(vf)->selection = NULL;
+
- id = work->data;
- fd = id->fd;
+ }
- needle = vfi->list;
- while (needle)
+ /* check for same files from old_list */
+ work = vf->list;
+ work_fd = new_filelist;
+ while (work || work_fd)
+ {
+ IconData *id = NULL;
+ FileData *fd = NULL;
+ FileData *new_fd = NULL;
+ gint match;
+
+ if (work && work_fd)
{
- IconData *idn = needle->data;
- FileData *fdn = idn->fd;
- if (fdn == fd)
+ id = work->data;
+ fd = id->fd;
+
+ new_fd = work_fd->data;
+
+ if (fd == new_fd)
{
- /* swap, to retain old thumb, selection */
- needle->data = id;
- work->data = idn;
- needle = NULL;
+ /* not changed, go to next */
+ work = work->next;
+ work_fd = work_fd->next;
+ if (id->selected & SELECTION_SELECTED)
+ {
+ VFICON(vf)->selection = g_list_prepend(VFICON(vf)->selection, id);
+ }
+ continue;
}
+
+ match = filelist_sort_compare_filedata_full(fd, new_fd, vf->sort_method, vf->sort_ascend);
+ if (match == 0) g_warning("multiple fd for the same path");
+ }
+ else if (work)
+ {
+ id = work->data;
+ fd = id->fd;
+ match = -1;
+ }
+ else /* work_fd */
+ {
+ new_fd = work_fd->data;
+ match = 1;
+ }
+
+ if (match < 0)
+ {
+ /* file no longer exists, delete from vf->list */
+ GList *to_delete = work;
+ work = work->next;
+ if (id == VFICON(vf)->prev_selection) VFICON(vf)->prev_selection = NULL;
+ if (id == VFICON(vf)->click_id) VFICON(vf)->click_id = NULL;
+ file_data_unref(fd);
+ g_free(id);
+ vf->list = g_list_delete_link(vf->list, to_delete);
+ }
+ else
+ {
+ /* new file, add to vf->list */
+ id = g_new0(IconData, 1);
+
+ id->selected = SELECTION_NONE;
+ id->fd = file_data_ref(new_fd);
+ if (work)
+ vf->list = g_list_insert_before(vf->list, work, id);
else
- {
- needle = needle->next;
- }
+ new_iconlist = g_list_prepend(new_iconlist, id); /* it is faster to append all new entries together later */
+
+ work_fd = work_fd->next;
}
- work = work->next;
}
- vfi->list = iconlist_sort(vfi->list, vfi->sort_method, vfi->sort_ascend);
-
- work = old_list;
- while (work)
+ if (new_iconlist)
{
- IconData *id = work->data;
- work = work->next;
-
- if (id == vfi->prev_selection) vfi->prev_selection = NULL;
- if (id == vfi->click_id) vfi->click_id = NULL;
+ vf->list = g_list_concat(vf->list, g_list_reverse(new_iconlist));
}
+
+ VFICON(vf)->selection = g_list_reverse(VFICON(vf)->selection);
+
+ filelist_free(new_filelist);
- vficon_populate(vfi, TRUE, keep_position);
+ vficon_populate(vf, TRUE, keep_position);
+ if (first_selected && !VFICON(vf)->selection)
+ {
+ /* all selected files disappeared */
+ vficon_select_closest(vf, first_selected);
+ }
+ file_data_unref(first_selected);
+
/* attempt to keep focus on same icon when refreshing */
- if (focus_id && g_list_find(vfi->list, focus_id))
+ if (focus_id && g_list_find(vf->list, focus_id))
{
- vficon_set_focus(vfi, focus_id);
+ vficon_set_focus(vf, focus_id);
}
- iconlist_free(old_list);
-
return ret;
}
-gint vficon_refresh(ViewFileIcon *vfi)
+gboolean vficon_refresh(ViewFile *vf)
{
- return vficon_refresh_real(vfi, TRUE);
+ return vficon_refresh_real(vf, TRUE);
}
/*
typedef struct _ColumnData ColumnData;
struct _ColumnData
{
- ViewFileIcon *vfi;
+ ViewFile *vf;
gint number;
};
static void vficon_cell_data_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
- ColumnData *cd = data;
- ViewFileIcon *vfi;
- GtkStyle *style;
GList *list;
- GdkColor color_fg;
- GdkColor color_bg;
IconData *id;
+ ColumnData *cd = data;
+ ViewFile *vf = cd->vf;
- vfi = cd->vfi;
+ if (!GQV_IS_CELL_RENDERER_ICON(cell)) return;
gtk_tree_model_get(tree_model, iter, FILE_COLUMN_POINTER, &list, -1);
id = g_list_nth_data(list, cd->number);
-
- if (id) g_assert(id->fd->magick == 0x12345678);
-
- style = gtk_widget_get_style(vfi->listview);
- if (id && id->selected & SELECTION_SELECTED)
- {
- memcpy(&color_fg, &style->text[GTK_STATE_SELECTED], sizeof(color_fg));
- memcpy(&color_bg, &style->base[GTK_STATE_SELECTED], sizeof(color_bg));
- }
- else
+
+ if (id)
{
- memcpy(&color_fg, &style->text[GTK_STATE_NORMAL], sizeof(color_fg));
- memcpy(&color_bg, &style->base[GTK_STATE_NORMAL], sizeof(color_bg));
- }
+ GdkColor color_fg;
+ GdkColor color_bg;
+ GtkStyle *style;
+ gchar *name_sidecars;
+ gchar *link;
+ GtkStateType state = GTK_STATE_NORMAL;
- if (id && id->selected & SELECTION_PRELIGHT)
- {
-#if 0
- shift_color(&color_fg, -1, 0);
-#endif
- shift_color(&color_bg, -1, 0);
- }
+ g_assert(id->fd->magick == FD_MAGICK);
- if (GQV_IS_CELL_RENDERER_ICON(cell))
- {
- if (id)
+ link = islink(id->fd->path) ? GQ_LINK_STR : "";
+ if (id->fd->sidecar_files)
{
- g_object_set(cell, "pixbuf", id->fd->pixbuf,
- "text", id->fd->name,
- "cell-background-gdk", &color_bg,
- "cell-background-set", TRUE,
- "foreground-gdk", &color_fg,
- "foreground-set", TRUE,
- "has-focus", (vfi->focus_id == id), NULL);
+ gchar *sidecars = file_data_sc_list_to_string(id->fd);
+ name_sidecars = g_strdup_printf("%s%s %s", link, id->fd->name, sidecars);
+ g_free(sidecars);
}
else
{
- g_object_set(cell, "pixbuf", NULL,
- "text", NULL,
- "cell-background-set", FALSE,
- "foreground-set", FALSE,
- "has-focus", FALSE, NULL);
+ gchar *disabled_grouping = id->fd->disable_grouping ? _(" [NO GROUPING]") : "";
+ name_sidecars = g_strdup_printf("%s%s%s", link, id->fd->name, disabled_grouping);
}
+
+ style = gtk_widget_get_style(vf->listview);
+ if (id->selected & SELECTION_SELECTED)
+ {
+ state = GTK_STATE_SELECTED;
+ }
+
+ memcpy(&color_fg, &style->text[state], sizeof(color_fg));
+ memcpy(&color_bg, &style->base[state], sizeof(color_bg));
+
+ if (id->selected & SELECTION_PRELIGHT)
+ {
+ shift_color(&color_bg, -1, 0);
+ }
+
+ g_object_set(cell, "pixbuf", id->fd->thumb_pixbuf,
+ "text", name_sidecars,
+ "marks", file_data_get_marks(id->fd),
+ "show_marks", vf->marks_enabled,
+ "cell-background-gdk", &color_bg,
+ "cell-background-set", TRUE,
+ "foreground-gdk", &color_fg,
+ "foreground-set", TRUE,
+ "has-focus", (VFICON(vf)->focus_id == id), NULL);
+ g_free(name_sidecars);
+ }
+ else
+ {
+ g_object_set(cell, "pixbuf", NULL,
+ "text", NULL,
+ "show_marks", FALSE,
+ "cell-background-set", FALSE,
+ "foreground-set", FALSE,
+ "has-focus", FALSE, NULL);
}
}
-static void vficon_append_column(ViewFileIcon *vfi, gint n)
+static void vficon_append_column(ViewFile *vf, gint n)
{
ColumnData *cd;
GtkTreeViewColumn *column;
"mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE, NULL);
g_object_set_data(G_OBJECT(column), "column_number", GINT_TO_POINTER(n));
+ g_object_set_data(G_OBJECT(renderer), "column_number", GINT_TO_POINTER(n));
cd = g_new0(ColumnData, 1);
- cd->vfi = vfi;
+ cd->vf = vf;
cd->number = n;
gtk_tree_view_column_set_cell_data_func(column, renderer, vficon_cell_data_cb, cd, g_free);
- gtk_tree_view_append_column(GTK_TREE_VIEW(vfi->listview), column);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(vf->listview), column);
+
+ g_signal_connect(G_OBJECT(renderer), "toggled", G_CALLBACK(vficon_mark_toggled_cb), vf);
}
/*
*-----------------------------------------------------------------------------
*/
-gint vficon_set_path(ViewFileIcon *vfi, const gchar *path)
+gboolean vficon_set_fd(ViewFile *vf, FileData *dir_fd)
{
- gint ret;
+ gboolean ret;
- if (!path) return FALSE;
- if (vfi->path && strcmp(path, vfi->path) == 0) return TRUE;
+ if (!dir_fd) return FALSE;
+ if (vf->dir_fd == dir_fd) return TRUE;
- g_free(vfi->path);
- vfi->path = g_strdup(path);
+ file_data_unref(vf->dir_fd);
+ vf->dir_fd = file_data_ref(dir_fd);
- g_list_free(vfi->selection);
- vfi->selection = NULL;
+ g_list_free(VFICON(vf)->selection);
+ VFICON(vf)->selection = NULL;
- iconlist_free(vfi->list);
- vfi->list = NULL;
+ iconlist_free(vf->list);
+ vf->list = NULL;
/* NOTE: populate will clear the store for us */
- ret = vficon_refresh_real(vfi, FALSE);
+ ret = vficon_refresh_real(vf, FALSE);
- vfi->focus_id = NULL;
- vficon_move_focus(vfi, 0, 0, FALSE);
+ VFICON(vf)->focus_id = NULL;
+ vficon_move_focus(vf, 0, 0, FALSE);
return ret;
}
-static void vficon_destroy_cb(GtkWidget *widget, gpointer data)
+void vficon_destroy_cb(GtkWidget *widget, gpointer data)
{
- ViewFileIcon *vfi = data;
-
- if (vfi->popup)
- {
- g_signal_handlers_disconnect_matched(G_OBJECT(vfi->popup), G_SIGNAL_MATCH_DATA,
- 0, 0, 0, NULL, vfi);
- gtk_widget_destroy(vfi->popup);
- }
+ ViewFile *vf = data;
- if (vfi->sync_idle_id != -1) g_source_remove(vfi->sync_idle_id);
+ vf_refresh_idle_cancel(vf);
+
+ file_data_unregister_notify_func(vf_notify_cb, vf);
- tip_unschedule(vfi);
+ tip_unschedule(vf);
- vficon_thumb_cleanup(vfi);
+ vf_thumb_cleanup(vf);
- g_free(vfi->path);
-
- iconlist_free(vfi->list);
- g_list_free(vfi->selection);
- g_free(vfi);
+ iconlist_free(vf->list);
+ g_list_free(VFICON(vf)->selection);
}
-ViewFileIcon *vficon_new(const gchar *path)
+ViewFile *vficon_new(ViewFile *vf, FileData *dir_fd)
{
- ViewFileIcon *vfi;
GtkListStore *store;
GtkTreeSelection *selection;
gint i;
- vfi = g_new0(ViewFileIcon, 1);
-
- vfi->path = NULL;
- vfi->sort_method = SORT_NAME;
- vfi->sort_ascend = TRUE;
-
- vfi->selection = NULL;
- vfi->prev_selection = NULL;
-
- vfi->tip_window = NULL;
- vfi->tip_delay_id = -1;
-
- vfi->focus_row = 0;
- vfi->focus_column = 0;
- vfi->focus_id = NULL;
-
- vfi->show_text = options->show_icon_names;
+ vf->info = g_new0(ViewFileInfoIcon, 1);
- vfi->sync_idle_id = -1;
-
- vfi->popup = NULL;
-
- vfi->widget = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(vfi->widget), GTK_SHADOW_IN);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(vfi->widget),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- g_signal_connect(G_OBJECT(vfi->widget), "destroy",
- G_CALLBACK(vficon_destroy_cb), vfi);
+ VFICON(vf)->show_text = options->show_icon_names;
store = gtk_list_store_new(1, G_TYPE_POINTER);
- vfi->listview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+ vf->listview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
g_object_unref(store);
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vfi->listview));
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vf->listview));
gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_NONE);
- gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(vfi->listview), FALSE);
- gtk_tree_view_set_enable_search(GTK_TREE_VIEW(vfi->listview), FALSE);
+ gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(vf->listview), FALSE);
+ gtk_tree_view_set_enable_search(GTK_TREE_VIEW(vf->listview), FALSE);
for (i = 0; i < VFICON_MAX_COLUMNS; i++)
{
- vficon_append_column(vfi, i);
+ vficon_append_column(vf, i);
}
/* zero width column to hide tree view focus, we draw it ourselves */
- vficon_append_column(vfi, i);
+ vficon_append_column(vf, i);
/* end column to fill white space */
- vficon_append_column(vfi, i);
-
- g_signal_connect(G_OBJECT(vfi->listview), "size_allocate",
- G_CALLBACK(vficon_sized_cb), vfi);
- g_signal_connect(G_OBJECT(vfi->listview), "key_press_event",
- G_CALLBACK(vficon_press_key_cb), vfi);
+ vficon_append_column(vf, i);
- gtk_container_add(GTK_CONTAINER(vfi->widget), vfi->listview);
- gtk_widget_show(vfi->listview);
+ g_signal_connect(G_OBJECT(vf->listview), "size_allocate",
+ G_CALLBACK(vficon_sized_cb), vf);
- vficon_dnd_init(vfi);
-
- gtk_widget_set_events(vfi->listview, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK |
+ gtk_widget_set_events(vf->listview, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_BUTTON_PRESS_MASK | GDK_LEAVE_NOTIFY_MASK);
- g_signal_connect(G_OBJECT(vfi->listview), "button_press_event",
- G_CALLBACK(vficon_press_cb), vfi);
- g_signal_connect(G_OBJECT(vfi->listview), "button_release_event",
- G_CALLBACK(vficon_release_cb), vfi);
- g_signal_connect(G_OBJECT(vfi->listview),"motion_notify_event",
- G_CALLBACK(vficon_motion_cb), vfi);
- g_signal_connect(G_OBJECT(vfi->listview), "leave_notify_event",
- G_CALLBACK(vficon_leave_cb), vfi);
- /* force vfi->columns to be at least 1 (sane) - this will be corrected in the size_cb */
- vficon_populate_at_new_size(vfi, 1, 1, FALSE);
+ g_signal_connect(G_OBJECT(vf->listview),"motion_notify_event",
+ G_CALLBACK(vficon_motion_cb), vf);
+ g_signal_connect(G_OBJECT(vf->listview), "leave_notify_event",
+ G_CALLBACK(vficon_leave_cb), vf);
- if (path) vficon_set_path(vfi, path);
+ /* force VFICON(vf)->columns to be at least 1 (sane) - this will be corrected in the size_cb */
+ vficon_populate_at_new_size(vf, 1, 1, FALSE);
- return vfi;
-}
+ file_data_register_notify_func(vf_notify_cb, vf, NOTIFY_PRIORITY_MEDIUM);
-void vficon_set_status_func(ViewFileIcon *vfi,
- void (*func)(ViewFileIcon *vfi, gpointer data), gpointer data)
-{
- vfi->func_status = func;
- vfi->data_status = data;
+ return vf;
}
-void vficon_set_thumb_status_func(ViewFileIcon *vfi,
- void (*func)(ViewFileIcon *vfi, gdouble val, const gchar *text, gpointer data),
- gpointer data)
-{
- vfi->func_thumb_status = func;
- vfi->data_thumb_status = data;
-}
-
-void vficon_set_layout(ViewFileIcon *vfi, LayoutWindow *layout)
-{
- vfi->layout = layout;
-}
-
-/*
- *-----------------------------------------------------------------------------
- * maintenance (for rename, move, remove)
- *-----------------------------------------------------------------------------
- */
-
-static gint vficon_maint_find_closest(ViewFileIcon *vfi, gint row, gint count, GList *ignore_list)
-{
- GList *list = NULL;
- GList *work;
- gint rev = row - 1;
- row ++;
-
- work = ignore_list;
- while (work)
- {
- FileData *fd = work->data;
- gint f = vficon_index_by_fd(vfi, work->data);
- g_assert(fd->magick == 0x12345678);
- if (f >= 0) list = g_list_prepend(list, GINT_TO_POINTER(f));
- work = work->next;
- }
-
- while (list)
- {
- gint c = TRUE;
- work = list;
- while (work && c)
- {
- gpointer p = work->data;
- work = work->next;
- if (row == GPOINTER_TO_INT(p))
- {
- row++;
- c = FALSE;
- }
- if (rev == GPOINTER_TO_INT(p))
- {
- rev--;
- c = FALSE;
- }
- if (!c) list = g_list_remove(list, p);
- }
- if (c && list)
- {
- g_list_free(list);
- list = NULL;
- }
- }
- if (row > count - 1)
- {
- if (rev < 0)
- return -1;
- else
- return rev;
- }
- else
- {
- return row;
- }
-}
-
-gint vficon_maint_renamed(ViewFileIcon *vfi, FileData *fd)
-{
- gint ret = FALSE;
- gint row;
- gchar *source_base;
- gchar *dest_base;
- IconData *id = vficon_icon_data(vfi, fd);
-
- if (!id) return FALSE;
-
- row = vficon_index_by_id(vfi, id);
- if (row < 0) return FALSE;
-
- source_base = remove_level_from_path(fd->change->source);
- dest_base = remove_level_from_path(fd->change->dest);
-
- if (strcmp(source_base, dest_base) == 0)
- {
- vfi->list = g_list_remove(vfi->list, id);
- vfi->list = iconlist_insert_sort(vfi->list, id, vfi->sort_method, vfi->sort_ascend);
-
- vficon_sync_idle(vfi);
- ret = TRUE;
- }
- else
- {
- ret = vficon_maint_removed(vfi, fd, NULL);
- }
-
- g_free(source_base);
- g_free(dest_base);
-
- return ret;
-}
-
-gint vficon_maint_removed(ViewFileIcon *vfi, FileData *fd, GList *ignore_list)
-{
- gint row;
- gint new_row = -1;
- GtkTreeModel *store;
- GtkTreeIter iter;
- IconData *id = vficon_icon_data(vfi, fd);
-
- if (!id) return FALSE;
-
- row = g_list_index(vfi->list, id);
- if (row < 0) return FALSE;
-
- if ((id->selected & SELECTION_SELECTED) &&
- layout_image_get_collection(vfi->layout, NULL) == NULL)
- {
- vficon_unselect(vfi, id);
-
- if (!vfi->selection)
- {
- gint n;
-
- n = vficon_count(vfi, NULL);
- if (ignore_list)
- {
- new_row = vficon_maint_find_closest(vfi, row, n, ignore_list);
- DEBUG_1("row = %d, closest is %d", row, new_row);
- }
- else
- {
- if (row + 1 < n)
- {
- new_row = row + 1;
- }
- else if (row > 0)
- {
- new_row = row - 1;
- }
- }
- }
- else if (ignore_list)
- {
- GList *work;
-
- work = vfi->selection;
- while (work)
- {
- IconData *ignore_id;
- FileData *ignore_fd;
- GList *tmp;
- gint match = FALSE;
-
- ignore_id = work->data;
- ignore_fd = ignore_id->fd;
- g_assert(ignore_fd->magick == 0x12345678);
- work = work->next;
-
- tmp = ignore_list;
- while (tmp && !match)
- {
- FileData *ignore_list_fd = tmp->data;
- g_assert(ignore_list_fd->magick == 0x12345678);
- tmp = tmp->next;
-
- if (ignore_list_fd == ignore_fd)
- {
- match = TRUE;
- }
- }
- if (!match)
- {
- new_row = g_list_index(vfi->list, ignore_id);
- work = NULL;
- }
- }
- if (new_row == -1)
- {
- /* selection all ignored, use closest */
- new_row = vficon_maint_find_closest(vfi, row, vficon_count(vfi, NULL), ignore_list);
- }
- }
- else
- {
- new_row = g_list_index(vfi->list, vfi->selection->data);
- }
- if (new_row >= 0)
- {
- IconData *idn = g_list_nth_data(vfi->list, new_row);
-
- vficon_select(vfi, idn);
- vficon_send_layout_select(vfi, idn);
- }
- }
-
- /* Thumb loader check */
- if (fd == vfi->thumbs_fd) vfi->thumbs_fd = NULL;
- if (vfi->thumbs_count > 0) vfi->thumbs_count--;
-
- if (vfi->prev_selection == id) vfi->prev_selection = NULL;
- if (vfi->click_id == id) vfi->click_id = NULL;
-
- /* remove pointer to this fd from grid */
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(vfi->listview));
- if (id->row >= 0 &&
- gtk_tree_model_iter_nth_child(store, &iter, NULL, id->row))
- {
- GList *list;
-
- gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1);
- list = g_list_find(list, id);
- if (list) list->data = NULL;
- }
-
- vfi->list = g_list_remove(vfi->list, id);
- file_data_unref(fd);
- g_free(id);
-
- vficon_sync_idle(vfi);
- vficon_send_update(vfi);
-
- return TRUE;
-}
-
-gint vficon_maint_moved(ViewFileIcon *vfi, FileData *fd, GList *ignore_list)
-{
- gint ret = FALSE;
- gchar *buf;
-
- if (!fd->change->source || !vfi->path) return FALSE;
-
- buf = remove_level_from_path(fd->change->source);
-
- if (strcmp(buf, vfi->path) == 0)
- {
- ret = vficon_maint_removed(vfi, fd, ignore_list);
- }
-
- g_free(buf);
-
- return ret;
-}
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
projects / geeqie.git / blobdiff