comparison src/layout_image.c @ 318:b16b9b8979e5

Add a new struct ConfOptions to handle options. Changes were made among the code to use only one global var named "options" of type ConfOptions *. Initialization takes place in new init_options().

317:46169c246c51

	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, zoom_mode));

	image_set_scroll_center(lw->image, sx, sy);

	layout_list_sync_fd(lw, fd);
	layout_image_slideshow_continue_check(lw);

		old_path = layout_image_get_path(lw);
		if (old_path && strcmp(path, old_path) == 0) return;
		}
*/
	layout_image_set_fd(lw, fd);
	if (enable_read_ahead) image_prebuffer_set(lw->image, read_ahead_fd);
}

void layout_image_set_index(LayoutWindow *lw, gint index)
{
	FileData *fd;

static void layout_image_set_collection_real(LayoutWindow *lw, CollectionData *cd, CollectInfo *info, gint forward)
{
	if (!layout_valid(&lw)) return;

	image_change_from_collection(lw->image, cd, info, image_zoom_get_default(lw->image, zoom_mode));
	if (enable_read_ahead)
		{
		CollectInfo *r_info;
		if (forward)
			{
			r_info = collection_next_by_info(cd, info);

				break;
			default:
				break;
			}
		}
	else if ( (state & GDK_SHIFT_MASK) != (mousewheel_scrolls))
		{
		switch (direction)
			{
			case GDK_SCROLL_UP:
				image_scroll(imd, 0, -MOUSEWHEEL_SCROLL_SIZE);

		{
		lw->split_images[i] = image_new(TRUE);

		gtk_widget_ref(lw->split_images[i]->widget);

		image_background_set_color(lw->split_images[i], user_specified_window_background ? &window_background_color : NULL);

		image_auto_refresh(lw->split_images[i], 0);

		layout_image_dnd_init(lw, i);
		image_color_profile_set(lw->split_images[i],

318:b16b9b8979e5

	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, options->zoom_mode));

	image_set_scroll_center(lw->image, sx, sy);

	layout_list_sync_fd(lw, fd);
	layout_image_slideshow_continue_check(lw);

		old_path = layout_image_get_path(lw);
		if (old_path && strcmp(path, old_path) == 0) return;
		}
*/
	layout_image_set_fd(lw, fd);
	if (options->enable_read_ahead) image_prebuffer_set(lw->image, read_ahead_fd);
}

void layout_image_set_index(LayoutWindow *lw, gint index)
{
	FileData *fd;

static void layout_image_set_collection_real(LayoutWindow *lw, CollectionData *cd, CollectInfo *info, gint forward)
{
	if (!layout_valid(&lw)) return;

	image_change_from_collection(lw->image, cd, info, image_zoom_get_default(lw->image, options->zoom_mode));
	if (options->enable_read_ahead)
		{
		CollectInfo *r_info;
		if (forward)
			{
			r_info = collection_next_by_info(cd, info);

				break;
			default:
				break;
			}
		}
	else if ( (state & GDK_SHIFT_MASK) != (options->mousewheel_scrolls))
		{
		switch (direction)
			{
			case GDK_SCROLL_UP:
				image_scroll(imd, 0, -MOUSEWHEEL_SCROLL_SIZE);

		{
		lw->split_images[i] = image_new(TRUE);

		gtk_widget_ref(lw->split_images[i]->widget);

		image_background_set_color(lw->split_images[i], options->user_specified_window_background ? &options->window_background_color : NULL);

		image_auto_refresh(lw->split_images[i], 0);

		layout_image_dnd_init(lw, i);
		image_color_profile_set(lw->split_images[i],