Trim trailing white spaces.

[geeqie.git] / src / fullscreen.c

diff --git a/src/fullscreen.c b/src/fullscreen.c
index 8a66da7..4452734 100644 (file)
--- a/src/fullscreen.c
+++ b/src/fullscreen.c
@@ -211,10 +211,10 @@ FullScreenData *fullscreen_start(GtkWidget *window, ImageWindow *imd,
 {
        FullScreenData *fs;
        GdkScreen *screen;
-       gboolean same;
        gint x, y;
        gint w, h;
        GdkGeometry geometry;
+       GdkWindow *gdkwin;
 
        if (!window || !imd) return NULL;
 
@@ -230,7 +230,7 @@ FullScreenData *fullscreen_start(GtkWidget *window, ImageWindow *imd,
 
        DEBUG_1("full screen requests screen %d", options->fullscreen.screen);
        fullscreen_prefs_get_geometry(options->fullscreen.screen, window, &x, &y, &w, &h,
-                                     &screen, &same);
+                                     &screen, &fs->same_region);
 
        fs->window = window_new(GTK_WINDOW_TOPLEVEL, "fullscreen", NULL, NULL, _("Full screen"));
 
@@ -244,15 +244,14 @@ FullScreenData *fullscreen_start(GtkWidget *window, ImageWindow *imd,
                 */
                gtk_window_fullscreen(GTK_WINDOW(fs->window));
                }
-       else if (options->fullscreen.above)
+       else
                {
-               /* request to be above other windows */
-               gtk_window_set_keep_above(GTK_WINDOW(fs->window), TRUE);
+               gtk_window_set_screen(GTK_WINDOW(fs->window), screen);
+               if (options->fullscreen.above)
+                       gtk_window_set_keep_above(GTK_WINDOW(fs->window), TRUE);
                }
 
        gtk_window_set_resizable(GTK_WINDOW(fs->window), FALSE);
-
-       gtk_window_set_screen(GTK_WINDOW(fs->window), screen);
        gtk_container_set_border_width(GTK_CONTAINER(fs->window), 0);
        g_signal_connect(G_OBJECT(fs->window), "delete_event",
                         G_CALLBACK(fullscreen_delete_cb), fs);
@@ -279,6 +278,11 @@ FullScreenData *fullscreen_start(GtkWidget *window, ImageWindow *imd,
        gtk_window_set_default_size(GTK_WINDOW(fs->window), w, h);
        gtk_window_move(GTK_WINDOW(fs->window), x, y);
 
+       gtk_widget_realize(fs->window);
+       gdkwin = gtk_widget_get_window(fs->window);
+       if (gdkwin != NULL)
+               gdk_window_set_override_redirect(gdkwin, TRUE);
+
        fs->imd = image_new(FALSE);
 
        gtk_container_add(GTK_CONTAINER(fs->window), fs->imd->widget);
@@ -295,7 +299,16 @@ FullScreenData *fullscreen_start(GtkWidget *window, ImageWindow *imd,
 
        gtk_widget_show(fs->imd->widget);
 
-       image_change_from_image(fs->imd, fs->normal_imd);
+       if (fs->same_region)
+               {
+               DEBUG_0("Original vindow is not visible, enabling std. fullscreen mode");
+               image_move_from_image(fs->imd, fs->normal_imd);
+               }
+       else
+               {
+               DEBUG_0("Original vindow is still visible, enabling presentation fullscreen mode");
+               image_copy_from_image(fs->imd, fs->normal_imd);
+               }
 
        if (options->stereo.enable_fsmode) {
                image_stereo_set(fs->imd, options->stereo.fsmode);
@@ -314,10 +327,13 @@ FullScreenData *fullscreen_start(GtkWidget *window, ImageWindow *imd,
        /* hide normal window
         * FIXME: properly restore this window on show
         */
+       if (fs->same_region)
+               {
 #ifdef HIDE_WINDOW_IN_FULLSCREEN
-       gtk_widget_hide(fs->normal_window);
+               gtk_widget_hide(fs->normal_window);
 #endif
-       image_change_fd(fs->normal_imd, NULL, image_zoom_get(fs->normal_imd));
+               image_change_fd(fs->normal_imd, NULL, image_zoom_get(fs->normal_imd));
+               }
 
        return fs;
 }
@@ -332,15 +348,19 @@ void fullscreen_stop(FullScreenData *fs)
        fullscreen_busy_mouse_disable(fs);
        gdk_keyboard_ungrab(GDK_CURRENT_TIME);
 
-       image_change_from_image(fs->normal_imd, fs->imd);
-
-       if (options->stereo.enable_fsmode) {
-               image_stereo_set(fs->normal_imd, options->stereo.mode);
-       }
-
+       if (fs->same_region)
+               {
+               image_move_from_image(fs->normal_imd, fs->imd);
 #ifdef HIDE_WINDOW_IN_FULLSCREEN
-       gtk_widget_show(fs->normal_window);
+               gtk_widget_show(fs->normal_window);
 #endif
+               if (options->stereo.enable_fsmode)
+                       {
+                       image_stereo_set(fs->normal_imd, options->stereo.mode);
+                       }
+               }
+
+
        if (fs->stop_func) fs->stop_func(fs, fs->stop_data);
 
        gtk_widget_destroy(fs->window);
@@ -394,7 +414,11 @@ GList *fullscreen_prefs_list(void)
                        else
                                {
                                gdk_screen_get_monitor_geometry(screen, j, &rect);
-                               subname = g_strdup_printf("%s %d", _("Monitor"), j + 1);
+                               subname = gdk_screen_get_monitor_plug_name(screen, j);
+                               if (subname == NULL)
+                                       {
+                                       subname = g_strdup_printf("%s %d", _("Monitor"), j + 1);
+                                       }
                                }
 
                        sd = g_new0(ScreenData, 1);