/*
* Geeqie
* (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
};
+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);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), cursor);
if (cursor) gdk_cursor_unref(cursor);
gdk_flush();
}
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);
{
if (!nd) return;
- file_data_unref(nd->fd);
+ if (nd->fd) file_data_unref(nd->fd);
g_free(nd);
}
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
/*
*----------------------------------------------------------------------------
/* 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);
if (nd->expanded)
{
- 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;
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;
}
if (target_fd->path[n] == G_DIR_SEPARATOR && target_fd->path[n+1] == '.')
{
gchar *name8;
- struct stat sbuf;
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);
return selection_is_ok;
}
-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->dir_fd)) return;
-
- vdtree_expand_by_iter(vd, &iter, TRUE);
-
- if (fd && vd->select_func)
- {
- vd->select_func(vd, fd->path, vd->select_data);
- }
-}
-
gboolean vdtree_set_fd(ViewDir *vd, FileData *dir_fd)
{
FileData *fd;
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);
- gtk_tree_path_free(tpath);
- vdtree_select_row(vd, fd);
+ 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);
+ 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->dir_fd, FALSE, TRUE);
switch (event->keyval)
{
- case GDK_Menu:
+ case GDK_KEY_Menu:
vd->click_fd = fd;
vd_color_set(vd, vd->click_fd, TRUE);
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->dir_fd);
gtk_tree_model_get(store, a, DIR_COLUMN_POINTER, &nda, -1);
gtk_tree_model_get(store, b, DIR_COLUMN_POINTER, &ndb, -1);
+ 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
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);
projects / geeqie.git / blobdiff