comparison src/img-view.c @ 117:0c2e1f0a001b

Wed Nov 29 14:28:30 2006 John Ellis <[e-mail]> * image-overlay.[ch]: Rewrite most of the information overlay code to be more flexible and easily extended. * image.[ch], typedefs.h: Remove image_new_func, and replace it with image_state_func callback which is much more informative. * img-view.c, layout.c, layout_image.c: Updates for new image overlay function names.

116:1bd40943dc2a

	FullScreenData *fs;
	SlideShowData *ss;

	GList *list;
	GList *list_pointer;

	gint overlay_id;
};


static GList *view_window_list = NULL;

	if (vw->ss) vw->ss->imd = vw->imd;
}

static void view_fullscreen_toggle(ViewWindow *vw, gint force_off)
{
	if (force_off && !vw->fs) return;

	if (vw->fs)
		{
		fullscreen_stop(vw->fs);

		if (vw->overlay_id != -1) vw->overlay_id = image_overlay_info_enable(vw->imd);
		}
	else
		{
		vw->fs = fullscreen_start(vw->window, vw->imd, view_fullscreen_stop_func, vw);

		g_signal_connect(G_OBJECT(vw->fs->window), "key_press_event",
				 G_CALLBACK(view_window_key_press_cb), vw);

		if (vw->ss) vw->ss->imd = vw->fs->imd;

		if (vw->overlay_id != -1)
			{
			image_overlay_info_disable(vw->imd, vw->overlay_id);
			vw->overlay_id = image_overlay_info_enable(vw->fs->imd);
			}
		}
}

static void view_overlay_toggle(ViewWindow *vw)
{
	ImageWindow *imd;

	imd = view_window_active_image(vw);

	if (vw->overlay_id == -1)
		{
		vw->overlay_id = image_overlay_info_enable(imd);
		}
	else
		{
		image_overlay_info_disable(imd, vw->overlay_id);
		vw->overlay_id = -1;
		}
}

static void view_slideshow_next(ViewWindow *vw)
{

	vw = g_new0(ViewWindow, 1);
	vw->fs = NULL;
	vw->ss = NULL;
	vw->list = NULL;
	vw->list_pointer = NULL;

	vw->overlay_id = -1;

	vw->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);

	geometry.min_width = 8;
	geometry.min_height = 8;

			image_change_path(imd, path, image_zoom_get_default(imd, zoom_mode));
			}
		}

	if (vw->overlay_id != -1) image_overlay_update(imd, vw->overlay_id);
}

static void view_real_moved(ViewWindow *vw, const gchar *source, const gchar *dest)
{
	ImageWindow *imd;

117:0c2e1f0a001b

	FullScreenData *fs;
	SlideShowData *ss;

	GList *list;
	GList *list_pointer;
};


static GList *view_window_list = NULL;

	if (vw->ss) vw->ss->imd = vw->imd;
}

static void view_fullscreen_toggle(ViewWindow *vw, gint force_off)
{
	gint info, status;

	if (force_off && !vw->fs) return;

	if (vw->fs)
		{
		if (image_osd_get(vw->fs->imd, &info, &status))
			{
			image_osd_set(vw->imd, info, status);
			}

		fullscreen_stop(vw->fs);
		}
	else
		{
		vw->fs = fullscreen_start(vw->window, vw->imd, view_fullscreen_stop_func, vw);

		g_signal_connect(G_OBJECT(vw->fs->window), "key_press_event",
				 G_CALLBACK(view_window_key_press_cb), vw);

		if (vw->ss) vw->ss->imd = vw->fs->imd;

		if (image_osd_get(vw->imd, &info, &status))
			{
			image_osd_set(vw->imd, FALSE, FALSE);
			image_osd_set(vw->fs->imd, info, status);
			}
		}
}

static void view_overlay_toggle(ViewWindow *vw)
{
	ImageWindow *imd;

	imd = view_window_active_image(vw);

	if (!image_osd_get(imd, NULL, NULL))
		{
		image_osd_set(imd, TRUE, TRUE);
		}
	else
		{
		image_osd_set(imd, FALSE, FALSE);
		}
}

static void view_slideshow_next(ViewWindow *vw)
{

	vw = g_new0(ViewWindow, 1);
	vw->fs = NULL;
	vw->ss = NULL;
	vw->list = NULL;
	vw->list_pointer = NULL;

	vw->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);

	geometry.min_width = 8;
	geometry.min_height = 8;

			image_change_path(imd, path, image_zoom_get_default(imd, zoom_mode));
			}
		}

	image_osd_update(imd);
}

static void view_real_moved(ViewWindow *vw, const gchar *source, const gchar *dest)
{
	ImageWindow *imd;