Trim trailing white spaces on empty lines.
[geeqie.git] / src / view_dir.c
index d9058fe..77446ce 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Geeqie
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: Laurent Monin
  *
@@ -18,6 +18,7 @@
 #include "filedata.h"
 #include "layout_image.h"
 #include "layout_util.h"
+#include "pixbuf_util.h"
 #include "ui_fileops.h"
 #include "ui_tree_edit.h"
 #include "ui_menu.h"
 #include "view_dir_list.h"
 #include "view_dir_tree.h"
 
-GtkRadioActionEntry menu_view_dir_radio_entries[] = {
-  { "FolderList",      NULL,           N_("_List"),            "<meta>L",      NULL, DIRVIEW_LIST },
-  { "FolderTree",      NULL,           N_("_Tree"),            "<control>T",   NULL, DIRVIEW_TREE },
-};
+/* 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);
+#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;
+}
+
+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_free(pf);
+}
+
+
+
+static void vd_notify_cb(FileData *fd, NotifyType type, gpointer data);
 
 static void vd_destroy_cb(GtkWidget *widget, gpointer data)
 {
        ViewDir *vd = data;
 
+       file_data_unregister_notify_func(vd_notify_cb, vd);
+
        if (vd->popup)
                {
                g_signal_handlers_disconnect_matched(G_OBJECT(vd->popup), G_SIGNAL_MATCH_DATA,
@@ -42,7 +79,7 @@ static void vd_destroy_cb(GtkWidget *widget, gpointer data)
                gtk_widget_destroy(vd->popup);
                }
 
-       switch(vd->type)
+       switch (vd->type)
        {
        case DIRVIEW_LIST: vdlist_destroy_cb(widget, data); break;
        case DIRVIEW_TREE: vdtree_destroy_cb(widget, data); break;
@@ -59,31 +96,16 @@ static void vd_destroy_cb(GtkWidget *widget, gpointer data)
 
 ViewDir *vd_new(DirViewType type, FileData *dir_fd)
 {
-       g_assert(VIEW_DIR_TYPES_COUNT <= G_N_ELEMENTS(menu_view_dir_radio_entries));
-
        ViewDir *vd = g_new0(ViewDir, 1);
 
-       vd->dir_fd = NULL;
-       vd->click_fd = NULL;
-
-       vd->drop_fd = NULL;
-       vd->drop_list = NULL;
-       vd->drop_scroll_id = -1;
-       vd->drop_list = NULL;
-
-       vd->popup = NULL;
-
-       vd->dnd_drop_leave_func = NULL;
-       vd->dnd_drop_update_func = NULL;
-
        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->pf = folder_icons_new(vd->widget);
 
-       switch(type)
+       switch (type)
        {
        case DIRVIEW_LIST: vd = vdlist_new(vd, dir_fd); break;
        case DIRVIEW_TREE: vd = vdtree_new(vd, dir_fd); break;
@@ -104,6 +126,9 @@ ViewDir *vd_new(DirViewType type, FileData *dir_fd)
        g_signal_connect(G_OBJECT(vd->view), "button_release_event",
                         G_CALLBACK(vd_release_cb), vd);
 
+       file_data_register_notify_func(vd_notify_cb, vd, NOTIFY_PRIORITY_HIGH);
+
+       /* vd_set_fd expects that vd_notify_cb is already registered */
        if (dir_fd) vd_set_fd(vd, dir_fd);
 
        gtk_widget_show(vd->view);
@@ -112,7 +137,7 @@ ViewDir *vd_new(DirViewType type, FileData *dir_fd)
 }
 
 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;
@@ -123,25 +148,29 @@ void vd_set_layout(ViewDir *vd, LayoutWindow *layout)
        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);
 
-       switch(vd->type)
+       switch (vd->type)
        {
        case DIRVIEW_LIST: ret = vdlist_set_fd(vd, dir_fd); break;
        case DIRVIEW_TREE: ret = vdtree_set_fd(vd, dir_fd); break;
        }
 
+       file_data_register_notify_func(vd_notify_cb, vd, NOTIFY_PRIORITY_HIGH);
+
        return ret;
 }
 
 void vd_refresh(ViewDir *vd)
 {
-       switch(vd->type)
+       switch (vd->type)
        {
-       case DIRVIEW_LIST: return vdlist_refresh(vd);
-       case DIRVIEW_TREE: return vdtree_refresh(vd);
+       case DIRVIEW_LIST: vdlist_refresh(vd); break;
+       case DIRVIEW_TREE: vdtree_refresh(vd); break;
        }
 }
 
