/*
- * GQview
+ * Geeqie
* (C) 2006 John Ellis
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
*/
-#include "gqview.h"
+#include "main.h"
#include "img-view.h"
#include "collect.h"
#include "collect-io.h"
#include "dnd.h"
#include "editors.h"
-#include "filelist.h"
+#include "filedata.h"
#include "fullscreen.h"
#include "image.h"
#include "image-overlay.h"
-#include "info.h"
+#include "layout.h"
+#include "layout_image.h"
#include "menu.h"
-#include "pixbuf-renderer.h"
+#include "misc.h"
#include "pixbuf_util.h"
+#include "pixbuf-renderer.h"
#include "print.h"
#include "slideshow.h"
-#include "utilops.h"
-#include "ui_bookmark.h"
#include "ui_fileops.h"
#include "ui_menu.h"
+#include "uri_utils.h"
+#include "utilops.h"
+#include "window.h"
#include <gdk/gdkkeysyms.h> /* for keyboard values */
GList *list;
GList *list_pointer;
-
- gint overlay_id;
};
static GtkWidget *view_popup_menu(ViewWindow *vw);
-static void view_fullscreen_toggle(ViewWindow *vw, gint force_off);
+static void view_fullscreen_toggle(ViewWindow *vw, gboolean force_off);
static void view_overlay_toggle(ViewWindow *vw);
static void view_slideshow_next(ViewWindow *vw);
static void view_window_dnd_init(ViewWindow *vw);
+static void view_window_notify_cb(FileData *fd, NotifyType type, gpointer data);
/*
*-----------------------------------------------------------------------------
* misc
*-----------------------------------------------------------------------------
- */
+ */
static ImageWindow *view_window_active_image(ViewWindow *vw)
{
static void view_window_set_list(ViewWindow *vw, GList *list)
{
- path_list_free(vw->list);
+ filelist_free(vw->list);
vw->list = NULL;
vw->list_pointer = NULL;
- vw->list = path_list_copy(list);
+ vw->list = filelist_copy(list);
}
-static gint view_window_contains_collection(ViewWindow *vw)
+static gboolean view_window_contains_collection(ViewWindow *vw)
{
CollectionData *cd;
CollectInfo *info;
return (cd && info);
}
-static void view_collection_step(ViewWindow *vw, gint next)
+static void view_collection_step(ViewWindow *vw, gboolean next)
{
ImageWindow *imd = view_window_active_image(vw);
CollectionData *cd;
if (next)
{
info = collection_next_by_info(cd, info);
- if (enable_read_ahead)
+ if (options->image.enable_read_ahead)
{
read_ahead_info = collection_next_by_info(cd, info);
if (!read_ahead_info) read_ahead_info = collection_prev_by_info(cd, info);
else
{
info = collection_prev_by_info(cd, info);
- if (enable_read_ahead)
+ if (options->image.enable_read_ahead)
{
read_ahead_info = collection_prev_by_info(cd, info);
if (!read_ahead_info) read_ahead_info = collection_next_by_info(cd, info);
if (info)
{
- image_change_from_collection(imd, cd, info, image_zoom_get_default(imd, zoom_mode));
+ image_change_from_collection(imd, cd, info, image_zoom_get_default(imd));
- if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->path);
+ if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd);
}
-
+
}
-static void view_collection_step_to_end(ViewWindow *vw, gint last)
+static void view_collection_step_to_end(ViewWindow *vw, gboolean last)
{
ImageWindow *imd = view_window_active_image(vw);
CollectionData *cd;
if (last)
{
info = collection_get_last(cd);
- if (enable_read_ahead) read_ahead_info = collection_prev_by_info(cd, info);
+ if (options->image.enable_read_ahead) read_ahead_info = collection_prev_by_info(cd, info);
}
else
{
info = collection_get_first(cd);
- if (enable_read_ahead) read_ahead_info = collection_next_by_info(cd, info);
+ if (options->image.enable_read_ahead) read_ahead_info = collection_next_by_info(cd, info);
}
if (info)
{
- image_change_from_collection(imd, cd, info, image_zoom_get_default(imd, zoom_mode));
- if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->path);
+ image_change_from_collection(imd, cd, info, image_zoom_get_default(imd));
+ if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd);
}
}
-static void view_list_step(ViewWindow *vw, gint next)
+static void view_list_step(ViewWindow *vw, gboolean next)
{
ImageWindow *imd = view_window_active_image(vw);
- const gchar *path;
+ FileData *fd;
GList *work;
GList *work_ahead;
if (!vw->list) return;
- path = image_get_path(imd);
- if (!path) return;
+ fd = image_get_fd(imd);
+ if (!fd) return;
if (g_list_position(vw->list, vw->list_pointer) >= 0)
{
}
else
{
- gint found = FALSE;
+ gboolean found = FALSE;
work = vw->list;
while (work && !found)
{
- gchar *temp;
+ FileData *temp;
temp = work->data;
- if (strcmp(path, temp) == 0)
+ if (fd == temp)
{
found = TRUE;
}
work = work->prev;
if (work) work_ahead = work->prev;
}
+
if (!work) return;
vw->list_pointer = work;
- path = work->data;
- image_change_path(imd, path, image_zoom_get_default(imd, zoom_mode));
+ fd = work->data;
+ image_change_fd(imd, fd, image_zoom_get_default(imd));
- if (enable_read_ahead && work_ahead)
+ if (options->image.enable_read_ahead && work_ahead)
{
- const gchar *next_path = work_ahead->data;
- image_prebuffer_set(imd, next_path);
+ FileData *next_fd = work_ahead->data;
+ image_prebuffer_set(imd, next_fd);
}
}
-static void view_list_step_to_end(ViewWindow *vw, gint last)
+static void view_list_step_to_end(ViewWindow *vw, gboolean last)
{
ImageWindow *imd = view_window_active_image(vw);
- const gchar *path;
+ FileData *fd;
GList *work;
GList *work_ahead;
}
vw->list_pointer = work;
- path = work->data;
- image_change_path(imd, path, image_zoom_get_default(imd, zoom_mode));
+ fd = work->data;
+ image_change_fd(imd, fd, image_zoom_get_default(imd));
- if (enable_read_ahead && work_ahead)
+ if (options->image.enable_read_ahead && work_ahead)
{
- const gchar *next_path = work_ahead->data;
- image_prebuffer_set(imd, next_path);
+ FileData *next_fd = work_ahead->data;
+ image_prebuffer_set(imd, next_fd);
}
}
}
}
-static void view_step_to_end(ViewWindow *vw, gint last)
+static void view_step_to_end(ViewWindow *vw, gboolean last)
{
if (vw->list)
{
ImageWindow *imd;
imd = view_window_active_image(vw);
- gdk_window_get_origin(imd->pr->window, x, y);
+ gdk_window_get_origin(gtk_widget_get_window(imd->pr), x, y);
popup_menu_position_clamp(menu, x, y, 0);
}
-static gint view_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
+static gboolean view_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
ViewWindow *vw = data;
ImageWindow *imd;
stop_signal = TRUE;
switch (event->keyval)
{
- case GDK_Left: case GDK_KP_Left:
+ case GDK_KEY_Left: case GDK_KEY_KP_Left:
x -= 1;
break;
- case GDK_Right: case GDK_KP_Right:
+ case GDK_KEY_Right: case GDK_KEY_KP_Right:
x += 1;
break;
- case GDK_Up: case GDK_KP_Up:
+ case GDK_KEY_Up: case GDK_KEY_KP_Up:
y -= 1;
break;
- case GDK_Down: case GDK_KP_Down:
+ case GDK_KEY_Down: case GDK_KEY_KP_Down:
y += 1;
break;
default:
if (event->state & GDK_CONTROL_MASK)
{
- gint n = -1;
-
stop_signal = TRUE;
switch (event->keyval)
{
case '1':
- n = 0;
- break;
case '2':
- n = 1;
- break;
case '3':
- n = 2;
- break;
case '4':
- n = 3;
- break;
case '5':
- n = 4;
- break;
case '6':
- n = 5;
- break;
case '7':
- n = 6;
- break;
case '8':
- n = 7;
- break;
case '9':
- n = 8;
- break;
case '0':
- n = 9;
break;
case 'C': case 'c':
- file_util_copy(image_get_path(imd), NULL, NULL, imd->widget);
+ file_util_copy(image_get_fd(imd), NULL, NULL, imd->widget);
break;
case 'M': case 'm':
- file_util_move(image_get_path(imd), NULL, NULL, imd->widget);
+ file_util_move(image_get_fd(imd), NULL, NULL, imd->widget);
break;
case 'R': case 'r':
- file_util_rename(image_get_path(imd), NULL, imd->widget);
+ file_util_rename(image_get_fd(imd), NULL, imd->widget);
break;
case 'D': case 'd':
- file_util_delete(image_get_path(imd), NULL, imd->widget);
- break;
- case 'P': case 'p':
- info_window_new(image_get_path(imd), NULL);
+ file_util_delete(image_get_fd(imd), NULL, imd->widget);
break;
case 'W': case 'w':
view_window_close(vw);
stop_signal = FALSE;
break;
}
- if (n != -1)
- {
- if (!editor_window_flag_set(n))
- {
- view_fullscreen_toggle(vw, TRUE);
- }
- imd = view_window_active_image(vw);
- start_editor_from_file(n, image_get_path(imd));
- }
}
else if (event->state & GDK_SHIFT_MASK)
{
switch (event->keyval)
{
case 'R': case 'r':
- image_alter(imd, ALTER_ROTATE_180);
+ image_alter_orientation(imd, ALTER_ROTATE_180);
break;
case 'M': case 'm':
- image_alter(imd, ALTER_MIRROR);
+ image_alter_orientation(imd, ALTER_MIRROR);
break;
case 'F': case 'f':
- image_alter(imd, ALTER_FLIP);
+ image_alter_orientation(imd, ALTER_FLIP);
break;
case 'G': case 'g':
- image_alter(imd, ALTER_DESATURATE);
+ image_set_desaturate(imd, !image_get_desaturate(imd));
break;
case 'P': case 'p':
{
- const gchar *path;
+ FileData *fd;
view_fullscreen_toggle(vw, TRUE);
imd = view_window_active_image(vw);
- path = image_get_path(imd);
- print_window_new(path,
- (path) ? g_list_append(NULL, g_strdup(path)) : NULL,
- path_list_copy(vw->list), vw->window);
+ fd = image_get_fd(imd);
+ print_window_new(fd,
+ fd ? g_list_append(NULL, file_data_ref(fd)) : NULL,
+ filelist_copy(vw->list), vw->window);
}
break;
default:
break;
}
}
- else
+ else
{
stop_signal = TRUE;
switch (event->keyval)
{
- case GDK_Page_Up: case GDK_KP_Page_Up:
- case GDK_BackSpace:
+ case GDK_KEY_Page_Up: case GDK_KEY_KP_Page_Up:
+ case GDK_KEY_BackSpace:
case 'B': case 'b':
view_step_prev(vw);
break;
- case GDK_Page_Down: case GDK_KP_Page_Down:
- case GDK_space:
+ case GDK_KEY_Page_Down: case GDK_KEY_KP_Page_Down:
+ case GDK_KEY_space:
case 'N': case 'n':
view_step_next(vw);
break;
- case GDK_Home: case GDK_KP_Home:
+ case GDK_KEY_Home: case GDK_KEY_KP_Home:
view_step_to_end(vw, FALSE);
break;
- case GDK_End: case GDK_KP_End:
+ case GDK_KEY_End: case GDK_KEY_KP_End:
view_step_to_end(vw, TRUE);
break;
- case '+': case '=': case GDK_KP_Add:
+ case '+': case '=': case GDK_KEY_KP_Add:
image_zoom_adjust(imd, get_zoom_increment());
break;
- case '-': case GDK_KP_Subtract:
+ case '-': case GDK_KEY_KP_Subtract:
image_zoom_adjust(imd, -get_zoom_increment());
break;
- case 'X': case 'x': case GDK_KP_Multiply:
+ case 'X': case 'x': case GDK_KEY_KP_Multiply:
image_zoom_set(imd, 0.0);
break;
- case 'Z': case 'z': case GDK_KP_Divide: case '1':
+ case 'Z': case 'z': case GDK_KEY_KP_Divide: case '1':
image_zoom_set(imd, 1.0);
break;
case '2':
break;
case 'F': case 'f':
case 'V': case 'v':
- case GDK_F11:
+ case GDK_KEY_F11:
view_fullscreen_toggle(vw, FALSE);
break;
case 'I': case 'i':
view_overlay_toggle(vw);
break;
case ']':
- image_alter(imd, ALTER_ROTATE_90);
+ image_alter_orientation(imd, ALTER_ROTATE_90);
break;
case '[':
- image_alter(imd, ALTER_ROTATE_90_CC);
+ image_alter_orientation(imd, ALTER_ROTATE_90_CC);
break;
- case GDK_Delete: case GDK_KP_Delete:
- if (enable_delete_key)
+ case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
+ if (options->file_ops.enable_delete_key)
{
- file_util_delete(image_get_path(imd), NULL, imd->widget);
+ file_util_delete(image_get_fd(imd), NULL, imd->widget);
}
break;
- case GDK_Escape:
+ case GDK_KEY_Escape:
if (vw->fs)
{
view_fullscreen_toggle(vw, TRUE);
view_window_close(vw);
}
break;
- case GDK_Menu:
- case GDK_F10:
+ case GDK_KEY_Menu:
+ case GDK_KEY_F10:
menu = view_popup_menu(vw);
gtk_menu_popup(GTK_MENU(menu), NULL, NULL,
view_window_menu_pos_cb, vw, 0, GDK_CURRENT_TIME);
*-----------------------------------------------------------------------------
* view window main routines
*-----------------------------------------------------------------------------
- */
-
-static void button_cb(ImageWindow *imd, gint button, guint32 time,
- gdouble x, gdouble y, guint state, gpointer data)
+ */
+static void button_cb(ImageWindow *imd, GdkEventButton *event, gpointer data)
{
ViewWindow *vw = data;
GtkWidget *menu;
- switch (button)
+ switch (event->button)
{
- case 1:
+ case MOUSE_BUTTON_LEFT:
view_step_next(vw);
break;
- case 2:
+ case MOUSE_BUTTON_MIDDLE:
view_step_prev(vw);
break;
- case 3:
+ case MOUSE_BUTTON_RIGHT:
menu = view_popup_menu(vw);
- gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, time);
+ gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, event->time);
break;
default:
break;
}
}
-static void scroll_cb(ImageWindow *imd, GdkScrollDirection direction, guint32 time,
- gdouble x, gdouble y, guint state, gpointer data)
+static void scroll_cb(ImageWindow *imd, GdkEventScroll *event, gpointer data)
{
ViewWindow *vw = data;
- if (state & GDK_CONTROL_MASK)
+ if (event->state & GDK_CONTROL_MASK)
{
- switch (direction)
+ switch (event->direction)
{
case GDK_SCROLL_UP:
- image_zoom_adjust_at_point(imd, get_zoom_increment(), x, y);
+ image_zoom_adjust_at_point(imd, get_zoom_increment(), event->x, event->y);
break;
case GDK_SCROLL_DOWN:
- image_zoom_adjust_at_point(imd, -get_zoom_increment(), x, y);
+ image_zoom_adjust_at_point(imd, -get_zoom_increment(), event->x, event->y);
break;
default:
break;
}
}
- else if ( (state & GDK_SHIFT_MASK) != (mousewheel_scrolls))
+ else if ( (event->state & GDK_SHIFT_MASK) != (guint) (options->mousewheel_scrolls))
{
- switch (direction)
+ switch (event->direction)
{
case GDK_SCROLL_UP:
image_scroll(imd, 0, -MOUSEWHEEL_SCROLL_SIZE);
}
else
{
- switch (direction)
+ switch (event->direction)
{
case GDK_SCROLL_UP:
view_step_prev(vw);
if (vw->ss) vw->ss->imd = vw->imd;
}
-static void view_fullscreen_toggle(ViewWindow *vw, gint force_off)
+static void view_fullscreen_toggle(ViewWindow *vw, gboolean force_off)
{
if (force_off && !vw->fs) return;
if (vw->fs)
{
+ if (image_osd_get(vw->imd) & OSD_SHOW_INFO)
+ image_osd_set(vw->imd, image_osd_get(vw->fs->imd));
+
fullscreen_stop(vw->fs);
-
- if (vw->overlay_id != -1) vw->overlay_id = image_overlay_info_enable(vw->imd);
}
else
{
if (vw->ss) vw->ss->imd = vw->fs->imd;
- if (vw->overlay_id != -1)
+ if (image_osd_get(vw->imd) & OSD_SHOW_INFO)
{
- image_overlay_info_disable(vw->imd, vw->overlay_id);
- vw->overlay_id = image_overlay_info_enable(vw->fs->imd);
+ image_osd_set(vw->fs->imd, image_osd_get(vw->imd));
+ image_osd_set(vw->imd, OSD_SHOW_NOTHING);
}
}
}
ImageWindow *imd;
imd = view_window_active_image(vw);
-
- if (vw->overlay_id == -1)
- {
- vw->overlay_id = image_overlay_info_enable(imd);
- }
- else
- {
- image_overlay_info_disable(imd, vw->overlay_id);
- vw->overlay_id = -1;
- }
+
+ image_osd_toggle(imd);
}
static void view_slideshow_next(ViewWindow *vw)
static void view_slideshow_stop_func(SlideShowData *fs, gpointer data)
{
ViewWindow *vw = data;
+ GList *work;
+ FileData *fd;
vw->ss = NULL;
+
+ work = vw->list;
+ fd = image_get_fd(view_window_active_image(vw));
+ while (work)
+ {
+ FileData *temp;
+
+ temp = work->data;
+ if (fd == temp)
+ {
+ vw->list_pointer = work;
+ work = NULL;
+ }
+ else
+ {
+ work = work->next;
+ }
+ }
}
static void view_slideshow_start(ViewWindow *vw)
if (vw->list)
{
- vw->ss = slideshow_start_from_path_list(view_window_active_image(vw),
- path_list_copy(vw->list),
+ vw->ss = slideshow_start_from_filelist(NULL, view_window_active_image(vw),
+ filelist_copy(vw->list),
view_slideshow_stop_func, vw);
vw->list_pointer = NULL;
return;
cd = image_get_collection(view_window_active_image(vw), &info);
if (cd && info)
{
- vw->ss = slideshow_start_from_collection(view_window_active_image(vw), cd,
+ vw->ss = slideshow_start_from_collection(NULL, view_window_active_image(vw), cd,
view_slideshow_stop_func, vw, info);
}
}
view_slideshow_stop(vw);
fullscreen_stop(vw->fs);
- path_list_free(vw->list);
+ filelist_free(vw->list);
+
+ file_data_unregister_notify_func(view_window_notify_cb, vw);
+
g_free(vw);
}
gtk_widget_destroy(vw->window);
}
-static gint view_window_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
+static gboolean view_window_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data)
{
ViewWindow *vw = data;
return TRUE;
}
-static ViewWindow *real_view_window_new(const gchar *path, GList *list, CollectionData *cd, CollectInfo *info)
+static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionData *cd, CollectInfo *info)
{
ViewWindow *vw;
GtkAllocation req_size;
GdkGeometry geometry;
gint w, h;
- if (!path && !list && (!cd || !info)) return NULL;
+ if (!fd && !list && (!cd || !info)) return NULL;
vw = g_new0(ViewWindow, 1);
- vw->fs = NULL;
- vw->ss = NULL;
- vw->list = NULL;
- vw->list_pointer = NULL;
- vw->overlay_id = -1;
+ vw->window = window_new(GTK_WINDOW_TOPLEVEL, "view", PIXBUF_INLINE_ICON_VIEW, NULL, NULL);
- vw->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
- geometry.min_width = 8;
- geometry.min_height = 8;
+ geometry.min_width = DEFAULT_MINIMAL_WINDOW_SIZE;
+ geometry.min_height = DEFAULT_MINIMAL_WINDOW_SIZE;
gtk_window_set_geometry_hints(GTK_WINDOW(vw->window), NULL, &geometry, GDK_HINT_MIN_SIZE);
gtk_window_set_resizable(GTK_WINDOW(vw->window), TRUE);
- gtk_window_set_title (GTK_WINDOW(vw->window), "GQview");
- gtk_window_set_wmclass(GTK_WINDOW(vw->window), "view", "GQview");
- gtk_container_set_border_width(GTK_CONTAINER(vw->window), 0);
-
- window_set_icon(vw->window, PIXBUF_INLINE_ICON_VIEW, NULL);
+ gtk_container_set_border_width(GTK_CONTAINER(vw->window), 0);
vw->imd = image_new(FALSE);
+ image_color_profile_set(vw->imd,
+ options->color_profile.input_type,
+ options->color_profile.use_image);
+ image_color_profile_set_use(vw->imd, options->color_profile.enabled);
- if (black_window_background) image_background_set_black(vw->imd, TRUE);
+ image_background_set_color_from_options(vw->imd, FALSE);
- image_attach_window(vw->imd, vw->window, NULL, "GQview", TRUE);
+ image_attach_window(vw->imd, vw->window, NULL, GQ_APPNAME, TRUE);
- image_auto_refresh(vw->imd, 0);
+ image_auto_refresh_enable(vw->imd, TRUE);
image_top_window_set_sync(vw->imd, TRUE);
gtk_container_add(GTK_CONTAINER(vw->window), vw->imd->widget);
G_CALLBACK(view_window_key_press_cb), vw);
if (cd && info)
{
- image_change_from_collection(vw->imd, cd, info, image_zoom_get_default(NULL, zoom_mode));
- if (enable_read_ahead)
+ image_change_from_collection(vw->imd, cd, info, image_zoom_get_default(NULL));
+ if (options->image.enable_read_ahead)
{
CollectInfo * r_info = collection_next_by_info(cd, info);
if (!r_info) r_info = collection_prev_by_info(cd, info);
- if (r_info) image_prebuffer_set(vw->imd, r_info->path);
+ if (r_info) image_prebuffer_set(vw->imd, r_info->fd);
}
}
else if (list)
{
view_window_set_list(vw, list);
vw->list_pointer = vw->list;
- image_change_path(vw->imd, (gchar *)vw->list->data, image_zoom_get_default(NULL, zoom_mode));
+ image_change_fd(vw->imd, (FileData *)vw->list->data, image_zoom_get_default(NULL));
- if (enable_read_ahead)
+ if (options->image.enable_read_ahead)
{
GList *work = vw->list->next;
- if (work) image_prebuffer_set(vw->imd, (gchar *)work->data);
+ if (work) image_prebuffer_set(vw->imd, (FileData *)work->data);
}
}
else
{
- image_change_path(vw->imd, path, image_zoom_get_default(NULL, zoom_mode));
+ image_change_fd(vw->imd, fd, image_zoom_get_default(NULL));
+ }
+
+ /* Wait until image is loaded otherwise size is not defined */
+ int count;
+ for (count = 10; count && !w && !h; count++)
+ {
+ image_get_image_size(vw->imd, &w, &h);
+ usleep(100000);
}
if (image_zoom_get(vw->imd) == 0.0)
{
- pixbuf_renderer_get_image_size(PIXBUF_RENDERER(vw->imd->pr), &w, &h);
+ image_get_image_size(vw->imd, &w, &h);
}
else
{
pixbuf_renderer_get_scaled_size(PIXBUF_RENDERER(vw->imd->pr), &w, &h);
}
- if (limit_window_size)
+ if (options->image.limit_window_size)
{
- gint mw = gdk_screen_width() * max_window_size / 100;
- gint mh = gdk_screen_height() * max_window_size / 100;
+ gint mw = gdk_screen_width() * options->image.max_window_size / 100;
+ gint mh = gdk_screen_height() * options->image.max_window_size / 100;
if (w > mw) w = mw;
if (h > mh) h = mh;
view_window_list = g_list_append(view_window_list, vw);
+ file_data_register_notify_func(view_window_notify_cb, vw, NOTIFY_PRIORITY_LOW);
+
return vw;
}
collection_unref(cd);
}
-void view_window_new(const gchar *path)
+void view_window_new(FileData *fd)
{
- if (file_extension_match(path, ".gqv"))
+ GList *list;
+
+ if (file_extension_match(fd->path, GQ_COLLECTION_EXT))
{
ViewWindow *vw;
CollectionData *cd;
CollectInfo *info;
- cd = collection_new(path);
- if (collection_load(cd, path, FALSE))
+ cd = collection_new(fd->path);
+ if (collection_load(cd, fd->path, COLLECTION_LOAD_NONE))
{
info = collection_get_first(cd);
}
G_CALLBACK(view_window_collection_unref_cb), cd);
}
}
- else if (isdir(path))
+ else if (isdir(fd->path) && filelist_read(fd, &list, NULL))
{
- GList *list = NULL;
-
- if (path_list(path, &list, NULL))
- {
- list = path_list_sort(list);
- list = path_list_filter(list, FALSE);
- }
+ list = filelist_sort_path(list);
+ list = filelist_filter(list, FALSE);
real_view_window_new(NULL, list, NULL, NULL);
- path_list_free(list);
+ filelist_free(list);
}
else
{
- real_view_window_new(path, NULL, NULL, NULL);
+ real_view_window_new(fd, NULL, NULL, NULL);
}
}
{
ViewWindow *vw = work->data;
work = work->next;
-
- image_background_set_black(vw->imd, black_window_background);
+
+ image_background_set_color_from_options(vw->imd, !!vw->fs);
}
}
-gint view_window_find_image(ImageWindow *imd, gint *index, gint *total)
+gboolean view_window_find_image(ImageWindow *imd, gint *index, gint *total)
{
GList *work;
if (vw->ss)
{
gint n;
+ gint t;
+
n = g_list_length(vw->ss->list_done);
+ t = n + g_list_length(vw->ss->list);
+ if (n == 0) n = t;
if (index) *index = n - 1;
- if (total) *total = n + g_list_length(vw->ss->list);
+ if (total) *total = t;
}
else
{
*-----------------------------------------------------------------------------
* view window menu routines and callbacks
*-----------------------------------------------------------------------------
- */
+ */
static void view_new_window_cb(GtkWidget *widget, gpointer data)
{
}
else
{
- view_window_new(image_get_path(vw->imd));
+ view_window_new(image_get_fd(vw->imd));
}
}
{
ViewWindow *vw;
ImageWindow *imd;
- gint n;
+ const gchar *key = data;
vw = submenu_item_get_data(widget);
- n = GPOINTER_TO_INT(data);
if (!vw) return;
- if (!editor_window_flag_set(n))
+ if (!editor_window_flag_set(key))
{
view_fullscreen_toggle(vw, TRUE);
}
imd = view_window_active_image(vw);
- start_editor_from_file(n, image_get_path(imd));
+ file_util_start_editor_from_file(key, image_get_fd(imd), imd->widget);
}
static void view_alter_cb(GtkWidget *widget, gpointer data)
type = GPOINTER_TO_INT(data);
if (!vw) return;
- image_alter(vw->imd, type);
-}
-
-static void view_info_cb(GtkWidget *widget, gpointer data)
-{
- ViewWindow *vw = data;
- ImageWindow *imd;
-
- imd = view_window_active_image(vw);
- info_window_new(image_get_path(imd), NULL);
+ image_alter_orientation(vw->imd, type);
}
static void view_wallpaper_cb(GtkWidget *widget, gpointer data)
ImageWindow *imd;
imd = view_window_active_image(vw);
- file_util_copy(image_get_path(imd), NULL, NULL, imd->widget);
+ file_util_copy(image_get_fd(imd), NULL, NULL, imd->widget);
}
static void view_move_cb(GtkWidget *widget, gpointer data)
ImageWindow *imd;
imd = view_window_active_image(vw);
- file_util_move(image_get_path(imd), NULL, NULL, imd->widget);
+ file_util_move(image_get_fd(imd), NULL, NULL, imd->widget);
}
static void view_rename_cb(GtkWidget *widget, gpointer data)
ImageWindow *imd;
imd = view_window_active_image(vw);
- file_util_rename(image_get_path(imd), NULL, imd->widget);
+ file_util_rename(image_get_fd(imd), NULL, imd->widget);
}
static void view_delete_cb(GtkWidget *widget, gpointer data)
ImageWindow *imd;
imd = view_window_active_image(vw);
- file_util_delete(image_get_path(imd), NULL, imd->widget);
+ file_util_delete(image_get_fd(imd), NULL, imd->widget);
+}
+
+static void view_copy_path_cb(GtkWidget *widget, gpointer data)
+{
+ ViewWindow *vw = data;
+ ImageWindow *imd;
+
+ imd = view_window_active_image(vw);
+ file_util_copy_path_to_clipboard(image_get_fd(imd));
}
static void view_fullscreen_cb(GtkWidget *widget, gpointer data)
view_window_close(vw);
}
+static LayoutWindow *view_new_layout_with_fd(FileData *fd)
+{
+ LayoutWindow *nw;
+
+ nw = layout_new(NULL, NULL);
+ layout_sort_set(nw, options->file_sort.method, options->file_sort.ascending);
+ layout_set_fd(nw, fd);
+ return nw;
+}
+
+
+static void view_set_layout_path_cb(GtkWidget *widget, gpointer data)
+{
+ ViewWindow *vw = data;
+ LayoutWindow *lw;
+ ImageWindow *imd;
+
+ imd = view_window_active_image(vw);
+
+ if (!imd || !imd->image_fd) return;
+
+ lw = layout_find_by_image_fd(imd);
+ if (lw)
+ layout_set_fd(lw, imd->image_fd);
+ else
+ view_new_layout_with_fd(imd->image_fd);
+ view_window_close(vw);
+}
+
+static void view_popup_menu_destroy_cb(GtkWidget *widget, gpointer data)
+{
+ GList *editmenu_fd_list = data;
+
+ filelist_free(editmenu_fd_list);
+}
+
+static GList *view_window_get_fd_list(ViewWindow *vw)
+{
+ GList *list = NULL;
+ ImageWindow *imd = view_window_active_image(vw);
+
+ if (imd)
+ {
+ FileData *fd = image_get_fd(imd);
+ if (fd) list = g_list_append(NULL, file_data_ref(fd));
+ }
+
+ return list;
+}
+
static GtkWidget *view_popup_menu(ViewWindow *vw)
{
GtkWidget *menu;
GtkWidget *item;
+ GList *editmenu_fd_list;
menu = popup_menu_short_lived();
+
menu_item_add_stock(menu, _("Zoom _in"), GTK_STOCK_ZOOM_IN, G_CALLBACK(view_zoom_in_cb), vw);
menu_item_add_stock(menu, _("Zoom _out"), GTK_STOCK_ZOOM_OUT, G_CALLBACK(view_zoom_out_cb), vw);
menu_item_add_stock(menu, _("Zoom _1:1"), GTK_STOCK_ZOOM_100, G_CALLBACK(view_zoom_1_1_cb), vw);
menu_item_add_stock(menu, _("Fit image to _window"), GTK_STOCK_ZOOM_FIT, G_CALLBACK(view_zoom_fit_cb), vw);
menu_item_add_divider(menu);
- item = submenu_add_edit(menu, NULL, G_CALLBACK(view_edit_cb), vw);
+ editmenu_fd_list = view_window_get_fd_list(vw);
+ g_signal_connect(G_OBJECT(menu), "destroy",
+ G_CALLBACK(view_popup_menu_destroy_cb), editmenu_fd_list);
+ item = submenu_add_edit(menu, NULL, G_CALLBACK(view_edit_cb), vw, editmenu_fd_list);
menu_item_add_divider(item);
menu_item_add(item, _("Set as _wallpaper"), G_CALLBACK(view_wallpaper_cb), vw);
submenu_add_alter(menu, G_CALLBACK(view_alter_cb), vw);
- menu_item_add_stock(menu, _("_Properties"), GTK_STOCK_PROPERTIES, G_CALLBACK(view_info_cb), vw);
-
menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(view_new_window_cb), vw);
+ item = menu_item_add(menu, _("_Go to directory view"), G_CALLBACK(view_set_layout_path_cb), vw);
menu_item_add_divider(menu);
menu_item_add_stock(menu, _("_Copy..."), GTK_STOCK_COPY, G_CALLBACK(view_copy_cb), vw);
menu_item_add(menu, _("_Move..."), G_CALLBACK(view_move_cb), vw);
menu_item_add(menu, _("_Rename..."), G_CALLBACK(view_rename_cb), vw);
menu_item_add_stock(menu, _("_Delete..."), GTK_STOCK_DELETE, G_CALLBACK(view_delete_cb), vw);
+ menu_item_add(menu, _("_Copy path"), G_CALLBACK(view_copy_path_cb), vw);
menu_item_add_divider(menu);
/* do nothing */
}
-static void view_dir_list_do(ViewWindow *vw, GList *list, gint skip, gint recurse)
+static void view_dir_list_do(ViewWindow *vw, GList *list, gboolean skip, gboolean recurse)
{
GList *work;
work = list;
while (work)
{
- gchar *path = work->data;
+ FileData *fd = work->data;
work = work->next;
- if (isdir(path))
+ if (isdir(fd->path))
{
if (!skip)
{
if (recurse)
{
- list = path_list_recursive(path);
+ list = filelist_recursive(fd);
}
else
- {
- path_list(path, &list, NULL);
- list = path_list_sort(list);
- list = path_list_filter(list, FALSE);
+ { /*FIXME */
+ filelist_read(fd, &list, NULL);
+ list = filelist_sort_path(list);
+ list = filelist_filter(list, FALSE);
}
if (list) vw->list = g_list_concat(vw->list, list);
}
else
{
/* FIXME: no filtering here */
- vw->list = g_list_append(vw->list, g_strdup(path));
+ vw->list = g_list_append(vw->list, file_data_ref(fd));
}
}
if (vw->list)
{
- gchar *path;
+ FileData *fd;
vw->list_pointer = vw->list;
- path = vw->list->data;
- image_change_path(vw->imd, path, image_zoom_get_default(vw->imd, zoom_mode));
+ fd = vw->list->data;
+ image_change_fd(vw->imd, fd, image_zoom_get_default(vw->imd));
work = vw->list->next;
- if (enable_read_ahead && work)
+ if (options->image.enable_read_ahead && work)
{
- path = work->data;
- image_prebuffer_set(vw->imd, path);
+ fd = work->data;
+ image_prebuffer_set(vw->imd, fd);
}
}
else
{
- image_change_path(vw->imd, NULL, image_zoom_get_default(vw->imd, zoom_mode));
+ image_change_fd(vw->imd, NULL, image_zoom_get_default(vw->imd));
}
}
static void view_dir_list_destroy(GtkWidget *widget, gpointer data)
{
CViewConfirmD *d = data;
- path_list_free(d->list);
- g_free(d);
+ filelist_free(d->list);
+ g_free(d);
}
static GtkWidget *view_confirm_dir_list(ViewWindow *vw, GList *list)
{
GList *work;
- list = uri_list_from_text((gchar *)selection_data->data, TRUE);
+ list = uri_filelist_from_gtk_selection_data(selection_data);
work = list;
while (work)
{
- if (isdir((gchar *)work->data))
+ FileData *fd = work->data;
+ if (isdir(fd->path))
{
GtkWidget *menu;
menu = view_confirm_dir_list(vw, list);
work = work->next;
}
- list = path_list_filter(list, FALSE);
+ list = filelist_filter(list, FALSE);
source = NULL;
info_list = NULL;
}
else
{
- source = collection_from_dnd_data((gchar *)selection_data->data, &list, &info_list);
+ source = collection_from_dnd_data((gchar *)gtk_selection_data_get_data(selection_data), &list, &info_list);
}
if (list)
{
- gchar *path;
+ FileData *fd;
- path = list->data;
- if (isfile(path))
+ fd = list->data;
+ if (isfile(fd->path))
{
view_slideshow_stop(vw);
view_window_set_list(vw, NULL);
if (source && info_list)
{
- image_change_from_collection(imd, source, info_list->data, image_zoom_get_default(imd, zoom_mode));
+ image_change_from_collection(imd, source, info_list->data, image_zoom_get_default(imd));
}
else
{
vw->list_pointer = vw->list;
}
- image_change_path(imd, path, image_zoom_get_default(imd, zoom_mode));
+ image_change_fd(imd, fd, image_zoom_get_default(imd));
}
}
}
- path_list_free(list);
+ filelist_free(list);
g_list_free(info_list);
}
}
guint time, gpointer data)
{
ViewWindow *vw = data;
- const gchar *path;
+ FileData *fd;
- path = image_get_path(vw->imd);
+ fd = image_get_fd(vw->imd);
- if (path)
+ if (fd)
{
- gchar *text = NULL;
- gint len;
- gint plain_text;
GList *list;
- switch (info)
- {
- case TARGET_URI_LIST:
- plain_text = FALSE;
- break;
- case TARGET_TEXT_PLAIN:
- default:
- plain_text = TRUE;
- break;
- }
- list = g_list_append(NULL, (gchar *)path);
- text = uri_text_from_list(list, &len, plain_text);
+ list = g_list_append(NULL, fd);
+ uri_selection_data_set_uris_from_filelist(selection_data, list);
g_list_free(list);
- if (text)
- {
- gtk_selection_data_set (selection_data, selection_data->target,
- 8, (guchar *)text, len);
- g_free(text);
- }
}
else
{
- gtk_selection_data_set (selection_data, selection_data->target,
- 8, NULL, 0);
+ gtk_selection_data_set(selection_data, gtk_selection_data_get_target(selection_data),
+ 8, NULL, 0);
}
}
gtk_drag_dest_set(imd->pr,
GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP,
dnd_file_drop_types, dnd_file_drop_types_count,
- GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
+ GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
g_signal_connect(G_OBJECT(imd->pr), "drag_data_received",
G_CALLBACK(view_window_get_dnd_data), vw);
}
*-----------------------------------------------------------------------------
*/
-static void view_real_removed(ViewWindow *vw, const gchar *path, GList *ignore_list)
+static void view_real_removed(ViewWindow *vw, FileData *fd)
{
ImageWindow *imd;
- const gchar *image_path;
+ FileData *image_fd;
imd = view_window_active_image(vw);
- image_path = image_get_path(imd);
+ image_fd = image_get_fd(imd);
- if (image_path && strcmp(image_path, path) == 0)
+ if (image_fd && image_fd == fd)
{
if (vw->list)
{
view_list_step(vw, TRUE);
- if (image_get_path(imd) == image_path)
+ if (image_get_fd(imd) == image_fd)
{
view_list_step(vw, FALSE);
}
else if (view_window_contains_collection(vw))
{
view_collection_step(vw, TRUE);
- if (image_get_path(imd) == image_path)
+ if (image_get_fd(imd) == image_fd)
{
view_collection_step(vw, FALSE);
}
}
- if (image_get_path(imd) == image_path)
+ if (image_get_fd(imd) == image_fd)
{
- image_change_path(imd, NULL, image_zoom_get_default(imd, zoom_mode));
+ image_change_fd(imd, NULL, image_zoom_get_default(imd));
}
}
work = vw->list;
while (work)
{
- gchar *chk_path;
+ FileData *chk_fd;
GList *chk_link;
- chk_path = work->data;
+ chk_fd = work->data;
chk_link = work;
work = work->next;
- if (strcmp(chk_path, path) == 0)
+ if (chk_fd == fd)
{
if (vw->list_pointer == chk_link)
{
vw->list_pointer = (chk_link->next) ? chk_link->next : chk_link->prev;
}
- vw->list = g_list_remove(vw->list, chk_path);
- g_free(chk_path);
+ vw->list = g_list_remove(vw->list, chk_fd);
+ file_data_unref(chk_fd);
}
}
/* handles stepping correctly when same image is in the list more than once */
if (old && old != vw->list_pointer)
{
- gchar *path;
+ FileData *fd;
if (vw->list_pointer)
{
- path = vw->list_pointer->data;
+ fd = vw->list_pointer->data;
}
else
{
- path = NULL;
+ fd = NULL;
}
- image_change_path(imd, path, image_zoom_get_default(imd, zoom_mode));
+ image_change_fd(imd, fd, image_zoom_get_default(imd));
}
}
- if (vw->overlay_id != -1) image_overlay_update(imd, vw->overlay_id);
-}
-
-static void view_real_moved(ViewWindow *vw, const gchar *source, const gchar *dest)
-{
- ImageWindow *imd;
- const gchar *image_path;
-
- imd = view_window_active_image(vw);
- image_path = image_get_path(imd);
-
- if (image_path && strcmp(image_path, source) == 0)
- {
- image_set_path(imd, dest);
- }
-
- if (vw->list)
- {
- GList *work;
- work = vw->list;
- while (work)
- {
- gchar *chk_path;
-
- chk_path = work->data;
-
- if (strcmp(chk_path, source) == 0)
- {
- work->data = g_strdup(dest);
- g_free(chk_path);
- }
-
- work = work->next;
- }
- }
+ image_osd_update(imd);
}
-void view_window_maint_removed(const gchar *path, GList *ignore_list)
+static void view_window_notify_cb(FileData *fd, NotifyType type, gpointer data)
{
- GList *work = view_window_list;
- while (work)
- {
- ViewWindow *vw = work->data;
- work = work->next;
+ ViewWindow *vw = data;
- view_real_removed(vw, path, ignore_list);
- }
-}
+ if (!(type & NOTIFY_CHANGE) || !fd->change) return;
+
+ DEBUG_1("Notify view_window: %s %04x", fd->path, type);
-void view_window_maint_moved(const gchar *source, const gchar *dest)
-{
- GList *work = view_window_list;
- while (work)
+ switch (fd->change->type)
{
- ViewWindow *vw = work->data;
- work = work->next;
-
- view_real_moved(vw, source, dest);
+ case FILEDATA_CHANGE_MOVE:
+ case FILEDATA_CHANGE_RENAME:
+ break;
+ case FILEDATA_CHANGE_COPY:
+ break;
+ case FILEDATA_CHANGE_DELETE:
+ view_real_removed(vw, fd);
+ break;
+ case FILEDATA_CHANGE_UNSPECIFIED:
+ case FILEDATA_CHANGE_WRITE_METADATA:
+ break;
}
}
-
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
projects / geeqie.git / blobdiff