X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=blobdiff_plain;f=src%2Flayout_image.c;h=091a75dd6250a70222e7145fc40e63444102556a;hp=637c6129d0bfb3f46927b3b29dd3854b2de546aa;hb=e826f76dba8d57420edcfcf4bf47612798aadfa7;hpb=56b0d6ecccbd5ef448fb59983828fccc2c5dd5a2

diff --git a/src/layout_image.c b/src/layout_image.c
index 637c6129..091a75dd 100644
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -1,7 +1,7 @@
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
@@ -14,6 +14,7 @@
 #include "layout_image.h"
 
 #include "collect.h"
+#include "color-man.h"
 #include "dnd.h"
 #include "editors.h"
 #include "filedata.h"
@@ -21,16 +22,18 @@
 #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 "utilops.h"
+#include "pixbuf-renderer.h"
 #include "slideshow.h"
-#include "ui_bookmark.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 */
 
@@ -55,276 +58,14 @@ void layout_image_overlay_toggle(LayoutWindow *lw)
  * full screen
  *----------------------------------------------------------------------------
  */
-#if 0
-static void layout_image_fullscreen_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data)
-{
-	LayoutWindow *lw = data;
-
-	if (!lw->full_screen) return;
-
-	gdk_window_get_origin(lw->full_screen->imd->pr->window, x, y);
-	popup_menu_position_clamp(menu, x, y, 0);
-}
-
-static void layout_image_full_screen_menu_popup(LayoutWindow *lw)
-{
-	GtkWidget *menu;
-
-	menu = layout_image_pop_menu(lw);
-	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, layout_image_fullscreen_menu_pos_cb, lw, 0, GDK_CURRENT_TIME);
-}
-
-/* this is handled by layout_key_press_cb */
-
-
-static gint layout_image_full_screen_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
-{
-	LayoutWindow *lw = data;
-	gint stop_signal;
-	gint x = 0;
-	gint y = 0;
-
-	stop_signal = TRUE;
-	switch (event->keyval)
-		{
-		case GDK_Left: case GDK_KP_Left:
-			x -= 1;
-			break;
-		case GDK_Right: case GDK_KP_Right:
-			x += 1;
-			break;
-		case GDK_Up: case GDK_KP_Up:
-			y -= 1;
-			break;
-		case GDK_Down: case GDK_KP_Down:
-			y += 1;
-			break;
-		default:
-			stop_signal = FALSE;
-			break;
-		}
-
-	if (x != 0 || y!= 0)
-		{
-		if (event->state & GDK_SHIFT_MASK)
-			{
-			x *= 3;
-			y *= 3;
-			}
-
-		keyboard_scroll_calc(&x, &y, event);
-		layout_image_scroll(lw, x, y);
-		}
-
-	if (stop_signal) return stop_signal;
-
-	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(layout_image_get_fd(lw), NULL, NULL, widget);
-				break;
-			case 'M': case 'm':
-				file_util_move(layout_image_get_fd(lw), NULL, NULL, widget);
-				break;
-			case 'R': case 'r':
-				file_util_rename(layout_image_get_fd(lw), NULL, widget);
-				break;
-			case 'D': case 'd':
-				file_util_delete(layout_image_get_fd(lw), NULL, widget);
-				break;
-			case 'P': case 'p':
-				info_window_new(layout_image_get_fd(lw), NULL, NULL);
-				break;
-			case 'Q': case 'q':
-				exit_program();
-				return FALSE;
-				break;
-			default:
-				stop_signal = FALSE;
-				break;
-			}
-		if (n != -1)
-			{
-			if (!editor_window_flag_set(n))
-				{
-				layout_image_full_screen_stop(lw);
-				}
-			file_util_start_editor_from_file(n, layout_image_get_fd(lw), lw->widget);
-			}
-		}
-	else if (event->state & GDK_SHIFT_MASK)
-		{
-		stop_signal = TRUE;
-		switch (event->keyval)
-			{
-			case 'R': case 'r':
-				layout_image_alter(lw, ALTER_ROTATE_180);
-				break;
-			case 'M': case 'm':
-				layout_image_alter(lw, ALTER_MIRROR);
-				break;
-			case 'F': case 'f':
-				layout_image_alter(lw, ALTER_FLIP);
-				break;
-			case 'G': case 'g':
-				layout_image_alter(lw, ALTER_DESATURATE);
-				break;
-			default:
-				stop_signal = FALSE;
-				break;
-			}
-		}
-	else
-		{
-		stop_signal = TRUE;
-		switch (event->keyval)
-			{
-			case '+': case '=': case GDK_KP_Add:
-				layout_image_zoom_adjust(lw, get_zoom_increment());
-				break;
-			case '-': case GDK_KP_Subtract:
-				layout_image_zoom_adjust(lw, -get_zoom_increment());
-				break;
-			case 'X': case 'x': case GDK_KP_Multiply:
-				layout_image_zoom_set(lw, 0.0);
-				break;
-			case 'Z': case 'z': case GDK_KP_Divide:
-			case '1':
-				layout_image_zoom_set(lw, 1.0);
-				break;
-			case '2':
-				layout_image_zoom_set(lw, 2.0);
-				break;
-			case '3':
-				layout_image_zoom_set(lw, 3.0);
-				break;
-			case '4':
-				layout_image_zoom_set(lw, 4.0);
-				break;
-			case '7':
-				layout_image_zoom_set(lw, -4.0);
-				break;
-			case '8':
-				layout_image_zoom_set(lw, -3.0);
-				break;
-			case '9':
-				layout_image_zoom_set(lw, -2.0);
-				break;
-			case 'W': case 'w':
-				layout_image_zoom_set_fill_geometry(lw, FALSE);
-				break;
-			case 'H': case 'h':
-				layout_image_zoom_set_fill_geometry(lw, TRUE);
-				break;
-			case GDK_Page_Up: case GDK_KP_Page_Up:
-			case GDK_BackSpace:
-			case 'B': case 'b':
-				layout_image_prev(lw);
-				break;
-			case GDK_Page_Down: case GDK_KP_Page_Down:
-			case GDK_space:
-			case 'N': case 'n':
-				layout_image_next(lw);
-				break;
-			case GDK_Home: case GDK_KP_Home:
-				layout_image_first(lw);
-				break;
-			case GDK_End: case GDK_KP_End:
-				layout_image_last(lw);
-				break;
-			case ']':
-				layout_image_alter(lw, ALTER_ROTATE_90);
-				break;
-			case '[':
-				layout_image_alter(lw, ALTER_ROTATE_90_CC);
-				break;
-			case GDK_Delete: case GDK_KP_Delete:
-				if (enable_delete_key)
-					{
-					file_util_delete(layout_image_get_fd(lw), NULL, widget);
-					}
-				break;
-			case GDK_Escape:
-				layout_image_full_screen_stop(lw);
-				break;
-			case 'R': case 'r':
-				layout_refresh(lw);
-				break;
-			case 'S': case 's':
-				layout_image_slideshow_toggle(lw);
-				break;
-			case 'P': case 'p':
-				layout_image_slideshow_pause_toggle(lw);
-				break;
-			case 'F': case 'f':
-			case 'V': case 'v':
-			case GDK_F11:
-				layout_image_full_screen_stop(lw);
-				break;
-			case GDK_Menu:
-			case GDK_F10:
-				layout_image_full_screen_menu_popup(lw);
-				break;
-			case 'I': case 'i':
-				layout_image_overlay_toggle(lw);
-				break;
-			default:
-				stop_signal = FALSE;
-				break;
-			}
-		}
-
-	return stop_signal;
-}
-
-#endif
 
 static void layout_image_full_screen_stop_func(FullScreenData *fs, gpointer data)
 {
 	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;
 }
@@ -339,12 +80,8 @@ void layout_image_full_screen_start(LayoutWindow *lw)
 					   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);
 
@@ -352,16 +89,8 @@ void layout_image_full_screen_start(LayoutWindow *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)
@@ -369,15 +98,10 @@ 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)
@@ -393,7 +117,7 @@ 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;
 
@@ -436,13 +160,13 @@ void layout_image_slideshow_start(LayoutWindow *lw)
 
 	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,
-				layout_list_get_index(lw, layout_image_get_path(lw)),
+		lw->slideshow = slideshow_start(lw,
+				layout_list_get_index(lw, layout_image_get_fd(lw)),
 				layout_image_slideshow_stop_func, lw);
 		}
 
@@ -460,7 +184,7 @@ void layout_image_slideshow_start_from_list(LayoutWindow *lw, GList *list)
 		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);
@@ -490,16 +214,16 @@ void layout_image_slideshow_toggle(LayoutWindow *lw)
 		}
 }
 
-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;
 
@@ -510,14 +234,14 @@ gint layout_image_slideshow_pause_toggle(LayoutWindow *lw)
 	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;
 
@@ -540,42 +264,41 @@ static void li_pop_menu_zoom_in_cb(GtkWidget *widget, gpointer data)
 {
 	LayoutWindow *lw = data;
 
-	layout_image_zoom_adjust(lw, get_zoom_increment());
+	layout_image_zoom_adjust(lw, get_zoom_increment(), FALSE);
 }
 
 static void li_pop_menu_zoom_out_cb(GtkWidget *widget, gpointer data)
 {
 	LayoutWindow *lw = data;
-	layout_image_zoom_adjust(lw, -get_zoom_increment());
+	layout_image_zoom_adjust(lw, -get_zoom_increment(), FALSE);
 }
 
 static void li_pop_menu_zoom_1_1_cb(GtkWidget *widget, gpointer data)
 {
 	LayoutWindow *lw = data;
 
-	layout_image_zoom_set(lw, 1.0);
+	layout_image_zoom_set(lw, 1.0, FALSE);
 }
 
 static void li_pop_menu_zoom_fit_cb(GtkWidget *widget, gpointer data)
 {
 	LayoutWindow *lw = data;
 
-	layout_image_zoom_set(lw, 0.0);
+	layout_image_zoom_set(lw, 0.0, 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)
@@ -593,14 +316,7 @@ static void li_pop_menu_alter_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)
@@ -705,34 +421,59 @@ static void li_pop_menu_hide_cb(GtkWidget *widget, gpointer data)
 static void li_set_layout_path_cb(GtkWidget *widget, gpointer data)
 {
 	LayoutWindow *lw = data;
-	const gchar *path;
+	FileData *fd;
 
 	if (!layout_valid(&lw)) return;
 
-	path = layout_image_get_path(lw);
-	if (path) layout_set_path(lw, path);
+	fd = layout_image_get_fd(lw);
+	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->path) return FALSE;
+	if (!path || !layout_valid(&lw) || !lw->dir_fd) return FALSE;
 
 	dirname = g_path_get_dirname(path);
-	ret = (strcmp(lw->path, dirname) == 0);
+	ret = (strcmp(lw->dir_fd->path, dirname) == 0);
 	g_free(dirname);
 	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);
@@ -745,16 +486,16 @@ static GtkWidget *layout_image_pop_menu(LayoutWindow *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);
 
@@ -772,11 +513,8 @@ static GtkWidget *layout_image_pop_menu(LayoutWindow *lw)
 	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);
 
@@ -812,7 +550,7 @@ static GtkWidget *layout_image_pop_menu(LayoutWindow *lw)
 
 	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);
 
@@ -823,7 +561,7 @@ static void layout_image_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *
 {
 	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);
 }
 
@@ -858,7 +596,7 @@ static void layout_image_dnd_receive(GtkWidget *widget, GdkDragContext *context,
 	if (i < MAX_SPLIT_IMAGES)
 		{
 		DEBUG_1("dnd image activate %d", i);
-		layout_image_activate(lw, i);
+		layout_image_activate(lw, i, FALSE);
 		}
 
 
@@ -870,13 +608,13 @@ static void layout_image_dnd_receive(GtkWidget *widget, GdkDragContext *context,
 
 		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)
@@ -887,15 +625,18 @@ static void layout_image_dnd_receive(GtkWidget *widget, GdkDragContext *context,
 				{
 				gchar *base;
 				gint row;
+				FileData *dir_fd;
 
 				base = remove_level_from_path(fd->path);
-				if (strcmp(base, layout_get_path(lw)) != 0)
+				dir_fd = file_data_new_dir(base);
+				if (dir_fd != lw->dir_fd)
 					{
-					layout_set_path(lw, base);
+					layout_set_fd(lw, dir_fd);
 					}
+				file_data_unref(dir_fd);
 				g_free(base);
 
-				row = layout_list_get_index(lw, fd->path);
+				row = layout_list_get_index(lw, fd);
 				if (source && info_list)
 					{
 					layout_image_set_collection(lw, source, info_list->data);
@@ -911,7 +652,7 @@ static void layout_image_dnd_receive(GtkWidget *widget, GdkDragContext *context,
 				}
 			else if (isdir(fd->path))
 				{
-				layout_set_path(lw, fd->path);
+				layout_set_fd(lw, fd);
 				layout_image_set_fd(lw, NULL);
 				}
 			}
@@ -945,34 +686,15 @@ static void layout_image_dnd_get(GtkWidget *widget, GdkDragContext *context,
 
 	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);
 		}
 }
@@ -980,16 +702,16 @@ static void layout_image_dnd_get(GtkWidget *widget, GdkDragContext *context,
 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)
 		{
-		const gchar *path;
+		FileData *fd;
 		gint row;
 
-		path = layout_image_get_path(lw);
-		row = layout_list_get_index(lw, path);
+		fd = layout_image_get_fd(lw);
+		row = layout_list_get_index(lw, fd);
 		if (row < 0) return;
 
-		if (!isfile(path))
+		if (!isfile(fd->path))
 			{
 			if ((guint) row < layout_list_count(lw, NULL) - 1)
 				{
@@ -1042,7 +764,7 @@ void layout_image_to_root(LayoutWindow *lw)
  *----------------------------------------------------------------------------
  */
 
-void layout_image_scroll(LayoutWindow *lw, gint x, gint y)
+void layout_image_scroll(LayoutWindow *lw, gint x, gint y, gboolean connect_scroll)
 {
 	gdouble dx, dy;
 	gint width, height, i;
@@ -1050,13 +772,20 @@ void layout_image_scroll(LayoutWindow *lw, gint x, gint y)
 
 	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);
 	dx = (gdouble) x / width;
 	dy = (gdouble) y / height;
 	
 	for (i = 0; i < MAX_SPLIT_IMAGES; i++)
 		{
-		if (lw->split_images[i] && lw->split_images[i] != lw->image && lw->connect_scroll)
+		if (lw->split_images[i] && lw->split_images[i] != lw->image)
 			{
 			gdouble sx, sy;
 			image_get_scroll_center(lw->split_images[i], &sx, &sy);
@@ -1068,60 +797,146 @@ void layout_image_scroll(LayoutWindow *lw, gint x, gint y)
 
 }
 
-void layout_image_zoom_adjust(LayoutWindow *lw, gdouble increment)
+void layout_image_zoom_adjust(LayoutWindow *lw, gdouble increment, gboolean connect_zoom)
 {
 	gint i;
 	if (!layout_valid(&lw)) return;
 
 	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++)
 		{
-		if (lw->split_images[i] && lw->split_images[i] != lw->image && lw->connect_zoom)
+		if (lw->split_images[i] && lw->split_images[i] != lw->image)
 			image_zoom_adjust(lw->split_images[i], increment); ;
 		}
 }
 
-void layout_image_zoom_adjust_at_point(LayoutWindow *lw, gdouble increment, gint x, gint y)
+void layout_image_zoom_adjust_at_point(LayoutWindow *lw, gdouble increment, gint x, gint y, gboolean connect_zoom)
 {
 	gint i;
 	if (!layout_valid(&lw)) return;
 
 	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++)
 		{
-		if (lw->split_images[i] && lw->split_images[i] != lw->image && lw->connect_zoom)
+		if (lw->split_images[i] && lw->split_images[i] != lw->image)
 			image_zoom_adjust_at_point(lw->split_images[i], increment, x, y);
 		}
 }
 
-void layout_image_zoom_set(LayoutWindow *lw, gdouble zoom)
+void layout_image_zoom_set(LayoutWindow *lw, gdouble zoom, gboolean connect_zoom)
 {
 	gint i;
 	if (!layout_valid(&lw)) return;
 
 	image_zoom_set(lw->image, zoom);
 
-	for (i=0; i < MAX_SPLIT_IMAGES; i++)
+	if (lw->full_screen && lw->image != lw->full_screen->imd)
 		{
-		if (lw->split_images[i] && lw->split_images[i] != lw->image && lw->connect_zoom)
+		image_zoom_set(lw->full_screen->imd, zoom); 
+		}
+
+	if (!connect_zoom) return;
+
+	for (i = 0; i < MAX_SPLIT_IMAGES; i++)
+		{
+		if (lw->split_images[i] && lw->split_images[i] != lw->image)
 			image_zoom_set(lw->split_images[i], zoom);
 		}
 }
 
-void layout_image_zoom_set_fill_geometry(LayoutWindow *lw, gint vertical)
+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++)
+		{
+		if (lw->split_images[i] && lw->split_images[i] != lw->image)
+			image_zoom_set_fill_geometry(lw->split_images[i], vertical);
+		}
+}
+
+void layout_image_alter_orientation(LayoutWindow *lw, AlterType type)
+{
+	if (!layout_valid(&lw)) return;
+
+	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;
 
-void layout_image_alter(LayoutWindow *lw, AlterType type)
+	return image_stereo_pixbuf_get(lw->image);
+}
+
+void layout_image_stereo_pixbuf_set(LayoutWindow *lw, gint stereo_mode)
 {
 	if (!layout_valid(&lw)) return;
 
-	image_alter(lw->image, type);
+	image_stereo_pixbuf_set(lw->image, stereo_mode);
 }
 
 const gchar *layout_image_get_path(LayoutWindow *lw)
@@ -1154,7 +969,7 @@ CollectionData *layout_image_get_collection(LayoutWindow *lw, CollectInfo **info
 
 gint layout_image_get_index(LayoutWindow *lw)
 {
-	return layout_list_get_index(lw, image_get_path(lw->image));
+	return layout_list_get_index(lw, image_get_fd(lw->image));
 }
 
 /*
@@ -1165,14 +980,15 @@ gint layout_image_get_index(LayoutWindow *lw)
 
 void layout_image_set_fd(LayoutWindow *lw, FileData *fd)
 {
-	gdouble sx, sy;
 	if (!layout_valid(&lw)) return;
 
-	image_get_scroll_center(lw->image, &sx, &sy);
+	image_change_fd(lw->image, fd, image_zoom_get_default(lw->image));
 
-	image_change_fd(lw->image, fd, image_zoom_get_default(lw->image, options->image.zoom_mode));
+	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));
+		}
 
-	image_set_scroll_center(lw->image, sx, sy);
 
 	layout_list_sync_fd(lw, fd);
 	layout_image_slideshow_continue_check(lw);
@@ -1205,7 +1021,7 @@ void layout_image_set_index(LayoutWindow *lw, gint index)
 
 	if (!layout_valid(&lw)) return;
 
-	old = layout_list_get_index(lw, layout_image_get_path(lw));
+	old = layout_list_get_index(lw, layout_image_get_fd(lw));
 	fd = layout_list_get_fd(lw, index);
 
 	if (old > index)
@@ -1217,14 +1033,14 @@ void layout_image_set_index(LayoutWindow *lw, gint index)
 		read_ahead_fd = layout_list_get_fd(lw, index + 1);
 		}
 
- 	if (layout_selection_count(lw, 0) > 1)
+	if (layout_selection_count(lw, 0) > 1)
 		{
- 		GList *x = layout_selection_list_by_index(lw);
- 	  	GList *y;
- 	  	GList *last;
+		GList *x = layout_selection_list_by_index(lw);
+		GList *y;
+		GList *last;
 
- 		for (last = y = x; y; y = y->next)
- 			last = y;
+		for (last = y = x; y; y = y->next)
+			last = y;
 		for (y = x; y && (GPOINTER_TO_INT(y->data)) != index; y = y->next)
 			;
 
@@ -1233,7 +1049,7 @@ void layout_image_set_index(LayoutWindow *lw, gint index)
 			gint newindex;
 
 			if ((index > old && (index != GPOINTER_TO_INT(last->data) || old != GPOINTER_TO_INT(x->data)))
- 	        	    || (old == GPOINTER_TO_INT(last->data) && index == GPOINTER_TO_INT(x->data)))
+			    || (old == GPOINTER_TO_INT(last->data) && index == GPOINTER_TO_INT(x->data)))
 				{
 				if (y->next)
 					newindex = GPOINTER_TO_INT(y->next->data);
@@ -1246,7 +1062,7 @@ void layout_image_set_index(LayoutWindow *lw, gint index)
 					newindex = GPOINTER_TO_INT(y->prev->data);
 				else
 					newindex = GPOINTER_TO_INT(last->data);
- 	    			}
+				}
 
 			read_ahead_fd = layout_list_get_fd(lw, newindex);
 			}
@@ -1258,11 +1074,11 @@ void layout_image_set_index(LayoutWindow *lw, gint index)
 	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;
 
-	image_change_from_collection(lw->image, cd, info, image_zoom_get_default(lw->image, options->image.zoom_mode));
+	image_change_from_collection(lw->image, cd, info, image_zoom_get_default(lw->image));
 	if (options->image.enable_read_ahead)
 		{
 		CollectInfo *r_info;
@@ -1297,50 +1113,42 @@ void layout_image_refresh(LayoutWindow *lw)
 }
 
 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);
 }
 
 /*
@@ -1366,7 +1174,7 @@ void layout_image_next(LayoutWindow *lw)
 	if (layout_selection_count(lw, 0) > 1)
 		{
 		GList *x = layout_selection_list_by_index(lw);
-		gint old = layout_list_get_index(lw, layout_image_get_path(lw));
+		gint old = layout_list_get_index(lw, layout_image_get_fd(lw));
 		GList *y;
 
 		for (y = x; y && (GPOINTER_TO_INT(y->data)) != old; y = y->next)
@@ -1436,7 +1244,7 @@ void layout_image_prev(LayoutWindow *lw)
 	if (layout_selection_count(lw, 0) > 1)
 		{
 		GList *x = layout_selection_list_by_index(lw);
-		gint old = layout_list_get_index(lw, layout_image_get_path(lw));
+		gint old = layout_list_get_index(lw, layout_image_get_fd(lw));
 		GList *y;
 		GList *last;
 
@@ -1566,20 +1374,34 @@ static gint image_idx(LayoutWindow *lw, ImageWindow *imd)
 	return -1;
 }
 
+static void layout_image_focus_in_cb(ImageWindow *imd, gpointer data)
+{
+	LayoutWindow *lw = data;
+
+	gint i = image_idx(lw, imd);
 
-static void layout_image_button_cb(ImageWindow *imd, gint button, guint32 time,
-				   gdouble x, gdouble y, guint state, gpointer data)
+	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)
 {
 	LayoutWindow *lw = data;
 	GtkWidget *menu;
 
-	switch (button)
+	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);
@@ -1587,15 +1409,14 @@ static void layout_image_button_cb(ImageWindow *imd, gint button, guint32 time,
 				{
 				g_object_set_data(G_OBJECT(menu), "click_parent", imd->widget);
 				}
-			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 layout_image_scroll_cb(ImageWindow *imd, GdkScrollDirection direction, guint32 time,
-				   gdouble x, gdouble y, guint state, gpointer data)
+static void layout_image_scroll_cb(ImageWindow *imd, GdkEventScroll *event, gpointer data)
 {
 	LayoutWindow *lw = data;
 
@@ -1604,27 +1425,27 @@ static void layout_image_scroll_cb(ImageWindow *imd, GdkScrollDirection directio
 	if (i != -1)
 		{
 		DEBUG_1("image activate scroll %d", i);
-		layout_image_activate(lw, i);
+		layout_image_activate(lw, i, FALSE);
 		}
 
 
-	if (state & GDK_CONTROL_MASK)
+	if (event->state & GDK_CONTROL_MASK)
 		{
-		switch (direction)
+		switch (event->direction)
 			{
 			case GDK_SCROLL_UP:
-				layout_image_zoom_adjust_at_point(lw, get_zoom_increment(), x, y);
+				layout_image_zoom_adjust_at_point(lw, get_zoom_increment(), event->x, event->y, event->state & GDK_SHIFT_MASK);
 				break;
 			case GDK_SCROLL_DOWN:
-				layout_image_zoom_adjust_at_point(lw, -get_zoom_increment(), x, y);
+				layout_image_zoom_adjust_at_point(lw, -get_zoom_increment(), event->x, event->y, event->state & GDK_SHIFT_MASK);
 				break;
 			default:
 				break;
 			}
 		}
-	else if ( (state & GDK_SHIFT_MASK) != (guint) (options->mousewheel_scrolls))
+	else if (options->mousewheel_scrolls)
 		{
-		switch (direction)
+		switch (event->direction)
 			{
 			case GDK_SCROLL_UP:
 				image_scroll(imd, 0, -MOUSEWHEEL_SCROLL_SIZE);
@@ -1644,7 +1465,7 @@ static void layout_image_scroll_cb(ImageWindow *imd, GdkScrollDirection directio
 		}
 	else
 		{
-		switch (direction)
+		switch (event->direction)
 			{
 			case GDK_SCROLL_UP:
 				layout_image_prev(lw);
@@ -1658,36 +1479,51 @@ static void layout_image_scroll_cb(ImageWindow *imd, GdkScrollDirection directio
 		}
 }
 
-static void layout_image_drag_cb(ImageWindow *imd, gint button, guint32 time,
-				 gdouble x, gdouble y, guint state, gdouble dx, gdouble dy, gpointer data)
+static void layout_image_drag_cb(ImageWindow *imd, GdkEventButton *event, gdouble dx, gdouble dy, gpointer data)
 {
 	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;
 
-	for (i=0; i < MAX_SPLIT_IMAGES; i++)
+	for (i = 0; i < MAX_SPLIT_IMAGES; i++)
 		{
 		if (lw->split_images[i] && lw->split_images[i] != imd)
-			if (lw->connect_scroll)
+			{
+
+			if (event->state & GDK_CONTROL_MASK)
 				{
-				gdouble sx, sy;
-				if (state & GDK_CONTROL_MASK)
-					{
-					image_get_scroll_center(imd, &sx, &sy);
-					}
-				else
-					{
-					image_get_scroll_center(lw->split_images[i], &sx, &sy);
-					sx += dx;
-					sy += dy;
-					}
-				image_set_scroll_center(lw->split_images[i], sx, sy);
+				image_get_scroll_center(imd, &sx, &sy);
 				}
+			else
+				{
+				image_get_scroll_center(lw->split_images[i], &sx, &sy);
+				sx += dx;
+				sy += dy;
+				}
+			image_set_scroll_center(lw->split_images[i], sx, sy);
+			}
 		}
 }
 
-static void layout_image_button_inactive_cb(ImageWindow *imd, gint button, guint32 time,
-				   gdouble x, gdouble y, guint state, gpointer data)
+static void layout_image_button_inactive_cb(ImageWindow *imd, GdkEventButton *event, gpointer data)
 {
 	LayoutWindow *lw = data;
 	GtkWidget *menu;
@@ -1695,10 +1531,10 @@ static void layout_image_button_inactive_cb(ImageWindow *imd, gint button, guint
 
 	if (i != -1)
 		{
-		layout_image_activate(lw, i);
+		layout_image_activate(lw, i, FALSE);
 		}
 
-	switch (button)
+	switch (event->button)
 		{
 		case MOUSE_BUTTON_RIGHT:
 			menu = layout_image_pop_menu(lw);
@@ -1706,7 +1542,7 @@ static void layout_image_button_inactive_cb(ImageWindow *imd, gint button, guint
 				{
 				g_object_set_data(G_OBJECT(menu), "click_parent", imd->widget);
 				}
-			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;
@@ -1714,21 +1550,18 @@ static void layout_image_button_inactive_cb(ImageWindow *imd, gint button, guint
 
 }
 
-static void layout_image_drag_inactive_cb(ImageWindow *imd, gint button, guint32 time,
-				 gdouble x, gdouble y, guint state, gdouble dx, gdouble dy, gpointer data)
+static void layout_image_drag_inactive_cb(ImageWindow *imd, GdkEventButton *event, gdouble dx, gdouble dy, gpointer data)
 {
 	LayoutWindow *lw = data;
-
 	gint i = image_idx(lw, imd);
 
 	if (i != -1)
 		{
-		layout_image_activate(lw, i);
+		layout_image_activate(lw, i, FALSE);
 		}
 
-
 	/* continue as with active image */
-	layout_image_drag_cb(imd, button, time, x, y, state, dx, dy, data);
+	layout_image_drag_cb(imd, event, dx, dy, data);
 }
 
 
@@ -1744,6 +1577,64 @@ static void layout_image_set_buttons_inactive(LayoutWindow *lw, gint i)
 	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
@@ -1758,22 +1649,32 @@ static void layout_image_update_cb(ImageWindow *imd, gpointer data)
 
 GtkWidget *layout_image_new(LayoutWindow *lw, gint i)
 {
+	if (!lw->split_image_sizegroup) lw->split_image_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
+
 	if (!lw->split_images[i])
 		{
 		lw->split_images[i] = image_new(TRUE);
 
-		gtk_widget_ref(lw->split_images[i]->widget);
+		g_object_ref(lw->split_images[i]->widget);
 
-		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_auto_refresh(lw->split_images[i], 0);
+		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;
@@ -1781,7 +1682,6 @@ GtkWidget *layout_image_new(LayoutWindow *lw, gint i)
 
 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);
@@ -1791,12 +1691,13 @@ void layout_image_deactivate(LayoutWindow *lw, gint 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)
@@ -1824,97 +1725,111 @@ void layout_image_activate(LayoutWindow *lw, gint i)
 	if (fd)
 		{
 //		layout_list_sync_path(lw, path);
-		layout_set_path(lw, fd->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;
+	for (i = 0; i < n; i++)
+		if (!lw->split_images[i])
+			{
+			FileData *img_fd = NULL;
+			double zoom = 0.0;
 
-	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);
-		}
+			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]);
+				}
+
+			if (layout_selection_count(lw, 0) > 1)
+				{
+				GList *work = g_list_last(layout_selection_list(lw));
+				gint j = 0;
+				
+				if (work) work = work->prev;
 
-	for (i = 1; i < MAX_SPLIT_IMAGES; i++)
+				while (work && j < i)
+					{
+					FileData *fd = work->data;
+					work = work->prev;
+					
+					j++;
+					if (!fd || !*fd->path) continue;
+					img_fd = fd;
+					}
+				}
+
+			if (!img_fd && lw->image)
+				{
+				img_fd = image_get_fd(lw->image);
+				zoom = image_zoom_get(lw->image);
+				}
+
+			if (img_fd)
+				{
+				gdouble sx, sy;
+				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);
+				}
+			layout_image_deactivate(lw, i);
+			}
+		else
+			{
+			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])
 			{
-			gtk_widget_unref(lw->split_images[i]->widget);
+			g_object_unref(lw->split_images[i]->widget);
 			lw->split_images[i] = NULL;
 			}
 		}