@@ -149,7 +178,7 @@ const gchar *vd_row_get_path(ViewDir *vd, gint row)
 {
        const gchar *ret = NULL;
 
-       switch(vd->type)
+       switch (vd->type)
        {
        case DIRVIEW_LIST: ret = vdlist_row_get_path(vd, row); break;
        case DIRVIEW_TREE: ret = vdtree_row_get_path(vd, row); break;
@@ -158,20 +187,22 @@ const gchar *vd_row_get_path(ViewDir *vd, gint row)
        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)
+       switch (vd->type)
        {
        case DIRVIEW_LIST: ret = vdlist_find_row(vd, fd, iter); break;
        case DIRVIEW_TREE: ret = vdtree_find_row(vd, fd, iter, NULL); break;
@@ -205,7 +236,24 @@ FileData *vd_get_fd_from_tree_path(ViewDir *vd, GtkTreeView *tview, GtkTreePath
        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;
@@ -219,19 +267,7 @@ static gint vd_rename_cb(TreeEditData *td, const gchar *old, const gchar *new, g
        new_path = g_build_filename(base, new, NULL);
        g_free(base);
 
-       if (file_util_rename_dir(fd, new_path, vd->view))
-               {
-
-               if (vd->type == DIRVIEW_TREE) vdtree_populate_path(vd, fd, TRUE, TRUE);
-               if (vd->layout && vd->dir_fd != fd) /* FIXME */
-                       {
-                       layout_set_path(vd->layout, new_path);
-                       }
-               else
-                       {
-                       if (vd->type == DIRVIEW_LIST) vd_refresh(vd);
-                       }
-               }
+       file_util_rename_dir(fd, new_path, vd->view, vd_rename_finished_cb, vd);
 
        g_free(new_path);
 
@@ -244,7 +280,7 @@ static void vd_rename_by_data(ViewDir *vd, FileData *fd)
        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);
 
@@ -259,10 +295,10 @@ void vd_color_set(ViewDir *vd, FileData *fd, gint color_set)
        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)
+       switch (vd->type)
        {
        case DIRVIEW_LIST:
                gtk_list_store_set(GTK_LIST_STORE(store), &iter, DIR_COLUMN_COLOR, color_set, -1);
@@ -329,28 +365,30 @@ static void vd_drop_menu_filter_cb(GtkWidget *widget, gpointer data)
        ViewDir *vd = data;
        const gchar *path;
        GList *list;
-       guint n;
+       const gchar *key;
 
        if (!vd->drop_fd) return;
-       
-       n = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(widget), "filter_idx"));
-       if (n == 0) return;
-       n--;
+
+       key = g_object_get_data(G_OBJECT(widget), "filter_key");
 
        path = vd->drop_fd->path;
        list = vd->drop_list;
 
        vd->drop_list = NULL;
 
-       file_util_start_filter_from_filelist(n, list, path, vd->widget);
+       file_util_start_filter_from_filelist(key, list, path, vd->widget);
 }
 
-
+static void vd_drop_menu_edit_item_free(gpointer data)
+{
+       g_free(data);
+}
 
 GtkWidget *vd_drop_menu(ViewDir *vd, gint active)
 {
        GtkWidget *menu;
-       guint i;
+       GList *editors_list = editor_list_get();
+       GList *work = editors_list;
 
        menu = popup_menu_short_lived();
        g_signal_connect(G_OBJECT(menu), "destroy",
@@ -360,18 +398,21 @@ GtkWidget *vd_drop_menu(ViewDir *vd, gint active)
                                      G_CALLBACK(vd_drop_menu_copy_cb), vd);
        menu_item_add_sensitive(menu, _("_Move"), active, G_CALLBACK(vd_drop_menu_move_cb), vd);
 
-       for (i = 0; i < GQ_EDITOR_GENERIC_SLOTS; i++)
+       while (work)
                {
                GtkWidget *item;
-
-               const gchar *name = editor_get_name(i);
-               if (!name || !editor_is_filter(i)) continue;
-
-               item = menu_item_add_sensitive(menu, name, active, G_CALLBACK(vd_drop_menu_filter_cb), vd);
-
-               g_object_set_data(G_OBJECT(item), "filter_idx", GUINT_TO_POINTER(i + 1));
+               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);
        menu_item_add_stock(menu, _("Cancel"), GTK_STOCK_CANCEL, NULL, vd);
 
@@ -394,7 +435,9 @@ static void vd_pop_menu_up_cb(GtkWidget *widget, gpointer data)
 
        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);
@@ -479,13 +522,12 @@ static void vd_pop_menu_copy_path_cb(GtkWidget *widget, gpointer data)
        file_util_copy_path_to_clipboard(vd->click_fd);
 }
 
-#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));
-       layout_views_set(vd->layout, new_type, vd->layout->file_view_type);
+       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);
 }
 
 static void vd_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
@@ -503,66 +545,53 @@ static void vd_toggle_show_hidden_files_cb(GtkWidget *widget, gpointer data)
        if (vd->layout) layout_refresh(vd->layout);
 }
 
-static void vd_pop_menu_new_cb(GtkWidget *widget, gpointer data)
+static void vd_pop_menu_new_rename_cb(gboolean success, const gchar *new_path, gpointer data)
 {
        ViewDir *vd = data;
-       const gchar *path = NULL;
-       gchar *new_path;
-       gchar *buf;
+       FileData *fd = NULL;
+       if (!success) return;
 
-       switch(vd->type)
+       switch (vd->type)
                {
                case DIRVIEW_LIST:
                        {
-                       if (!vd->dir_fd) return;
-                       path = vd->dir_fd->path;
+                       vd_refresh(vd);
+                       fd = vdlist_row_by_path(vd, new_path, NULL);
                        };
                        break;
                case DIRVIEW_TREE:
                        {
-                       if (!vd->click_fd) return;
-                       path = vd->click_fd->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);
+}
 
-       buf = g_build_filename(path, _("new_folder"), NULL);
-       new_path = unique_filename(buf, NULL, NULL, FALSE);
-       g_free(buf);
-       if (!new_path) return;
-
-       if (!mkdir_utf8(new_path, 0755))
-               {
-               gchar *text;
+static void vd_pop_menu_new_cb(GtkWidget *widget, gpointer data)
+{
+       ViewDir *vd = data;
+       FileData *dir_fd = NULL;
 
-               text = g_strdup_printf(_("Unable to create folder:\n%s"), new_path);
-               file_util_warning_dialog(_("Error creating folder"), text, GTK_STOCK_DIALOG_ERROR, vd->view);
-               g_free(text);
-               }
-       else
+       switch (vd->type)
                {
-               FileData *fd = NULL;
-
-               switch(vd->type)
+               case DIRVIEW_LIST:
                        {
-                       case DIRVIEW_LIST:
-                               {
-                               vd_refresh(vd);
-                               fd = vdlist_row_by_path(vd, new_path, NULL);
-                               };
-                               break;
-                       case DIRVIEW_TREE:
-                               {
-                               FileData *new_fd = file_data_new_simple(new_path);
-                               fd = vdtree_populate_path(vd, new_fd, TRUE, TRUE);
-                               file_data_unref(new_fd);
-                               }
-                               break;
-                       }
-               vd_rename_by_data(vd, fd);
+                       if (!vd->dir_fd) return;
+                       dir_fd = vd->dir_fd;
+                       };
+                       break;
+               case DIRVIEW_TREE:
+                       {
+                       if (!vd->click_fd) return;
+                       dir_fd = vd->click_fd;
+                       };
+                       break;
                }
 
-       g_free(new_path);
+       file_util_create_dir(dir_fd, widget, vd_pop_menu_new_rename_cb, vd);
 }
 
 static void vd_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
@@ -575,15 +604,12 @@ static void vd_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
 GtkWidget *vd_pop_menu(ViewDir *vd, FileData *fd)
 {
        GtkWidget *menu;
-       GtkWidget *submenu;
-       GtkWidget *item;
-       gint active;
-       gint rename_delete_active = FALSE;
-       gint new_folder_active = FALSE;
-       gint i;
+       gboolean active;
+       gboolean rename_delete_active = FALSE;
+       gboolean new_folder_active = FALSE;
 
        active = (fd != NULL);
-       switch(vd->type)
+       switch (vd->type)
                {
                case DIRVIEW_LIST:
                        {
@@ -641,23 +667,19 @@ GtkWidget *vd_pop_menu(ViewDir *vd, FileData *fd)
        menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, rename_delete_active,
                                      G_CALLBACK(vd_pop_menu_delete_cb), vd);
 
-       if (options->show_copy_path)
-               menu_item_add(menu, _("_Copy path"), 
-                             G_CALLBACK(vd_pop_menu_copy_path_cb), vd);
+       menu_item_add(menu, _("_Copy path"),
+                     G_CALLBACK(vd_pop_menu_copy_path_cb), vd);
 
        menu_item_add_divider(menu);
 
-       item = menu_item_add(menu, _("_View as"), NULL, NULL);
-       submenu = gtk_menu_new();
-       gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
 
-       for (i = 0; i < VIEW_DIR_TYPES_COUNT; i++)
-               {
-               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));
-               }
+       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);
+
+       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);
+
+       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);
@@ -668,6 +690,11 @@ GtkWidget *vd_pop_menu(ViewDir *vd, FileData *fd)
        return menu;
 }
 
+void vd_new_folder(ViewDir *vd, FileData *dir_fd)
+{
+       file_util_create_dir(dir_fd, vd->widget, vd_pop_menu_new_rename_cb, vd);
+}
+
 /*
  *-----------------------------------------------------------------------------
  * dnd
@@ -700,8 +727,6 @@ static void vd_dnd_get(GtkWidget *widget, GdkDragContext *context,
 {
        ViewDir *vd = data;
        GList *list;
-       gchar *uritext = NULL;
-       gint length = 0;
 
        if (!vd->click_fd) return;
 
@@ -710,16 +735,10 @@ static void vd_dnd_get(GtkWidget *widget, GdkDragContext *context,
                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)
@@ -736,7 +755,7 @@ static void vd_dnd_end(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);
                }
@@ -767,9 +786,9 @@ static void vd_dnd_drop_receive(GtkWidget *widget,
                {
                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);
@@ -778,15 +797,17 @@ static void vd_dnd_drop_receive(GtkWidget *widget,
 
                if (active)
                        {
-                       if (context->actions == GDK_ACTION_COPY)
+                       if (gdk_drag_context_get_actions(context) == 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 (gdk_drag_context_get_actions(context) == GDK_ACTION_MOVE)
                                {
                                file_util_move_simple(list, fd->path, vd->widget);
                                done = TRUE;
+                               list = NULL;
                                }
                        }
 
@@ -825,11 +846,14 @@ static void vd_dnd_drop_update(ViewDir *vd, gint x, gint y)
 
 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;
 
@@ -839,31 +863,32 @@ static gint vd_auto_scroll_idle_cb(gpointer data)
                gint x, y;
                gint w, h;
 
-               window = vd->view->window;
+               window = gtk_widget_get_window(vd->view);
                gdk_window_get_pointer(window, &x, &y, NULL);
-               gdk_drawable_get_size(window, &w, &h);
+               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;
@@ -878,7 +903,7 @@ static gint vd_dnd_drop_motion(GtkWidget *widget, GdkDragContext *context,
                }
        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);
@@ -938,7 +963,7 @@ void vd_menu_position_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpo
        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);
@@ -985,7 +1010,7 @@ void vd_color_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
                     "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;
@@ -1006,18 +1031,18 @@ gint vd_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 
        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)
+       switch (vd->type)
        {
        case DIRVIEW_LIST: ret = vdlist_press_key_cb(widget, event, data); break;
        case DIRVIEW_TREE: ret = vdtree_press_key_cb(widget, event, data); break;
@@ -1026,12 +1051,12 @@ gint vd_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
        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;
 
-       switch(vd->type)
+       switch (vd->type)
        {
        case DIRVIEW_LIST: ret = vdlist_press_cb(widget, bevent, data); break;
        case DIRVIEW_TREE: ret = vdtree_press_cb(widget, bevent, data); break;
@@ -1039,3 +1064,61 @@ gint vd_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 
        return ret;
 }
+
+static void vd_notify_cb(FileData *fd, NotifyType type, gpointer data)
+{
+       ViewDir *vd = data;
+       gboolean refresh;
+       gchar *base;
+
+       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)
+               {
+               refresh = (fd == vd->dir_fd);
+
+               if (!refresh)
+                       {
+                       refresh = (strcmp(base, vd->dir_fd->path) == 0);
+                       }
+
+               if ((type & NOTIFY_CHANGE) && fd->change)
+                       {
+                       if (!refresh && fd->change->dest)
+                               {
+                               gchar *dest_base = remove_level_from_path(fd->change->dest);
+                               refresh = (strcmp(dest_base, vd->dir_fd->path) == 0);
+                               g_free(dest_base);
+                               }
+
+                       if (!refresh && fd->change->source)
+                               {
+                               gchar *source_base = remove_level_from_path(fd->change->source);
+                               refresh = (strcmp(source_base, vd->dir_fd->path) == 0);
+                               g_free(source_base);
+                               }
+                       }
+
+               if (refresh) vd_refresh(vd);
+               }
+
+       if (vd->type == DIRVIEW_TREE)
+               {
+               GtkTreeIter iter;
+               FileData *base_fd = file_data_new_dir(base);
+
+               if (vd_find_row(vd, base_fd, &iter))
+                       {
+                       vdtree_populate_path_by_iter(vd, &iter, TRUE, vd->dir_fd);
+                       }
+
+               file_data_unref(base_fd);
+               }
+
+       g_free(base);
+}
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */