/*
- * Geeqie
- * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2006 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
* Author: John Ellis
*
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "main.h"
-#include "view_dir_tree.h"
+#include "view-dir-tree.h"
#include "dnd.h"
#include "dupe.h"
#include "filedata.h"
#include "layout.h"
-#include "layout_image.h"
-#include "layout_util.h"
+#include "layout-image.h"
+#include "layout-util.h"
#include "utilops.h"
-#include "ui_fileops.h"
-#include "ui_menu.h"
-#include "ui_tree_edit.h"
-#include "view_dir.h"
+#include "ui-fileops.h"
+#include "ui-menu.h"
+#include "ui-tree-edit.h"
+#include "view-dir.h"
#include <gdk/gdkkeysyms.h> /* for keyboard values */
};
+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) gdk_cursor_unref(cursor);
+ gdk_window_set_cursor(gtk_widget_get_window(widget), cursor);
+ if (cursor) g_object_unref(G_OBJECT(cursor));
gdk_flush();
}
{
GtkTreeModel *store;
GtkTreePath *tpath;
+ NodeData *nd;
+ FileData *fd = NULL;
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), (gpointer)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);
+ gtk_tree_model_get(store, iter, DIR_COLUMN_POINTER, &nd, -1);
+ fd = (nd) ? nd->fd : NULL;
+
+ if (fd && islink(fd->path))
+ {
+ vdtree_icon_set_by_iter(vd, iter, vd->pf->link);
+ }
+ else
+ {
+ vdtree_icon_set_by_iter(vd, iter, vd->pf->open);
+ }
+
+ g_signal_handlers_unblock_by_func(G_OBJECT(vd->view), (gpointer)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
/*
*----------------------------------------------------------------------------
GdkPixbuf *pixbuf;
NodeData *end;
GtkTreeIter empty;
+ gchar *link = NULL;
if (!fd) return;
if (access_file(fd->path, R_OK | X_OK))
{
- pixbuf = vd->pf->close;
+ if (islink(fd->path))
+ {
+ pixbuf = vd->pf->link;
+ }
+ else
+ {
+ pixbuf = vd->pf->close;
+ }
}
else
{
nd->expanded = FALSE;
nd->last_update = time(NULL);
+ if (islink(fd->path))
+ {
+ link = realpath(fd->path, NULL);
+ }
+ else
+ {
+ link = NULL;
+ }
+
store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view)));
gtk_tree_store_append(store, &child, parent);
gtk_tree_store_set(store, &child, DIR_COLUMN_POINTER, nd,
DIR_COLUMN_ICON, pixbuf,
DIR_COLUMN_NAME, nd->fd->name,
+ DIR_COLUMN_LINK, link,
DIR_COLUMN_COLOR, FALSE, -1);
/* 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_path_free(tpath);
}
+
+ g_free(link);
}
gboolean vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gboolean force, FileData *target_fd)
time_t current_time;
GtkTreeIter child;
NodeData *nd;
+ gboolean add_hidden = FALSE;
+ gchar *link = NULL;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
gtk_tree_model_get(store, iter, DIR_COLUMN_POINTER, &nd, -1);
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;
}
- if (nd->fd->version == nd->version) return TRUE;
+ file_data_check_changed_files(nd->fd); /* make sure we have recent info */
}
- vdtree_busy_push(vd);
-
- 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
*/
n = strlen(nd->fd->path);
if (target_fd->path[n] == G_DIR_SEPARATOR && target_fd->path[n+1] == '.')
- {
- gchar *name8;
- struct stat sbuf;
+ add_hidden = TRUE;
+ }
- n++;
+ if (nd->expanded && (!force && !add_hidden) && nd->fd->version == nd->version)
+ return TRUE;
- while (target_fd->path[n] != '\0' && target_fd->path[n] != G_DIR_SEPARATOR) n++;
- name8 = g_strndup(target_fd->path, n);
+ vdtree_busy_push(vd);
- if (stat_utf8(name8, &sbuf))
- {
- list = g_list_prepend(list, file_data_new_simple(name8));
- }
+ filelist_read(nd->fd, NULL, &list);
- g_free(name8);
+ if (add_hidden)
+ {
+ gint n;
+ gchar *name8;
+
+ n = strlen(nd->fd->path) + 1;
+
+ while (target_fd->path[n] != '\0' && target_fd->path[n] != G_DIR_SEPARATOR) n++;
+ name8 = g_strndup(target_fd->path, n);
+
+ if (isdir(name8))
+ {
+ list = g_list_prepend(list, file_data_new_dir(name8));
}
+
+ g_free(name8);
}
old = NULL;
}
gtk_tree_store_set(GTK_TREE_STORE(store), &child, DIR_COLUMN_NAME, fd->name, -1);
+
+ if (islink(fd->path))
+ {
+ link = realpath(fd->path, NULL);
+ }
+ else
+ {
+ link = NULL;
+ }
+
+ gtk_tree_store_set(GTK_TREE_STORE(store), &child, DIR_COLUMN_LINK, link, -1);
+
cnd->version = fd->version;
old = g_list_remove(old, cnd);
file_data_unref(fd);
nd->expanded = TRUE;
nd->last_update = current_time;
+ g_free(link);
+
return TRUE;
}
static gboolean selection_is_ok = FALSE;
-static gboolean vdtree_select_cb(GtkTreeSelection *selection, GtkTreeModel *store, GtkTreePath *tpath,
- gboolean path_currently_selected, gpointer data)
+static gboolean vdtree_select_cb(GtkTreeSelection *UNUSED(selection), GtkTreeModel *UNUSED(store), GtkTreePath *UNUSED(tpath), gboolean UNUSED(path_currently_selected), gpointer UNUSED(data))
{
return selection_is_ok;
}
if (vd_find_row(vd, fd, &iter))
{
GtkTreeModel *store;
- GtkTreePath *tpath;
+ GtkTreePath *tpath, *old_tpath;
GtkTreeSelection *selection;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
- 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);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vd->view));
gtk_tree_selection_select_iter(selection, &iter);
selection_is_ok = FALSE;
- tree_view_row_make_visible(GTK_TREE_VIEW(vd->view), &iter, TRUE);
+ gtk_tree_view_get_cursor(GTK_TREE_VIEW(vd->view), &old_tpath, NULL);
+ tpath = gtk_tree_model_get_path(store, &iter);
+
+ 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);
}
-const gchar *vdtree_row_get_path(ViewDir *vd, gint row)
+const gchar *vdtree_row_get_path(ViewDir *UNUSED(vd), gint UNUSED(row))
{
+/** @FIXME no get row path */
log_printf("FIXME: no get row path\n");
return NULL;
}
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, vd_menu_position_cb, vd, 0, GDK_CURRENT_TIME);
+ gtk_menu_popup_at_pointer(GTK_MENU(vd->popup), NULL);
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);
- vdtree_icon_set_by_iter(vd, &iter, vd->pf->open);
+
+ if (islink(fd->path))
+ {
+ vdtree_icon_set_by_iter(vd, &iter, vd->pf->link);
+ }
+ else
+ {
+ vdtree_icon_set_by_iter(vd, &iter, vd->pf->open);
+ }
}
break;
}
}
static gboolean vdtree_clicked_on_expander(GtkTreeView *treeview, GtkTreePath *tpath,
- GtkTreeViewColumn *column, gint x, gint y, gint *left_of_expander)
+ GtkTreeViewColumn *column, gint x, gint UNUSED(y), gint *left_of_expander)
{
gint depth;
gint size;
GtkTreeViewColumn *column;
GtkTreeIter iter;
NodeData *nd = NULL;
+ FileData *fd;
if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y,
&tpath, &column, NULL, NULL))
!gtk_tree_view_row_expanded(GTK_TREE_VIEW(vd->view), tpath))
{
vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->dir_fd);
- vdtree_icon_set_by_iter(vd, &iter, vd->pf->open);
+
+ fd = (nd) ? nd->fd : NULL;
+ if (fd && islink(fd->path))
+ {
+ vdtree_icon_set_by_iter(vd, &iter, vd->pf->link);
+ }
+ else
+ {
+ vdtree_icon_set_by_iter(vd, &iter, vd->pf->open);
+ }
}
gtk_tree_path_free(tpath);
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);
+ gtk_menu_popup_at_pointer(GTK_MENU(vd->popup), NULL);
}
return (bevent->button != MOUSE_BUTTON_LEFT);
static void vdtree_row_expanded(GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *tpath, gpointer data)
{
ViewDir *vd = data;
+ GtkTreeModel *store;
+ NodeData *nd = NULL;
+ FileData *fd;
+
+ gtk_tree_view_set_tooltip_column(treeview, DIR_COLUMN_LINK);
vdtree_populate_path_by_iter(vd, iter, FALSE, NULL);
- vdtree_icon_set_by_iter(vd, iter, vd->pf->open);
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
+
+ gtk_tree_model_get_iter(store, iter, tpath);
+ gtk_tree_model_get(store, iter, DIR_COLUMN_POINTER, &nd, -1);
+
+ fd = (nd) ? nd->fd : NULL;
+ if (fd && islink(fd->path))
+ {
+ vdtree_icon_set_by_iter(vd, iter, vd->pf->link);
+ }
+ else
+ {
+ vdtree_icon_set_by_iter(vd, iter, vd->pf->open);
+ }
}
static void vdtree_row_collapsed(GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *tpath, gpointer data)
{
ViewDir *vd = data;
+ GtkTreeModel *store;
+ NodeData *nd = NULL;
+ FileData *fd;
+
+ vdtree_populate_path_by_iter(vd, iter, FALSE, NULL);
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
+
+ gtk_tree_model_get_iter(store, iter, tpath);
+ gtk_tree_model_get(store, iter, DIR_COLUMN_POINTER, &nd, -1);
- vdtree_icon_set_by_iter(vd, iter, vd->pf->close);
+ fd = (nd) ? nd->fd : NULL;
+ if (fd && islink(fd->path))
+ {
+ vdtree_icon_set_by_iter(vd, iter, vd->pf->link);
+ }
+ else
+ {
+ vdtree_icon_set_by_iter(vd, iter, vd->pf->close);
+ }
}
-static gint vdtree_sort_cb(GtkTreeModel *store, GtkTreeIter *a, GtkTreeIter *b, gpointer data)
+static gint vdtree_sort_cb(GtkTreeModel *store, GtkTreeIter *a, GtkTreeIter *b, gpointer UNUSED(data))
{
NodeData *nda;
NodeData *ndb;
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);
vdtree_populate_path(vd, fd, FALSE, FALSE);
}
-static gboolean vdtree_destroy_node_cb(GtkTreeModel *store, GtkTreePath *tpath, GtkTreeIter *iter, gpointer data)
+static gboolean vdtree_destroy_node_cb(GtkTreeModel *store, GtkTreePath *UNUSED(tpath), GtkTreeIter *iter, gpointer UNUSED(data))
{
NodeData *nd;
return FALSE;
}
-void vdtree_destroy_cb(GtkWidget *widget, gpointer data)
+void vdtree_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
ViewDir *vd = data;
GtkTreeModel *store;
gtk_tree_model_foreach(store, vdtree_destroy_node_cb, vd);
}
-ViewDir *vdtree_new(ViewDir *vd, FileData *dir_fd)
+ViewDir *vdtree_new(ViewDir *vd, FileData *UNUSED(dir_fd))
{
GtkTreeStore *store;
GtkTreeSelection *selection;
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);
+ store = gtk_tree_store_new(6, G_TYPE_POINTER, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
vd->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
g_object_unref(store);
gtk_tree_view_append_column(GTK_TREE_VIEW(vd->view), column);
+ gtk_tree_view_set_tooltip_column(GTK_TREE_VIEW(vd->view), DIR_COLUMN_LINK);
+
vdtree_setup_root(vd);
g_signal_connect(G_OBJECT(vd->view), "row_expanded",
projects / geeqie.git / blobdiff