+	
+	if (!lw->image || lw->active_split_image < 0 || lw->active_split_image >= n)
+		{
+		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);
+		}
+}
 
-
-	layout_image_activate(lw, 0);
+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;
-	gint i;
-
+	
 	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);
-
-	if (!lw->split_images[1])
-		{
-		layout_image_new(lw, 1);
-		image_set_frame(lw->split_images[1], 1);
-		image_set_selectable(lw->split_images[1], 1);
-		if (lw->image)
-			{
-			gdouble sx, sy;
-			image_change_fd(lw->split_images[1],
-					image_get_fd(lw->image), image_zoom_get(lw->image));
-			image_get_scroll_center(lw->image, &sx, &sy);
-			image_set_scroll_center(lw->split_images[1], sx, sy);
-			}
-		layout_image_deactivate(lw, 1);
-		layout_image_activate(lw, 0);
-		}
-	else
-		{
-		image_set_frame(lw->split_images[1], 1);
-		image_set_selectable(lw->split_images[1], 1);
-		}
-
-
-	for (i = 2; i < MAX_SPLIT_IMAGES; i++)
-		{
-		if (lw->split_images[i])
-			{
-			gtk_widget_unref(lw->split_images[i]->widget);
-			lw->split_images[i] = NULL;
-			}
-		}
-
-	if (!lw->image || lw->active_split_image < 0 || lw->active_split_image > 1)
-		{
-		layout_image_activate(lw, 0);
-		}
+	layout_image_setup_split_common(lw, 2);
 
 	/* horizontal split means vpaned and vice versa */
 	if (horizontal)
