/*
- * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
* Author: Laurent Monin
*
- * 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 "filedata.h"
#include "layout_image.h"
#include "layout_util.h"
+#include "menu.h"
+#include "pixbuf_util.h"
#include "ui_fileops.h"
#include "ui_tree_edit.h"
#include "ui_menu.h"
+#include "ui_misc.h"
#include "utilops.h"
#include "uri_utils.h"
#include "view_dir_list.h"
#include "view_dir_tree.h"
-static void vd_notify_cb(FileData *fd, NotifyType type, gpointer data);
+/* Folders icons to be used in tree or list directory view */
+static PixmapFolders *folder_icons_new(GtkWidget *widget)
+{
+ PixmapFolders *pf = g_new0(PixmapFolders, 1);
+
+#if 1
+ GtkIconSize size = GTK_ICON_SIZE_MENU;
+
+ /* Attempt to use stock gtk icons */
+ pf->close = gtk_widget_render_icon(widget, GTK_STOCK_DIRECTORY, size, NULL);
+ pf->open = gtk_widget_render_icon(widget, GTK_STOCK_OPEN, size, NULL);
+ pf->deny = gtk_widget_render_icon(widget, GTK_STOCK_STOP, size, NULL);
+ pf->parent = gtk_widget_render_icon(widget, GTK_STOCK_GO_UP, size, NULL);
+ pf->link = gtk_widget_render_icon(widget, GTK_STOCK_REDO, size, NULL); /** @FIXME this is not a suitable icon */
+#else
+ /* GQView legacy icons */
+ pf->close = pixbuf_inline(PIXBUF_INLINE_FOLDER_CLOSED);
+ pf->open = pixbuf_inline(PIXBUF_INLINE_FOLDER_OPEN);
+ pf->deny = pixbuf_inline(PIXBUF_INLINE_FOLDER_LOCKED);
+ pf->parent = pixbuf_inline(PIXBUF_INLINE_FOLDER_UP);
+#endif
+ return pf;
+}
-GtkRadioActionEntry menu_view_dir_radio_entries[] = {
- { "FolderList", NULL, N_("_List"), "<meta>L", NULL, DIRVIEW_LIST },
- { "FolderTree", NULL, N_("_Tree"), "<control>T", NULL, DIRVIEW_TREE },
-};
+static void folder_icons_free(PixmapFolders *pf)
+{
+ if (!pf) return;
+
+ g_object_unref(pf->close);
+ g_object_unref(pf->open);
+ g_object_unref(pf->deny);
+ g_object_unref(pf->parent);
+ g_object_unref(pf->link);
+
+ g_free(pf);
+}
+
+
+
+static void vd_notify_cb(FileData *fd, NotifyType type, gpointer data);
static void vd_destroy_cb(GtkWidget *widget, gpointer data)
{
g_free(vd);
}
-ViewDir *vd_new(DirViewType type, FileData *dir_fd)
+ViewDir *vd_new(LayoutWindow *lw)
{
- g_assert(VIEW_DIR_TYPES_COUNT <= G_N_ELEMENTS(menu_view_dir_radio_entries));
-
ViewDir *vd = g_new0(ViewDir, 1);
- vd->drop_scroll_id = -1;
-
vd->widget = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(vd->widget), GTK_SHADOW_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(vd->widget),
GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
- vd->pf = folder_icons_new();
+ vd->layout = lw;
+ vd->pf = folder_icons_new(vd->widget);
- switch (type)
- {
- case DIRVIEW_LIST: vd = vdlist_new(vd, dir_fd); break;
- case DIRVIEW_TREE: vd = vdtree_new(vd, dir_fd); break;
- }
+ switch (lw->options.dir_view_type)
+ {
+ case DIRVIEW_LIST: vd = vdlist_new(vd, lw->dir_fd); break;
+ case DIRVIEW_TREE: vd = vdtree_new(vd, lw->dir_fd); break;
+ }
gtk_container_add(GTK_CONTAINER(vd->widget), vd->view);
g_signal_connect(G_OBJECT(vd->view), "button_release_event",
G_CALLBACK(vd_release_cb), vd);
- if (dir_fd) vd_set_fd(vd, dir_fd);
-
file_data_register_notify_func(vd_notify_cb, vd, NOTIFY_PRIORITY_HIGH);
+ /* vd_set_fd expects that vd_notify_cb is already registered */
+ if (lw->dir_fd) vd_set_fd(vd, lw->dir_fd);
+
gtk_widget_show(vd->view);
return vd;
}
void vd_set_select_func(ViewDir *vd,
- void (*func)(ViewDir *vd, const gchar *path, gpointer data), gpointer data)
+ void (*func)(ViewDir *vd, FileData *fd, gpointer data), gpointer data)
{
vd->select_func = func;
vd->select_data = data;
vd->layout = layout;
}
-gint vd_set_fd(ViewDir *vd, FileData *dir_fd)
+gboolean vd_set_fd(ViewDir *vd, FileData *dir_fd)
{
- gint ret = FALSE;
+ gboolean ret = FALSE;
file_data_unregister_notify_func(vd_notify_cb, vd);
return ret;
}
+/* the calling stack is this:
+ vd_select_row -> select_func -> layout_set_fd -> vd_set_fd
+*/
void vd_select_row(ViewDir *vd, FileData *fd)
{
- switch (vd->type)
- {
- case DIRVIEW_LIST: vdlist_select_row(vd, fd); break;
- case DIRVIEW_TREE: vdtree_select_row(vd, fd); break;
- }
+ if (fd && vd->select_func)
+ {
+ vd->select_func(vd, fd, vd->select_data);
+ }
}
-gint vd_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter)
+gboolean vd_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter)
{
- gint ret = FALSE;
+ gboolean ret = FALSE;
switch (vd->type)
{
return fd;
}
-static gint vd_rename_cb(TreeEditData *td, const gchar *old, const gchar *new, gpointer data)
+static void vd_rename_finished_cb(gboolean success, const gchar *new_path, gpointer data)
+{
+ ViewDir *vd = data;
+ if (success)
+ {
+ FileData *fd = file_data_new_dir(new_path);
+ GtkTreeIter iter;
+
+ if (vd_find_row(vd, fd, &iter))
+ {
+ tree_view_row_make_visible(GTK_TREE_VIEW(vd->view), &iter, TRUE);
+ }
+
+ file_data_unref(fd);
+ }
+}
+
+static gboolean vd_rename_cb(TreeEditData *td, const gchar *old, const gchar *new, gpointer data)
{
ViewDir *vd = data;
FileData *fd;
new_path = g_build_filename(base, new, NULL);
g_free(base);
- file_util_rename_dir(fd, new_path, vd->view);
-
+ file_util_rename_dir(fd, new_path, vd->view, vd_rename_finished_cb, vd);
+
g_free(new_path);
return FALSE;
GtkTreePath *tpath;
GtkTreeIter iter;
- if (!fd || vd_find_row(vd, fd, &iter) < 0) return;
+ if (!fd || !vd_find_row(vd, fd, &iter)) return;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
tpath = gtk_tree_model_get_path(store, &iter);
GtkTreeModel *store;
GtkTreeIter iter;
- if (vd_find_row(vd, fd, &iter) < 0) return;
+ if (!vd_find_row(vd, fd, &iter)) return;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
switch (vd->type)
const gchar *path;
GList *list;
const gchar *key;
-
+
if (!vd->drop_fd) return;
-
+
key = g_object_get_data(G_OBJECT(widget), "filter_key");
path = vd->drop_fd->path;
const EditorDescription *editor = work->data;
gchar *key;
work = work->next;
-
+
if (!editor_is_filter(editor->key)) continue;
key = g_strdup(editor->key);
item = menu_item_add_sensitive(menu, editor->name, active, G_CALLBACK(vd_drop_menu_filter_cb), vd);
g_object_set_data_full(G_OBJECT(item), "filter_key", key, vd_drop_menu_edit_item_free);
}
-
+
g_list_free(editors_list);
menu_item_add_divider(menu);
if (vd->select_func)
{
- vd->select_func(vd, path, vd->select_data);
+ FileData *fd = file_data_new_dir(path);
+ vd->select_func(vd, fd, vd->select_data);
+ file_data_unref(fd);
}
g_free(path);
if (!vd->layout) return;
if (!vd->click_fd) return;
- list = filelist_recursive(vd->click_fd);
+ list = filelist_recursive_full(vd->click_fd, vd->layout->sort_method, vd->layout->sort_ascend);
layout_image_slideshow_stop(vd->layout);
layout_image_slideshow_start_from_list(vd->layout, list);
list = filelist_filter(list, FALSE);
}
- dw = dupe_window_new(DUPE_MATCH_NAME);
+ dw = dupe_window_new();
dupe_window_add_files(dw, list, recursive);
filelist_free(list);
if (!vd->click_fd) return;
- file_util_copy_path_to_clipboard(vd->click_fd);
+ file_util_copy_path_to_clipboard(vd->click_fd, TRUE);
+}
+
+static void vd_pop_menu_copy_path_unquoted_cb(GtkWidget *widget, gpointer data)
+{
+ ViewDir *vd = data;
+
+ if (!vd->click_fd) return;
+
+ file_util_copy_path_to_clipboard(vd->click_fd, FALSE);
}
-#define VIEW_DIR_AS_SUBMENU_KEY "view_dir_as_submenu"
static void vd_pop_submenu_dir_view_as_cb(GtkWidget *widget, gpointer data)
{
ViewDir *vd = data;
- DirViewType new_type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), VIEW_DIR_AS_SUBMENU_KEY));
+ DirViewType new_type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "menu_item_radio_data"));
layout_views_set(vd->layout, new_type, vd->layout->options.file_view_type);
}
if (vd->layout) layout_refresh(vd->layout);
}
-static void vd_pop_menu_new_rename_cb(gboolean success, const gchar *new_path, gpointer data)
+static void vd_pop_menu_new_folder_cb(gboolean success, const gchar *new_path, gpointer data)
{
ViewDir *vd = data;
FileData *fd = NULL;
+ GtkTreeIter iter;
+ GtkTreePath *tpath;
+ GtkTreeModel *store;
+
if (!success) return;
switch (vd->type)
break;
case DIRVIEW_TREE:
{
- FileData *new_fd = file_data_new_simple(new_path);
+ FileData *new_fd = file_data_new_dir(new_path);
fd = vdtree_populate_path(vd, new_fd, TRUE, TRUE);
file_data_unref(new_fd);
}
break;
}
- vd_rename_by_data(vd, fd);
+
+ if (!fd || !vd_find_row(vd, fd, &iter)) return;
+ 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);
}
static void vd_pop_menu_new_cb(GtkWidget *widget, gpointer data)
break;
}
- file_util_create_dir(dir_fd, widget, vd_pop_menu_new_rename_cb, vd);
+ file_util_create_dir(dir_fd, vd->layout->window, vd_pop_menu_new_folder_cb, vd);
}
static void vd_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
vd_rename_by_data(vd, vd->click_fd);
}
+static void vd_pop_menu_sort_ascend_cb(GtkWidget *widget, gpointer data)
+{
+ ViewDir *vd = data;
+ gboolean ascend;
+
+ if (!vd) return;
+
+ if (!vd->layout) return;
+
+ ascend = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
+ layout_views_set_sort(vd->layout, vd->layout->options.dir_view_list_sort.method, ascend);
+
+ if (vd->layout) layout_refresh(vd->layout);
+}
+
+static void vd_pop_menu_sort_cb(GtkWidget *widget, gpointer data)
+{
+ ViewDir *vd;
+ SortType type;
+
+ vd = submenu_item_get_data(widget);
+
+ if (!vd) return;
+ if (!vd->layout) return;
+
+ type = (SortType)GPOINTER_TO_INT(data);
+
+ if (type == SORT_NAME || type == SORT_TIME)
+ {
+ layout_views_set_sort(vd->layout, type, vd->layout->options.dir_view_list_sort.ascend);
+
+ if (vd->layout) layout_refresh(vd->layout);
+ }
+}
+
GtkWidget *vd_pop_menu(ViewDir *vd, FileData *fd)
{
GtkWidget *menu;
+ gboolean active;
+ gboolean rename_delete_active = FALSE;
+ gboolean new_folder_active = FALSE;
GtkWidget *submenu;
GtkWidget *item;
- gint active;
- gint rename_delete_active = FALSE;
- gint new_folder_active = FALSE;
- gint i;
active = (fd != NULL);
switch (vd->type)
menu_item_add_sensitive(menu, _("_Rename..."), rename_delete_active,
G_CALLBACK(vd_pop_menu_rename_cb), vd);
+
+ menu_item_add(menu, _("_Copy path"),
+ G_CALLBACK(vd_pop_menu_copy_path_cb), vd);
+
+ menu_item_add(menu, _("_Copy path unquoted"),
+ G_CALLBACK(vd_pop_menu_copy_path_unquoted_cb), vd);
+
menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, rename_delete_active,
G_CALLBACK(vd_pop_menu_delete_cb), vd);
+ menu_item_add_divider(menu);
- if (options->show_copy_path)
- menu_item_add(menu, _("_Copy path"),
- G_CALLBACK(vd_pop_menu_copy_path_cb), vd);
- menu_item_add_divider(menu);
+ menu_item_add_radio(menu, _("View as _List"), GINT_TO_POINTER(DIRVIEW_LIST), vd->type == DIRVIEW_LIST,
+ G_CALLBACK(vd_pop_submenu_dir_view_as_cb), vd);
- item = menu_item_add(menu, _("_View as"), NULL, NULL);
- submenu = gtk_menu_new();
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
+ menu_item_add_radio(menu, _("View as _Tree"), GINT_TO_POINTER(DIRVIEW_TREE), vd->type == DIRVIEW_TREE,
+ G_CALLBACK(vd_pop_submenu_dir_view_as_cb), vd);
- for (i = 0; i < VIEW_DIR_TYPES_COUNT; i++)
+ if (vd->type == DIRVIEW_LIST)
{
- item = menu_item_add_check(submenu, _(menu_view_dir_radio_entries[i].label),
- ((gint) vd->type == menu_view_dir_radio_entries[i].value),
- G_CALLBACK(vd_pop_submenu_dir_view_as_cb), vd);
- g_object_set_data(G_OBJECT(item), VIEW_DIR_AS_SUBMENU_KEY, GINT_TO_POINTER(menu_view_dir_radio_entries[i].value));
+ submenu = submenu_add_dir_sort(NULL, G_CALLBACK(vd_pop_menu_sort_cb), vd, FALSE, FALSE, TRUE, vd->layout->options.dir_view_list_sort.method);
+ menu_item_add_check(submenu, _("Ascending"), vd->layout->options.dir_view_list_sort.ascend, G_CALLBACK(vd_pop_menu_sort_ascend_cb), (vd));
+ item = menu_item_add(menu, _("_Sort"), NULL, NULL);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
}
+ menu_item_add_divider(menu);
+
menu_item_add_check(menu, _("Show _hidden files"), options->file_filter.show_hidden_files,
G_CALLBACK(vd_toggle_show_hidden_files_cb), vd);
return menu;
}
+void vd_new_folder(ViewDir *vd, FileData *dir_fd)
+{
+ file_util_create_dir(dir_fd, vd->layout->window, vd_pop_menu_new_folder_cb, vd);
+}
+
/*
*-----------------------------------------------------------------------------
* dnd
{
ViewDir *vd = data;
GList *list;
- gchar *uritext = NULL;
- gint length = 0;
if (!vd->click_fd) return;
case TARGET_URI_LIST:
case TARGET_TEXT_PLAIN:
list = g_list_prepend(NULL, vd->click_fd);
- uritext = uri_text_from_filelist(list, &length, (info == TARGET_TEXT_PLAIN));
+ uri_selection_data_set_uris_from_filelist(selection_data, list);
g_list_free(list);
break;
}
- if (uritext)
- {
- gtk_selection_data_set(selection_data, selection_data->target,
- 8, (guchar *)uritext, length);
- g_free(uritext);
- }
}
static void vd_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data)
vd_color_set(vd, vd->click_fd, FALSE);
- if (vd->type == DIRVIEW_LIST && context->action == GDK_ACTION_MOVE)
+ if (vd->type == DIRVIEW_LIST && gdk_drag_context_get_selected_action(context) == GDK_ACTION_MOVE)
{
vd_refresh(vd);
}
ViewDir *vd = data;
GtkTreePath *tpath;
FileData *fd = NULL;
+ GdkDragAction action;
vd->click_fd = NULL;
{
GList *list;
gint active;
- gint done = FALSE;
+ gboolean done = FALSE;
- list = uri_filelist_from_text((gchar *)selection_data->data, TRUE);
+ list = uri_filelist_from_gtk_selection_data(selection_data);
if (!list) return;
active = access_file(fd->path, W_OK | X_OK);
if (active)
{
- if (context->actions == GDK_ACTION_COPY)
+/** @FIXME With GTK2 gdk_drag_context_get_actions() shows the state of the
+ * shift and control keys during the drag operation. With GTK3 this is not
+ * so. This is a workaround.
+ */
+#if GTK_CHECK_VERSION(3,0,0)
+ GdkModifierType mask;
+
+ gdk_window_get_pointer(gtk_widget_get_window(widget), NULL, NULL, &mask);
+ if (mask & GDK_CONTROL_MASK)
+ {
+ action = GDK_ACTION_COPY;
+ }
+ else if (mask & GDK_SHIFT_MASK)
+ {
+ action = GDK_ACTION_MOVE;
+ }
+#else
+ action = (gdk_drag_context_get_actions(context));
+#endif
+ if (action != GDK_ACTION_COPY && action != GDK_ACTION_MOVE)
+ {
+ if (options->dnd_default_action == DND_ACTION_COPY)
+ {
+ action = GDK_ACTION_COPY;
+ }
+ else if (options->dnd_default_action == DND_ACTION_MOVE)
+ {
+ action = GDK_ACTION_MOVE;
+ }
+ }
+
+ if (action == GDK_ACTION_COPY)
{
file_util_copy_simple(list, fd->path, vd->widget);
done = TRUE;
+ list = NULL;
}
- else if (context->actions == GDK_ACTION_MOVE)
+ else if (action == GDK_ACTION_MOVE)
{
file_util_move_simple(list, fd->path, vd->widget);
done = TRUE;
+ list = NULL;
}
}
void vd_dnd_drop_scroll_cancel(ViewDir *vd)
{
- if (vd->drop_scroll_id != -1) g_source_remove(vd->drop_scroll_id);
- vd->drop_scroll_id = -1;
+ if (vd->drop_scroll_id)
+ {
+ g_source_remove(vd->drop_scroll_id);
+ vd->drop_scroll_id = 0;
+ }
}
-static gint vd_auto_scroll_idle_cb(gpointer data)
+static gboolean vd_auto_scroll_idle_cb(gpointer data)
{
ViewDir *vd = data;
+#if GTK_CHECK_VERSION(3,0,0)
+ GdkDeviceManager *device_manager;
+ GdkDevice *device;
+#endif
if (vd->drop_fd)
{
gint x, y;
gint w, h;
- window = vd->view->window;
+ window = gtk_widget_get_window(vd->view);
+#if GTK_CHECK_VERSION(3,0,0)
+ device_manager = gdk_display_get_device_manager(gdk_window_get_display(window));
+ device = gdk_device_manager_get_client_pointer(device_manager);
+ gdk_window_get_device_position(window, device, &x, &y, NULL);
+#else
gdk_window_get_pointer(window, &x, &y, NULL);
- gdk_drawable_get_size(window, &w, &h);
+#endif
+ w = gdk_window_get_width(window);
+ h = gdk_window_get_height(window);
if (x >= 0 && x < w && y >= 0 && y < h)
{
vd_dnd_drop_update(vd, x, y);
}
}
- vd->drop_scroll_id = -1;
+ vd->drop_scroll_id = 0;
return FALSE;
}
-static gint vd_auto_scroll_notify_cb(GtkWidget *widget, gint x, gint y, gpointer data)
+static gboolean vd_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(vd_auto_scroll_idle_cb, vd);
+ if (!vd->drop_scroll_id) vd->drop_scroll_id = g_idle_add(vd_auto_scroll_idle_cb, vd);
return TRUE;
}
-static gint vd_dnd_drop_motion(GtkWidget *widget, GdkDragContext *context,
+static gboolean vd_dnd_drop_motion(GtkWidget *widget, GdkDragContext *context,
gint x, gint y, guint time, gpointer data)
{
ViewDir *vd = data;
}
else
{
- gdk_drag_status(context, context->suggested_action, time);
+ gdk_drag_status(context, gdk_drag_context_get_suggested_action(context), time);
}
vd_dnd_drop_update(vd, x, y);
GtkTreePath *tpath;
gint cw, ch;
- if (vd_find_row(vd, vd->click_fd, &iter) < 0) return;
+ if (!vd_find_row(vd, vd->click_fd, &iter)) 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);
"cell-background-set", set, NULL);
}
-gint vd_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+gboolean vd_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
ViewDir *vd = data;
GtkTreePath *tpath;
FileData *fd = NULL;
+ if (defined_mouse_buttons(widget, bevent, vd->layout))
+ {
+ return TRUE;
+ }
+
+ if (vd->type == DIRVIEW_LIST && !options->view_dir_list_single_click_enter)
+ return FALSE;
+
if (!vd->click_fd) return FALSE;
vd_color_set(vd, vd->click_fd, FALSE);
if (fd && vd->click_fd == fd)
{
- vdlist_select_row(vd, vd->click_fd);
+ vd_select_row(vd, vd->click_fd);
}
return FALSE;
}
-gint vd_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+gboolean vd_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
ViewDir *vd = data;
- gint ret = FALSE;
+ gboolean ret = FALSE;
switch (vd->type)
{
return ret;
}
-gint vd_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+gboolean vd_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
ViewDir *vd = data;
- gint ret = FALSE;
+ gboolean ret = FALSE;
+ FileData *fd;
+ GtkTreePath *tpath;
+ GtkTreeIter iter;
+ NodeData *nd = NULL;
+ GtkTreeModel *store;
+
+ if (bevent->button == MOUSE_BUTTON_RIGHT)
+ {
+ if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y, &tpath, NULL, NULL, NULL))
+ {
+ store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
+ gtk_tree_model_get_iter(store, &iter, tpath);
+
+ switch (vd->type)
+ {
+ case DIRVIEW_LIST:
+ gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &fd, -1);
+ vd->click_fd = fd;
+ break;
+ case DIRVIEW_TREE:
+ gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &nd, -1);
+ vd->click_fd = (nd) ? nd->fd : NULL;
+ }
+
+ if (vd->click_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, NULL, NULL,
+ bevent->button, bevent->time);
+
+ return TRUE;
+ }
switch (vd->type)
{
if (!S_ISDIR(fd->mode)) return; /* this gives correct results even on recently deleted files/directories */
+ DEBUG_1("Notify vd: %s %04x", fd->path, type);
+
base = remove_level_from_path(fd->path);
if (vd->type == DIRVIEW_LIST)
g_free(source_base);
}
}
-
+
if (refresh) vd_refresh(vd);
}
if (vd->type == DIRVIEW_TREE)
{
GtkTreeIter iter;
- FileData *base_fd = file_data_new_simple(base);
+ FileData *base_fd = file_data_new_dir(base);
if (vd_find_row(vd, base_fd, &iter))
{
projects / geeqie.git / blobdiff