comparison src/fullscreen.c @ 322:d344bcf37618

Rationalize fullscreen options naming.

321:20d9b3cd7434

		}
}

static gboolean fullscreen_saver_block_cb(gpointer data)
{
	if (options->fullscreen_disable_saver)
		{
		fullscreen_saver_deactivate();
		}

	return TRUE;

	fs->normal_imd = imd;

	fs->stop_func = stop_func;
	fs->stop_data = stop_data;

	if (debug) printf("full screen requests screen %d\n", options->fullscreen_screen);
	fullscreen_prefs_get_geometry(options->fullscreen_screen, window, &x, &y, &w, &h,
				      &screen, &same);

	fs->window = window_new(GTK_WINDOW_TOPLEVEL, "fullscreen", NULL, NULL, _("Full screen"));

	/* this requests no decorations, if you still have them complain to the window manager author(s) */
	gtk_window_set_decorated(GTK_WINDOW(fs->window), FALSE);

	if (options->fullscreen_screen < 0)
		{
		/* If we want control of the window size and position this is not what we want.
		 * Geeqie needs control of which monitor(s) to use for full screen.
		 */
		gtk_window_fullscreen(GTK_WINDOW(fs->window));
		}
	else if (options->fullscreen_above)
		{
		/* request to be above other windows */
		gtk_window_set_keep_above(GTK_WINDOW(fs->window), TRUE);
		}

	if (options->user_specified_window_background)
		{
		image_background_set_color(fs->imd, &options->window_background_color);
		}

	image_set_delay_flip(fs->imd, options->fullscreen_clean_flip);
	image_auto_refresh(fs->imd, fs->normal_imd->auto_refresh_interval);

	if (options->fullscreen_clean_flip)
		{
		image_set_update_func(fs->imd, fullscreen_image_update_cb, fs);
		image_set_complete_func(fs->imd, fullscreen_image_complete_cb, fs);
		}

322:d344bcf37618

		}
}

static gboolean fullscreen_saver_block_cb(gpointer data)
{
	if (options->fullscreen.disable_saver)
		{
		fullscreen_saver_deactivate();
		}

	return TRUE;

	fs->normal_imd = imd;

	fs->stop_func = stop_func;
	fs->stop_data = stop_data;

	if (debug) printf("full screen requests screen %d\n", options->fullscreen.screen);
	fullscreen_prefs_get_geometry(options->fullscreen.screen, window, &x, &y, &w, &h,
				      &screen, &same);

	fs->window = window_new(GTK_WINDOW_TOPLEVEL, "fullscreen", NULL, NULL, _("Full screen"));

	/* this requests no decorations, if you still have them complain to the window manager author(s) */
	gtk_window_set_decorated(GTK_WINDOW(fs->window), FALSE);

	if (options->fullscreen.screen < 0)
		{
		/* If we want control of the window size and position this is not what we want.
		 * Geeqie needs control of which monitor(s) to use for full screen.
		 */
		gtk_window_fullscreen(GTK_WINDOW(fs->window));
		}
	else if (options->fullscreen.above)
		{
		/* request to be above other windows */
		gtk_window_set_keep_above(GTK_WINDOW(fs->window), TRUE);
		}

	if (options->user_specified_window_background)
		{
		image_background_set_color(fs->imd, &options->window_background_color);
		}

	image_set_delay_flip(fs->imd, options->fullscreen.clean_flip);
	image_auto_refresh(fs->imd, fs->normal_imd->auto_refresh_interval);

	if (options->fullscreen.clean_flip)
		{
		image_set_update_func(fs->imd, fullscreen_image_update_cb, fs);
		image_set_complete_func(fs->imd, fullscreen_image_complete_cb, fs);
		}