@@ -1928,7 +1843,6 @@ GtkWidget *layout_image_setup_split_hv(LayoutWindow *lw, gboolean horizontal)
 	gtk_widget_show(lw->split_images[0]->widget);
 	gtk_widget_show(lw->split_images[1]->widget);
 
-
 	lw->split_image_widget = paned;
 
 	return lw->split_image_widget;
@@ -1944,55 +1858,7 @@ GtkWidget *layout_image_setup_split_quad(LayoutWindow *lw)
 
 	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);
-		}
-
-	for (i = 1; i < 4; 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)
-				{
-				gdouble sx, sy;
-				image_change_fd(lw->split_images[i],
-					image_get_fd(lw->image), image_zoom_get(lw->image));
-				image_get_scroll_center(lw->image, &sx, &sy);
-				image_set_scroll_center(lw->split_images[i], sx, sy);
-				}
-			layout_image_deactivate(lw, i);
-			}
-		else
-			{
-			image_set_frame(lw->split_images[i], 1);
-			image_set_selectable(lw->split_images[i], 1);
-			}
-
-	for (i = 4; i < MAX_SPLIT_IMAGES; i++)
-		{
-		if (lw->split_images[i])
-			{
-			gtk_widget_unref(lw->split_images[i]->widget);
-			lw->split_images[i] = NULL;
-			}
-		}
-
-
-	if (!lw->image || lw->active_split_image < 0 || lw->active_split_image > 3)
-		{
-		layout_image_activate(lw, 0);
-		}
+	layout_image_setup_split_common(lw, 4);
 
 	hpaned = gtk_hpaned_new();
 	vpaned1 = gtk_vpaned_new();
@@ -2007,14 +1873,12 @@ GtkWidget *layout_image_setup_split_quad(LayoutWindow *lw)
 	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;
@@ -2044,24 +1908,17 @@ GtkWidget *layout_image_setup_split(LayoutWindow *lw, ImageSplitMode mode)
  *-----------------------------------------------------------------------------
  */
 
-void layout_image_maint_renamed(LayoutWindow *lw, FileData *fd)
+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);
 		}
 }
 
-void layout_image_maint_removed(LayoutWindow *lw, FileData *fd)
+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;
@@ -2079,13 +1936,37 @@ void layout_image_maint_removed(LayoutWindow *lw, FileData *fd)
 				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*/
 		}
 }
 
-void layout_image_maint_moved(LayoutWindow *lw, FileData *fd)
+
+void layout_image_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-	layout_image_maint_renamed(lw, fd);
+	LayoutWindow *lw = data;
+
+	if (!(type & NOTIFY_CHANGE) || !fd->change) return;
+
+	DEBUG_1("Notify layout_image: %s %04x", fd->path, type);
+	
+	switch (fd->change->type)
+		{
+		case FILEDATA_CHANGE_MOVE:
+		case FILEDATA_CHANGE_RENAME:
+			layout_image_maint_renamed(lw, fd);
+			break;
+		case FILEDATA_CHANGE_DELETE:
+			layout_image_maint_removed(lw, fd);
+			break;
+		case FILEDATA_CHANGE_COPY:
+		case FILEDATA_CHANGE_UNSPECIFIED:
+		case FILEDATA_CHANGE_WRITE_METADATA:
+			break;
+		}
+
 }
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */