Remove commented out code.
[geeqie.git] / src / view_dir_tree.c
index 710f804..88b78c4 100644 (file)
@@ -1,6 +1,7 @@
 /*
  * Geeqie
  * (C) 2006 John Ellis
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
 
 #include "dnd.h"
 #include "dupe.h"
-#include "filelist.h"
+#include "filedata.h"
 #include "layout.h"
 #include "layout_image.h"
 #include "layout_util.h"
 #include "utilops.h"
-#include "ui_bookmark.h"
 #include "ui_fileops.h"
 #include "ui_menu.h"
 #include "ui_tree_edit.h"
@@ -29,7 +29,7 @@
 #include <gdk/gdkkeysyms.h> /* for keyboard values */
 
 
-#define VDTREE_INFO(_vd_, _part_) (((ViewDirInfoTree *)(_vd_->info))->_part_)
+#define VDTREE(_vd_) ((ViewDirInfoTree *)(_vd_->info))
 
 
 typedef struct _PathData PathData;
@@ -40,8 +40,7 @@ struct _PathData
 };
 
 
-
-static gint vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gint force, const gchar *target_path);
+static void vdtree_row_expanded(GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *tpath, gpointer data);
 
 
 /*
@@ -54,30 +53,30 @@ static void set_cursor(GtkWidget *widget, GdkCursorType cursor_type)
 {
        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_type > -1) cursor = gdk_cursor_new(cursor_type);
+       gdk_window_set_cursor(gtk_widget_get_window(widget), cursor);
        if (cursor) gdk_cursor_unref(cursor);
        gdk_flush();
 }
 
 static void vdtree_busy_push(ViewDir *vd)
 {
-       if (VDTREE_INFO(vd, busy_ref) == 0) set_cursor(vd->view, GDK_WATCH);
-       VDTREE_INFO(vd, busy_ref)++;
+       if (VDTREE(vd)->busy_ref == 0) set_cursor(vd->view, GDK_WATCH);
+       VDTREE(vd)->busy_ref++;
 }
 
 static void vdtree_busy_pop(ViewDir *vd)
 {
-       if (VDTREE_INFO(vd, busy_ref) == 1) set_cursor(vd->view, -1);
-       if (VDTREE_INFO(vd, busy_ref) > 0) VDTREE_INFO(vd, busy_ref)--;
+       if (VDTREE(vd)->busy_ref == 1) set_cursor(vd->view, -1);
+       if (VDTREE(vd)->busy_ref > 0) VDTREE(vd)->busy_ref--;
 }
 
-gint vdtree_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter, GtkTreeIter *parent)
+gboolean vdtree_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter, GtkTreeIter *parent)
 {
        GtkTreeModel *store;
-       gint valid;
+       gboolean valid;
 
        store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
        if (parent)
@@ -121,26 +120,32 @@ static void vdtree_icon_set_by_iter(ViewDir *vd, GtkTreeIter *iter, GdkPixbuf *p
                }
 }
 
-static void vdtree_expand_by_iter(ViewDir *vd, GtkTreeIter *iter, gint expand)
+static void vdtree_expand_by_iter(ViewDir *vd, GtkTreeIter *iter, gboolean expand)
 {
        GtkTreeModel *store;
        GtkTreePath *tpath;
 
        store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
        tpath = gtk_tree_model_get_path(store, iter);
+
        if (expand)
                {
+               /* block signal handler, icon is set here, the caller of vdtree_expand_by_iter must make sure
+                  that the iter is populated */
+               g_signal_handlers_block_by_func(G_OBJECT(vd->view), vdtree_row_expanded, vd);
                gtk_tree_view_expand_row(GTK_TREE_VIEW(vd->view), tpath, FALSE);
                vdtree_icon_set_by_iter(vd, iter, vd->pf->open);
+               g_signal_handlers_unblock_by_func(G_OBJECT(vd->view), vdtree_row_expanded, vd);
                }
        else
                {
+               /* signal handler vdtree_row_collapsed is called, it updates the icon */
                gtk_tree_view_collapse_row(GTK_TREE_VIEW(vd->view), tpath);
                }
        gtk_tree_path_free(tpath);
 }
 
-static void vdtree_expand_by_data(ViewDir *vd, FileData *fd, gint expand)
+static void vdtree_expand_by_data(ViewDir *vd, FileData *fd, gboolean expand)
 {
        GtkTreeIter iter;
 
@@ -154,7 +159,7 @@ static void vdtree_node_free(NodeData *nd)
 {
        if (!nd) return;
 
-       file_data_unref(nd->fd);
+       if (nd->fd) file_data_unref(nd->fd);
        g_free(nd);
 }
 
@@ -164,31 +169,34 @@ static void vdtree_node_free(NodeData *nd)
  *----------------------------------------------------------------------------
  */
 
-static gint vdtree_dnd_drop_expand_cb(gpointer data)
+static gboolean vdtree_dnd_drop_expand_cb(gpointer data)
 {
        ViewDir *vd = data;
        GtkTreeIter iter;
 
        if (vd->drop_fd && vd_find_row(vd, vd->drop_fd, &iter))
                {
-               vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->path);
+               vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->dir_fd);
                vdtree_expand_by_data(vd, vd->drop_fd, TRUE);
                }
 
-       VDTREE_INFO(vd, drop_expand_id) = -1;
+       VDTREE(vd)->drop_expand_id = 0;
        return FALSE;
 }
 
-void vdtree_dnd_drop_expand_cancel(ViewDir *vd)
+static void vdtree_dnd_drop_expand_cancel(ViewDir *vd)
 {
-       if (VDTREE_INFO(vd, drop_expand_id) != -1) g_source_remove(VDTREE_INFO(vd, drop_expand_id));
-       VDTREE_INFO(vd, drop_expand_id) = -1;
+       if (VDTREE(vd)->drop_expand_id)
+               {
+               g_source_remove(VDTREE(vd)->drop_expand_id);
+               VDTREE(vd)->drop_expand_id = 0;
+               }
 }
 
-void vdtree_dnd_drop_expand(ViewDir *vd)
+static void vdtree_dnd_drop_expand(ViewDir *vd)
 {
        vdtree_dnd_drop_expand_cancel(vd);
-       VDTREE_INFO(vd, drop_expand_id) = g_timeout_add(1000, vdtree_dnd_drop_expand_cb, vd);
+       VDTREE(vd)->drop_expand_id = g_timeout_add(1000, vdtree_dnd_drop_expand_cb, vd);
 }
 
 /*
@@ -205,7 +213,7 @@ static GList *parts_list(const gchar *path)
 
        strp = path;
 
-       if (*strp != '/') return NULL;
+       if (*strp != G_DIR_SEPARATOR) return NULL;
 
        strp++;
        strb = strp;
@@ -213,7 +221,7 @@ static GList *parts_list(const gchar *path)
 
        while (*strp != '\0')
                {
-               if (*strp == '/')
+               if (*strp == G_DIR_SEPARATOR)
                        {
                        if (l > 0) list = g_list_prepend(list, g_strndup(strb, l));
                        strp++;
@@ -230,7 +238,7 @@ static GList *parts_list(const gchar *path)
 
        list = g_list_reverse(list);
 
-       list = g_list_prepend(list, g_strdup("/"));
+       list = g_list_prepend(list, g_strdup(G_DIR_SEPARATOR_S));
 
        return list;
 }
@@ -254,7 +262,7 @@ static GList *parts_list_add_node_points(ViewDir *vd, GList *list)
        GList *work;
        GtkTreeModel *store;
        GtkTreeIter iter;
-       gint valid;
+       gboolean valid;
 
        store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
        valid = gtk_tree_model_get_iter_first(store, &iter);
@@ -273,7 +281,7 @@ static GList *parts_list_add_node_points(ViewDir *vd, GList *list)
                        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;
                                }
@@ -299,27 +307,6 @@ static GList *parts_list_add_node_points(ViewDir *vd, GList *list)
        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
 
 /*
  *----------------------------------------------------------------------------
@@ -327,7 +314,7 @@ static void vdtree_row_deleted_cb(GtkTreeModel *tree_model, GtkTreePath *tpath,
  *----------------------------------------------------------------------------
  */
 
-static gint vdtree_find_iter_by_data(ViewDir *vd, GtkTreeIter *parent, NodeData *nd, GtkTreeIter *iter)
+static gboolean vdtree_find_iter_by_data(ViewDir *vd, GtkTreeIter *parent, NodeData *nd, GtkTreeIter *iter)
 {
        GtkTreeModel *store;
 
@@ -359,6 +346,22 @@ static NodeData *vdtree_find_iter_by_name(ViewDir *vd, GtkTreeIter *parent, cons
        return NULL;
 }
 
+static NodeData *vdtree_find_iter_by_fd(ViewDir *vd, GtkTreeIter *parent, FileData *fd, GtkTreeIter *iter)
+{
+       GtkTreeModel *store;
+
+       store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
+       if (!fd || !gtk_tree_model_iter_children(store, iter, parent)) return NULL;
+       do      {
+               NodeData *nd;
+
+               gtk_tree_model_get(store, iter, DIR_COLUMN_POINTER, &nd, -1);
+               if (nd && nd->fd == fd) return nd;
+               } while (gtk_tree_model_iter_next(store, iter));
+
+       return NULL;
+}
+
 static void vdtree_add_by_data(ViewDir *vd, FileData *fd, GtkTreeIter *parent)
 {
        GtkTreeStore *store;
@@ -381,6 +384,7 @@ static void vdtree_add_by_data(ViewDir *vd, FileData *fd, GtkTreeIter *parent)
 
        nd = g_new0(NodeData, 1);
        nd->fd = fd;
+       nd->version = fd->version;
        nd->expanded = FALSE;
        nd->last_update = time(NULL);
 
@@ -394,7 +398,7 @@ static void vdtree_add_by_data(ViewDir *vd, FileData *fd, GtkTreeIter *parent)
        /* 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);
@@ -412,13 +416,13 @@ static void vdtree_add_by_data(ViewDir *vd, FileData *fd, GtkTreeIter *parent)
                    gtk_tree_view_row_expanded(GTK_TREE_VIEW(vd->view), tpath) &&
                    !nd->expanded)
                        {
-                       vdtree_populate_path_by_iter(vd, &child, FALSE, vd->path);
+                       vdtree_populate_path_by_iter(vd, &child, FALSE, vd->dir_fd);
                        }
                gtk_tree_path_free(tpath);
                }
 }
 
-static gint vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gint force, const gchar *target_path)
+gboolean vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gboolean force, FileData *target_fd)
 {
        GtkTreeModel *store;
        GList *list;
@@ -434,11 +438,10 @@ static gint vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gint fo
        if (!nd) return FALSE;
 
        current_time = time(NULL);
-       
+
        if (nd->expanded)
                {
-               if (!force && current_time - nd->last_update < 10) return TRUE;
-               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;
@@ -446,37 +449,41 @@ static gint vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gint fo
                        vdtree_node_free(nd);
                        return FALSE;
                        }
-               if (!force && filetime(nd->fd->path) == nd->fd->date) return TRUE;
+               if (!force && current_time - nd->last_update < 2)
+                       {
+                       DEBUG_1("Too frequent update of %s", nd->fd->path);
+                       return TRUE;
+                       }
+               file_data_check_changed_files(nd->fd); /* make sure we have recent info */
+               if (nd->fd->version == nd->version) return TRUE;
                }
 
        vdtree_busy_push(vd);
 
-       list = NULL;
-       filelist_read(nd->fd->path, NULL, &list);
+       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
         */
        if (!options->file_filter.show_hidden_files &&
-           target_path &&
-           strncmp(nd->fd->path, target_path, strlen(nd->fd->path)) == 0)
+           target_fd &&
+           strncmp(nd->fd->path, target_fd->path, strlen(nd->fd->path)) == 0)
                {
                gint n;
 
                n = strlen(nd->fd->path);
-               if (target_path[n] == '/' && target_path[n+1] == '.')
+               if (target_fd->path[n] == G_DIR_SEPARATOR && target_fd->path[n+1] == '.')
                        {
                        gchar *name8;
-                       struct stat sbuf;
 
                        n++;
 
-                       while (target_path[n] != '\0' && target_path[n] != '/') n++;
-                       name8 = g_strndup(target_path, n);
+                       while (target_fd->path[n] != '\0' && target_fd->path[n] != G_DIR_SEPARATOR) n++;
+                       name8 = g_strndup(target_fd->path, n);
 
-                       if (stat_utf8(name8, &sbuf))
+                       if (isdir(name8))
                                {
-                               list = g_list_prepend(list, file_data_new_simple(name8));
+                               list = g_list_prepend(list, file_data_new_dir(name8));
                                }
 
                        g_free(name8);
@@ -510,17 +517,17 @@ static gint vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gint fo
                        {
                        NodeData *cnd;
 
-                       cnd = vdtree_find_iter_by_name(vd, iter, fd->name, &child);
+                       cnd = vdtree_find_iter_by_fd(vd, iter, fd, &child);
                        if (cnd)
                                {
-                               old = g_list_remove(old, cnd);
-                               if (cnd->expanded && cnd->fd->date != fd->date &&
-                                   vdtree_populate_path_by_iter(vd, &child, FALSE, target_path))
+                               if (cnd->expanded && cnd->version != fd->version)
                                        {
-                                       cnd->fd->size = fd->size;
-                                       cnd->fd->date = fd->date;
+                                       vdtree_populate_path_by_iter(vd, &child, FALSE, target_fd);
                                        }
 
+                               gtk_tree_store_set(GTK_TREE_STORE(store), &child, DIR_COLUMN_NAME, fd->name, -1);
+                               cnd->version = fd->version;
+                               old = g_list_remove(old, cnd);
                                file_data_unref(fd);
                                }
                        else
@@ -557,17 +564,17 @@ static gint vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gint fo
        return TRUE;
 }
 
-FileData *vdtree_populate_path(ViewDir *vd, const gchar *path, gint expand, gint force)
+FileData *vdtree_populate_path(ViewDir *vd, FileData *target_fd, gboolean expand, gboolean force)
 {
        GList *list;
        GList *work;
        FileData *fd = NULL;
 
-       if (!path) return NULL;
+       if (!target_fd) return NULL;
 
        vdtree_busy_push(vd);
 
-       list = parts_list(path);
+       list = parts_list(target_fd->path);
        list = parts_list_add_node_points(vd, list);
 
        work = list;
@@ -584,7 +591,7 @@ FileData *vdtree_populate_path(ViewDir *vd, const gchar *path, gint expand, gint
                        if (work == list)
                                {
                                /* should not happen */
-                               printf("vdtree warning, root node not found\n");
+                               log_printf("vdtree warning, root node not found\n");
                                parts_list_free(list);
                                vdtree_busy_pop(vd);
                                return NULL;
@@ -593,10 +600,10 @@ FileData *vdtree_populate_path(ViewDir *vd, const gchar *path, gint expand, gint
                        parent_pd = work->prev->data;
 
                        if (!vd_find_row(vd, parent_pd->node, &parent_iter) ||
-                           !vdtree_populate_path_by_iter(vd, &parent_iter, force, path) ||
+                           !vdtree_populate_path_by_iter(vd, &parent_iter, force, target_fd) ||
                            (nd = vdtree_find_iter_by_name(vd, &parent_iter, pd->name, &iter)) == NULL)
                                {
-                               printf("vdtree warning, aborted at %s\n", parent_pd->name);
+                               log_printf("vdtree warning, aborted at %s\n", parent_pd->name);
                                parts_list_free(list);
                                vdtree_busy_pop(vd);
                                return NULL;
@@ -611,7 +618,7 @@ FileData *vdtree_populate_path(ViewDir *vd, const gchar *path, gint expand, gint
                                        vdtree_expand_by_iter(vd, &parent_iter, TRUE);
                                        vdtree_expand_by_iter(vd, &iter, TRUE);
                                        }
-                               vdtree_populate_path_by_iter(vd, &iter, force, path);
+                               vdtree_populate_path_by_iter(vd, &iter, force, target_fd);
                                }
                        }
                else
@@ -621,7 +628,7 @@ FileData *vdtree_populate_path(ViewDir *vd, const gchar *path, gint expand, gint
                        if (vd_find_row(vd, pd->node, &iter))
                                {
                                if (expand) vdtree_expand_by_iter(vd, &iter, TRUE);
-                               vdtree_populate_path_by_iter(vd, &iter, force, path);
+                               vdtree_populate_path_by_iter(vd, &iter, force, target_fd);
                                }
                        }
 
@@ -647,85 +654,71 @@ FileData *vdtree_populate_path(ViewDir *vd, const gchar *path, gint expand, gint
  *----------------------------------------------------------------------------
  */
 
-static gint selection_is_ok = FALSE;
+static gboolean selection_is_ok = FALSE;
 
 static gboolean vdtree_select_cb(GtkTreeSelection *selection, GtkTreeModel *store, GtkTreePath *tpath,
-                                 gboolean path_currently_selected, gpointer data)
+                                gboolean path_currently_selected, gpointer data)
 {
        return selection_is_ok;
 }
 
-void vdtree_select_row(ViewDir *vd, FileData *fd)
-{
-       GtkTreeSelection *selection;
-       GtkTreeIter iter;
-                                                                                                                               
-       if (!vd_find_row(vd, fd, &iter)) return;
-       selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vd->view));
-
-       /* hack, such that selection is only allowed to be changed from here */
-       selection_is_ok = TRUE;
-       gtk_tree_selection_select_iter(selection, &iter);
-       selection_is_ok = FALSE;
-
-       if (!vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->path)) return;
-
-       vdtree_expand_by_iter(vd, &iter, TRUE);
-
-        if (fd && vd->select_func)
-                {
-                vd->select_func(vd, fd->path, vd->select_data);
-                }
-}
-
-gint vdtree_set_path(ViewDir *vd, const gchar *path)
+gboolean vdtree_set_fd(ViewDir *vd, FileData *dir_fd)
 {
        FileData *fd;
        GtkTreeIter iter;
 
-       if (!path) return FALSE;
-       if (vd->path && strcmp(path, vd->path) == 0) return TRUE;
+       if (!dir_fd) return FALSE;
+       if (vd->dir_fd == dir_fd) return TRUE;
 
-       g_free(vd->path);
-       vd->path = g_strdup(path);
+       file_data_unref(vd->dir_fd);
+       vd->dir_fd = file_data_ref(dir_fd);;
 
-       fd = vdtree_populate_path(vd, vd->path, TRUE, FALSE);
+       fd = vdtree_populate_path(vd, vd->dir_fd, TRUE, FALSE);
 
        if (!fd) return FALSE;
 
        if (vd_find_row(vd, fd, &iter))
                {
                GtkTreeModel *store;
-               GtkTreePath *tpath;
-
-               tree_view_row_make_visible(GTK_TREE_VIEW(vd->view), &iter, TRUE);
+               GtkTreePath *tpath, *old_tpath;
+               GtkTreeSelection *selection;
 
                store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
+
+               selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vd->view));
+
+               /* hack, such that selection is only allowed to be changed from here */
+               selection_is_ok = TRUE;
+               gtk_tree_selection_select_iter(selection, &iter);
+               selection_is_ok = FALSE;
+
+               gtk_tree_view_get_cursor(GTK_TREE_VIEW(vd->view), &old_tpath, NULL);
                tpath = gtk_tree_model_get_path(store, &iter);
-               gtk_tree_view_set_cursor(GTK_TREE_VIEW(vd->view), tpath, NULL, FALSE);
+               
+               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);
-
-               vdtree_select_row(vd, fd);
+               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->path, FALSE, TRUE);
+       vdtree_populate_path(vd, vd->dir_fd, FALSE, TRUE);
 }
 
 const gchar *vdtree_row_get_path(ViewDir *vd, gint row)
 {
-       printf("FIXME: no get row path\n");
+       log_printf("FIXME: no get row path\n");
        return NULL;
 }
 
@@ -735,7 +728,7 @@ const gchar *vdtree_row_get_path(ViewDir *vd, gint row)
  *----------------------------------------------------------------------------
  */
 
-gint vdtree_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+gboolean vdtree_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
        ViewDir *vd = data;
        GtkTreePath *tpath;
@@ -759,7 +752,7 @@ gint vdtree_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 
        switch (event->keyval)
                {
-               case GDK_Menu:
+               case GDK_KEY_Menu:
                        vd->click_fd = fd;
                        vd_color_set(vd, vd->click_fd, TRUE);
 
@@ -768,12 +761,12 @@ gint vdtree_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 
                        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->path);
+                               vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->dir_fd);
                                vdtree_icon_set_by_iter(vd, &iter, vd->pf->open);
                                }
                        break;
@@ -782,8 +775,8 @@ gint vdtree_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
        return FALSE;
 }
 
-static gint vdtree_clicked_on_expander(GtkTreeView *treeview, GtkTreePath *tpath,
-                                      GtkTreeViewColumn *column, gint x, gint y, gint *left_of_expander)
+static gboolean vdtree_clicked_on_expander(GtkTreeView *treeview, GtkTreePath *tpath,
+                                          GtkTreeViewColumn *column, gint x, gint y, gint *left_of_expander)
 {
        gint depth;
        gint size;
@@ -806,7 +799,7 @@ static gint vdtree_clicked_on_expander(GtkTreeView *treeview, GtkTreePath *tpath
        return FALSE;
 }
 
-gint vdtree_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+gboolean vdtree_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 {
        ViewDir *vd = data;
        GtkTreePath *tpath;
@@ -832,11 +825,11 @@ gint vdtree_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
                        /* clicking this region should automatically reveal an expander, if necessary
                         * treeview bug: the expander will not expand until a button_motion_event highlights it.
                         */
-                       if (bevent->button == 1 &&
+                       if (bevent->button == MOUSE_BUTTON_LEFT &&
                            !left_of_expander &&
                            !gtk_tree_view_row_expanded(GTK_TREE_VIEW(vd->view), tpath))
                                {
-                               vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->path);
+                               vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->dir_fd);
                                vdtree_icon_set_by_iter(vd, &iter, vd->pf->open);
                                }
 
@@ -850,14 +843,14 @@ gint vdtree_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
        vd->click_fd = (nd) ? nd->fd : NULL;
        vd_color_set(vd, vd->click_fd, TRUE);
 
-       if (bevent->button == 3)
+       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);
                }
 
