Trim trailing white spaces on empty lines.
[geeqie.git] / src / view_dir.c
index d0d96b9..77446ce 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Geeqie
- * (C) 2008 Vladimir Nadvornik
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: Laurent Monin
  *
 #include "main.h"
 #include "view_dir.h"
 
+#include "dnd.h"
 #include "dupe.h"
-#include "filelist.h"
+#include "editors.h"
+#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 "utilops.h"
+#include "uri_utils.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_("Tr_ee"),            "<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;
+}
 
-void vd_destroy_cb(GtkWidget *widget, gpointer data)
+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,
@@ -39,56 +79,68 @@ void vd_destroy_cb(GtkWidget *widget, gpointer data)
                gtk_widget_destroy(vd->popup);
                }
 
-       if (vd->widget_destroy_cb) vd->widget_destroy_cb(widget, data);
+       switch (vd->type)
+       {
+       case DIRVIEW_LIST: vdlist_destroy_cb(widget, data); break;
+       case DIRVIEW_TREE: vdtree_destroy_cb(widget, data); break;
+       }
 
        if (vd->pf) folder_icons_free(vd->pf);
        if (vd->drop_list) filelist_free(vd->drop_list);
 
-       if (vd->path) g_free(vd->path);
+       if (vd->dir_fd) file_data_unref(vd->dir_fd);
        if (vd->info) g_free(vd->info);
 
        g_free(vd);
 }
 
-ViewDir *vd_new(DirViewType type, const gchar *path)
+ViewDir *vd_new(DirViewType type, FileData *dir_fd)
 {
        ViewDir *vd = g_new0(ViewDir, 1);
 
-       vd->path = 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->pf = 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);
 
-       switch(type)
+       vd->pf = folder_icons_new(vd->widget);
+
+       switch (type)
        {
-       case DIRVIEW_LIST: vd = vdlist_new(vd, path); break;
-       case DIRVIEW_TREE: vd = vdtree_new(vd, path); break;
+       case DIRVIEW_LIST: vd = vdlist_new(vd, dir_fd); break;
+       case DIRVIEW_TREE: vd = vdtree_new(vd, dir_fd); break;
        }
 
+       gtk_container_add(GTK_CONTAINER(vd->widget), vd->view);
+
+       vd_dnd_init(vd);
+
+       g_signal_connect(G_OBJECT(vd->view), "row_activated",
+                        G_CALLBACK(vd_activate_cb), vd);
        g_signal_connect(G_OBJECT(vd->widget), "destroy",
                         G_CALLBACK(vd_destroy_cb), vd);
+       g_signal_connect(G_OBJECT(vd->view), "key_press_event",
+                        G_CALLBACK(vd_press_key_cb), vd);
+       g_signal_connect(G_OBJECT(vd->view), "button_press_event",
+                        G_CALLBACK(vd_press_cb), vd);
+       g_signal_connect(G_OBJECT(vd->view), "button_release_event",
+                        G_CALLBACK(vd_release_cb), vd);
 
-       vd->pf = folder_icons_new();
+       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);
 
        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->select_func = func;
+       vd->select_data = data;
 }
 
 void vd_set_layout(ViewDir *vd, LayoutWindow *layout)
@@ -96,25 +148,29 @@ void vd_set_layout(ViewDir *vd, LayoutWindow *layout)
        vd->layout = layout;
 }
 
-gint vd_set_path(ViewDir *vd, const gchar *path)
+gboolean vd_set_fd(ViewDir *vd, FileData *dir_fd)
 {
-       gint ret = FALSE;
+       gboolean ret = FALSE;
 
-       switch(vd->type)
+       file_data_unregister_notify_func(vd_notify_cb, vd);
+
+       switch (vd->type)
        {
-       case DIRVIEW_LIST: ret = vdlist_set_path(vd, path); break;
-       case DIRVIEW_TREE: ret = vdtree_set_path(vd, path); break;
+       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;
        }
 }
 
@@ -122,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;
@@ -131,11 +187,22 @@ const gchar *vd_row_get_path(ViewDir *vd, gint row)
        return ret;
 }
 
-gint vd_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter)
+/* the calling stack is this:
+   vd_select_row -> select_func -> layout_set_fd -> vd_set_fd
+*/
+void vd_select_row(ViewDir *vd, FileData *fd)
+{
+       if (fd && vd->select_func)
+               {
+               vd->select_func(vd, fd, vd->select_data);
+               }
+}
+
+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;
@@ -144,57 +211,64 @@ gint vd_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter)
        return ret;
 }
 
