/*
* Geeqie
* (C) 2006 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
#include "layout_image.h"
#include "collect.h"
+#include "color-man.h"
#include "dnd.h"
#include "editors.h"
#include "filedata.h"
#include "image.h"
#include "image-overlay.h"
#include "img-view.h"
-#include "info.h"
#include "layout.h"
#include "layout_util.h"
#include "menu.h"
#include "misc.h"
#include "pixbuf_util.h"
+#include "pixbuf-renderer.h"
#include "slideshow.h"
#include "ui_fileops.h"
#include "ui_menu.h"
#include "uri_utils.h"
#include "utilops.h"
+#include "view_file.h"
#include <gdk/gdkkeysyms.h> /* for keyboard values */
LayoutWindow *lw = data;
/* restore image window */
- lw->image = fs->normal_imd;
-
- if (lw->slideshow)
- {
- lw->slideshow->imd = lw->image;
- }
+ if (lw->image == fs->imd)
+ lw->image = fs->normal_imd;
lw->full_screen = NULL;
}
layout_image_full_screen_stop_func, lw);
/* set to new image window */
- lw->image = lw->full_screen->imd;
-
- if (lw->slideshow)
- {
- lw->slideshow->imd = lw->image;
- }
+ if (lw->full_screen->same_region)
+ lw->image = lw->full_screen->imd;
layout_image_set_buttons(lw);
G_CALLBACK(layout_key_press_cb), lw);
layout_actions_add_window(lw, lw->full_screen->window);
-#if 0
- gtk_widget_set_sensitive(lw->window, FALSE);
- if (lw->tools) gtk_widget_set_sensitive(lw->tools, FALSE);
-#endif
- if (image_osd_get(lw->full_screen->normal_imd) & OSD_SHOW_INFO)
- {
- image_osd_set(lw->image, image_osd_get(lw->full_screen->normal_imd));
- image_osd_set(lw->full_screen->normal_imd, OSD_SHOW_NOTHING);
- }
+ image_osd_copy_status(lw->full_screen->normal_imd, lw->image);
}
void layout_image_full_screen_stop(LayoutWindow *lw)
if (!layout_valid(&lw)) return;
if (!lw->full_screen) return;
- if (image_osd_get(lw->full_screen->normal_imd) & OSD_SHOW_INFO)
- image_osd_set(lw->full_screen->normal_imd, image_osd_get(lw->image));
+ if (lw->image == lw->full_screen->imd)
+ image_osd_copy_status(lw->image, lw->full_screen->normal_imd);
fullscreen_stop(lw->full_screen);
-
-#if 0
- gtk_widget_set_sensitive(lw->window, TRUE);
- if (lw->tools) gtk_widget_set_sensitive(lw->tools, TRUE);
-#endif
}
void layout_image_full_screen_toggle(LayoutWindow *lw)
}
}
-gint layout_image_full_screen_active(LayoutWindow *lw)
+gboolean layout_image_full_screen_active(LayoutWindow *lw)
{
if (!layout_valid(&lw)) return FALSE;
if (cd && info)
{
- lw->slideshow = slideshow_start_from_collection(lw->image, cd,
+ lw->slideshow = slideshow_start_from_collection(lw, NULL, cd,
layout_image_slideshow_stop_func, lw, info);
}
else
{
- lw->slideshow = slideshow_start(lw->image, lw,
+ lw->slideshow = slideshow_start(lw,
layout_list_get_index(lw, layout_image_get_fd(lw)),
layout_image_slideshow_stop_func, lw);
}
return;
}
- lw->slideshow = slideshow_start_from_filelist(lw->image, list,
+ lw->slideshow = slideshow_start_from_filelist(lw, NULL, list,
layout_image_slideshow_stop_func, lw);
layout_status_update_info(lw, NULL);
}
}
-gint layout_image_slideshow_active(LayoutWindow *lw)
+gboolean layout_image_slideshow_active(LayoutWindow *lw)
{
if (!layout_valid(&lw)) return FALSE;
return (lw->slideshow != NULL);
}
-gint layout_image_slideshow_pause_toggle(LayoutWindow *lw)
+gboolean layout_image_slideshow_pause_toggle(LayoutWindow *lw)
{
- gint ret;
+ gboolean ret;
if (!layout_valid(&lw)) return FALSE;
return ret;
}
-gint layout_image_slideshow_paused(LayoutWindow *lw)
+gboolean layout_image_slideshow_paused(LayoutWindow *lw)
{
if (!layout_valid(&lw)) return FALSE;
return (slideshow_paused(lw->slideshow));
}
-static gint layout_image_slideshow_continue_check(LayoutWindow *lw)
+static gboolean layout_image_slideshow_continue_check(LayoutWindow *lw)
{
if (!lw->slideshow) return FALSE;
static void li_pop_menu_edit_cb(GtkWidget *widget, gpointer data)
{
LayoutWindow *lw;
- gint n;
+ const gchar *key = data;
lw = submenu_item_get_data(widget);
- n = GPOINTER_TO_INT(data);
- if (!editor_window_flag_set(n))
+ if (!editor_window_flag_set(key))
{
layout_image_full_screen_stop(lw);
}
- file_util_start_editor_from_file(n, layout_image_get_fd(lw), lw->window);
+ file_util_start_editor_from_file(key, layout_image_get_fd(lw), lw->window);
}
static void li_pop_menu_wallpaper_cb(GtkWidget *widget, gpointer data)
lw = submenu_item_get_data(widget);
type = (AlterType)GPOINTER_TO_INT(data);
- image_alter(lw->image, type);
-}
-
-static void li_pop_menu_info_cb(GtkWidget *widget, gpointer data)
-{
- LayoutWindow *lw = data;
-
- info_window_new(layout_image_get_fd(lw), NULL, lw->full_screen ? lw->full_screen->window : NULL);
+ image_alter_orientation(lw->image, type);
}
static void li_pop_menu_new_cb(GtkWidget *widget, gpointer data)
if (fd) layout_set_fd(lw, fd);
}
-static gint li_check_if_current_path(LayoutWindow *lw, const gchar *path)
+static gboolean li_check_if_current_path(LayoutWindow *lw, const gchar *path)
{
gchar *dirname;
- gint ret;
+ gboolean ret;
if (!path || !layout_valid(&lw) || !lw->dir_fd) return FALSE;
return ret;
}
+static void layout_image_popup_menu_destroy_cb(GtkWidget *widget, gpointer data)
+{
+ GList *editmenu_fd_list = data;
+
+ filelist_free(editmenu_fd_list);
+}
+
+static GList *layout_image_get_fd_list(LayoutWindow *lw)
+{
+ GList *list = NULL;
+ FileData *fd = layout_image_get_fd(lw);
+
+ if (fd)
+ {
+ if (lw->vf)
+ /* optionally include sidecars if the filelist entry is not expanded */
+ list = vf_selection_get_one(lw->vf, fd);
+ else
+ list = g_list_append(NULL, file_data_ref(fd));
+ }
+
+ return list;
+}
+
static GtkWidget *layout_image_pop_menu(LayoutWindow *lw)
{
GtkWidget *menu;
GtkWidget *item;
GtkWidget *submenu;
const gchar *path;
- gint fullscreen;
+ gboolean fullscreen;
+ GList *editmenu_fd_list;
path = layout_image_get_path(lw);
fullscreen = layout_image_full_screen_active(lw);
menu_item_add_stock(menu, _("Fit image to _window"), GTK_STOCK_ZOOM_FIT, G_CALLBACK(li_pop_menu_zoom_fit_cb), lw);
menu_item_add_divider(menu);
- submenu = submenu_add_edit(menu, &item, G_CALLBACK(li_pop_menu_edit_cb), lw);
+ editmenu_fd_list = layout_image_get_fd_list(lw);
+ g_signal_connect(G_OBJECT(menu), "destroy",
+ G_CALLBACK(layout_image_popup_menu_destroy_cb), editmenu_fd_list);
+ submenu = submenu_add_edit(menu, &item, G_CALLBACK(li_pop_menu_edit_cb), lw, editmenu_fd_list);
if (!path) gtk_widget_set_sensitive(item, FALSE);
menu_item_add_divider(submenu);
menu_item_add(submenu, _("Set as _wallpaper"), G_CALLBACK(li_pop_menu_wallpaper_cb), lw);
item = submenu_add_alter(menu, G_CALLBACK(li_pop_menu_alter_cb), lw);
- item = menu_item_add_stock(menu, _("_Properties"), GTK_STOCK_PROPERTIES, G_CALLBACK(li_pop_menu_info_cb), lw);
- if (!path) gtk_widget_set_sensitive(item, FALSE);
-
item = menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(li_pop_menu_new_cb), lw);
if (!path || fullscreen) gtk_widget_set_sensitive(item, FALSE);
item = menu_item_add_stock(menu, _("_Delete..."), GTK_STOCK_DELETE, G_CALLBACK(li_pop_menu_delete_cb), lw);
if (!path) gtk_widget_set_sensitive(item, FALSE);
- if (options->show_copy_path)
- {
- item = menu_item_add(menu, _("_Copy path"), G_CALLBACK(li_pop_menu_copy_path_cb), lw);
- if (!path) gtk_widget_set_sensitive(item, FALSE);
- }
+ item = menu_item_add(menu, _("_Copy path"), G_CALLBACK(li_pop_menu_copy_path_cb), lw);
+ if (!path) gtk_widget_set_sensitive(item, FALSE);
menu_item_add_divider(menu);
menu_item_add_divider(menu);
- item = menu_item_add_check(menu, _("Hide file _list"), lw->tools_hidden,
+ item = menu_item_add_check(menu, _("Hide file _list"), lw->options.tools_hidden,
G_CALLBACK(li_pop_menu_hide_cb), lw);
if (fullscreen) gtk_widget_set_sensitive(item, FALSE);
{
LayoutWindow *lw = data;
- gdk_window_get_origin(lw->image->pr->window, x, y);
+ gdk_window_get_origin(gtk_widget_get_window(lw->image->pr), x, y);
popup_menu_position_clamp(menu, x, y, 0);
}
if (i < MAX_SPLIT_IMAGES)
{
DEBUG_1("dnd image activate %d", i);
- layout_image_activate(lw, i);
+ layout_image_activate(lw, i, FALSE);
}
if (info == TARGET_URI_LIST)
{
- list = uri_filelist_from_text((gchar *)selection_data->data, TRUE);
+ list = uri_filelist_from_gtk_selection_data(selection_data);
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)
FileData *dir_fd;
base = remove_level_from_path(fd->path);
- dir_fd = file_data_new_simple(base);
+ dir_fd = file_data_new_dir(base);
if (dir_fd != lw->dir_fd)
{
layout_set_fd(lw, dir_fd);
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, fd);
- text = uri_text_from_filelist(list, &len, plain_text);
+ 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,
+ gtk_selection_data_set(selection_data, gtk_selection_data_get_target(selection_data),
8, NULL, 0);
}
}
static void layout_image_dnd_end(GtkWidget *widget, GdkDragContext *context, gpointer data)
{
LayoutWindow *lw = data;
- if (context->action == GDK_ACTION_MOVE)
+ if (gdk_drag_context_get_selected_action(context) == GDK_ACTION_MOVE)
{
FileData *fd;
gint row;
image_scroll(lw->image, x, y);
+ if (lw->full_screen && lw->image != lw->full_screen->imd)
+ {
+ image_scroll(lw->full_screen->imd, x, y);
+ }
+
if (!connect_scroll) return;
image_get_image_size(lw->image, &width, &height);
image_zoom_adjust(lw->image, increment);
+ if (lw->full_screen && lw->image != lw->full_screen->imd)
+ {
+ image_zoom_adjust(lw->full_screen->imd, increment);
+ }
+
if (!connect_zoom) return;
for (i = 0; i < MAX_SPLIT_IMAGES; i++)
image_zoom_adjust_at_point(lw->image, increment, x, y);
+ if (lw->full_screen && lw->image != lw->full_screen->imd)
+ {
+ image_zoom_adjust_at_point(lw->full_screen->imd, increment, x, y);
+ }
+
if (!connect_zoom) return;
for (i = 0; i < MAX_SPLIT_IMAGES; i++)
image_zoom_set(lw->image, zoom);
+ if (lw->full_screen && lw->image != lw->full_screen->imd)
+ {
+ image_zoom_set(lw->full_screen->imd, zoom);
+ }
+
if (!connect_zoom) return;
for (i = 0; i < MAX_SPLIT_IMAGES; i++)
}
}
-void layout_image_zoom_set_fill_geometry(LayoutWindow *lw, gint vertical, gboolean connect_zoom)
+void layout_image_zoom_set_fill_geometry(LayoutWindow *lw, gboolean vertical, gboolean connect_zoom)
{
gint i;
if (!layout_valid(&lw)) return;
image_zoom_set_fill_geometry(lw->image, vertical);
+ if (lw->full_screen && lw->image != lw->full_screen->imd)
+ {
+ image_zoom_set_fill_geometry(lw->full_screen->imd, vertical);
+ }
+
if (!connect_zoom) return;
for (i = 0; i < MAX_SPLIT_IMAGES; i++)
}
}
-void layout_image_alter(LayoutWindow *lw, AlterType type)
+void layout_image_alter_orientation(LayoutWindow *lw, AlterType type)
{
if (!layout_valid(&lw)) return;
- image_alter(lw->image, type);
+ image_alter_orientation(lw->image, type);
+}
+
+void layout_image_set_desaturate(LayoutWindow *lw, gboolean desaturate)
+{
+ if (!layout_valid(&lw)) return;
+
+ image_set_desaturate(lw->image, desaturate);
+}
+
+gboolean layout_image_get_desaturate(LayoutWindow *lw)
+{
+ if (!layout_valid(&lw)) return FALSE;
+
+ return image_get_desaturate(lw->image);
+}
+
+/* stereo */
+/*
+gint layout_image_stereo_get(LayoutWindow *lw)
+{
+ if (!layout_valid(&lw)) return 0;
+
+ return image_stereo_get(lw->image);
+}
+
+void layout_image_stereo_set(LayoutWindow *lw, gint stereo_mode)
+{
+ if (!layout_valid(&lw)) return;
+
+ image_stereo_set(lw->image, stereo_mode);
+}
+void layout_image_stereo_swap(LayoutWindow *lw)
+{
+ if (!layout_valid(&lw)) return;
+
+ image_stereo_swap(lw->image);
+}
+*/
+
+gint layout_image_stereo_pixbuf_get(LayoutWindow *lw)
+{
+ if (!layout_valid(&lw)) return 0;
+
+ return image_stereo_pixbuf_get(lw->image);
+}
+
+void layout_image_stereo_pixbuf_set(LayoutWindow *lw, gint stereo_mode)
+{
+ if (!layout_valid(&lw)) return;
+
+ image_stereo_pixbuf_set(lw->image, stereo_mode);
}
const gchar *layout_image_get_path(LayoutWindow *lw)
image_change_fd(lw->image, fd, image_zoom_get_default(lw->image));
+ if (lw->full_screen && lw->image != lw->full_screen->imd)
+ {
+ image_change_fd(lw->full_screen->imd, fd, image_zoom_get_default(lw->full_screen->imd));
+ }
+
+
layout_list_sync_fd(lw, fd);
layout_image_slideshow_continue_check(lw);
layout_bars_new_image(lw);
layout_image_set_with_ahead(lw, fd, read_ahead_fd);
}
-static void layout_image_set_collection_real(LayoutWindow *lw, CollectionData *cd, CollectInfo *info, gint forward)
+static void layout_image_set_collection_real(LayoutWindow *lw, CollectionData *cd, CollectInfo *info, gboolean forward)
{
if (!layout_valid(&lw)) return;
}
void layout_image_color_profile_set(LayoutWindow *lw,
- gint input_type, gint screen_type,
- gint use_image)
+ gint input_type,
+ gboolean use_image)
{
if (!layout_valid(&lw)) return;
- image_color_profile_set(lw->image, input_type, screen_type, use_image);
+ image_color_profile_set(lw->image, input_type, use_image);
}
-gint layout_image_color_profile_get(LayoutWindow *lw,
- gint *input_type, gint *screen_type,
- gint *use_image)
+gboolean layout_image_color_profile_get(LayoutWindow *lw,
+ gint *input_type,
+ gboolean *use_image)
{
if (!layout_valid(&lw)) return FALSE;
- return image_color_profile_get(lw->image, input_type, screen_type, use_image);
+ return image_color_profile_get(lw->image, input_type, use_image);
}
-void layout_image_color_profile_set_use(LayoutWindow *lw, gint enable)
+void layout_image_color_profile_set_use(LayoutWindow *lw, gboolean enable)
{
if (!layout_valid(&lw)) return;
image_color_profile_set_use(lw->image, enable);
-
- if (lw->info_color)
- {
-#ifndef HAVE_LCMS
- enable = FALSE;
-#endif
- gtk_widget_set_sensitive(GTK_BIN(lw->info_color)->child, enable);
- }
}
-gint layout_image_color_profile_get_use(LayoutWindow *lw)
+gboolean layout_image_color_profile_get_use(LayoutWindow *lw)
{
if (!layout_valid(&lw)) return FALSE;
return image_color_profile_get_use(lw->image);
}
-gint layout_image_color_profile_get_from_image(LayoutWindow *lw)
+gboolean layout_image_color_profile_get_status(LayoutWindow *lw, gchar **image_profile, gchar **screen_profile)
{
if (!layout_valid(&lw)) return FALSE;
- return image_color_profile_get_from_image(lw->image);
+ return image_color_profile_get_status(lw->image, image_profile, screen_profile);
}
/*
return -1;
}
+static void layout_image_focus_in_cb(ImageWindow *imd, gpointer data)
+{
+ LayoutWindow *lw = data;
+
+ gint i = image_idx(lw, imd);
+
+ if (i != -1)
+ {
+ DEBUG_1("image activate focus_in %d", i);
+ layout_image_activate(lw, i, FALSE);
+ }
+}
+
static void layout_image_button_cb(ImageWindow *imd, GdkEventButton *event, gpointer data)
{
switch (event->button)
{
case MOUSE_BUTTON_LEFT:
- layout_image_next(lw);
+ if (lw->split_mode == SPLIT_NONE)
+ layout_image_next(lw);
break;
case MOUSE_BUTTON_MIDDLE:
- layout_image_prev(lw);
+ if (lw->split_mode == SPLIT_NONE)
+ layout_image_prev(lw);
break;
case MOUSE_BUTTON_RIGHT:
menu = layout_image_pop_menu(lw);
if (i != -1)
{
DEBUG_1("image activate scroll %d", i);
- layout_image_activate(lw, i);
+ layout_image_activate(lw, i, FALSE);
}
{
gint i;
LayoutWindow *lw = data;
+ gdouble sx, sy;
+
+ if (lw->full_screen && lw->image != lw->full_screen->imd &&
+ imd != lw->full_screen->imd)
+ {
+ if (event->state & GDK_CONTROL_MASK)
+ {
+ image_get_scroll_center(imd, &sx, &sy);
+ }
+ else
+ {
+ image_get_scroll_center(lw->full_screen->imd, &sx, &sy);
+ sx += dx;
+ sy += dy;
+ }
+ image_set_scroll_center(lw->full_screen->imd, sx, sy);
+ }
if (!(event->state & GDK_SHIFT_MASK)) return;
{
if (lw->split_images[i] && lw->split_images[i] != imd)
{
- gdouble sx, sy;
if (event->state & GDK_CONTROL_MASK)
{
if (i != -1)
{
- layout_image_activate(lw, i);
+ layout_image_activate(lw, i, FALSE);
}
switch (event->button)
if (i != -1)
{
- layout_image_activate(lw, i);
+ layout_image_activate(lw, i, FALSE);
}
/* continue as with active image */
image_set_scroll_func(lw->split_images[i], layout_image_scroll_cb, lw);
}
+/* Returns the length of an integer */
+static gint num_length(gint num)
+{
+ gint len = 0;
+ if (num < 0) num = -num;
+ while (num)
+ {
+ num /= 10;
+ len++;
+ }
+ return len;
+}
+
+void layout_status_update_pixel_cb(PixbufRenderer *pr, gpointer data)
+{
+ LayoutWindow *lw = data;
+ gint x_pixel, y_pixel;
+ gint width, height;
+ gchar *text;
+ PangoAttrList *attrs;
+
+ if (!data || !layout_valid(&lw) || !lw->image
+ || !lw->options.show_info_pixel || lw->image->unknown) return;
+
+ pixbuf_renderer_get_image_size(pr, &width, &height);
+ if (width < 1 || height < 1) return;
+
+ pixbuf_renderer_get_mouse_position(pr, &x_pixel, &y_pixel);
+
+ if(x_pixel >= 0 && y_pixel >= 0)
+ {
+ gint r_mouse, g_mouse, b_mouse;
+
+ pixbuf_renderer_get_pixel_colors(pr, x_pixel, y_pixel,
+ &r_mouse, &g_mouse, &b_mouse);
+
+ text = g_strdup_printf(_("[%*d,%*d]: RGB(%3d,%3d,%3d)"),
+ num_length(width - 1), x_pixel,
+ num_length(height - 1), y_pixel,
+ r_mouse, g_mouse, b_mouse);
+
+ }
+ else
+ {
+ text = g_strdup_printf(_("[%*s,%*s]: RGB(---,---,---)"),
+ num_length(width - 1), " ",
+ num_length(height - 1), " ");
+ }
+
+ attrs = pango_attr_list_new();
+ pango_attr_list_insert(attrs, pango_attr_family_new("Monospace"));
+ gtk_label_set_text(GTK_LABEL(lw->info_pixel), text);
+ gtk_label_set_attributes(GTK_LABEL(lw->info_pixel), attrs);
+ pango_attr_list_unref(attrs);
+ g_free(text);
+}
+
+
/*
*----------------------------------------------------------------------------
* setup
{
lw->split_images[i] = image_new(TRUE);
-#if GTK_CHECK_VERSION(2,12,0)
g_object_ref(lw->split_images[i]->widget);
-#else
- gtk_widget_ref(lw->split_images[i]->widget);
-#endif
- image_background_set_color(lw->split_images[i], options->image.use_custom_border_color ? &options->image.border_color : NULL);
+
+ g_signal_connect(G_OBJECT(lw->split_images[i]->pr), "update-pixel",
+ G_CALLBACK(layout_status_update_pixel_cb), lw);
+
+ image_background_set_color_from_options(lw->split_images[i], FALSE);
image_auto_refresh_enable(lw->split_images[i], TRUE);
layout_image_dnd_init(lw, i);
image_color_profile_set(lw->split_images[i],
options->color_profile.input_type,
- options->color_profile.screen_type,
options->color_profile.use_image);
image_color_profile_set_use(lw->split_images[i], options->color_profile.enabled);
gtk_size_group_add_widget(lw->split_image_sizegroup, lw->split_images[i]->widget);
+ gtk_widget_set_size_request(lw->split_images[i]->widget, IMAGE_MIN_WIDTH, -1);
+
+ image_set_focus_in_func(lw->split_images[i], layout_image_focus_in_cb, lw);
+
}
return lw->split_images[i]->widget;
void layout_image_deactivate(LayoutWindow *lw, gint i)
{
-
if (!lw->split_images[i]) return;
image_set_update_func(lw->split_images[i], NULL, NULL);
layout_image_set_buttons_inactive(lw, i);
image_select(lw->split_images[i], FALSE);
}
-
-void layout_image_activate(LayoutWindow *lw, gint i)
+/* force should be set after change of lw->split_mode */
+void layout_image_activate(LayoutWindow *lw, gint i, gboolean force)
{
FileData *fd;
if (!lw->split_images[i]) return;
+ if (!force && lw->active_split_image == i) return;
/* deactivate currently active */
if (lw->active_split_image != i)
// layout_list_sync_path(lw, path);
layout_set_fd(lw, fd);
}
+ layout_status_update_image(lw);
}
-GtkWidget *layout_image_setup_split_none(LayoutWindow *lw)
+static void layout_image_setup_split_common(LayoutWindow *lw, gint n)
{
+ gboolean frame = (n > 1) || (!lw->options.tools_float && !lw->options.tools_hidden);
gint i;
- lw->split_mode = SPLIT_NONE;
-
- if (!lw->split_images[0])
- {
- layout_image_new(lw, 0);
- image_set_frame(lw->split_images[0], (!lw->tools_float && !lw->tools_hidden));
- image_set_selectable(lw->split_images[0], 0);
- layout_image_activate(lw, 0);
- }
- else
- {
- image_set_frame(lw->split_images[0], (!lw->tools_float && !lw->tools_hidden));
- image_set_selectable(lw->split_images[0], 0);
- }
-
- for (i = 1; i < MAX_SPLIT_IMAGES; i++)
- {
- if (lw->split_images[i])
+ for (i = 0; i < n; i++)
+ if (!lw->split_images[i])
{
-#if GTK_CHECK_VERSION(2,12,0)
- g_object_unref(lw->split_images[i]->widget);
-#else
- gtk_widget_unref(lw->split_images[i]->widget);
-#endif
- lw->split_images[i] = NULL;
- }
- }
+ FileData *img_fd = NULL;
+ double zoom = 0.0;
+ layout_image_new(lw, i);
+ image_set_frame(lw->split_images[i], frame);
+ image_set_selectable(lw->split_images[i], (n > 1));
+
+ if (lw->image)
+ {
+ image_osd_copy_status(lw->image, lw->split_images[i]);
+ }
- layout_image_activate(lw, 0);
-
- lw->split_image_widget = lw->split_images[0]->widget;
+ if (layout_selection_count(lw, 0) > 1)
+ {
+ GList *work = g_list_last(layout_selection_list(lw));
+ gint j = 0;
+
+ if (work) work = work->prev;
- return lw->split_image_widget;
-}
+ while (work && j < i)
+ {
+ FileData *fd = work->data;
+ work = work->prev;
+
+ j++;
+ if (!fd || !*fd->path) continue;
+ img_fd = fd;
+ }
+ }
-static void layout_image_setup_split_common(LayoutWindow *lw, gint n)
-{
- gint i;
+ if (!img_fd && lw->image)
+ {
+ img_fd = image_get_fd(lw->image);
+ zoom = image_zoom_get(lw->image);
+ }
- for (i = 1; i < n; i++)
- if (!lw->split_images[i])
- {
- layout_image_new(lw, i);
- image_set_frame(lw->split_images[i], 1);
- image_set_selectable(lw->split_images[i], 1);
- if (lw->image)
+ if (img_fd)
{
gdouble sx, sy;
- image_change_fd(lw->split_images[i],
- image_get_fd(lw->image), image_zoom_get(lw->image));
+ image_change_fd(lw->split_images[i], img_fd, zoom);
image_get_scroll_center(lw->image, &sx, &sy);
image_set_scroll_center(lw->split_images[i], sx, sy);
}
}
else
{
- image_set_frame(lw->split_images[i], 1);
- image_set_selectable(lw->split_images[i], 1);
+ image_set_frame(lw->split_images[i], frame);
+ image_set_selectable(lw->split_images[i], (n > 1));
}
for (i = n; i < MAX_SPLIT_IMAGES; i++)
{
if (lw->split_images[i])
{
-#if GTK_CHECK_VERSION(2,12,0)
g_object_unref(lw->split_images[i]->widget);
-#else
- gtk_widget_unref(lw->split_images[i]->widget);
-#endif
lw->split_images[i] = NULL;
}
}
if (!lw->image || lw->active_split_image < 0 || lw->active_split_image >= n)
{
- layout_image_activate(lw, 0);
+ layout_image_activate(lw, 0, TRUE);
+ }
+ else
+ {
+ /* this will draw the frame around selected image (image_select)
+ on switch from single to split images */
+ layout_image_activate(lw, lw->active_split_image, TRUE);
}
+}
+GtkWidget *layout_image_setup_split_none(LayoutWindow *lw)
+{
+ lw->split_mode = SPLIT_NONE;
+
+ layout_image_setup_split_common(lw, 1);
+
+ lw->split_image_widget = lw->split_images[0]->widget;
+
+ return lw->split_image_widget;
}
+
GtkWidget *layout_image_setup_split_hv(LayoutWindow *lw, gboolean horizontal)
{
GtkWidget *paned;
lw->split_mode = horizontal ? SPLIT_HOR : SPLIT_VERT;
- if (!lw->split_images[0])
- {
- layout_image_new(lw, 0);
- }
- image_set_frame(lw->split_images[0], 1);
- image_set_selectable(lw->split_images[0], 1);
-
layout_image_setup_split_common(lw, 2);
/* horizontal split means vpaned and vice versa */
lw->split_mode = SPLIT_QUAD;
- if (!lw->split_images[0])
- {
- layout_image_new(lw, 0);
- }
-
- image_set_frame(lw->split_images[0], 1);
- image_set_selectable(lw->split_images[0], 1);
-
- if (!lw->split_images[1])
- {
- layout_image_activate(lw, 0);
- }
-
layout_image_setup_split_common(lw, 4);
-
hpaned = gtk_hpaned_new();
vpaned1 = gtk_vpaned_new();
vpaned2 = gtk_vpaned_new();
gtk_paned_pack1(GTK_PANED(hpaned), vpaned1, TRUE, TRUE);
gtk_paned_pack2(GTK_PANED(hpaned), vpaned2, TRUE, TRUE);
-
for (i = 0; i < 4; i++)
gtk_widget_show(lw->split_images[i]->widget);
gtk_widget_show(vpaned1);
gtk_widget_show(vpaned2);
-
lw->split_image_widget = hpaned;
return lw->split_image_widget;
static void layout_image_maint_renamed(LayoutWindow *lw, FileData *fd)
{
- FileData *img_fd;
-
- img_fd = layout_image_get_fd(lw);
- if (img_fd == fd)
+ if (fd == layout_image_get_fd(lw))
{
image_set_fd(lw->image, fd);
- layout_bars_maint_renamed(lw);
}
}
static void layout_image_maint_removed(LayoutWindow *lw, FileData *fd)
{
- FileData *img_fd;
-
- img_fd = layout_image_get_fd(lw);
- if (img_fd == fd)
+ if (fd == layout_image_get_fd(lw))
{
CollectionData *cd;
CollectInfo *info;
layout_image_set_collection(lw, cd, new);
return;
}
+ layout_image_set_fd(lw, NULL);
}
-
- layout_image_set_fd(lw, NULL);
+
+ /* the image will be set to the next image from the list soon,
+ setting it to NULL here is not necessary*/
}
}
{
LayoutWindow *lw = data;
- if (type != NOTIFY_TYPE_CHANGE || !fd->change) return;
+ if (!(type & NOTIFY_CHANGE) || !fd->change) return;
+
+ DEBUG_1("Notify layout_image: %s %04x", fd->path, type);
- switch(fd->change->type)
+ switch (fd->change->type)
{
case FILEDATA_CHANGE_MOVE:
case FILEDATA_CHANGE_RENAME:
break;
case FILEDATA_CHANGE_COPY:
case FILEDATA_CHANGE_UNSPECIFIED:
+ case FILEDATA_CHANGE_WRITE_METADATA:
break;
}
projects / geeqie.git / blobdiff