/*
* Geeqie
* (C) 2006 John Ellis
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
#include "dnd.h"
#include "dupe.h"
-#include "filelist.h"
+#include "filedata.h"
#include "layout.h"
#include "layout_image.h"
#include "layout_util.h"
#include "utilops.h"
-#include "ui_bookmark.h"
#include "ui_fileops.h"
#include "ui_menu.h"
#include "ui_tree_edit.h"
#include <gdk/gdkkeysyms.h> /* for keyboard values */
-#define VDTREE_INDENT 14
-#define VDTREE_PAD 4
-
-#define VDTREE_INFO(_vd_, _part_) (((ViewDirInfoTree *)(_vd_->info))->_part_)
+#define VDTREE(_vd_) ((ViewDirInfoTree *)(_vd_->info))
typedef struct _PathData PathData;
};
-
-static gint vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gint force, const gchar *target_path);
+static void vdtree_row_expanded(GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *tpath, gpointer data);
/*
{
GdkCursor *cursor = NULL;
- if (!widget || !widget->window) return;
+ if (!widget || !gtk_widget_get_window(widget)) return;
- if (cursor_type > -1) cursor = gdk_cursor_new (cursor_type);
- gdk_window_set_cursor (widget->window, cursor);
+ if (cursor_type > -1) cursor = gdk_cursor_new(cursor_type);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), cursor);
if (cursor) gdk_cursor_unref(cursor);
gdk_flush();
}
static void vdtree_busy_push(ViewDir *vd)
{
- if (VDTREE_INFO(vd, busy_ref) == 0) set_cursor(vd->view, GDK_WATCH);
- VDTREE_INFO(vd, busy_ref)++;
+ if (VDTREE(vd)->busy_ref == 0) set_cursor(vd->view, GDK_WATCH);
+ VDTREE(vd)->busy_ref++;
}
static void vdtree_busy_pop(ViewDir *vd)
{
- if (VDTREE_INFO(vd, busy_ref) == 1) set_cursor(vd->view, -1);
- if (VDTREE_INFO(vd, busy_ref) > 0) VDTREE_INFO(vd, busy_ref)--;
+ if (VDTREE(vd)->busy_ref == 1) set_cursor(vd->view, -1);
+ if (VDTREE(vd)->busy_ref > 0) VDTREE(vd)->busy_ref--;
}
-gint vdtree_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter, GtkTreeIter *parent)
+gboolean vdtree_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter, GtkTreeIter *parent)
{
GtkTreeModel *store;
- gint valid;
+ gboolean valid;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
if (parent)
}
}
-static void vdtree_expand_by_iter(ViewDir *vd, GtkTreeIter *iter, gint expand)
+static void vdtree_expand_by_iter(ViewDir *vd, GtkTreeIter *iter, gboolean expand)
{
GtkTreeModel *store;
GtkTreePath *tpath;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
tpath = gtk_tree_model_get_path(store, iter);
+
if (expand)
{
+ /* block signal handler, icon is set here, the caller of vdtree_expand_by_iter must make sure
+ that the iter is populated */
+ g_signal_handlers_block_by_func(G_OBJECT(vd->view), vdtree_row_expanded, vd);
gtk_tree_view_expand_row(GTK_TREE_VIEW(vd->view), tpath, FALSE);
vdtree_icon_set_by_iter(vd, iter, vd->pf->open);
+ g_signal_handlers_unblock_by_func(G_OBJECT(vd->view), vdtree_row_expanded, vd);
}
else
{
+ /* signal handler vdtree_row_collapsed is called, it updates the icon */
gtk_tree_view_collapse_row(GTK_TREE_VIEW(vd->view), tpath);
}
gtk_tree_path_free(tpath);
}
-static void vdtree_expand_by_data(ViewDir *vd, FileData *fd, gint expand)
+static void vdtree_expand_by_data(ViewDir *vd, FileData *fd, gboolean expand)
{
GtkTreeIter iter;
{
if (!nd) return;
- file_data_unref(nd->fd);
+ if (nd->fd) file_data_unref(nd->fd);
g_free(nd);
}
*----------------------------------------------------------------------------
*/
-static GtkTargetEntry vdtree_dnd_drop_types[] = {
- { "text/uri-list", 0, TARGET_URI_LIST }
-};
-static gint vdtree_dnd_drop_types_count = 1;
-
-
-static void vdtree_dest_set(ViewDir *vd, gint enable)
-{
- if (enable)
- {
- gtk_drag_dest_set(vd->view,
- GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP,
- vdtree_dnd_drop_types, vdtree_dnd_drop_types_count,
- GDK_ACTION_MOVE | GDK_ACTION_COPY);
- }
- else
- {
- gtk_drag_dest_unset(vd->view);
- }
-}
-
-static void vdtree_dnd_get(GtkWidget *widget, GdkDragContext *context,
- GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
-{
- ViewDir *vd = data;
- GList *list;
- gchar *uri_text = NULL;
- gint length = 0;
-
- if (!vd->click_fd) return;
-
- switch (info)
- {
- case TARGET_URI_LIST:
- case TARGET_TEXT_PLAIN:
- list = g_list_prepend(NULL, vd->click_fd);
- uri_text = uri_text_from_filelist(list, &length, (info == TARGET_TEXT_PLAIN));
- g_list_free(list);
- break;
- }
-
- if (uri_text)
- {
- gtk_selection_data_set(selection_data, selection_data->target,
- 8, (guchar *)uri_text, length);
- g_free(uri_text);
- }
-}
-
-static void vdtree_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data)
-{
- ViewDir *vd = data;
-
- vd_color_set(vd, vd->click_fd, TRUE);
- vdtree_dest_set(vd, FALSE);
-}
-
-static void vdtree_dnd_end(GtkWidget *widget, GdkDragContext *context, gpointer data)
-{
- ViewDir *vd = data;
-
- vd_color_set(vd, vd->click_fd, FALSE);
- vdtree_dest_set(vd, TRUE);
-}
-
-static void vdtree_dnd_drop_receive(GtkWidget *widget,
- GdkDragContext *context, gint x, gint y,
- GtkSelectionData *selection_data, guint info,
- guint time, gpointer data)
-{
- ViewDir *vd = data;
- GtkTreePath *tpath;
- GtkTreeIter iter;
- FileData *fd = NULL;
-
- vd->click_fd = NULL;
-
- if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), x, y,
- &tpath, NULL, NULL, NULL))
- {
- GtkTreeModel *store;
- NodeData *nd;
-
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
- gtk_tree_model_get_iter(store, &iter, tpath);
- gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &nd, -1);
- gtk_tree_path_free(tpath);
-
- fd = (nd) ? nd->fd : NULL;
- }
-
- if (!fd) return;
-
- if (info == TARGET_URI_LIST)
- {
- GList *list;
- gint active;
-
- list = uri_filelist_from_text((gchar *)selection_data->data, TRUE);
- if (!list) return;
-
- active = access_file(fd->path, W_OK | X_OK);
-
- vd_color_set(vd, fd, TRUE);
- vd->popup = vd_drop_menu(vd, active);
- gtk_menu_popup(GTK_MENU(vd->popup), NULL, NULL, NULL, NULL, 0, time);
-
- vd->drop_fd = fd;
- vd->drop_list = list;
- }
-}
-
-static gint vdtree_dnd_drop_expand_cb(gpointer data)
+static gboolean vdtree_dnd_drop_expand_cb(gpointer data)
{
ViewDir *vd = data;
GtkTreeIter iter;
- if (vd->drop_fd &&
- vd_find_row(vd, vd->drop_fd, &iter))
+ if (vd->drop_fd && vd_find_row(vd, vd->drop_fd, &iter))
{
- vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->path);
+ vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->dir_fd);
vdtree_expand_by_data(vd, vd->drop_fd, TRUE);
}
- VDTREE_INFO(vd, drop_expand_id) = -1;
+ VDTREE(vd)->drop_expand_id = 0;
return FALSE;
}
static void vdtree_dnd_drop_expand_cancel(ViewDir *vd)
{
- if (VDTREE_INFO(vd, drop_expand_id) != -1) g_source_remove(VDTREE_INFO(vd, drop_expand_id));
- VDTREE_INFO(vd, drop_expand_id) = -1;
-}
-
-static void vdtree_dnd_drop_expand(ViewDir *vd)
-{
- vdtree_dnd_drop_expand_cancel(vd);
- VDTREE_INFO(vd, drop_expand_id) = g_timeout_add(1000, vdtree_dnd_drop_expand_cb, vd);
-}
-
-static void vdtree_drop_update(ViewDir *vd, gint x, gint y)
-{
- GtkTreePath *tpath;
- GtkTreeIter iter;
- FileData *fd = NULL;
-
- if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vd->view), x, y,
- &tpath, NULL, NULL, NULL))
- {
- GtkTreeModel *store;
- NodeData *nd;
-
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
- gtk_tree_model_get_iter(store, &iter, tpath);
- gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &nd, -1);
- gtk_tree_path_free(tpath);
-
- fd = (nd) ? nd->fd : NULL;
- }
-
- if (fd != vd->drop_fd)
+ if (VDTREE(vd)->drop_expand_id)
{
- vd_color_set(vd, vd->drop_fd, FALSE);
- vd_color_set(vd, fd, TRUE);
- if (fd) vdtree_dnd_drop_expand(vd);
+ g_source_remove(VDTREE(vd)->drop_expand_id);
+ VDTREE(vd)->drop_expand_id = 0;
}
-
- vd->drop_fd = fd;
-}
-
-static void vdtree_dnd_drop_scroll_cancel(ViewDir *vd)
-{
- if (vd->drop_scroll_id != -1) g_source_remove(vd->drop_scroll_id);
- vd->drop_scroll_id = -1;
}
-static gint vdtree_auto_scroll_idle_cb(gpointer data)
-{
- ViewDir *vd = data;
-
- if (vd->drop_fd)
- {
- GdkWindow *window;
- gint x, y;
- gint w, h;
-
- window = vd->view->window;
- gdk_window_get_pointer(window, &x, &y, NULL);
- gdk_drawable_get_size(window, &w, &h);
- if (x >= 0 && x < w && y >= 0 && y < h)
- {
- vdtree_drop_update(vd, x, y);
- }
- }
-
- vd->drop_scroll_id = -1;
- return FALSE;
-}
-
-static gint vdtree_auto_scroll_notify_cb(GtkWidget *widget, gint x, gint y, gpointer data)
-{
- ViewDir *vd = data;
-
- if (!vd->drop_fd || vd->drop_list) return FALSE;
-
- if (vd->drop_scroll_id == -1) vd->drop_scroll_id = g_idle_add(vdtree_auto_scroll_idle_cb, vd);
-
- return TRUE;
-}
-
-static gint vdtree_dnd_drop_motion(GtkWidget *widget, GdkDragContext *context,
- gint x, gint y, guint time, gpointer data)
-{
- ViewDir *vd = data;
-
- vd->click_fd = NULL;
-
- if (gtk_drag_get_source_widget(context) == vd->view)
- {
- gdk_drag_status(context, 0, time);
- return TRUE;
- }
- else
- {
- gdk_drag_status(context, context->suggested_action, time);
- }
-
- vdtree_drop_update(vd, x, y);
-
- if (vd->drop_fd)
- {
- GtkAdjustment *adj = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(vd->view));
- widget_auto_scroll_start(vd->view, adj, -1, -1, vdtree_auto_scroll_notify_cb, vd);
- }
-
- return FALSE;
-}
-
-static void vdtree_dnd_drop_leave(GtkWidget *widget, GdkDragContext *context, guint time, gpointer data)
+static void vdtree_dnd_drop_expand(ViewDir *vd)
{
- ViewDir *vd = data;
-
- if (vd->drop_fd != vd->click_fd) vd_color_set(vd, vd->drop_fd, FALSE);
-
- vd->drop_fd = NULL;
-
vdtree_dnd_drop_expand_cancel(vd);
-}
-
-static void vdtree_dnd_init(ViewDir *vd)
-{
- gtk_drag_source_set(vd->view, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
- dnd_file_drag_types, dnd_file_drag_types_count,
- GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_ASK);
- g_signal_connect(G_OBJECT(vd->view), "drag_data_get",
- G_CALLBACK(vdtree_dnd_get), vd);
- g_signal_connect(G_OBJECT(vd->view), "drag_begin",
- G_CALLBACK(vdtree_dnd_begin), vd);
- g_signal_connect(G_OBJECT(vd->view), "drag_end",
- G_CALLBACK(vdtree_dnd_end), vd);
-
- vdtree_dest_set(vd, TRUE);
- g_signal_connect(G_OBJECT(vd->view), "drag_data_received",
- G_CALLBACK(vdtree_dnd_drop_receive), vd);
- g_signal_connect(G_OBJECT(vd->view), "drag_motion",
- G_CALLBACK(vdtree_dnd_drop_motion), vd);
- g_signal_connect(G_OBJECT(vd->view), "drag_leave",
- G_CALLBACK(vdtree_dnd_drop_leave), vd);
+ VDTREE(vd)->drop_expand_id = g_timeout_add(1000, vdtree_dnd_drop_expand_cb, vd);
}
/*
strp = path;
- if (*strp != '/') return NULL;
+ if (*strp != G_DIR_SEPARATOR) return NULL;
strp++;
strb = strp;
while (*strp != '\0')
{
- if (*strp == '/')
+ if (*strp == G_DIR_SEPARATOR)
{
if (l > 0) list = g_list_prepend(list, g_strndup(strb, l));
strp++;
list = g_list_reverse(list);
- list = g_list_prepend(list, g_strdup("/"));
+ list = g_list_prepend(list, g_strdup(G_DIR_SEPARATOR_S));
return list;
}
GList *work;
GtkTreeModel *store;
GtkTreeIter iter;
- gint valid;
+ gboolean valid;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
valid = gtk_tree_model_get_iter_first(store, &iter);
NodeData *nd;
gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &nd, -1);
- if (strcmp(nd->fd->name, pd->name) == 0)
+ if (nd->fd && strcmp(nd->fd->name, pd->name) == 0)
{
fd = nd->fd;
}
return list;
}
-/*
- *----------------------------------------------------------------------------
- * misc
- *----------------------------------------------------------------------------
- */
-
-#if 0
-static void vdtree_row_deleted_cb(GtkTreeModel *tree_model, GtkTreePath *tpath, gpointer data)
-{
- GtkTreeIter iter;
- NodeData *nd;
-
- gtk_tree_model_get_iter(tree_model, &iter, tpath);
- gtk_tree_model_get(tree_model, &iter, DIR_COLUMN_POINTER, &nd, -1);
-
- if (!nd) return;
-
- file_data_unref(nd->fd);
- g_free(nd);
-}
-#endif
/*
*----------------------------------------------------------------------------
*----------------------------------------------------------------------------
*/
-static gint vdtree_find_iter_by_data(ViewDir *vd, GtkTreeIter *parent, NodeData *nd, GtkTreeIter *iter)
+static gboolean vdtree_find_iter_by_data(ViewDir *vd, GtkTreeIter *parent, NodeData *nd, GtkTreeIter *iter)
{
GtkTreeModel *store;
return NULL;
}
+static NodeData *vdtree_find_iter_by_fd(ViewDir *vd, GtkTreeIter *parent, FileData *fd, GtkTreeIter *iter)
+{
+ GtkTreeModel *store;
+
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
+ if (!fd || !gtk_tree_model_iter_children(store, iter, parent)) return NULL;
+ do {
+ NodeData *nd;
+
+ gtk_tree_model_get(store, iter, DIR_COLUMN_POINTER, &nd, -1);
+ if (nd && nd->fd == fd) return nd;
+ } while (gtk_tree_model_iter_next(store, iter));
+
+ return NULL;
+}
+
static void vdtree_add_by_data(ViewDir *vd, FileData *fd, GtkTreeIter *parent)
{
GtkTreeStore *store;
nd = g_new0(NodeData, 1);
nd->fd = fd;
+ nd->version = fd->version;
nd->expanded = FALSE;
nd->last_update = time(NULL);
/* all nodes are created with an "empty" node, so that the expander is shown
* this is removed when the child is populated */
end = g_new0(NodeData, 1);
- end->fd = file_data_new_simple("");
+ end->fd = NULL;
end->expanded = TRUE;
gtk_tree_store_append(store, &empty, &child);
gtk_tree_view_row_expanded(GTK_TREE_VIEW(vd->view), tpath) &&
!nd->expanded)
{
- vdtree_populate_path_by_iter(vd, &child, FALSE, vd->path);
+ vdtree_populate_path_by_iter(vd, &child, FALSE, vd->dir_fd);
}
gtk_tree_path_free(tpath);
}
}
-static gint vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gint force, const gchar *target_path)
+gboolean vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gboolean force, FileData *target_fd)
{
GtkTreeModel *store;
GList *list;
if (!nd) return FALSE;
current_time = time(NULL);
-
+
if (nd->expanded)
{
- if (!force && current_time - nd->last_update < 10) return TRUE;
- if (!isdir(nd->fd->path))
+ if (!nd->fd || !isdir(nd->fd->path))
{
if (vd->click_fd == nd->fd) vd->click_fd = NULL;
if (vd->drop_fd == nd->fd) vd->drop_fd = NULL;
vdtree_node_free(nd);
return FALSE;
}
- if (!force && filetime(nd->fd->path) == nd->fd->date) return TRUE;
+ if (!force && current_time - nd->last_update < 2)
+ {
+ DEBUG_1("Too frequent update of %s", nd->fd->path);
+ return TRUE;
+ }
+ file_data_check_changed_files(nd->fd); /* make sure we have recent info */
+ if (nd->fd->version == nd->version) return TRUE;
}
vdtree_busy_push(vd);
- list = NULL;
- filelist_read(nd->fd->path, NULL, &list);
+ filelist_read(nd->fd, NULL, &list);
/* when hidden files are not enabled, and the user enters a hidden path,
* allow the tree to display that path by specifically inserting the hidden entries
*/
if (!options->file_filter.show_hidden_files &&
- target_path &&
- strncmp(nd->fd->path, target_path, strlen(nd->fd->path)) == 0)
+ target_fd &&
+ strncmp(nd->fd->path, target_fd->path, strlen(nd->fd->path)) == 0)
{
gint n;
n = strlen(nd->fd->path);
- if (target_path[n] == '/' && target_path[n+1] == '.')
+ if (target_fd->path[n] == G_DIR_SEPARATOR && target_fd->path[n+1] == '.')
{
gchar *name8;
- struct stat sbuf;
n++;
- while (target_path[n] != '\0' && target_path[n] != '/') n++;
- name8 = g_strndup(target_path, n);
+ while (target_fd->path[n] != '\0' && target_fd->path[n] != G_DIR_SEPARATOR) n++;
+ name8 = g_strndup(target_fd->path, n);
- if (stat_utf8(name8, &sbuf))
+ if (isdir(name8))
{
- list = g_list_prepend(list, file_data_new_simple(name8));
+ list = g_list_prepend(list, file_data_new_dir(name8));
}
g_free(name8);
{
NodeData *cnd;
- cnd = vdtree_find_iter_by_name(vd, iter, fd->name, &child);
+ cnd = vdtree_find_iter_by_fd(vd, iter, fd, &child);
if (cnd)
{
- old = g_list_remove(old, cnd);
- if (cnd->expanded && cnd->fd->date != fd->date &&
- vdtree_populate_path_by_iter(vd, &child, FALSE, target_path))
+ if (cnd->expanded && cnd->version != fd->version)
{
- cnd->fd->size = fd->size;
- cnd->fd->date = fd->date;
+ vdtree_populate_path_by_iter(vd, &child, FALSE, target_fd);
}
+ gtk_tree_store_set(GTK_TREE_STORE(store), &child, DIR_COLUMN_NAME, fd->name, -1);
+ cnd->version = fd->version;
+ old = g_list_remove(old, cnd);
file_data_unref(fd);
}
else
return TRUE;
}
-FileData *vdtree_populate_path(ViewDir *vd, const gchar *path, gint expand, gint force)
+FileData *vdtree_populate_path(ViewDir *vd, FileData *target_fd, gboolean expand, gboolean force)
{
GList *list;
GList *work;
FileData *fd = NULL;
- if (!path) return NULL;
+ if (!target_fd) return NULL;
vdtree_busy_push(vd);
- list = parts_list(path);
+ list = parts_list(target_fd->path);
list = parts_list_add_node_points(vd, list);
work = list;
if (work == list)
{
/* should not happen */
- printf("vdtree warning, root node not found\n");
+ log_printf("vdtree warning, root node not found\n");
parts_list_free(list);
vdtree_busy_pop(vd);
return NULL;
parent_pd = work->prev->data;
if (!vd_find_row(vd, parent_pd->node, &parent_iter) ||
- !vdtree_populate_path_by_iter(vd, &parent_iter, force, path) ||
+ !vdtree_populate_path_by_iter(vd, &parent_iter, force, target_fd) ||
(nd = vdtree_find_iter_by_name(vd, &parent_iter, pd->name, &iter)) == NULL)
{
- printf("vdtree warning, aborted at %s\n", parent_pd->name);
+ log_printf("vdtree warning, aborted at %s\n", parent_pd->name);
parts_list_free(list);
vdtree_busy_pop(vd);
return NULL;
vdtree_expand_by_iter(vd, &parent_iter, TRUE);
vdtree_expand_by_iter(vd, &iter, TRUE);
}
- vdtree_populate_path_by_iter(vd, &iter, force, path);
+ vdtree_populate_path_by_iter(vd, &iter, force, target_fd);
}
}
else
if (vd_find_row(vd, pd->node, &iter))
{
if (expand) vdtree_expand_by_iter(vd, &iter, TRUE);
- vdtree_populate_path_by_iter(vd, &iter, force, path);
+ vdtree_populate_path_by_iter(vd, &iter, force, target_fd);
}
}
*----------------------------------------------------------------------------
*/
-static gint selection_is_ok = FALSE;
+static gboolean selection_is_ok = FALSE;
static gboolean vdtree_select_cb(GtkTreeSelection *selection, GtkTreeModel *store, GtkTreePath *tpath,
- gboolean path_currently_selected, gpointer data)
+ gboolean path_currently_selected, gpointer data)
{
return selection_is_ok;
}
-static void vdtree_select_row(ViewDir *vd, FileData *fd)
-{
- GtkTreeSelection *selection;
- GtkTreeIter iter;
-
- if (!vd_find_row(vd, fd, &iter)) return;
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vd->view));
-
- /* hack, such that selection is only allowed to be changed from here */
- selection_is_ok = TRUE;
- gtk_tree_selection_select_iter(selection, &iter);
- selection_is_ok = FALSE;
-
- if (!vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->path)) return;
-
- vdtree_expand_by_iter(vd, &iter, TRUE);
-
- if (fd && vd->select_func)
- {
- vd->select_func(vd, fd->path, vd->select_data);
- }
-}
-
-gint vdtree_set_path(ViewDir *vd, const gchar *path)
+gboolean vdtree_set_fd(ViewDir *vd, FileData *dir_fd)
{
FileData *fd;
GtkTreeIter iter;
- if (!path) return FALSE;
- if (vd->path && strcmp(path, vd->path) == 0) return TRUE;
+ if (!dir_fd) return FALSE;
+ if (vd->dir_fd == dir_fd) return TRUE;
- g_free(vd->path);
- vd->path = g_strdup(path);
+ file_data_unref(vd->dir_fd);
+ vd->dir_fd = file_data_ref(dir_fd);;
- fd = vdtree_populate_path(vd, vd->path, TRUE, FALSE);
+ fd = vdtree_populate_path(vd, vd->dir_fd, TRUE, FALSE);
if (!fd) return FALSE;
if (vd_find_row(vd, fd, &iter))
{
GtkTreeModel *store;
- GtkTreePath *tpath;
-
- tree_view_row_make_visible(GTK_TREE_VIEW(vd->view), &iter, TRUE);
+ GtkTreePath *tpath, *old_tpath;
+ GtkTreeSelection *selection;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
+
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vd->view));
+
+ /* hack, such that selection is only allowed to be changed from here */
+ selection_is_ok = TRUE;
+ gtk_tree_selection_select_iter(selection, &iter);
+ selection_is_ok = FALSE;
+
+ gtk_tree_view_get_cursor(GTK_TREE_VIEW(vd->view), &old_tpath, NULL);
tpath = gtk_tree_model_get_path(store, &iter);
- gtk_tree_view_set_cursor(GTK_TREE_VIEW(vd->view), tpath, NULL, FALSE);
+
+ if (!old_tpath || gtk_tree_path_compare(tpath, old_tpath) != 0)
+ {
+ /* setting the cursor scrolls the view; do not do that unless it is necessary */
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(vd->view), tpath, NULL, FALSE);
+
+ /* gtk_tree_view_set_cursor scrolls the window itself, but it sometimes
+ does not work (switch from dir_list to dir_tree) */
+ tree_view_row_make_visible(GTK_TREE_VIEW(vd->view), &iter, TRUE);
+ }
gtk_tree_path_free(tpath);
-
- vdtree_select_row(vd, fd);
+ gtk_tree_path_free(old_tpath);
}
return TRUE;
}
-#if 0
-const gchar *vdtree_get_path(ViewDir *vd)
-{
- return vd->path;
-}
-#endif
-
void vdtree_refresh(ViewDir *vd)
{
- vdtree_populate_path(vd, vd->path, FALSE, TRUE);
+ vdtree_populate_path(vd, vd->dir_fd, FALSE, TRUE);
}
const gchar *vdtree_row_get_path(ViewDir *vd, gint row)
{
- printf("FIXME: no get row path\n");
+ log_printf("FIXME: no get row path\n");
return NULL;
}
*----------------------------------------------------------------------------
*/
-static void vdtree_menu_position_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
-{
- ViewDir *vd = data;
- GtkTreeModel *store;
- GtkTreeIter iter;
- GtkTreePath *tpath;
- gint cw, ch;
-
- if (vd_find_row(vd, vd->click_fd, &iter) < 0) return;
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
- tpath = gtk_tree_model_get_path(store, &iter);
- tree_view_get_cell_clamped(GTK_TREE_VIEW(vd->view), tpath, 0, TRUE, x, y, &cw, &ch);
- gtk_tree_path_free(tpath);
- *y += ch;
- popup_menu_position_clamp(menu, x, y, 0);
-}
-
-static gint vdtree_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+gboolean vdtree_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
ViewDir *vd = data;
GtkTreePath *tpath;
switch (event->keyval)
{
- case GDK_Menu:
+ case GDK_KEY_Menu:
vd->click_fd = fd;
vd_color_set(vd, vd->click_fd, TRUE);
vd->popup = vd_pop_menu(vd, vd->click_fd);
- gtk_menu_popup(GTK_MENU(vd->popup), NULL, NULL, vdtree_menu_position_cb, vd, 0, GDK_CURRENT_TIME);
+ gtk_menu_popup(GTK_MENU(vd->popup), NULL, NULL, vd_menu_position_cb, vd, 0, GDK_CURRENT_TIME);
return TRUE;
break;
- case GDK_plus:
- case GDK_Right:
- case GDK_KP_Add:
+ case GDK_KEY_plus:
+ case GDK_KEY_Right:
+ case GDK_KEY_KP_Add:
if (fd)
{
- vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->path);
+ vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->dir_fd);
vdtree_icon_set_by_iter(vd, &iter, vd->pf->open);
}
break;
return FALSE;
}
-static gint vdtree_clicked_on_expander(GtkTreeView *treeview, GtkTreePath *tpath,
- GtkTreeViewColumn *column, gint x, gint y, gint *left_of_expander)
+static gboolean vdtree_clicked_on_expander(GtkTreeView *treeview, GtkTreePath *tpath,
+ GtkTreeViewColumn *column, gint x, gint y, gint *left_of_expander)
{
gint depth;
gint size;
return FALSE;
}
-static gint vdtree_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+gboolean vdtree_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
ViewDir *vd = data;
GtkTreePath *tpath;
/* clicking this region should automatically reveal an expander, if necessary
* treeview bug: the expander will not expand until a button_motion_event highlights it.
*/
- if (bevent->button == 1 &&
+ if (bevent->button == MOUSE_BUTTON_LEFT &&
!left_of_expander &&
!gtk_tree_view_row_expanded(GTK_TREE_VIEW(vd->view), tpath))
{
- vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->path);
+ vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->dir_fd);
vdtree_icon_set_by_iter(vd, &iter, vd->pf->open);
}
vd->click_fd = (nd) ? nd->fd : NULL;
vd_color_set(vd, vd->click_fd, TRUE);
- if (bevent->button == 3)
+ if (bevent->button == MOUSE_BUTTON_RIGHT)
{
vd->popup = vd_pop_menu(vd, vd->click_fd);
gtk_menu_popup(GTK_MENU(vd->popup), NULL, NULL, NULL, NULL,
bevent->button, bevent->time);
}
- return (bevent->button != 1);
-}
-
-static gint vdtree_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
-{
- ViewDir *vd = data;
- GtkTreePath *tpath;
- GtkTreeIter iter;
- NodeData *nd = NULL;
-
- if (!vd->click_fd) return FALSE;
- vd_color_set(vd, vd->click_fd, FALSE);
-
- if (bevent->button != 1) return TRUE;
-
- if ((bevent->x != 0 || bevent->y != 0) &&
- gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y,
- &tpath, NULL, NULL, NULL))
- {
- GtkTreeModel *store;
-
- store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
- gtk_tree_model_get_iter(store, &iter, tpath);
- gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &nd, -1);
- gtk_tree_path_free(tpath);
- }
-
- if (nd && vd->click_fd == nd->fd)
- {
- vdtree_select_row(vd, vd->click_fd);
- }
-
- return FALSE;
+ return (bevent->button != MOUSE_BUTTON_LEFT);
}
static void vdtree_row_expanded(GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *tpath, gpointer data)
gtk_tree_model_get(store, a, DIR_COLUMN_POINTER, &nda, -1);
gtk_tree_model_get(store, b, DIR_COLUMN_POINTER, &ndb, -1);
- return CASE_SORT(nda->fd->name, ndb->fd->name);
+ if (!nda->fd && !ndb->fd) return 0;
+ if (!nda->fd) return 1;
+ if (!ndb->fd) return -1;
+
+ if (options->file_sort.case_sensitive)
+ return strcmp(nda->fd->collate_key_name, ndb->fd->collate_key_name);
+ else
+ return strcmp(nda->fd->collate_key_name_nocase, ndb->fd->collate_key_name_nocase);
}
/*
static void vdtree_setup_root(ViewDir *vd)
{
- const gchar *path = "/";
+ const gchar *path = G_DIR_SEPARATOR_S;
FileData *fd;
- fd = file_data_new_simple(path);
+ fd = file_data_new_dir(path);
vdtree_add_by_data(vd, fd, NULL);
vdtree_expand_by_data(vd, fd, TRUE);
- vdtree_populate_path(vd, path, FALSE, FALSE);
-}
-
-static void vdtree_activate_cb(GtkTreeView *tview, GtkTreePath *tpath, GtkTreeViewColumn *column, gpointer data)
-{
- ViewDir *vd = data;
- GtkTreeModel *store;
- GtkTreeIter iter;
- NodeData *nd;
-
- store = gtk_tree_view_get_model(tview);
- gtk_tree_model_get_iter(store, &iter, tpath);
- gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &nd, -1);
-
- vdtree_select_row(vd, nd->fd);
-}
-
-static GdkColor *vdtree_color_shifted(GtkWidget *widget)
-{
- static GdkColor color;
- static GtkWidget *done = NULL;
-
- if (done != widget)
- {
- GtkStyle *style;
-
- style = gtk_widget_get_style(widget);
- memcpy(&color, &style->base[GTK_STATE_NORMAL], sizeof(color));
- shift_color(&color, -1, 0);
- done = widget;
- }
-
- return &color;
-}
-
-static void vdtree_color_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
- GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
-{
- ViewDir *vd = data;
- gboolean set;
-
- gtk_tree_model_get(tree_model, iter, DIR_COLUMN_COLOR, &set, -1);
- g_object_set(G_OBJECT(cell),
- "cell-background-gdk", vdtree_color_shifted(vd->view),
- "cell-background-set", set, NULL);
+ vdtree_populate_path(vd, fd, FALSE, FALSE);
}
static gboolean vdtree_destroy_node_cb(GtkTreeModel *store, GtkTreePath *tpath, GtkTreeIter *iter, gpointer data)
return FALSE;
}
-static void vdtree_destroy_cb(GtkWidget *widget, gpointer data)
+void vdtree_destroy_cb(GtkWidget *widget, gpointer data)
{
ViewDir *vd = data;
GtkTreeModel *store;
vdtree_dnd_drop_expand_cancel(vd);
- vdtree_dnd_drop_scroll_cancel(vd);
+ vd_dnd_drop_scroll_cancel(vd);
widget_auto_scroll_stop(vd->view);
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
gtk_tree_model_foreach(store, vdtree_destroy_node_cb, vd);
}
-ViewDir *vdtree_new(ViewDir *vd, const gchar *path)
+ViewDir *vdtree_new(ViewDir *vd, FileData *dir_fd)
{
GtkTreeStore *store;
GtkTreeSelection *selection;
GtkCellRenderer *renderer;
vd->info = g_new0(ViewDirInfoTree, 1);
- vd->type = DIRVIEW_TREE;
- vd->widget_destroy_cb = vdtree_destroy_cb;
- VDTREE_INFO(vd, drop_expand_id) = -1;
+ vd->type = DIRVIEW_TREE;
- VDTREE_INFO(vd, busy_ref) = 0;
+ vd->dnd_drop_leave_func = vdtree_dnd_drop_expand_cancel;
+ vd->dnd_drop_update_func = vdtree_dnd_drop_expand;
store = gtk_tree_store_new(4, G_TYPE_POINTER, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT);
vd->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(store),
GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING);
- g_signal_connect(G_OBJECT(vd->view), "row_activated",
- G_CALLBACK(vdtree_activate_cb), vd);
- g_signal_connect(G_OBJECT(vd->view), "row_expanded",
- G_CALLBACK(vdtree_row_expanded), vd);
- g_signal_connect(G_OBJECT(vd->view), "row_collapsed",
- G_CALLBACK(vdtree_row_collapsed), vd);
-#if 0
- g_signal_connect(G_OBJECT(store), "row_deleted",
- G_CALLBACK(vdtree_row_deleted_cb), vd);
-#endif
-
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vd->view));
gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
gtk_tree_selection_set_select_function(selection, vdtree_select_cb, vd, NULL);
renderer = gtk_cell_renderer_pixbuf_new();
gtk_tree_view_column_pack_start(column, renderer, FALSE);
gtk_tree_view_column_add_attribute(column, renderer, "pixbuf", DIR_COLUMN_ICON);
- gtk_tree_view_column_set_cell_data_func(column, renderer, vdtree_color_cb, vd, NULL);
+ gtk_tree_view_column_set_cell_data_func(column, renderer, vd_color_cb, vd, NULL);
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_column_pack_start(column, renderer, TRUE);
gtk_tree_view_column_add_attribute(column, renderer, "text", DIR_COLUMN_NAME);
- gtk_tree_view_column_set_cell_data_func(column, renderer, vdtree_color_cb, vd, NULL);
+ gtk_tree_view_column_set_cell_data_func(column, renderer, vd_color_cb, vd, NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(vd->view), column);
- g_signal_connect(G_OBJECT(vd->view), "key_press_event",
- G_CALLBACK(vdtree_press_key_cb), vd);
-
- gtk_container_add(GTK_CONTAINER(vd->widget), vd->view);
- gtk_widget_show(vd->view);
-
- vd->pf = folder_icons_new();
-
vdtree_setup_root(vd);
- vdtree_dnd_init(vd);
-
- g_signal_connect(G_OBJECT(vd->view), "button_press_event",
- G_CALLBACK(vdtree_press_cb), vd);
- g_signal_connect(G_OBJECT(vd->view), "button_release_event",
- G_CALLBACK(vdtree_release_cb), vd);
-
- vdtree_set_path(vd, path);
+ g_signal_connect(G_OBJECT(vd->view), "row_expanded",
+ G_CALLBACK(vdtree_row_expanded), vd);
+ g_signal_connect(G_OBJECT(vd->view), "row_collapsed",
+ G_CALLBACK(vdtree_row_collapsed), vd);
return vd;
}
-
-#if 0
-void vdtree_set_click_func(ViewDir *vd,
- void (*func)(ViewDir *vd, GdkEventButton *event, FileData *fd, gpointer), gpointer data)
-{
- if (!td) return;
- vd->click_func = func;
- vd->click_data = data;
-}
-#endif
-
-
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
projects / geeqie.git / blobdiff