/*
* Geeqie
* (C) 2004 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"
#include <gdk/gdkkeysyms.h> /* for keyboard values */
-#define VDLIST_PAD 4
-
-#define VDLIST_INFO(_vd_, _part_) (((ViewDirInfoList *)(_vd_->info))->_part_)
+#define VDLIST(_vd_) ((ViewDirInfoList *)(_vd_->info))
/*
*-----------------------------------------------------------------------------
*/
-gint vdlist_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter)
+gboolean vdlist_find_row(ViewDir *vd, FileData *fd, GtkTreeIter *iter)
{
GtkTreeModel *store;
- gint valid;
- gint row = 0;
+ gboolean valid;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view));
valid = gtk_tree_model_get_iter_first(store, iter);
{
FileData *fd_n;
gtk_tree_model_get(GTK_TREE_MODEL(store), iter, DIR_COLUMN_POINTER, &fd_n, -1);
- if (fd_n == fd) return row;
+ if (fd_n == fd) return TRUE;
valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), iter);
- row++;
}
- return -1;
+ return FALSE;
}
}
n = 0;
- work = VDLIST_INFO(vd, list);
+ work = VDLIST(vd)->list;
while (work)
{
FileData *fd = work->data;
{
GtkTreeIter iter;
- if (GTK_WIDGET_REALIZED(vd->view) && vd_find_row(vd, fd, &iter) >= 0)
+ if (gtk_widget_get_realized(vd->view) && vd_find_row(vd, fd, &iter))
{
GtkTreeModel *store;
GtkTreePath *tpath;
gtk_tree_view_set_cursor(GTK_TREE_VIEW(vd->view), tpath, NULL, FALSE);
gtk_tree_path_free(tpath);
- if (!GTK_WIDGET_HAS_FOCUS(vd->view)) gtk_widget_grab_focus(vd->view);
+ if (!gtk_widget_has_focus(vd->view)) gtk_widget_grab_focus(vd->view);
}
}
*-----------------------------------------------------------------------------
* main
*-----------------------------------------------------------------------------
- */
-
-void vdlist_select_row(ViewDir *vd, FileData *fd)
-{
- if (fd && vd->select_func)
- {
- gchar *path;
-
- path = g_strdup(fd->path);
- vd->select_func(vd, path, vd->select_data);
- g_free(path);
- }
-}
+ */
const gchar *vdlist_row_get_path(ViewDir *vd, gint row)
{
FileData *fd;
- fd = g_list_nth_data(VDLIST_INFO(vd, list), row);
+ fd = g_list_nth_data(VDLIST(vd)->list, row);
if (fd) return fd->path;
return NULL;
}
-static void vdlist_populate(ViewDir *vd)
+static gboolean vdlist_populate(ViewDir *vd, gboolean clear)
{
GtkListStore *store;
GList *work;
+ GtkTreeIter iter;
+ gboolean valid;
+ gchar *filepath;
+ GList *old_list;
+ gboolean ret;
+ FileData *fd;
+ SortType sort_type = SORT_NAME;
+ gboolean sort_ascend = TRUE;
+
+ old_list = VDLIST(vd)->list;
+
+ ret = filelist_read(vd->dir_fd, NULL, &VDLIST(vd)->list);
+ VDLIST(vd)->list = filelist_sort(VDLIST(vd)->list, sort_type, sort_ascend);
+
+ /* add . and .. */
+
+ if (strcmp(vd->dir_fd->path, G_DIR_SEPARATOR_S) != 0)
+ {
+ filepath = g_build_filename(vd->dir_fd->path, "..", NULL);
+ fd = file_data_new_dir(filepath);
+ VDLIST(vd)->list = g_list_prepend(VDLIST(vd)->list, fd);
+ g_free(filepath);
+ }
+
+ if (options->file_filter.show_dot_directory)
+ {
+ filepath = g_build_filename(vd->dir_fd->path, ".", NULL);
+ fd = file_data_new_dir(filepath);
+ VDLIST(vd)->list = g_list_prepend(VDLIST(vd)->list, fd);
+ g_free(filepath);
+ }
store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(vd->view)));
- gtk_list_store_clear(store);
+ if (clear) gtk_list_store_clear(store);
- work = VDLIST_INFO(vd, list);
+ valid = gtk_tree_model_iter_children(GTK_TREE_MODEL(store), &iter, NULL);
+
+ work = VDLIST(vd)->list;
while (work)
{
- FileData *fd;
- GtkTreeIter iter;
+ gint match;
GdkPixbuf *pixbuf;
+ const gchar *date = "";
+ gboolean done = FALSE;
fd = work->data;
else
{
pixbuf = vd->pf->close;
+ if (vd->layout && vd->layout->options.show_directory_date)
+ date = text_from_time(fd->date);
}
}
else
pixbuf = vd->pf->deny;
}
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
- DIR_COLUMN_POINTER, fd,
- DIR_COLUMN_ICON, pixbuf,
- DIR_COLUMN_NAME, fd->name, -1);
+ while (!done)
+ {
+ FileData *old_fd = NULL;
+
+ if (valid)
+ {
+ gtk_tree_model_get(GTK_TREE_MODEL(store), &iter,
+ DIR_COLUMN_POINTER, &old_fd,
+ -1);
+
+ if (fd == old_fd)
+ {
+ match = 0;
+ }
+ else
+ {
+ match = filelist_sort_compare_filedata_full(fd, old_fd, sort_type, sort_ascend);
+
+ if (match == 0) g_warning("multiple fd for the same path");
+ }
+
+ }
+ else
+ {
+ match = -1;
+ }
+ if (match < 0)
+ {
+ GtkTreeIter new;
+
+ if (valid)
+ {
+ gtk_list_store_insert_before(store, &new, &iter);
+ }
+ else
+ {
+ gtk_list_store_append(store, &new);
+ }
+
+ gtk_list_store_set(store, &new,
+ DIR_COLUMN_POINTER, fd,
+ DIR_COLUMN_ICON, pixbuf,
+ DIR_COLUMN_NAME, fd->name,
+ DIR_COLUMN_DATE, date,
+ -1);
+
+ done = TRUE;
+ }
+ else if (match > 0)
+ {
+ valid = gtk_list_store_remove(store, &iter);
+ }
+ else
+ {
+ gtk_list_store_set(store, &iter,
+ DIR_COLUMN_ICON, pixbuf,
+ DIR_COLUMN_NAME, fd->name,
+ DIR_COLUMN_DATE, date,
+ -1);
+
+ if (valid) valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
+
+ done = TRUE;
+ }
+ }
work = work->next;
}
+ while (valid)
+ {
+ FileData *old_fd;
+ gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, DIR_COLUMN_POINTER, &old_fd, -1);
+
+ valid = gtk_list_store_remove(store, &iter);
+ }
+
+
vd->click_fd = NULL;
vd->drop_fd = NULL;
+
+ filelist_free(old_list);
+ return ret;
}
-gint vdlist_set_path(ViewDir *vd, const gchar *path)
+gboolean vdlist_set_fd(ViewDir *vd, FileData *dir_fd)
{
- gint ret;
- FileData *fd;
- gchar *old_path = NULL;
- gchar *filepath;
+ gboolean ret;
+ gchar *old_path = NULL; /* Used to store directory for walking up */
- 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;
- if (vd->path)
+ if (vd->dir_fd)
{
gchar *base;
- base = remove_level_from_path(vd->path);
- if (strcmp(base, path) == 0)
+ base = remove_level_from_path(vd->dir_fd->path);
+ if (strcmp(base, dir_fd->path) == 0)
{
- old_path = g_strdup(filename_from_path(vd->path));
+ old_path = g_strdup(filename_from_path(vd->dir_fd->path));
}
g_free(base);
}
- g_free(vd->path);
- vd->path = g_strdup(path);
-
- filelist_free(VDLIST_INFO(vd, list));
- VDLIST_INFO(vd, list) = NULL;
-
- ret = filelist_read(vd->path, NULL, &VDLIST_INFO(vd, list));
-
- VDLIST_INFO(vd, list) = filelist_sort(VDLIST_INFO(vd, list), SORT_NAME, TRUE);
-
- /* add . and .. */
+ file_data_unref(vd->dir_fd);
+ vd->dir_fd = file_data_ref(dir_fd);
- if (strcmp(vd->path, "/") != 0)
- {
- filepath = g_strconcat(vd->path, "/", "..", NULL);
- fd = file_data_new_simple(filepath);
- VDLIST_INFO(vd, list) = g_list_prepend(VDLIST_INFO(vd, list), fd);
- g_free(filepath);
- }
-
- if (options->file_filter.show_dot_directory)
- {
- filepath = g_strconcat(vd->path, "/", ".", NULL);
- fd = file_data_new_simple(filepath);
- VDLIST_INFO(vd, list) = g_list_prepend(VDLIST_INFO(vd, list), fd);
- g_free(filepath);
- }
-
- vdlist_populate(vd);
+ ret = vdlist_populate(vd, TRUE);
if (old_path)
{
FileData *found = NULL;
GList *work;
- work = VDLIST_INFO(vd, list);
+ work = VDLIST(vd)->list;
while (work && !found)
{
FileData *fd = work->data;
return ret;
}
- if (GTK_WIDGET_REALIZED(vd->view))
+ if (gtk_widget_get_realized(vd->view))
{
gtk_tree_view_scroll_to_point(GTK_TREE_VIEW(vd->view), 0, 0);
}
void vdlist_refresh(ViewDir *vd)
{
- gchar *path;
-
- path = g_strdup(vd->path);
- vd->path = NULL;
- vdlist_set_path(vd, path);
- g_free(path);
+ vdlist_populate(vd, FALSE);
}
-static gint vdlist_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+gboolean vdlist_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
ViewDir *vd = data;
GtkTreePath *tpath;
-
- if (event->keyval != GDK_Menu) return FALSE;
+
+ if (event->keyval != GDK_KEY_Menu) return FALSE;
gtk_tree_view_get_cursor(GTK_TREE_VIEW(vd->view), &tpath, NULL);
if (tpath)
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, &vd->click_fd, -1);
-
+
gtk_tree_path_free(tpath);
}
else
return TRUE;
}
-static gint vdlist_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+gboolean vdlist_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
ViewDir *vd = data;
GtkTreePath *tpath;
vd->click_fd = fd;
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,
return TRUE;
}
-static gint vdlist_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
-{
- ViewDir *vd = data;
- GtkTreePath *tpath;
- GtkTreeIter iter;
- FileData *fd = NULL;
-
- vd_color_set(vd, vd->click_fd, FALSE);
-
- if (bevent->button != 1) 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))
- {
- GtkTreeModel *store;
-
- 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, &fd, -1);
- gtk_tree_path_free(tpath);
- }
-
- if (fd && vd->click_fd == fd)
- {
- vdlist_select_row(vd, vd->click_fd);
- }
-
- return TRUE;
-}
-
-static void vdlist_destroy_cb(GtkWidget *widget, gpointer data)
+void vdlist_destroy_cb(GtkWidget *widget, gpointer data)
{
ViewDir *vd = data;
vd_dnd_drop_scroll_cancel(vd);
widget_auto_scroll_stop(vd->view);
- filelist_free(VDLIST_INFO(vd, list));
+ filelist_free(VDLIST(vd)->list);
}
-ViewDir *vdlist_new(ViewDir *vd, const gchar *path)
+ViewDir *vdlist_new(ViewDir *vd, FileData *dir_fd)
{
GtkListStore *store;
GtkTreeSelection *selection;
GtkCellRenderer *renderer;
vd->info = g_new0(ViewDirInfoList, 1);
- vd->type = DIRVIEW_LIST;
- vd->widget_destroy_cb = vdlist_destroy_cb;
- VDLIST_INFO(vd, list) = NULL;
+ vd->type = DIRVIEW_LIST;
- store = gtk_list_store_new(4, G_TYPE_POINTER, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_BOOLEAN);
+ store = gtk_list_store_new(5, G_TYPE_POINTER, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_STRING);
vd->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
g_object_unref(store);
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(vd->view), FALSE);
gtk_tree_view_set_enable_search(GTK_TREE_VIEW(vd->view), FALSE);
- g_signal_connect(G_OBJECT(vd->view), "row_activated",
-
- G_CALLBACK(vd_activate_cb), vd);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(vd->view));
gtk_tree_selection_set_mode(selection, GTK_SELECTION_NONE);
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_append_column(GTK_TREE_VIEW(vd->view), column);
-
- g_signal_connect(G_OBJECT(vd->view), "key_press_event",
- G_CALLBACK(vdlist_press_key_cb), vd);
- gtk_container_add(GTK_CONTAINER(vd->widget), vd->view);
- gtk_widget_show(vd->view);
-
- vd_dnd_init(vd);
-
- g_signal_connect(G_OBJECT(vd->view), "button_press_event",
- G_CALLBACK(vdlist_press_cb), vd);
- g_signal_connect(G_OBJECT(vd->view), "button_release_event",
- G_CALLBACK(vdlist_release_cb), vd);
+ 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_DATE);
+ gtk_tree_view_column_set_cell_data_func(column, renderer, vd_color_cb, vd, NULL);
- if (path) vdlist_set_path(vd, path);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(vd->view), column);
return vd;
}
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
projects / geeqie.git / blobdiff