-static gint vd_rename_cb(TreeEditData *td, const gchar *old, const gchar *new, gpointer data)
+FileData *vd_get_fd_from_tree_path(ViewDir *vd, GtkTreeView *tview, GtkTreePath *tpath)
 {
-       ViewDir *vd = data;
-       GtkTreeModel *store;
        GtkTreeIter iter;
-       FileData *fd;
-       gchar *old_path;
-       gchar *new_path;
-       gchar *base;
-
-       store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
-       if (!gtk_tree_model_get_iter(store, &iter, td->path)) return FALSE;
+       FileData *fd = NULL;
+       GtkTreeModel *store;
 
-       switch(vd->type)
-       {
-       case DIRVIEW_LIST:
-               gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &fd, -1);
-               break;
-       case DIRVIEW_TREE:
+       store = gtk_tree_view_get_model(tview);
+       gtk_tree_model_get_iter(store, &iter, tpath);
+       switch (vd->type)
                {
-               NodeData *nd;
-               gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &nd, -1);
-               if (!nd) return FALSE;
-               fd = nd->fd;
-               };
-               break;
-       }
-
-       if (!fd) return FALSE;
-
-       old_path = g_strdup(fd->path);
+               case DIRVIEW_LIST:
+                       gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &fd, -1);
+                       break;
+               case DIRVIEW_TREE:
+                       {
+                       NodeData *nd;
+                       gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &nd, -1);
+                       fd = (nd) ? nd->fd : NULL;
+                       };
+                       break;
+               }
 
-       base = remove_level_from_path(old_path);
-       new_path = concat_dir_and_file(base, new);
-       g_free(base);
+       return fd;
+}
 
-       if (file_util_rename_dir(fd, new_path, vd->view))
+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->type == DIRVIEW_TREE) vdtree_populate_path(vd, new_path, TRUE, TRUE);
-               if (vd->layout && strcmp(vd->path, old_path) == 0)
-                       {
-                       layout_set_path(vd->layout, new_path);
-                       }
-               else
+               if (vd_find_row(vd, fd, &iter))
                        {
-                       if (vd->type == DIRVIEW_LIST) vd_refresh(vd);
+                       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;
+       gchar *new_path;
+       gchar *base;
+
+       fd = vd_get_fd_from_tree_path(vd, GTK_TREE_VIEW(vd->view), td->path);
+       if (!fd) return FALSE;
+
+       base = remove_level_from_path(fd->path);
+       new_path = g_build_filename(base, new, NULL);
+       g_free(base);
+
+       file_util_rename_dir(fd, new_path, vd->view, vd_rename_finished_cb, vd);
 
-       g_free(old_path);
        g_free(new_path);
 
        return FALSE;
@@ -206,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);
 
@@ -221,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);
@@ -267,7 +341,7 @@ static void vd_drop_menu_copy_cb(GtkWidget *widget, gpointer data)
        list = vd->drop_list;
        vd->drop_list = NULL;
 
-       file_util_copy_simple(list, path);
+       file_util_copy_simple(list, path, vd->widget);
 }
 
 static void vd_drop_menu_move_cb(GtkWidget *widget, gpointer data)
@@ -283,12 +357,38 @@ static void vd_drop_menu_move_cb(GtkWidget *widget, gpointer data)
 
        vd->drop_list = NULL;
 
