Remove commented out code.

[geeqie.git] / src / layout_image.c

diff --git a/src/layout_image.c b/src/layout_image.c
index 4156ef3..091a75d 100644 (file)
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -1,7 +1,7 @@
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
@@ -64,7 +64,8 @@ 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->image == fs->imd)
+               lw->image = fs->normal_imd;
 
        lw->full_screen = NULL;
 }
@@ -79,7 +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->full_screen->same_region)
+               lw->image = lw->full_screen->imd;
 
        layout_image_set_buttons(lw);
 
@@ -87,10 +89,6 @@ 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
 
        image_osd_copy_status(lw->full_screen->normal_imd, lw->image);
 }
@@ -100,14 +98,10 @@ void layout_image_full_screen_stop(LayoutWindow *lw)
        if (!layout_valid(&lw)) return;
        if (!lw->full_screen) return;
 
-       image_osd_copy_status(lw->image, lw->full_screen->normal_imd);
+       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)
@@ -567,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);
 }
 
@@ -614,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)
@@ -634,7 +628,7 @@ static void layout_image_dnd_receive(GtkWidget *widget, GdkDragContext *context,
                                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);
@@ -692,34 +686,15 @@ static void layout_image_dnd_get(GtkWidget *widget, GdkDragContext *context,
 
        if (fd)
                {
-               gchar *text = NULL;
-               gint len;
-               gboolean 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);
                }
 }
@@ -727,7 +702,7 @@ 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)
                {
                FileData *fd;
                gint row;
@@ -797,6 +772,11 @@ void layout_image_scroll(LayoutWindow *lw, gint x, gint y, gboolean connect_scro
 
        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);
@@ -824,6 +804,11 @@ void layout_image_zoom_adjust(LayoutWindow *lw, gdouble increment, gboolean conn
 
        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++)
@@ -840,6 +825,11 @@ void layout_image_zoom_adjust_at_point(LayoutWindow *lw, gdouble increment, gint
 
        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++)
@@ -856,6 +846,11 @@ void layout_image_zoom_set(LayoutWindow *lw, gdouble zoom, gboolean connect_zoom
 
        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++)
@@ -872,6 +867,11 @@ void layout_image_zoom_set_fill_geometry(LayoutWindow *lw, gboolean vertical, gb
 
        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++)
@@ -902,7 +902,42 @@ gboolean layout_image_get_desaturate(LayoutWindow *lw)
        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)
 {
@@ -949,6 +984,12 @@ void layout_image_set_fd(LayoutWindow *lw, FileData *fd)
 
        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);
@@ -1442,6 +1483,23 @@ static void layout_image_drag_cb(ImageWindow *imd, GdkEventButton *event, gdoubl
 {
        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;
 
@@ -1449,7 +1507,6 @@ static void layout_image_drag_cb(ImageWindow *imd, GdkEventButton *event, gdoubl
                {
                if (lw->split_images[i] && lw->split_images[i] != imd)
                        {
-                       gdouble sx, sy;
 
                        if (event->state & GDK_CONTROL_MASK)
                                {
@@ -1598,11 +1655,7 @@ GtkWidget *layout_image_new(LayoutWindow *lw, gint i)
                {
                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
 
                g_signal_connect(G_OBJECT(lw->split_images[i]->pr), "update-pixel",
                                 G_CALLBACK(layout_status_update_pixel_cb), lw);
@@ -1674,6 +1727,7 @@ void layout_image_activate(LayoutWindow *lw, gint i, gboolean force)
 //             layout_list_sync_path(lw, path);
                layout_set_fd(lw, fd);
                }
+       layout_status_update_image(lw);
 }
 
 
@@ -1740,11 +1794,7 @@ static void layout_image_setup_split_common(LayoutWindow *lw, gint n)
                {
                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;
                        }
                }