* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "main.h"
#include "view-dir-tree.h"
+#include <unistd.h>
+
+#include <cstdlib>
+#include <cstring>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <glib-object.h>
+
+#include "debug.h"
#include "filedata.h"
+#include "layout.h"
+#include "options.h"
+#include "typedefs.h"
#include "ui-fileops.h"
#include "ui-tree-edit.h"
#include "view-dir.h"
-#define VDTREE(_vd_) ((ViewDirInfoTree *)(_vd_->info))
+struct ViewDirInfoTree
+{
+ guint drop_expand_id; /**< event source id */
+ gint busy_ref;
+};
+
+#define VDTREE(_vd_) ((ViewDirInfoTree *)((_vd_)->info))
-typedef struct _PathData PathData;
-struct _PathData
+struct PathData
{
gchar *name;
FileData *node;
static void set_cursor(GtkWidget *widget, GdkCursorType cursor_type)
{
- GdkCursor *cursor = NULL;
+ GdkCursor *cursor = nullptr;
+ GdkDisplay *display;
if (!widget || !gtk_widget_get_window(widget)) return;
- if (cursor_type > -1) cursor = gdk_cursor_new(cursor_type);
+ display = gdk_display_get_default();
+
+ if (cursor_type > -1) cursor = gdk_cursor_new_for_display(display, cursor_type);
gdk_window_set_cursor(gtk_widget_get_window(widget), cursor);
if (cursor) g_object_unref(G_OBJECT(cursor));
gdk_flush();
GtkTreeModel *store;
GtkTreePath *tpath;
NodeData *nd;
- FileData *fd = NULL;
+ FileData *fd = nullptr;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
tpath = gtk_tree_model_get_path(store, iter);
g_signal_handlers_block_by_func(G_OBJECT(vd->view), (gpointer)vdtree_row_expanded, vd);
gtk_tree_view_expand_row(GTK_TREE_VIEW(vd->view), tpath, FALSE);
gtk_tree_model_get(store, iter, DIR_COLUMN_POINTER, &nd, -1);
- fd = (nd) ? nd->fd : NULL;
+ fd = (nd) ? nd->fd : nullptr;
if (fd && islink(fd->path))
{
static gboolean vdtree_dnd_drop_expand_cb(gpointer data)
{
- ViewDir *vd = static_cast<ViewDir *>(data);
+ auto vd = static_cast<ViewDir *>(data);
GtkTreeIter iter;
if (vd->drop_fd && vd_find_row(vd, vd->drop_fd, &iter))
static GList *parts_list(const gchar *path)
{
- GList *list = NULL;
- const gchar *strb, *strp;
+ GList *list = nullptr;
+ const gchar *strb;
+ const gchar *strp;
gint l;
strp = path;
- if (*strp != G_DIR_SEPARATOR) return NULL;
+ if (*strp != G_DIR_SEPARATOR) return nullptr;
strp++;
strb = strp;
return list;
}
-static void parts_list_free(GList *list)
+static void path_data_free(PathData *pd)
{
- GList *work = list;
- while (work)
- {
- PathData *pd = static_cast<PathData *>(work->data);
- g_free(pd->name);
- g_free(pd);
- work = work->next;
- }
+ if (!pd) return;
- g_list_free(list);
+ g_free(pd->name);
+ g_free(pd);
}
static GList *parts_list_add_node_points(ViewDir *vd, GList *list)
while (work)
{
PathData *pd;
- FileData *fd = NULL;
+ FileData *fd = nullptr;
pd = g_new0(PathData, 1);
pd->name = static_cast<gchar *>(work->data);
GtkTreeModel *store;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
- if (!name || !gtk_tree_model_iter_children(store, iter, parent)) return NULL;
+ if (!name || !gtk_tree_model_iter_children(store, iter, parent)) return nullptr;
do {
NodeData *nd;
if (nd && strcmp(nd->fd->name, name) == 0) return nd;
} while (gtk_tree_model_iter_next(store, iter));
- return NULL;
+ return nullptr;
}
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;
+ if (!fd || !gtk_tree_model_iter_children(store, iter, parent)) return nullptr;
do {
NodeData *nd;
if (nd && nd->fd == fd) return nd;
} while (gtk_tree_model_iter_next(store, iter));
- return NULL;
+ return nullptr;
}
static void vdtree_add_by_data(ViewDir *vd, FileData *fd, GtkTreeIter *parent)
{
GtkTreeStore *store;
GtkTreeIter child;
- NodeData *nd;
GdkPixbuf *pixbuf;
- NodeData *end;
GtkTreeIter empty;
- gchar *link = NULL;
+ gchar *link = nullptr;
if (!fd) return;
pixbuf = vd->pf->deny;
}
- nd = g_new0(NodeData, 1);
+ auto nd = g_new0(NodeData, 1);
nd->fd = fd;
nd->version = fd->version;
nd->expanded = FALSE;
- nd->last_update = time(NULL);
+ nd->last_update = time(nullptr);
if (islink(fd->path))
{
- link = realpath(fd->path, NULL);
+ link = realpath(fd->path, nullptr);
}
else
{
- link = NULL;
+ link = nullptr;
}
store = GTK_TREE_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view)));
/* 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 = NULL;
+ auto end = g_new0(NodeData, 1);
+ end->fd = nullptr;
end->expanded = TRUE;
gtk_tree_store_append(store, &empty, &child);
GtkTreeIter child;
NodeData *nd;
gboolean add_hidden = FALSE;
- gchar *link = NULL;
+ gchar *link = nullptr;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
gtk_tree_model_get(store, iter, DIR_COLUMN_POINTER, &nd, -1);
if (!nd) return FALSE;
- current_time = time(NULL);
+ current_time = time(nullptr);
if (nd->expanded)
{
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;
+ if (vd->click_fd == nd->fd) vd->click_fd = nullptr;
+ if (vd->drop_fd == nd->fd) vd->drop_fd = nullptr;
gtk_tree_store_remove(GTK_TREE_STORE(store), iter);
vdtree_node_free(nd);
return FALSE;
vdtree_busy_push(vd);
- filelist_read(nd->fd, NULL, &list);
+ filelist_read(nd->fd, nullptr, &list);
if (add_hidden)
{
g_free(name8);
}
- old = NULL;
+ old = nullptr;
if (gtk_tree_model_iter_children(store, &child, iter))
{
do {
if (islink(fd->path))
{
- link = realpath(fd->path, NULL);
+ link = realpath(fd->path, nullptr);
}
else
{
- link = NULL;
+ link = nullptr;
}
gtk_tree_store_set(GTK_TREE_STORE(store), &child, DIR_COLUMN_LINK, link, -1);
work = old;
while (work)
{
- NodeData *cnd = static_cast<NodeData *>(work->data);
+ auto cnd = static_cast<NodeData *>(work->data);
work = work->next;
- if (vd->click_fd == cnd->fd) vd->click_fd = NULL;
- if (vd->drop_fd == cnd->fd) vd->drop_fd = NULL;
+ if (vd->click_fd == cnd->fd) vd->click_fd = nullptr;
+ if (vd->drop_fd == cnd->fd) vd->drop_fd = nullptr;
if (vdtree_find_iter_by_data(vd, iter, cnd, &child))
{
{
GList *list;
GList *work;
- FileData *fd = NULL;
+ FileData *fd = nullptr;
- if (!target_fd) return NULL;
+ if (!target_fd) return nullptr;
vdtree_busy_push(vd);
work = list;
while (work)
{
-
PathData *pd = static_cast<PathData *>(work->data);
- if (pd->node == NULL)
+
auto pd = static_cast<PathData *>(work->data);
+ if (pd->node == nullptr)
{
PathData *parent_pd;
GtkTreeIter parent_iter;
{
/* should not happen */
log_printf("vdtree warning, root node not found\n");
- parts_list_free(list);
+ g_list_free_full(list, reinterpret_cast<GDestroyNotify>(path_data_free));
vdtree_busy_pop(vd);
- return NULL;
+ return nullptr;
}
parent_pd = static_cast<PathData *>(work->prev->data);
if (!vd_find_row(vd, parent_pd->node, &parent_iter) ||
!vdtree_populate_path_by_iter(vd, &parent_iter, force, target_fd) ||
- (nd = vdtree_find_iter_by_name(vd, &parent_iter, pd->name, &iter)) == NULL)
+ (nd = vdtree_find_iter_by_name(vd, &parent_iter, pd->name, &iter)) == nullptr)
{
log_printf("vdtree warning, aborted at %s\n", parent_pd->name);
- parts_list_free(list);
+ g_list_free_full(list, reinterpret_cast<GDestroyNotify>(path_data_free));
vdtree_busy_pop(vd);
- return NULL;
+ return nullptr;
}
pd->node = nd->fd;
work = g_list_last(list);
if (work)
{
-
PathData *pd = static_cast<PathData *>(work->data);
+
auto pd = static_cast<PathData *>(work->data);
fd = pd->node;
}
- parts_list_free(list);
+ g_list_free_full(list, reinterpret_cast<GDestroyNotify>(path_data_free));
vdtree_busy_pop(vd);
static gboolean selection_is_ok = FALSE;
-static gboolean vdtree_select_cb(GtkTreeSelection *UNUSED(selection), GtkTreeModel *UNUSED(store), GtkTreePath *UNUSED(tpath), gboolean UNUSED(path_currently_selected), gpointer UNUSED(data))
+static gboolean vdtree_select_cb(GtkTreeSelection *, GtkTreeModel *, GtkTreePath *, gboolean, gpointer)
{
return selection_is_ok;
}
if (vd_find_row(vd, fd, &iter))
{
GtkTreeModel *store;
- GtkTreePath *tpath, *old_tpath;
+ GtkTreePath *tpath;
+ GtkTreePath *old_tpath;
GtkTreeSelection *selection;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
gtk_tree_selection_select_iter(selection, &iter);
selection_is_ok = FALSE;
- gtk_tree_view_get_cursor(GTK_TREE_VIEW(vd->view), &old_tpath, NULL);
+ gtk_tree_view_get_cursor(GTK_TREE_VIEW(vd->view), &old_tpath, nullptr);
tpath = gtk_tree_model_get_path(store, &iter);
if (!old_tpath || gtk_tree_path_compare(tpath, old_tpath) != 0)
{
/* setting the cursor scrolls the view; do not do that unless it is necessary */
- gtk_tree_view_set_cursor(GTK_TREE_VIEW(vd->view), tpath, NULL, FALSE);
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(vd->view), tpath, nullptr, FALSE);
/* gtk_tree_view_set_cursor scrolls the window itself, but it sometimes
does not work (switch from dir_list to dir_tree) */
vdtree_populate_path(vd, vd->dir_fd, FALSE, TRUE);
}
-const gchar *vdtree_row_get_path(ViewDir *UNUSED(vd), gint UNUSED(row))
+const gchar *vdtree_row_get_path(ViewDir *, gint)
{
/** @FIXME no get row path */
log_printf("FIXME: no get row path\n");
- return NULL;
+ return nullptr;
}
/*
gboolean vdtree_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- ViewDir *vd = static_cast<ViewDir *>(data);
+ auto vd = static_cast<ViewDir *>(data);
GtkTreePath *tpath;
GtkTreeIter iter;
- FileData *fd = NULL;
+ FileData *fd = nullptr;
- gtk_tree_view_get_cursor(GTK_TREE_VIEW(vd->view), &tpath, NULL);
+ gtk_tree_view_get_cursor(GTK_TREE_VIEW(vd->view), &tpath, nullptr);
if (tpath)
{
GtkTreeModel *store;
gtk_tree_path_free(tpath);
- fd = (nd) ? nd->fd : NULL;
+ fd = (nd) ? nd->fd : nullptr;
}
switch (event->keyval)
vd_color_set(vd, vd->click_fd, TRUE);
vd->popup = vd_pop_menu(vd, vd->click_fd);
- gtk_menu_popup_at_pointer(GTK_MENU(vd->popup), NULL);
+ gtk_menu_popup_at_pointer(GTK_MENU(vd->popup), nullptr);
return TRUE;
break;
}
static gboolean vdtree_clicked_on_expander(GtkTreeView *treeview, GtkTreePath *tpath,
- GtkTreeViewColumn *column, gint x, gint UNUSED(y), gint *left_of_expander)
+ GtkTreeViewColumn *column, gint x, gint, gint *left_of_expander)
{
gint depth;
gint size;
gboolean vdtree_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
- ViewDir *vd = static_cast<ViewDir *>(data);
+ auto vd = static_cast<ViewDir *>(data);
GtkTreePath *tpath;
GtkTreeViewColumn *column;
GtkTreeIter iter;
- NodeData *nd = NULL;
+ NodeData *nd = nullptr;
FileData *fd;
if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y,
- &tpath, &column, NULL, NULL))
+ &tpath, &column, nullptr, nullptr))
{
GtkTreeModel *store;
gint left_of_expander;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
gtk_tree_model_get_iter(store, &iter, tpath);
gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &nd, -1);
- gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), tpath, NULL, FALSE);
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), tpath, nullptr, FALSE);
if (vdtree_clicked_on_expander(GTK_TREE_VIEW(widget), tpath, column, bevent->x, bevent->y, &left_of_expander))
{
- vd->click_fd = NULL;
+ vd->click_fd = nullptr;
/* clicking this region should automatically reveal an expander, if necessary
* treeview bug: the expander will not expand until a button_motion_event highlights it.
{
vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->dir_fd);
- fd = (nd) ? nd->fd : NULL;
+ fd = (nd) ? nd->fd : nullptr;
if (fd && islink(fd->path))
{
vdtree_icon_set_by_iter(vd, &iter, vd->pf->link);
gtk_tree_path_free(tpath);
}
- vd->click_fd = (nd) ? nd->fd : NULL;
+ vd->click_fd = (nd) ? nd->fd : nullptr;
vd_color_set(vd, vd->click_fd, TRUE);
if (bevent->button == MOUSE_BUTTON_RIGHT)
{
vd->popup = vd_pop_menu(vd, vd->click_fd);
- gtk_menu_popup_at_pointer(GTK_MENU(vd->popup), NULL);
+ gtk_menu_popup_at_pointer(GTK_MENU(vd->popup), nullptr);
}
return (bevent->button != MOUSE_BUTTON_LEFT);
static void vdtree_row_expanded(GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *tpath, gpointer data)
{
- ViewDir *vd = static_cast<ViewDir *>(data);
+ auto vd = static_cast<ViewDir *>(data);
GtkTreeModel *store;
- NodeData *nd = NULL;
+ NodeData *nd = nullptr;
FileData *fd;
gtk_tree_view_set_tooltip_column(treeview, DIR_COLUMN_LINK);
- vdtree_populate_path_by_iter(vd, iter, FALSE, NULL);
+ vdtree_populate_path_by_iter(vd, iter, FALSE, nullptr);
store = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
gtk_tree_model_get_iter(store, iter, tpath);
gtk_tree_model_get(store, iter, DIR_COLUMN_POINTER, &nd, -1);
- fd = (nd) ? nd->fd : NULL;
+ fd = (nd) ? nd->fd : nullptr;
if (fd && islink(fd->path))
{
vdtree_icon_set_by_iter(vd, iter, vd->pf->link);
static void vdtree_row_collapsed(GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *tpath, gpointer data)
{
- ViewDir *vd = static_cast<ViewDir *>(data);
+ auto vd = static_cast<ViewDir *>(data);
GtkTreeModel *store;
- NodeData *nd = NULL;
+ NodeData *nd = nullptr;
FileData *fd;
- vdtree_populate_path_by_iter(vd, iter, FALSE, NULL);
+ vdtree_populate_path_by_iter(vd, iter, FALSE, nullptr);
store = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
gtk_tree_model_get_iter(store, iter, tpath);
gtk_tree_model_get(store, iter, DIR_COLUMN_POINTER, &nd, -1);
- fd = (nd) ? nd->fd : NULL;
+ fd = (nd) ? nd->fd : nullptr;
if (fd && islink(fd->path))
{
vdtree_icon_set_by_iter(vd, iter, vd->pf->link);
}
}
-static gint vdtree_sort_cb(GtkTreeModel *store, GtkTreeIter *a, GtkTreeIter *b, gpointer UNUSED(data))
+static gint vdtree_sort_cb(GtkTreeModel *store, GtkTreeIter *a, GtkTreeIter *b, gpointer data)
{
NodeData *nda;
NodeData *ndb;
+ auto vd = static_cast<ViewDir *>(data);
gtk_tree_model_get(store, a, DIR_COLUMN_POINTER, &nda, -1);
gtk_tree_model_get(store, b, DIR_COLUMN_POINTER, &ndb, -1);
if (!nda->fd) return 1;
if (!ndb->fd) return -1;
- if (options->file_sort.case_sensitive)
+ if (vd->layout->options.dir_view_list_sort.method == SORT_NUMBER)
+ {
+ if (vd->layout->options.dir_view_list_sort.case_sensitive == TRUE)
+ {
+ return strcmp(nda->fd->collate_key_name_natural, ndb->fd->collate_key_name_natural);
+ }
+
+ return strcmp(nda->fd->collate_key_name_nocase_natural, ndb->fd->collate_key_name_nocase_natural);
+ }
+
+ if (vd->layout->options.dir_view_list_sort.method == SORT_TIME)
+ {
+ if (nda->fd->date < ndb->fd->date) return -1;
+ if (nda->fd->date > ndb->fd->date) return 1;
+ return 0;
+ }
+
+ if (vd->layout->options.dir_view_list_sort.case_sensitive == TRUE)
+ {
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);
+ }
+
+ return strcmp(nda->fd->collate_key_name_nocase, ndb->fd->collate_key_name_nocase);
}
/*
fd = file_data_new_dir(path);
- vdtree_add_by_data(vd, fd, NULL);
+ vdtree_add_by_data(vd, fd, nullptr);
vdtree_expand_by_data(vd, fd, TRUE);
vdtree_populate_path(vd, fd, FALSE, FALSE);
}
-static gboolean vdtree_destroy_node_cb(GtkTreeModel *store, GtkTreePath *UNUSED(tpath), GtkTreeIter *iter, gpointer UNUSED(data))
+static gboolean vdtree_destroy_node_cb(GtkTreeModel *store, GtkTreePath *, GtkTreeIter *iter, gpointer)
{
NodeData *nd;
return FALSE;
}
-void vdtree_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
+void vdtree_destroy_cb(GtkWidget *, gpointer data)
{
- ViewDir *vd = static_cast<ViewDir *>(data);
+ auto vd = static_cast<ViewDir *>(data);
GtkTreeModel *store;
vdtree_dnd_drop_expand_cancel(vd);
gtk_tree_model_foreach(store, vdtree_destroy_node_cb, vd);
}
-ViewDir *vdtree_new(ViewDir *vd, FileData *UNUSED(dir_fd))
+ViewDir *vdtree_new(ViewDir *vd, FileData *)
{
GtkTreeStore *store;
GtkTreeSelection *selection;
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(vd->view), FALSE);
gtk_tree_view_set_enable_search(GTK_TREE_VIEW(vd->view), FALSE);
- gtk_tree_sortable_set_default_sort_func(GTK_TREE_SORTABLE(store), vdtree_sort_cb, vd, NULL);
+ gtk_tree_sortable_set_default_sort_func(GTK_TREE_SORTABLE(store), vdtree_sort_cb, vd, nullptr);
gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(store),
GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vd->view));
gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
- gtk_tree_selection_set_select_function(selection, vdtree_select_cb, vd, NULL);
+ gtk_tree_selection_set_select_function(selection, vdtree_select_cb, vd, nullptr);
column = gtk_tree_view_column_new();
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_GROW_ONLY);
renderer = gtk_cell_renderer_pixbuf_new();
gtk_tree_view_column_pack_start(column, renderer, FALSE);
gtk_tree_view_column_add_attribute(column, renderer, "pixbuf", DIR_COLUMN_ICON);
- gtk_tree_view_column_set_cell_data_func(column, renderer, vd_color_cb, vd, NULL);
+ gtk_tree_view_column_set_cell_data_func(column, renderer, vd_color_cb, vd, nullptr);
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_column_pack_start(column, renderer, TRUE);
gtk_tree_view_column_add_attribute(column, renderer, "text", DIR_COLUMN_NAME);
- gtk_tree_view_column_set_cell_data_func(column, renderer, vd_color_cb, vd, NULL);
+ gtk_tree_view_column_set_cell_data_func(column, renderer, vd_color_cb, vd, nullptr);
gtk_tree_view_append_column(GTK_TREE_VIEW(vd->view), column);
projects / geeqie.git / blobdiff