-       file_util_move_simple(list, path);
+       file_util_move_simple(list, path, vd->widget);
+}
+
+static void vd_drop_menu_filter_cb(GtkWidget *widget, gpointer data)
+{
+       ViewDir *vd = data;
+       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;
+       list = vd->drop_list;
+
+       vd->drop_list = NULL;
+
+       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;
+       GList *editors_list = editor_list_get();
+       GList *work = editors_list;
 
        menu = popup_menu_short_lived();
        g_signal_connect(G_OBJECT(menu), "destroy",
@@ -298,6 +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);
 
+       while (work)
+               {
+               GtkWidget *item;
+               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);
 
@@ -308,19 +423,21 @@ GtkWidget *vd_drop_menu(ViewDir *vd, gint active)
  *-----------------------------------------------------------------------------
  * pop-up menu
  *-----------------------------------------------------------------------------
- */ 
+ */
 
 static void vd_pop_menu_up_cb(GtkWidget *widget, gpointer data)
 {
        ViewDir *vd = data;
        gchar *path;
 
-       if (!vd->path || strcmp(vd->path, "/") == 0) return;
-       path = remove_level_from_path(vd->path);
+       if (!vd->dir_fd || strcmp(vd->dir_fd->path, G_DIR_SEPARATOR_S) == 0) return;
+       path = remove_level_from_path(vd->dir_fd->path);
 
        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);
@@ -329,14 +446,11 @@ static void vd_pop_menu_up_cb(GtkWidget *widget, gpointer data)
 static void vd_pop_menu_slide_cb(GtkWidget *widget, gpointer data)
 {
        ViewDir *vd = data;
-       gchar *path;
 
        if (!vd->layout) return;
        if (!vd->click_fd) return;
 
-       path = vd->click_fd->path;
-
-       layout_set_path(vd->layout, path);
+       layout_set_fd(vd->layout, vd->click_fd);
        layout_select_none(vd->layout);
        layout_image_slideshow_stop(vd->layout);
        layout_image_slideshow_start(vd->layout);
@@ -345,15 +459,12 @@ static void vd_pop_menu_slide_cb(GtkWidget *widget, gpointer data)
 static void vd_pop_menu_slide_rec_cb(GtkWidget *widget, gpointer data)
 {
        ViewDir *vd = data;
-       gchar *path;
        GList *list;
 
        if (!vd->layout) return;
        if (!vd->click_fd) return;
 
-       path = vd->click_fd->path;
-
-       list = filelist_recursive(path);
+       list = filelist_recursive(vd->click_fd);
 
        layout_image_slideshow_stop(vd->layout);
        layout_image_slideshow_start_from_list(vd->layout, list);
@@ -372,7 +483,7 @@ static void vd_pop_menu_dupe(ViewDir *vd, gint recursive)
                }
        else
                {
-               filelist_read(vd->click_fd->path, &list, NULL);
+               filelist_read(vd->click_fd, &list, NULL);
                list = filelist_filter(list, FALSE);
                }
 
@@ -402,20 +513,21 @@ static void vd_pop_menu_delete_cb(GtkWidget *widget, gpointer data)
        file_util_delete_dir(vd->click_fd, vd->widget);
 }
 
-static void vd_pop_menu_dir_view_as_cb(GtkWidget *widget, gpointer data)
+static void vd_pop_menu_copy_path_cb(GtkWidget *widget, gpointer data)
 {
        ViewDir *vd = data;
-       DirViewType new_type = DIRVIEW_LIST;
 
-       if (!vd->layout) return;
+       if (!vd->click_fd) return;
 
-       switch(vd->type)
-       {
-       case DIRVIEW_LIST: new_type = DIRVIEW_TREE; break;
-       case DIRVIEW_TREE: new_type = DIRVIEW_LIST; break;
-       }
-       
-       layout_views_set(vd->layout, new_type, vd->layout->icon_view);
+       file_util_copy_path_to_clipboard(vd->click_fd);
+}
+
+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), "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)
@@ -433,114 +545,104 @@ 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->path) return;
-                       path = vd->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 = concat_dir_and_file(path, _("new_folder"));
-       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:
-                               fd = vdtree_populate_path(vd, new_path, TRUE, TRUE);
-                               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)
 {
        ViewDir *vd = data;
-       
+
        vd_rename_by_data(vd, vd->click_fd);
 }
 
 GtkWidget *vd_pop_menu(ViewDir *vd, FileData *fd)
 {
        GtkWidget *menu;
-       gint active;
-       gint rename_delete_active = FALSE;
-       gint new_folder_active = FALSE;
+       gboolean active;
+       gboolean rename_delete_active = FALSE;
+       gboolean new_folder_active = FALSE;
 
        active = (fd != NULL);
-       if (fd)
+       switch (vd->type)
                {
-               switch(vd->type)
+               case DIRVIEW_LIST:
                        {
-                       case DIRVIEW_LIST:
-                               {
-                               /* check using . (always row 0) */
-                               new_folder_active = (vd->path && access_file(vd->path , W_OK | X_OK));
-
-                               /* ignore .. and . */
-                               rename_delete_active = (new_folder_active &&
-                                       strcmp(fd->name, ".") != 0 &&
-                                       strcmp(fd->name, "..") != 0 &&
-                                       access_file(fd->path, W_OK | X_OK));
-                               };
-                               break;
-                       case DIRVIEW_TREE:
+                       /* check using . (always row 0) */
+                       new_folder_active = (vd->dir_fd && access_file(vd->dir_fd->path , W_OK | X_OK));
+
+                       /* ignore .. and . */
+                       rename_delete_active = (new_folder_active && fd &&
+                               strcmp(fd->name, ".") != 0 &&
+                               strcmp(fd->name, "..") != 0 &&
+                               access_file(fd->path, W_OK | X_OK));
+                       };
+                       break;
+               case DIRVIEW_TREE:
+                       {
+                       if (fd)
                                {
                                gchar *parent;
-
                                new_folder_active = (fd && access_file(fd->path, W_OK | X_OK));
                                parent = remove_level_from_path(fd->path);
                                rename_delete_active = access_file(parent, W_OK | X_OK);
                                g_free(parent);
                                };
-                               break;
                        }
-
+                       break;
                }
+
        menu = popup_menu_short_lived();
        g_signal_connect(G_OBJECT(menu), "destroy",
                         G_CALLBACK(vd_popup_destroy_cb), vd);
 
        menu_item_add_stock_sensitive(menu, _("_Up to parent"), GTK_STOCK_GO_UP,
-                                     (vd->path && strcmp(vd->path, "/") != 0),
+                                     (vd->dir_fd && strcmp(vd->dir_fd->path, G_DIR_SEPARATOR_S) != 0),
                                      G_CALLBACK(vd_pop_menu_up_cb), vd);
 
        menu_item_add_divider(menu);
@@ -565,10 +667,20 @@ 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);
 
+       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);
+
+       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);
-       /* FIXME */
-       menu_item_add_check(menu, _("View as _tree"), vd->type,
-                           G_CALLBACK(vd_pop_menu_dir_view_as_cb), vd);
+
        menu_item_add_check(menu, _("Show _hidden files"), options->file_filter.show_hidden_files,
                            G_CALLBACK(vd_toggle_show_hidden_files_cb), vd);
 
@@ -578,3 +690,435 @@ 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
+ *-----------------------------------------------------------------------------
+ */
+
+static GtkTargetEntry vd_dnd_drop_types[] = {
+       { "text/uri-list", 0, TARGET_URI_LIST }
+};
+static gint vd_dnd_drop_types_count = 1;
+
+static void vd_dest_set(ViewDir *vd, gint enable)
+{
+       if (enable)
+               {
+               gtk_drag_dest_set(vd->view,
+                                 GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP,
+                                 vd_dnd_drop_types, vd_dnd_drop_types_count,
+                                 GDK_ACTION_MOVE | GDK_ACTION_COPY);
+               }
+       else
+               {
+               gtk_drag_dest_unset(vd->view);
+               }
+}
+
+static void vd_dnd_get(GtkWidget *widget, GdkDragContext *context,
+                          GtkSelectionData *selection_data, guint info,
+                          guint time, gpointer data)
+{
+       ViewDir *vd = data;
+       GList *list;
+
+       if (!vd->click_fd) return;
+
+       switch (info)
+               {
+               case TARGET_URI_LIST:
+               case TARGET_TEXT_PLAIN:
+                       list = g_list_prepend(NULL, vd->click_fd);
+                       uri_selection_data_set_uris_from_filelist(selection_data, list);
+                       g_list_free(list);
+                       break;
+               }
+}
+
+static void vd_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data)
+{
+       ViewDir *vd = data;
+
+       vd_color_set(vd, vd->click_fd, TRUE);
+       vd_dest_set(vd, FALSE);
+}
+
+static void vd_dnd_end(GtkWidget *widget, GdkDragContext *context, gpointer data)
+{
+       ViewDir *vd = data;
+
+       vd_color_set(vd, vd->click_fd, FALSE);
+
+       if (vd->type == DIRVIEW_LIST && gdk_drag_context_get_selected_action(context) == GDK_ACTION_MOVE)
+               {
+               vd_refresh(vd);
+               }
+       vd_dest_set(vd, TRUE);
+}
+
+static void vd_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;
+       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))
+               {
+               fd = vd_get_fd_from_tree_path(vd, GTK_TREE_VIEW(widget), tpath);
+               gtk_tree_path_free(tpath);
+               }
+
+       if (!fd) return;
+
+       if (info == TARGET_URI_LIST)
+               {
+               GList *list;
+               gint active;
+               gboolean done = FALSE;
+
+               list = uri_filelist_from_gtk_selection_data(selection_data);
+               if (!list) return;
+
+               active = access_file(fd->path, W_OK | X_OK);
+
+               vd_color_set(vd, fd, TRUE);
+
+               if (active)
+                       {
+                       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 (gdk_drag_context_get_actions(context) == GDK_ACTION_MOVE)
+                               {
+                               file_util_move_simple(list, fd->path, vd->widget);
+                               done = TRUE;
+                               list = NULL;
+                               }
+                       }
+
+               if (done == FALSE)
+                       {
+                       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 void vd_dnd_drop_update(ViewDir *vd, gint x, gint y)
+{
+       GtkTreePath *tpath;
+       FileData *fd = NULL;
+
+       if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vd->view), x, y,
+                                         &tpath, NULL, NULL, NULL))
+               {
+               fd = vd_get_fd_from_tree_path(vd, GTK_TREE_VIEW(vd->view), tpath);
+               gtk_tree_path_free(tpath);
+               }
+
+       if (fd != vd->drop_fd)
+               {
+               vd_color_set(vd, vd->drop_fd, FALSE);
+               vd_color_set(vd, fd, TRUE);
+               if (fd && vd->dnd_drop_update_func) vd->dnd_drop_update_func(vd);
+               }
+
+       vd->drop_fd = fd;
+}
+
+void vd_dnd_drop_scroll_cancel(ViewDir *vd)
+{
+       if (vd->drop_scroll_id)
+               {
+               g_source_remove(vd->drop_scroll_id);
+               vd->drop_scroll_id = 0;
+               }
+}
+
+static gboolean vd_auto_scroll_idle_cb(gpointer data)
+{
+       ViewDir *vd = data;
+
+       if (vd->drop_fd)
+               {
+               GdkWindow *window;
+               gint x, y;
+               gint w, h;
+
+               window = gtk_widget_get_window(vd->view);
+               gdk_window_get_pointer(window, &x, &y, NULL);
+               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 = 0;
+       return FALSE;
+}
+
+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) vd->drop_scroll_id = g_idle_add(vd_auto_scroll_idle_cb, vd);
+
+       return TRUE;
+}
+
+static gboolean vd_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)
+               {
+               /* from same window */
+               gdk_drag_status(context, 0, time);
+               return TRUE;
+               }
+       else
+               {
+               gdk_drag_status(context, gdk_drag_context_get_suggested_action(context), time);
+               }
+
+       vd_dnd_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, vd_auto_scroll_notify_cb, vd);
+               }
+
+       return FALSE;
+}
+
+static void vd_dnd_drop_leave(GtkWidget *widget, GdkDragContext *context, guint time, gpointer data)
+{
+       ViewDir *vd = data;
+
+       if (vd->drop_fd != vd->click_fd) vd_color_set(vd, vd->drop_fd, FALSE);
+
+       vd->drop_fd = NULL;
+
+       if (vd->dnd_drop_leave_func) vd->dnd_drop_leave_func(vd);
+}
+
+void vd_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(vd_dnd_get), vd);
+       g_signal_connect(G_OBJECT(vd->view), "drag_begin",
+                        G_CALLBACK(vd_dnd_begin), vd);
+       g_signal_connect(G_OBJECT(vd->view), "drag_end",
+                        G_CALLBACK(vd_dnd_end), vd);
+
+       vd_dest_set(vd, TRUE);
+       g_signal_connect(G_OBJECT(vd->view), "drag_data_received",
+                        G_CALLBACK(vd_dnd_drop_receive), vd);
+       g_signal_connect(G_OBJECT(vd->view), "drag_motion",
+                        G_CALLBACK(vd_dnd_drop_motion), vd);
+       g_signal_connect(G_OBJECT(vd->view), "drag_leave",
+                        G_CALLBACK(vd_dnd_drop_leave), vd);
+}
+
+/*
+ *----------------------------------------------------------------------------
+ * callbacks
+ *----------------------------------------------------------------------------
+ */
+
+void vd_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)) 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);
+}
+
+void vd_activate_cb(GtkTreeView *tview, GtkTreePath *tpath, GtkTreeViewColumn *column, gpointer data)
+{
+       ViewDir *vd = data;
+       FileData *fd = vd_get_fd_from_tree_path(vd, tview, tpath);
+
+       vd_select_row(vd, fd);
+}
+
+static GdkColor *vd_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;
+}
+
+void vd_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", vd_color_shifted(vd->view),
+                    "cell-background-set", set, NULL);
+}
+
+gboolean vd_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+{
+       ViewDir *vd = data;
+       GtkTreePath *tpath;
+       FileData *fd = NULL;
+
+       if (!vd->click_fd) return FALSE;
+       vd_color_set(vd, vd->click_fd, FALSE);
+
+       if (bevent->button != MOUSE_BUTTON_LEFT) 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))
+               {
+               fd = vd_get_fd_from_tree_path(vd, GTK_TREE_VIEW(widget), tpath);
+               gtk_tree_path_free(tpath);
+               }
+
+       if (fd && vd->click_fd == fd)
+               {
+               vd_select_row(vd, vd->click_fd);
+               }
+
+       return FALSE;
+}
+
+gboolean vd_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+       ViewDir *vd = data;
+       gboolean ret = FALSE;
+
+       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;
+       }
+
+       return ret;
+}
+
+gboolean vd_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+{
+       ViewDir *vd = data;
+       gboolean ret = FALSE;
+
+       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;
+       }
+
+       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: */