-       return (bevent->button != 1);
+       return (bevent->button != MOUSE_BUTTON_LEFT);
 }
 
 static void vdtree_row_expanded(GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *tpath, gpointer data)
@@ -883,7 +876,14 @@ static gint vdtree_sort_cb(GtkTreeModel *store, GtkTreeIter *a, GtkTreeIter *b,
        gtk_tree_model_get(store, a, DIR_COLUMN_POINTER, &nda, -1);
        gtk_tree_model_get(store, b, DIR_COLUMN_POINTER, &ndb, -1);
 
-       return CASE_SORT(nda->fd->name, ndb->fd->name);
+       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
+               return strcmp(nda->fd->collate_key_name_nocase, ndb->fd->collate_key_name_nocase);
 }
 
 /*
@@ -894,15 +894,15 @@ static gint vdtree_sort_cb(GtkTreeModel *store, GtkTreeIter *a, GtkTreeIter *b,
 
 static void vdtree_setup_root(ViewDir *vd)
 {
-       const gchar *path = "/";
+       const gchar *path = G_DIR_SEPARATOR_S;
        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, path, FALSE, FALSE);
+       vdtree_populate_path(vd, fd, FALSE, FALSE);
 }
 
 static gboolean vdtree_destroy_node_cb(GtkTreeModel *store, GtkTreePath *tpath, GtkTreeIter *iter, gpointer data)
@@ -928,7 +928,7 @@ void vdtree_destroy_cb(GtkWidget *widget, gpointer data)
        gtk_tree_model_foreach(store, vdtree_destroy_node_cb, vd);
 }
 
-ViewDir *vdtree_new(ViewDir *vd, const gchar *path)
+ViewDir *vdtree_new(ViewDir *vd, FileData *dir_fd)
 {
        GtkTreeStore *store;
        GtkTreeSelection *selection;
@@ -936,11 +936,11 @@ ViewDir *vdtree_new(ViewDir *vd, const gchar *path)
        GtkCellRenderer *renderer;
 
        vd->info = g_new0(ViewDirInfoTree, 1);
-       vd->type = DIRVIEW_TREE;
 
-       VDTREE_INFO(vd, drop_expand_id) = -1;
+       vd->type = DIRVIEW_TREE;
 
-       VDTREE_INFO(vd, busy_ref) = 0;
+       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);
        vd->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
@@ -980,3 +980,4 @@ ViewDir *vdtree_new(ViewDir *vd, const gchar *path)
 
        return vd;
 }
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */