/*
* Geeqie
* (C) 2006 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
#include "image.h"
-#include "image-load.h"
#include "collect.h"
#include "color-man.h"
#include "exif.h"
+#include "metadata.h"
#include "histogram.h"
+#include "image-load.h"
#include "image-overlay.h"
#include "layout.h"
#include "layout_image.h"
#include "pixbuf_util.h"
#include "ui_fileops.h"
-#include "filelist.h"
+#include "filedata.h"
+#include "filecache.h"
#include <math.h>
-
-/* size of the image loader buffer (512 bytes x defined number) */
-#define IMAGE_LOAD_BUFFER_COUNT 8
-
-/* define this so that more bytes are read per idle loop on larger images (> 1MB) */
-#define IMAGE_THROTTLE_LARGER_IMAGES 1
-
-/* throttle factor to increase read bytes by (2 is double, 3 is triple, etc.) */
-#define IMAGE_THROTTLE_FACTOR 32
-
-/* the file size at which throttling take place */
-#define IMAGE_THROTTLE_THRESHOLD 1048576
-
-#define IMAGE_AUTO_REFRESH_TIME 3000
-
-
static GList *image_list = NULL;
-
static void image_update_title(ImageWindow *imd);
-static void image_post_process(ImageWindow *imd, gint clamp);
static void image_read_ahead_start(ImageWindow *imd);
+static void image_cache_set(ImageWindow *imd, FileData *fd);
/*
*-------------------------------------------------------------------
if (imd->func_button)
{
- imd->func_button(imd, event->button, event->time,
- event->x, event->y, event->state, imd->data_button);
+ imd->func_button(imd, event, imd->data_button);
}
}
if (imd->func_drag)
{
- imd->func_drag(imd, event->button, event->time,
- event->x, event->y, event->state,
- (gfloat)(pr->drag_last_x - event->x) / width, (gfloat)(pr->drag_last_y - event->y) / height,
- imd->data_button);
+ imd->func_drag(imd, event,
+ (gfloat)(pr->drag_last_x - event->x) / width,
+ (gfloat)(pr->drag_last_y - event->y) / height,
+ imd->data_button);
}
}
if (imd->func_update) imd->func_update(imd, imd->data_update);
}
-static void image_zoom_cb(PixbufRenderer *pr, gdouble zoom, gpointer data)
-{
- ImageWindow *imd = data;
-
- if (imd->title_show_zoom) image_update_title(imd);
- if (imd->overlay_show_zoom) image_osd_update(imd);
-
- image_update_util(imd);
-}
-static void image_complete_util(ImageWindow *imd, gint preload)
+static void image_complete_util(ImageWindow *imd, gboolean preload)
{
if (imd->il && image_get_pixbuf(imd) != image_loader_get_pixbuf(imd->il)) return;
- if (debug) printf("%s image load completed \"%s\" (%s)\n", get_exec_time(),
+ DEBUG_1("%s image load completed \"%s\" (%s)", get_exec_time(),
(preload) ? (imd->read_ahead_fd ? imd->read_ahead_fd->path : "null") :
(imd->image_fd ? imd->image_fd->path : "null"),
(preload) ? "preload" : "current");
if (imd->func_state) imd->func_state(imd, state, imd->data_state);
}
+static void image_zoom_cb(PixbufRenderer *pr, gdouble zoom, gpointer data)
+{
+ ImageWindow *imd = data;
+
+ if (imd->title_show_zoom) image_update_title(imd);
+ image_state_set(imd, IMAGE_STATE_IMAGE);
+ image_update_util(imd);
+}
+
/*
*-------------------------------------------------------------------
* misc
if (imd->collection && collection_to_number(imd->collection) >= 0)
{
- const gchar *name;
- name = imd->collection->name;
+ const gchar *name = imd->collection->name;
if (!name) name = _("Untitled");
- collection = g_strdup_printf(" (Collection %s)", name);
+ collection = g_strdup_printf(_(" (Collection %s)"), name);
}
if (imd->title_show_zoom)
* rotation, flip, etc.
*-------------------------------------------------------------------
*/
-
-
-#if 0
-
-static void image_alter_real(ImageWindow *imd, AlterType type, gint clamp)
-{
- PixbufRenderer *pr;
- GdkPixbuf *new = NULL;
- gint exif_rotate;
- gint x, y;
- gint t;
-
- pr = (PixbufRenderer *)imd->pr;
-
- exif_rotate = (imd->delay_alter_type != ALTER_NONE && (imd->state & IMAGE_STATE_ROTATE_AUTO));
- imd->delay_alter_type = ALTER_NONE;
-
- if (!pr->pixbuf) return;
-
- x = pr->x_scroll + (pr->vis_width / 2);
- y = pr->y_scroll + (pr->vis_height / 2);
-
- switch (type)
- {
- case ALTER_ROTATE_90:
- new = pixbuf_copy_rotate_90(pr->pixbuf, FALSE);
- t = x;
- x = pr->height - y;
- y = t;
- break;
- case ALTER_ROTATE_90_CC:
- new = pixbuf_copy_rotate_90(pr->pixbuf, TRUE);
- t = x;
- x = y;
- y = pr->width - t;
- break;
- case ALTER_ROTATE_180:
- new = pixbuf_copy_mirror(pr->pixbuf, TRUE, TRUE);
- x = pr->width - x;
- y = pr->height - y;
- break;
- case ALTER_MIRROR:
- new = pixbuf_copy_mirror(pr->pixbuf, TRUE, FALSE);
- x = pr->width - x;
- break;
- case ALTER_FLIP:
- new = pixbuf_copy_mirror(pr->pixbuf, FALSE, TRUE);
- y = pr->height - y;
- break;
- case ALTER_DESATURATE:
- pixbuf_desaturate_rect(pr->pixbuf,
- 0, 0, pr->image_width, pr->image_height);
- image_area_changed(imd, 0, 0, pr->image_width, pr->image_height);
- layout_image_overlay_update(layout_find_by_image(imd));
- break;
- case ALTER_NONE:
- default:
- return;
- break;
- }
-
- if (!new) return;
-
- pixbuf_renderer_set_pixbuf(pr, new, pr->zoom);
- g_object_unref(new);
-
- if (clamp && pr->zoom != 0.0 && pr->scale != 0.0)
- {
- if (exif_rotate)
- {
- switch (pr->scroll_reset)
- {
- case PR_SCROLL_RESET_NOCHANGE:
- break;
- case PR_SCROLL_RESET_CENTER:
- x = (gint)((gdouble)pr->image_width / 2.0 * pr->scale);
- y = (gint)((gdouble)pr->image_height / 2.0 * pr->scale);
- break;
- case PR_SCROLL_RESET_TOPLEFT:
- default:
- x = 0;
- y = 0;
- break;
- }
- }
- pixbuf_renderer_scroll_to_point(pr, (gint)((gdouble)x / pr->scale),
- (gint)((gdouble)y / pr->scale),
- 0.50, 0.50);
- }
-
- if (exif_rotate) image_state_set(imd, IMAGE_STATE_ROTATE_AUTO);
- layout_image_overlay_update(layout_find_by_image(imd));
- if (debug) printf("%s image postprocess done: %s\n", get_exec_time(), imd->image_fd->name);
-}
-
-static void image_post_process_alter(ImageWindow *imd, gint clamp)
-{
- if (imd->delay_alter_type != ALTER_NONE)
- {
- image_alter_real(imd, imd->delay_alter_type, clamp);
- }
-}
-
-
-static void image_post_process_color_cb(ColorMan *cm, ColorManReturnType type, gpointer data)
+static gboolean image_get_x11_screen_profile(ImageWindow *imd, guchar **screen_profile, gint *screen_profile_len)
{
- ImageWindow *imd = data;
-
- color_man_free(cm);
- if (type == COLOR_RETURN_IMAGE_CHANGED)
- {
- if (cm == imd->cm) imd->cm = NULL;
- return;
- }
-
- imd->cm = NULL;
- image_state_set(imd, IMAGE_STATE_COLOR_ADJ);
- if (debug) printf("%s image postprocess cm done: %s\n", get_exec_time(), imd->image_fd->name);
-
- image_post_process_alter(imd, FALSE);
+ GdkScreen *screen = gtk_widget_get_screen(imd->widget);;
+ GdkAtom type = GDK_NONE;
+ gint format = 0;
- image_read_ahead_start(imd);
+ return (gdk_property_get(gdk_screen_get_root_window(screen),
+ gdk_atom_intern ("_ICC_PROFILE", FALSE),
+ GDK_NONE,
+ 0, 64 * 1024 * 1024, FALSE,
+ &type, &format, screen_profile_len, screen_profile) && *screen_profile_len > 0);
}
-#endif
-static gint image_post_process_color(ImageWindow *imd, gint start_row, ExifData *exif, gint run_in_bg)
+static gboolean image_post_process_color(ImageWindow *imd, gint start_row, gboolean run_in_bg)
{
ColorMan *cm;
ColorManProfileType input_type;
ColorManProfileType screen_type;
- const gchar *input_file;
- const gchar *screen_file;
- unsigned char *profile = NULL;
+ const gchar *input_file = NULL;
+ const gchar *screen_file = NULL;
+ guchar *profile = NULL;
guint profile_len;
+ guchar *screen_profile = NULL;
+ gint screen_profile_len;
+ ExifData *exif;
if (imd->cm) return FALSE;
if (imd->color_profile_input >= COLOR_PROFILE_FILE &&
imd->color_profile_input < COLOR_PROFILE_FILE + COLOR_PROFILE_INPUTS)
{
- gint n;
-
- n = imd->color_profile_input - COLOR_PROFILE_FILE;
- if (!options->color_profile.input_file[n]) return FALSE;
+ const gchar *file = options->color_profile.input_file[imd->color_profile_input - COLOR_PROFILE_FILE];
+
+ if (!is_readable_file(file)) return FALSE;
input_type = COLOR_PROFILE_FILE;
- input_file = options->color_profile.input_file[n];
+ input_file = file;
}
else if (imd->color_profile_input >= COLOR_PROFILE_SRGB &&
imd->color_profile_input < COLOR_PROFILE_FILE)
return FALSE;
}
- if (imd->color_profile_screen == 1 &&
- options->color_profile.screen_file)
+ if (options->color_profile.use_x11_screen_profile &&
+ image_get_x11_screen_profile(imd, &screen_profile, &screen_profile_len))
+ {
+ screen_type = COLOR_PROFILE_MEM;
+ DEBUG_1("Using X11 screen profile, length: %d", screen_profile_len);
+ }
+ else if (options->color_profile.screen_file &&
+ is_readable_file(options->color_profile.screen_file))
{
screen_type = COLOR_PROFILE_FILE;
screen_file = options->color_profile.screen_file;
}
- else if (imd->color_profile_screen == 0)
+ else
{
screen_type = COLOR_PROFILE_SRGB;
screen_file = NULL;
}
- else
- {
- return FALSE;
- }
+
+
imd->color_profile_from_image = COLOR_PROFILE_NONE;
- if (imd->color_profile_use_image && exif)
+ exif = exif_read_fd(imd->image_fd);
+
+ if (exif)
{
profile = exif_get_color_profile(exif, &profile_len);
- if (!profile)
+ if (profile)
{
- gint cs;
- gchar *interop_index;
-
- /* ColorSpace == 1 specifies sRGB per EXIF 2.2 */
- if (!exif_get_integer(exif, "Exif.Photo.ColorSpace", &cs)) cs = 0;
- interop_index = exif_get_data_as_text(exif, "Exif.Iop.InteroperabilityIndex");
-
- if (cs == 1)
+ if (!imd->color_profile_use_image)
{
- input_type = COLOR_PROFILE_SRGB;
- input_file = NULL;
- imd->color_profile_from_image = COLOR_PROFILE_SRGB;
+ g_free(profile);
+ profile = NULL;
+ }
+ DEBUG_1("Found embedded color profile");
+ imd->color_profile_from_image = COLOR_PROFILE_MEM;
+ }
+ else
+ {
+ gchar *interop_index = exif_get_data_as_text(exif, "Exif.Iop.InteroperabilityIndex");
- if (debug) printf("Found EXIF ColorSpace of sRGB\n");
+ if (interop_index)
+ {
+ /* Exif 2.21 specification */
+ if (!strcmp(interop_index, "R98"))
+ {
+ imd->color_profile_from_image = COLOR_PROFILE_SRGB;
+ DEBUG_1("Found EXIF 2.21 ColorSpace of sRGB");
+ }
+ else if (!strcmp(interop_index, "R03"))
+ {
+ imd->color_profile_from_image = COLOR_PROFILE_ADOBERGB;
+ DEBUG_1("Found EXIF 2.21 ColorSpace of AdobeRGB");
+ }
+ g_free(interop_index);
}
- if (cs == 2 || (interop_index && !strcmp(interop_index, "R03")))
+ else
{
- input_type = COLOR_PROFILE_ADOBERGB;
- input_file = NULL;
- imd->color_profile_from_image = COLOR_PROFILE_ADOBERGB;
-
- if (debug) printf("Found EXIF ColorSpace of AdobeRGB\n");
+ gint cs;
+
+ /* ColorSpace == 1 specifies sRGB per EXIF 2.2 */
+ if (!exif_get_integer(exif, "Exif.Photo.ColorSpace", &cs)) cs = 0;
+ if (cs == 1)
+ {
+ imd->color_profile_from_image = COLOR_PROFILE_SRGB;
+ DEBUG_1("Found EXIF 2.2 ColorSpace of sRGB");
+ }
+ else if (cs == 2)
+ {
+ /* non-standard way of specifying AdobeRGB (used by some software) */
+ imd->color_profile_from_image = COLOR_PROFILE_ADOBERGB;
+ DEBUG_1("Found EXIF 2.2 ColorSpace of AdobeRGB");
+ }
}
- g_free(interop_index);
+ if (imd->color_profile_use_image && imd->color_profile_from_image != COLOR_PROFILE_NONE)
+ {
+ input_type = imd->color_profile_from_image;
+ input_file = NULL;
+ }
}
+
+ exif_free_fd(imd->image_fd, exif);
}
+
if (profile)
{
- if (debug) printf("Found embedded color profile\n");
- imd->color_profile_from_image = COLOR_PROFILE_MEM;
-
cm = color_man_new_embedded(run_in_bg ? imd : NULL, NULL,
profile, profile_len,
- screen_type, screen_file);
+ screen_type, screen_file, screen_profile, screen_profile_len);
g_free(profile);
}
else
{
cm = color_man_new(run_in_bg ? imd : NULL, NULL,
input_type, input_file,
- screen_type, screen_file);
+ screen_type, screen_file, screen_profile, screen_profile_len);
}
if (cm)
}
imd->cm = (gpointer)cm;
-#if 0
- if (run_in_bg) color_man_start_bg(imd->cm, image_post_process_color_cb, imd);
-#endif
- return TRUE;
}
- return FALSE;
-}
-
-static void image_post_process(ImageWindow *imd, gint clamp)
-{
-#if 0
- ExifData *exif = NULL;
-
- if (!image_get_pixbuf(imd)) return;
-
- if (debug) printf("%s image postprocess: %s\n", get_exec_time(), imd->image_fd->name);
-
- if (options->image.exif_rotate_enable ||
- (imd->color_profile_enable && imd->color_profile_use_image) )
- {
- exif = exif_read_fd(imd->image_fd);
- }
- if (options->image.exif_rotate_enable && exif)
- {
- gint orientation;
-
- if (exif_get_integer(exif, "Exif.Image.Orientation", &orientation))
- {
- gint rotate = TRUE;
-
- /* see http://jpegclub.org/exif_orientation.html
- 1 2 3 4 5 6 7 8
-
- 888888 888888 88 88 8888888888 88 88 8888888888
- 88 88 88 88 88 88 88 88 88 88 88 88
- 8888 8888 8888 8888 88 8888888888 8888888888 88
- 88 88 88 88
- 88 88 888888 888888
- */
- switch (orientation)
- {
- case EXIF_ORIENTATION_TOP_LEFT:
- /* normal -- nothing to do */
- rotate = FALSE;
- break;
- case EXIF_ORIENTATION_TOP_RIGHT:
- /* mirrored */
- imd->delay_alter_type = ALTER_MIRROR;
- break;
- case EXIF_ORIENTATION_BOTTOM_RIGHT:
- /* upside down */
- imd->delay_alter_type = ALTER_ROTATE_180;
- break;
- case EXIF_ORIENTATION_BOTTOM_LEFT:
- /* flipped */
- imd->delay_alter_type = ALTER_FLIP;
- break;
- case EXIF_ORIENTATION_LEFT_TOP:
- /* not implemented -- too wacky to fix in one step */
- rotate = FALSE;
- break;
- case EXIF_ORIENTATION_RIGHT_TOP:
- /* rotated -90 (270) */
- imd->delay_alter_type = ALTER_ROTATE_90;
- break;
- case EXIF_ORIENTATION_RIGHT_BOTTOM:
- /* not implemented -- too wacky to fix in one step */
- rotate = FALSE;
- break;
- case EXIF_ORIENTATION_LEFT_BOTTOM:
- /* rotated 90 */
- imd->delay_alter_type = ALTER_ROTATE_90_CC;
- break;
- default:
- /* The other values are out of range */
- rotate = FALSE;
- break;
- }
-
- if (rotate) image_state_set(imd, IMAGE_STATE_ROTATE_AUTO);
- }
- }
- if (imd->color_profile_enable)
+ image_update_util(imd);
+
+ if (screen_profile)
{
- if (!image_post_process_color(imd, 0, exif, TRUE))
- {
- /* fixme: note error to user */
- image_state_set(imd, IMAGE_STATE_COLOR_ADJ);
- }
+ g_free(screen_profile);
+ screen_profile = NULL;
}
-
-
- if (!imd->cm) image_post_process_alter(imd, clamp);
-
- exif_free(exif);
-#endif
+
+ return !!cm;
}
+
static void image_post_process_tile_color_cb(PixbufRenderer *pr, GdkPixbuf **pixbuf, gint x, gint y, gint w, gint h, gpointer data)
{
ImageWindow *imd = (ImageWindow *)data;
}
-void image_alter(ImageWindow *imd, AlterType type)
+void image_alter_orientation(ImageWindow *imd, AlterType type)
{
-
- const static gint rotate_90[] = {1, 6, 7, 8, 5, 2, 3, 4, 1};
- const static gint rotate_90_cc[] = {1, 8, 5, 6, 7, 4, 1, 2, 3};
- const static gint rotate_180[] = {1, 3, 4, 1, 2, 7, 8, 5, 6};
- const static gint mirror[] = {1, 2, 1, 4, 3, 6, 5, 8, 7};
- const static gint flip[] = {1, 4, 3, 2, 1, 8, 7, 6, 5};
+ static const gint rotate_90[] = {1, 6, 7, 8, 5, 2, 3, 4, 1};
+ static const gint rotate_90_cc[] = {1, 8, 5, 6, 7, 4, 1, 2, 3};
+ static const gint rotate_180[] = {1, 3, 4, 1, 2, 7, 8, 5, 6};
+ static const gint mirror[] = {1, 2, 1, 4, 3, 6, 5, 8, 7};
+ static const gint flip[] = {1, 4, 3, 2, 1, 8, 7, 6, 5};
- if (!imd || !imd->pr) return;
+ if (!imd || !imd->pr || !imd->image_fd) return;
if (imd->orientation < 1 || imd->orientation > 8) imd->orientation = 1;
case ALTER_FLIP:
imd->orientation = flip[imd->orientation];
break;
- case ALTER_DESATURATE:
- imd->desaturate = !imd->desaturate;
- break;
case ALTER_NONE:
imd->orientation = imd->image_fd->exif_orientation ? imd->image_fd->exif_orientation : 1;
- imd->desaturate = FALSE;
break;
default:
return;
break;
}
- if (type != ALTER_NONE && type != ALTER_DESATURATE)
+ if (imd->orientation != imd->image_fd->exif_orientation ? imd->image_fd->exif_orientation : 1)
{
- if (imd->image_fd->user_orientation == 0) file_data_ref(imd->image_fd);
- imd->image_fd->user_orientation = imd->orientation;
+ if (!options->metadata.write_orientation)
+ {
+ /* user_orientation does not work together with options->metadata.write_orientation,
+ use either one or the other.
+ we must however handle switching metadata.write_orientation on and off, therefore
+ we just disable referencing new fd's, not unreferencing the old ones
+ */
+ if (imd->image_fd->user_orientation == 0) file_data_ref(imd->image_fd);
+ imd->image_fd->user_orientation = imd->orientation;
+ }
}
else
{
imd->image_fd->user_orientation = 0;
}
+ if (options->metadata.write_orientation)
+ {
+ if (type == ALTER_NONE)
+ {
+ metadata_write_revert(imd->image_fd, ORIENTATION_KEY);
+ }
+ else
+ {
+ metadata_write_int(imd->image_fd, ORIENTATION_KEY, imd->orientation);
+ }
+ }
+
pixbuf_renderer_set_orientation((PixbufRenderer *)imd->pr, imd->orientation);
+}
+
+void image_set_desaturate(ImageWindow *imd, gboolean desaturate)
+{
+ imd->desaturate = desaturate;
if (imd->cm || imd->desaturate)
pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, image_post_process_tile_color_cb, (gpointer) imd, (imd->cm != NULL) );
else
pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, NULL, NULL, TRUE);
+ pixbuf_renderer_set_orientation((PixbufRenderer *)imd->pr, imd->orientation);
}
+gboolean image_get_desaturate(ImageWindow *imd)
+{
+ return imd->desaturate;
+}
/*
*-------------------------------------------------------------------
static void image_read_ahead_cancel(ImageWindow *imd)
{
- if (debug) printf("%s read ahead cancelled for :%s\n", get_exec_time(), imd->read_ahead_fd ? imd->read_ahead_fd->path : "null");
+ DEBUG_1("%s read ahead cancelled for :%s", get_exec_time(), imd->read_ahead_fd ? imd->read_ahead_fd->path : "null");
image_loader_free(imd->read_ahead_il);
imd->read_ahead_il = NULL;
- if (imd->read_ahead_pixbuf) g_object_unref(imd->read_ahead_pixbuf);
- imd->read_ahead_pixbuf = NULL;
-
file_data_unref(imd->read_ahead_fd);
imd->read_ahead_fd = NULL;
}
{
ImageWindow *imd = data;
- if (debug) printf("%s read ahead done for :%s\n", get_exec_time(), imd->read_ahead_fd->path);
+ DEBUG_1("%s read ahead done for :%s", get_exec_time(), imd->read_ahead_fd->path);
- imd->read_ahead_pixbuf = image_loader_get_pixbuf(imd->read_ahead_il);
- if (imd->read_ahead_pixbuf)
+ if (!imd->read_ahead_fd->pixbuf)
{
- g_object_ref(imd->read_ahead_pixbuf);
- }
- else
- {
- imd->read_ahead_pixbuf = pixbuf_inline(PIXBUF_INLINE_BROKEN);
+ imd->read_ahead_fd->pixbuf = image_loader_get_pixbuf(imd->read_ahead_il);
+ if (imd->read_ahead_fd->pixbuf)
+ {
+ g_object_ref(imd->read_ahead_fd->pixbuf);
+ image_cache_set(imd, imd->read_ahead_fd);
+ }
}
image_loader_free(imd->read_ahead_il);
imd->read_ahead_il = NULL;
static void image_read_ahead_start(ImageWindow *imd)
{
/* already started ? */
- if (!imd->read_ahead_fd || imd->read_ahead_il || imd->read_ahead_pixbuf) return;
+ if (!imd->read_ahead_fd || imd->read_ahead_il || imd->read_ahead_fd->pixbuf) return;
/* still loading ?, do later */
if (imd->il /*|| imd->cm*/) return;
- if (debug) printf("%s read ahead started for :%s\n", get_exec_time(), imd->read_ahead_fd->path);
+ DEBUG_1("%s read ahead started for :%s", get_exec_time(), imd->read_ahead_fd->path);
imd->read_ahead_il = image_loader_new(imd->read_ahead_fd);
+
+ image_loader_delay_area_ready(imd->read_ahead_il, TRUE); /* we will need the area_ready signals later */
- image_loader_set_error_func(imd->read_ahead_il, image_read_ahead_error_cb, imd);
- if (!image_loader_start(imd->read_ahead_il, image_read_ahead_done_cb, imd))
+ g_signal_connect(G_OBJECT(imd->read_ahead_il), "error", (GCallback)image_read_ahead_error_cb, imd);
+ g_signal_connect(G_OBJECT(imd->read_ahead_il), "done", (GCallback)image_read_ahead_done_cb, imd);
+
+ if (!image_loader_start(imd->read_ahead_il))
{
image_read_ahead_cancel(imd);
image_complete_util(imd, TRUE);
imd->read_ahead_fd = file_data_ref(fd);
- if (debug) printf("read ahead set to :%s\n", imd->read_ahead_fd->path);
+ DEBUG_1("read ahead set to :%s", imd->read_ahead_fd->path);
image_read_ahead_start(imd);
}
*-------------------------------------------------------------------
*/
-static void image_post_buffer_set(ImageWindow *imd, FileData *fd, GdkPixbuf *pixbuf, gint color_row)
+static void image_cache_release_cb(FileData *fd)
{
- file_data_unref(imd->prev_fd);
- if (imd->prev_pixbuf) g_object_unref(imd->prev_pixbuf);
+ g_object_unref(fd->pixbuf);
+ fd->pixbuf = NULL;
+}
- if (fd && pixbuf)
- {
- imd->prev_fd = file_data_ref(fd);
+static FileCacheData *image_get_cache(void)
+{
+ static FileCacheData *cache = NULL;
+ if (!cache) cache = file_cache_new(image_cache_release_cb, 1);
+ file_cache_set_max_size(cache, (gulong)options->image.image_cache_max * 1048576); /* update from options */
+ return cache;
+}
- g_object_ref(pixbuf);
- imd->prev_pixbuf = pixbuf;
- imd->prev_color_row = color_row;
- }
- else
- {
- imd->prev_fd = NULL;
- imd->prev_pixbuf = NULL;
- imd->prev_color_row = -1;
- }
+static void image_cache_set(ImageWindow *imd, FileData *fd)
+{
+ g_assert(fd->pixbuf);
- if (debug) printf("%s post buffer set: %s\n", get_exec_time(), fd ? fd->path : "null");
+ file_cache_put(image_get_cache(), fd, (gulong)gdk_pixbuf_get_rowstride(fd->pixbuf) * (gulong)gdk_pixbuf_get_height(fd->pixbuf));
+ file_data_send_notification(fd, NOTIFY_PIXBUF); /* to update histogram */
}
-static gint image_post_buffer_get(ImageWindow *imd)
+static gint image_cache_get(ImageWindow *imd)
{
gint success;
- if (imd->prev_pixbuf &&
- imd->image_fd && imd->prev_fd && imd->image_fd == imd->prev_fd)
+ success = file_cache_get(image_get_cache(), imd->image_fd);
+ if (success)
{
- image_change_pixbuf(imd, imd->prev_pixbuf, image_zoom_get(imd));
- if (imd->prev_color_row >= 0)
- {
- ExifData *exif = NULL;
-
- if (imd->color_profile_use_image) exif = exif_read_fd(imd->image_fd);
-// image_post_process_color(imd, imd->prev_color_row, exif, TRUE);
- exif_free(exif);
- }
- success = TRUE;
- }
- else
- {
- success = FALSE;
+ g_assert(imd->image_fd->pixbuf);
+ image_change_pixbuf(imd, imd->image_fd->pixbuf, image_zoom_get(imd), FALSE);
}
-
- if (imd->prev_pixbuf) g_object_unref(imd->prev_pixbuf);
- imd->prev_pixbuf = NULL;
-
- file_data_unref(imd->prev_fd);
- imd->prev_fd = NULL;
-
+
+// file_cache_dump(image_get_cache());
return success;
}
{
if (image_get_pixbuf(imd) || !imd->il) return;
- image_change_pixbuf(imd, image_loader_get_pixbuf(imd->il), image_zoom_get(imd));
+ image_change_pixbuf(imd, image_loader_get_pixbuf(imd->il), image_zoom_get(imd), FALSE);
}
static void image_load_area_cb(ImageLoader *il, guint x, guint y, guint w, guint h, gpointer data)
return;
}
- if (!pr->pixbuf) image_load_pixbuf_ready(imd);
+ if (!pr->pixbuf) image_change_pixbuf(imd, image_loader_get_pixbuf(imd->il), image_zoom_get(imd), TRUE);
pixbuf_renderer_area_changed(pr, x, y, w, h);
}
{
ImageWindow *imd = data;
- if (debug) printf ("%s image done\n", get_exec_time());
+ DEBUG_1("%s image done", get_exec_time());
+ if (options->image.enable_read_ahead && imd->image_fd && !imd->image_fd->pixbuf && image_loader_get_pixbuf(imd->il))
+ {
+ imd->image_fd->pixbuf = g_object_ref(image_loader_get_pixbuf(imd->il));
+ image_cache_set(imd, imd->image_fd);
+ }
+ /* call the callback triggered by image_state after fd->pixbuf is set */
g_object_set(G_OBJECT(imd->pr), "loading", FALSE, NULL);
image_state_unset(imd, IMAGE_STATE_LOADING);
- if (imd->delay_flip &&
+ if (!image_loader_get_pixbuf(imd->il))
+ {
+ GdkPixbuf *pixbuf;
+
+ pixbuf = pixbuf_inline(PIXBUF_INLINE_BROKEN);
+ image_change_pixbuf(imd, pixbuf, image_zoom_get(imd), FALSE);
+ g_object_unref(pixbuf);
+
+ imd->unknown = TRUE;
+ }
+ else if (imd->delay_flip &&
image_get_pixbuf(imd) != image_loader_get_pixbuf(imd->il))
{
g_object_set(G_OBJECT(imd->pr), "complete", FALSE, NULL);
- image_change_pixbuf(imd, image_loader_get_pixbuf(imd->il), image_zoom_get(imd));
+ image_change_pixbuf(imd, image_loader_get_pixbuf(imd->il), image_zoom_get(imd), FALSE);
}
image_loader_free(imd->il);
imd->il = NULL;
- image_post_process(imd, TRUE);
+// image_post_process(imd, TRUE);
image_read_ahead_start(imd);
}
+static void image_load_size_cb(ImageLoader *il, guint width, guint height, gpointer data)
+{
+ ImageWindow *imd = data;
+
+ DEBUG_1("image_load_size_cb: %dx%d", width, height);
+ pixbuf_renderer_set_size_early((PixbufRenderer *)imd->pr, width, height);
+}
+
static void image_load_error_cb(ImageLoader *il, gpointer data)
{
- if (debug) printf ("%s image error\n", get_exec_time());
+ DEBUG_1("%s image error", get_exec_time());
/* even on error handle it like it was done,
* since we have a pixbuf with _something_ */
image_load_done_cb(il, data);
}
-#ifdef IMAGE_THROTTLE_LARGER_IMAGES
-static void image_load_buffer_throttle(ImageLoader *il)
+static void image_load_set_signals(ImageWindow *imd, gboolean override_old_signals)
{
- if (!il || il->bytes_total < IMAGE_THROTTLE_THRESHOLD) return;
-
- /* Larger image files usually have larger chunks of data per pixel...
- * So increase the buffer read size so that the rendering chunks called
- * are also larger.
- */
+ g_assert(imd->il);
+ if (override_old_signals)
+ {
+ /* override the old signals */
+ g_signal_handlers_disconnect_matched(G_OBJECT(imd->il), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, imd);
+ }
- image_loader_set_buffer_size(il, IMAGE_LOAD_BUFFER_COUNT * IMAGE_THROTTLE_FACTOR);
+ g_signal_connect(G_OBJECT(imd->il), "area_ready", (GCallback)image_load_area_cb, imd);
+ g_signal_connect(G_OBJECT(imd->il), "error", (GCallback)image_load_error_cb, imd);
+ g_signal_connect(G_OBJECT(imd->il), "done", (GCallback)image_load_done_cb, imd);
+ g_signal_connect(G_OBJECT(imd->il), "size_prepared", (GCallback)image_load_size_cb, imd);
}
-#endif
/* this read ahead is located here merely for the callbacks, above */
-static gint image_read_ahead_check(ImageWindow *imd)
+static gboolean image_read_ahead_check(ImageWindow *imd)
{
if (!imd->read_ahead_fd) return FALSE;
if (imd->il) return FALSE;
imd->il = imd->read_ahead_il;
imd->read_ahead_il = NULL;
- /* override the old signals */
- image_loader_set_area_ready_func(imd->il, image_load_area_cb, imd);
- image_loader_set_error_func(imd->il, image_load_error_cb, imd);
- image_loader_set_buffer_size(imd->il, IMAGE_LOAD_BUFFER_COUNT);
-
-#ifdef IMAGE_THROTTLE_LARGER_IMAGES
- image_load_buffer_throttle(imd->il);
-#endif
-
- /* do this one directly (probably should add a set func) */
- imd->il->func_done = image_load_done_cb;
+ image_load_set_signals(imd, TRUE);
g_object_set(G_OBJECT(imd->pr), "loading", TRUE, NULL);
image_state_set(imd, IMAGE_STATE_LOADING);
if (!imd->delay_flip)
{
- image_change_pixbuf(imd, image_loader_get_pixbuf(imd->il), image_zoom_get(imd));
+ image_change_pixbuf(imd, image_loader_get_pixbuf(imd->il), image_zoom_get(imd), TRUE);
}
- image_read_ahead_cancel(imd);
+ image_loader_delay_area_ready(imd->il, FALSE); /* send the delayed area_ready signals */
+
+ file_data_unref(imd->read_ahead_fd);
+ imd->read_ahead_fd = NULL;
return TRUE;
}
- else if (imd->read_ahead_pixbuf)
+ else if (imd->read_ahead_fd->pixbuf)
{
- image_change_pixbuf(imd, imd->read_ahead_pixbuf, image_zoom_get(imd));
- g_object_unref(imd->read_ahead_pixbuf);
- imd->read_ahead_pixbuf = NULL;
+ image_change_pixbuf(imd, imd->read_ahead_fd->pixbuf, image_zoom_get(imd), FALSE);
- image_read_ahead_cancel(imd);
+ file_data_unref(imd->read_ahead_fd);
+ imd->read_ahead_fd = NULL;
- image_post_process(imd, FALSE);
+// image_post_process(imd, FALSE);
return TRUE;
}
return FALSE;
}
-static gint image_load_begin(ImageWindow *imd, FileData *fd)
+static gboolean image_load_begin(ImageWindow *imd, FileData *fd)
{
- if (debug) printf ("%s image begin \n", get_exec_time());
+ DEBUG_1("%s image begin", get_exec_time());
if (imd->il) return FALSE;
imd->completed = FALSE;
g_object_set(G_OBJECT(imd->pr), "complete", FALSE, NULL);
- if (image_post_buffer_get(imd))
+ if (image_cache_get(imd))
{
- if (debug) printf("from post buffer: %s\n", imd->image_fd->path);
+ DEBUG_1("from cache: %s", imd->image_fd->path);
return TRUE;
}
if (image_read_ahead_check(imd))
{
- if (debug) printf("from read ahead buffer: %s\n", imd->image_fd->path);
+ DEBUG_1("from read ahead buffer: %s", imd->image_fd->path);
return TRUE;
}
imd->il = image_loader_new(fd);
- image_loader_set_area_ready_func(imd->il, image_load_area_cb, imd);
- image_loader_set_error_func(imd->il, image_load_error_cb, imd);
- image_loader_set_buffer_size(imd->il, IMAGE_LOAD_BUFFER_COUNT);
+ image_load_set_signals(imd, FALSE);
- if (!image_loader_start(imd->il, image_load_done_cb, imd))
+ if (!image_loader_start(imd->il))
{
- if (debug) printf("image start error\n");
+ DEBUG_1("image start error");
g_object_set(G_OBJECT(imd->pr), "loading", FALSE, NULL);
image_state_set(imd, IMAGE_STATE_LOADING);
-#ifdef IMAGE_THROTTLE_LARGER_IMAGES
- image_load_buffer_throttle(imd->il);
-#endif
-
- if (!imd->delay_flip && !image_get_pixbuf(imd)) image_load_pixbuf_ready(imd);
-
+/*
+ if (!imd->delay_flip && !image_get_pixbuf(imd) && image_loader_get_pixbuf(imd->il))
+ {
+ image_change_pixbuf(imd, image_loader_get_pixbuf(imd->il), image_zoom_get(imd), TRUE);
+ }
+*/
return TRUE;
}
{
/* stops anything currently being done */
- if (debug) printf("%s image reset\n", get_exec_time());
+ DEBUG_1("%s image reset", get_exec_time());
g_object_set(G_OBJECT(imd->pr), "loading", FALSE, NULL);
*-------------------------------------------------------------------
*/
-static void image_change_complete(ImageWindow *imd, gdouble zoom, gint new)
+static void image_change_complete(ImageWindow *imd, gdouble zoom)
{
image_reset(imd);
+ imd->unknown = TRUE;
- if (imd->image_fd && isfile(imd->image_fd->path))
+ if (!imd->image_fd)
+ {
+ image_change_pixbuf(imd, NULL, zoom, FALSE);
+ }
+ else
{
- PixbufRenderer *pr;
-
- pr = PIXBUF_RENDERER(imd->pr);
- pr->zoom = zoom; /* store the zoom, needed by the loader */
- if (image_load_begin(imd, imd->image_fd))
- {
- imd->unknown = FALSE;
- }
- else
+ if (is_readable_file(imd->image_fd->path))
{
- GdkPixbuf *pixbuf;
-
- pixbuf = pixbuf_inline(PIXBUF_INLINE_BROKEN);
- image_change_pixbuf(imd, pixbuf, zoom);
- g_object_unref(pixbuf);
+ PixbufRenderer *pr;
+
+ pr = PIXBUF_RENDERER(imd->pr);
+ pr->zoom = zoom; /* store the zoom, needed by the loader */
- imd->unknown = TRUE;
+ if (image_load_begin(imd, imd->image_fd))
+ {
+ imd->unknown = FALSE;
+ }
}
- imd->size = filesize(imd->image_fd->path);
- imd->mtime = filetime(imd->image_fd->path);
- }
- else
- {
- if (imd->image_fd)
+
+ if (imd->unknown == TRUE)
{
GdkPixbuf *pixbuf;
-
+
pixbuf = pixbuf_inline(PIXBUF_INLINE_BROKEN);
- image_change_pixbuf(imd, pixbuf, zoom);
+ image_change_pixbuf(imd, pixbuf, zoom, FALSE);
g_object_unref(pixbuf);
- imd->mtime = filetime(imd->image_fd->path);
- }
- else
- {
- image_change_pixbuf(imd, NULL, zoom);
- imd->mtime = 0;
}
- imd->unknown = TRUE;
- imd->size = 0;
}
image_update_util(imd);
static void image_change_real(ImageWindow *imd, FileData *fd,
CollectionData *cd, CollectInfo *info, gdouble zoom)
{
- GdkPixbuf *pixbuf;
- GdkPixbuf *prev_pixbuf = NULL;
- FileData *prev_fd = NULL;
- gint prev_clear = FALSE;
- gint prev_color_row = -1;
imd->collection = cd;
imd->collection_info = info;
- pixbuf = image_get_pixbuf(imd);
-
- if (options->image.enable_read_ahead && imd->image_fd && pixbuf)
- {
- if (imd->il)
- {
- /* current image is not finished */
- prev_clear = TRUE;
- }
- else
- {
- prev_fd = file_data_ref(imd->image_fd);
- prev_pixbuf = pixbuf;
- g_object_ref(prev_pixbuf);
-
- if (imd->cm)
- {
- ColorMan *cm;
-
- cm = (ColorMan *)imd->cm;
- prev_color_row = cm->row;
- }
- }
- }
+ if (imd->auto_refresh && imd->image_fd)
+ file_data_unregister_real_time_monitor(imd->image_fd);
file_data_unref(imd->image_fd);
imd->image_fd = file_data_ref(fd);
- image_change_complete(imd, zoom, TRUE);
- if (prev_pixbuf)
- {
- image_post_buffer_set(imd, prev_fd, prev_pixbuf, prev_color_row);
- file_data_unref(prev_fd);
- g_object_unref(prev_pixbuf);
- }
- else if (prev_clear)
- {
- image_post_buffer_set(imd, NULL, NULL, -1);
- }
+ image_change_complete(imd, zoom);
image_update_title(imd);
image_state_set(imd, IMAGE_STATE_IMAGE);
+
+ if (imd->auto_refresh && imd->image_fd)
+ file_data_register_real_time_monitor(imd->image_fd);
}
/*
*-------------------------------------------------------------------
*/
-static void image_focus_paint(ImageWindow *imd, gint has_focus, GdkRectangle *area)
+static gboolean image_focus_in_cb(GtkWidget *widget, GdkEventFocus *event, gpointer data)
{
- GtkWidget *widget;
-
- widget = imd->widget;
- if (!widget->window) return;
+ ImageWindow *imd = data;
- if (has_focus)
- {
- gtk_paint_focus (widget->style, widget->window, GTK_STATE_ACTIVE,
- area, widget, "image_window",
- widget->allocation.x, widget->allocation.y,
- widget->allocation.width - 1, widget->allocation.height - 1);
- }
- else
+ if (imd->func_focus_in)
{
- gtk_paint_shadow (widget->style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_IN,
- area, widget, "image_window",
- widget->allocation.x, widget->allocation.y,
- widget->allocation.width - 1, widget->allocation.height - 1);
+ imd->func_focus_in(imd, imd->data_focus_in);
}
-}
-
-static gint image_focus_expose(GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
- ImageWindow *imd = data;
-
- image_focus_paint(imd, GTK_WIDGET_HAS_FOCUS(widget), &event->area);
- return TRUE;
-}
-
-static gint image_focus_in_cb(GtkWidget *widget, GdkEventFocus *event, gpointer data)
-{
- ImageWindow *imd = data;
-
- GTK_WIDGET_SET_FLAGS(imd->widget, GTK_HAS_FOCUS);
- image_focus_paint(imd, TRUE, NULL);
return TRUE;
}
-static gint image_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, gpointer data)
-{
- ImageWindow *imd = data;
-
- GTK_WIDGET_UNSET_FLAGS(imd->widget, GTK_HAS_FOCUS);
- image_focus_paint(imd, FALSE, NULL);
-
- return TRUE;
-}
-
-gint image_overlay_add(ImageWindow *imd, GdkPixbuf *pixbuf, gint x, gint y,
- gint relative, gint always)
-{
- return pixbuf_renderer_overlay_add((PixbufRenderer *)imd->pr, pixbuf, x, y, relative, always);
-}
-
-void image_overlay_set(ImageWindow *imd, gint id, GdkPixbuf *pixbuf, gint x, gint y)
-{
- pixbuf_renderer_overlay_set((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
-}
-
-gint image_overlay_get(ImageWindow *imd, gint id, GdkPixbuf **pixbuf, gint *x, gint *y)
-{
- return pixbuf_renderer_overlay_get((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
-}
-
-void image_overlay_remove(ImageWindow *imd, gint id)
-{
- pixbuf_renderer_overlay_remove((PixbufRenderer *)imd->pr, id);
-}
-
-static gint image_scroll_cb(GtkWidget *widget, GdkEventScroll *event, gpointer data)
+static gboolean image_scroll_cb(GtkWidget *widget, GdkEventScroll *event, gpointer data)
{
ImageWindow *imd = data;
if (imd->func_scroll &&
event && event->type == GDK_SCROLL)
{
- imd->func_scroll(imd, event->direction, event->time,
- event->x, event->y, event->state, imd->data_scroll);
+ imd->func_scroll(imd, event, imd->data_scroll);
return TRUE;
}
*/
void image_attach_window(ImageWindow *imd, GtkWidget *window,
- const gchar *title, const gchar *title_right, gint show_zoom)
+ const gchar *title, const gchar *title_right, gboolean show_zoom)
{
imd->top_window = window;
g_free(imd->title);
}
void image_set_complete_func(ImageWindow *imd,
- void (*func)(ImageWindow *imd, gint preload, gpointer data),
+ void (*func)(ImageWindow *imd, gboolean preload, gpointer data),
gpointer data)
{
imd->func_complete = func;
void image_set_button_func(ImageWindow *imd,
- void (*func)(ImageWindow *, gint button, guint32 time, gdouble x, gdouble y, guint state, gpointer),
+ void (*func)(ImageWindow *, GdkEventButton *event, gpointer),
gpointer data)
{
imd->func_button = func;
}
void image_set_drag_func(ImageWindow *imd,
- void (*func)(ImageWindow *, gint button, guint32 time, gdouble x, gdouble y, guint state, gdouble dx, gdouble dy, gpointer),
+ void (*func)(ImageWindow *, GdkEventButton *event, gdouble dx, gdouble dy, gpointer),
gpointer data)
{
imd->func_drag = func;
}
void image_set_scroll_func(ImageWindow *imd,
- void (*func)(ImageWindow *, GdkScrollDirection direction, guint32 time, gdouble x, gdouble y, guint state, gpointer),
+ void (*func)(ImageWindow *, GdkEventScroll *event, gpointer),
gpointer data)
{
imd->func_scroll = func;
imd->data_scroll_notify = data;
}
+void image_set_focus_in_func(ImageWindow *imd,
+ void (*func)(ImageWindow *, gpointer),
+ gpointer data)
+{
+ imd->func_focus_in = func;
+ imd->data_focus_in = data;
+}
+
/* path, name */
const gchar *image_get_path(ImageWindow *imd)
/* merely changes path string, does not change the image! */
void image_set_fd(ImageWindow *imd, FileData *fd)
{
+ if (imd->auto_refresh && imd->image_fd)
+ file_data_unregister_real_time_monitor(imd->image_fd);
+
file_data_unref(imd->image_fd);
imd->image_fd = file_data_ref(fd);
image_update_title(imd);
image_state_set(imd, IMAGE_STATE_IMAGE);
+
+ if (imd->auto_refresh && imd->image_fd)
+ file_data_register_real_time_monitor(imd->image_fd);
}
/* load a new image */
image_change_real(imd, fd, NULL, NULL, zoom);
}
+gboolean image_get_image_size(ImageWindow *imd, gint *width, gint *height)
+{
+ return pixbuf_renderer_get_image_size(PIXBUF_RENDERER(imd->pr), width, height);
+}
+
GdkPixbuf *image_get_pixbuf(ImageWindow *imd)
{
return pixbuf_renderer_get_pixbuf((PixbufRenderer *)imd->pr);
}
-void image_change_pixbuf(ImageWindow *imd, GdkPixbuf *pixbuf, gdouble zoom)
+void image_change_pixbuf(ImageWindow *imd, GdkPixbuf *pixbuf, gdouble zoom, gboolean lazy)
{
-
- ExifData *exif = NULL;
- gint read_exif_for_color_profile = (imd->color_profile_enable && imd->color_profile_use_image);
- gint read_exif_for_orientation = FALSE;
-
- if (imd->image_fd && imd->image_fd->user_orientation)
- imd->orientation = imd->image_fd->user_orientation;
- else if (options->image.exif_rotate_enable)
- read_exif_for_orientation = TRUE;
-
- if (read_exif_for_color_profile || read_exif_for_orientation)
+ StereoPixbufData stereo_data = STEREO_PIXBUF_DEFAULT;
+ /* read_exif and similar functions can actually notice that the file has changed and trigger
+ a notification that removes the pixbuf from cache and unrefs it. Therefore we must ref it
+ here before it is taken over by the renderer. */
+ if (pixbuf) g_object_ref(pixbuf);
+
+ if (imd->image_fd)
{
- gint orientation;
-
- exif = exif_read_fd(imd->image_fd);
-
- if (exif && read_exif_for_orientation)
+ if (imd->image_fd->user_orientation)
{
- if (exif_get_integer(exif, "Exif.Image.Orientation", &orientation))
- imd->orientation = orientation;
- else
- imd->orientation = 1;
+ imd->orientation = imd->image_fd->user_orientation;
+ }
+ else if (options->image.exif_rotate_enable)
+ {
+ imd->orientation = metadata_read_int(imd->image_fd, ORIENTATION_KEY, EXIF_ORIENTATION_TOP_LEFT);
imd->image_fd->exif_orientation = imd->orientation;
}
}
+ if (pixbuf)
+ {
+ stereo_data = imd->user_stereo;
+ if (stereo_data == STEREO_PIXBUF_DEFAULT)
+ {
+ stereo_data = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(pixbuf), "stereo_data"));
+ }
+ }
+
pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, NULL, NULL, FALSE);
if (imd->cm)
{
imd->cm = NULL;
}
- pixbuf_renderer_set_pixbuf((PixbufRenderer *)imd->pr, pixbuf, zoom);
- pixbuf_renderer_set_orientation((PixbufRenderer *)imd->pr, imd->orientation);
+ if (lazy)
+ {
+ pixbuf_renderer_set_pixbuf_lazy((PixbufRenderer *)imd->pr, pixbuf, zoom, imd->orientation, stereo_data);
+ }
+ else
+ {
+ pixbuf_renderer_set_pixbuf((PixbufRenderer *)imd->pr, pixbuf, zoom);
+ pixbuf_renderer_set_orientation((PixbufRenderer *)imd->pr, imd->orientation);
+ pixbuf_renderer_set_stereo_data((PixbufRenderer *)imd->pr, stereo_data);
+ }
+
+ if (pixbuf) g_object_unref(pixbuf);
if (imd->color_profile_enable)
{
- if (!image_post_process_color(imd, 0, exif, FALSE))
- {
- /* fixme: note error to user */
-// image_state_set(imd, IMAGE_STATE_COLOR_ADJ);
- }
+ image_post_process_color(imd, 0, FALSE); /* TODO: error handling */
}
- exif_free(exif);
-
if (imd->cm || imd->desaturate)
pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, image_post_process_tile_color_cb, (gpointer) imd, (imd->cm != NULL) );
return NULL;
}
-static void image_loader_sync_data(ImageLoader *il, gpointer data)
+static void image_loader_sync_read_ahead_data(ImageLoader *il, gpointer old_data, gpointer data)
+{
+ if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (GCallback)image_read_ahead_error_cb, old_data))
+ g_signal_connect(G_OBJECT(il), "error", (GCallback)image_read_ahead_error_cb, data);
+
+ if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (GCallback)image_read_ahead_done_cb, old_data))
+ g_signal_connect(G_OBJECT(il), "done", (GCallback)image_read_ahead_done_cb, data);
+}
+
+static void image_loader_sync_data(ImageLoader *il, gpointer old_data, gpointer data)
{
- /* change data for the callbacks directly */
+ if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (GCallback)image_load_area_cb, old_data))
+ g_signal_connect(G_OBJECT(il), "area_ready", (GCallback)image_load_area_cb, data);
+
+ if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (GCallback)image_load_error_cb, old_data))
+ g_signal_connect(G_OBJECT(il), "error", (GCallback)image_load_error_cb, data);
- il->data_area_ready = data;
- il->data_error = data;
- il->data_done = data;
- il->data_percent = data;
+ if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (GCallback)image_load_done_cb, old_data))
+ g_signal_connect(G_OBJECT(il), "done", (GCallback)image_load_done_cb, data);
}
/* this is more like a move function
* it moves most data from source to imd
*/
-void image_change_from_image(ImageWindow *imd, ImageWindow *source)
+void image_move_from_image(ImageWindow *imd, ImageWindow *source)
{
if (imd == source) return;
imd->collection = source->collection;
imd->collection_info = source->collection_info;
- imd->size = source->size;
- imd->mtime = source->mtime;
-
- image_set_fd(imd, image_get_fd(source));
image_loader_free(imd->il);
imd->il = NULL;
+ image_set_fd(imd, image_get_fd(source));
+
+
if (source->il)
{
imd->il = source->il;
source->il = NULL;
- image_loader_sync_data(imd->il, imd);
+ image_loader_sync_data(imd->il, source, imd);
imd->delay_alter_type = source->delay_alter_type;
source->delay_alter_type = ALTER_NONE;
imd->color_profile_enable = source->color_profile_enable;
imd->color_profile_input = source->color_profile_input;
- imd->color_profile_screen = source->color_profile_screen;
+ imd->color_profile_use_image = source->color_profile_use_image;
+ color_man_free((ColorMan *)imd->cm);
+ imd->cm = NULL;
+
+ file_data_unref(imd->read_ahead_fd);
+ source->read_ahead_fd = NULL;
+
+ imd->orientation = source->orientation;
+ imd->desaturate = source->desaturate;
+
+ imd->user_stereo = source->user_stereo;
+
+ pixbuf_renderer_move(PIXBUF_RENDERER(imd->pr), PIXBUF_RENDERER(source->pr));
+
+ if (imd->cm || imd->desaturate)
+ pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, image_post_process_tile_color_cb, (gpointer) imd, (imd->cm != NULL) );
+ else
+ pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, NULL, NULL, TRUE);
+
+}
+
+/* this is a copy function
+ * source stays unchanged
+ */
+void image_copy_from_image(ImageWindow *imd, ImageWindow *source)
+{
+ if (imd == source) return;
+
+ imd->unknown = source->unknown;
+
+ imd->collection = source->collection;
+ imd->collection_info = source->collection_info;
+
+ image_loader_free(imd->il);
+ imd->il = NULL;
+
+ image_set_fd(imd, image_get_fd(source));
+
+
+ imd->color_profile_enable = source->color_profile_enable;
+ imd->color_profile_input = source->color_profile_input;
imd->color_profile_use_image = source->color_profile_use_image;
color_man_free((ColorMan *)imd->cm);
imd->cm = NULL;
image_loader_free(imd->read_ahead_il);
imd->read_ahead_il = source->read_ahead_il;
source->read_ahead_il = NULL;
- if (imd->read_ahead_il) image_loader_sync_data(imd->read_ahead_il, imd);
-
- if (imd->read_ahead_pixbuf) g_object_unref(imd->read_ahead_pixbuf);
- imd->read_ahead_pixbuf = source->read_ahead_pixbuf;
- source->read_ahead_pixbuf = NULL;
+ if (imd->read_ahead_il) image_loader_sync_read_ahead_data(imd->read_ahead_il, source, imd);
file_data_unref(imd->read_ahead_fd);
imd->read_ahead_fd = source->read_ahead_fd;
source->read_ahead_fd = NULL;
- if (imd->prev_pixbuf) g_object_unref(imd->prev_pixbuf);
- imd->prev_pixbuf = source->prev_pixbuf;
- source->prev_pixbuf = NULL;
- imd->prev_color_row = source->prev_color_row;
- source->prev_color_row = -1;
-
- file_data_unref(imd->prev_fd);
- imd->prev_fd = source->prev_fd;
- source->prev_fd = NULL;
-
imd->completed = source->completed;
imd->state = source->state;
source->state = IMAGE_STATE_NONE;
imd->orientation = source->orientation;
imd->desaturate = source->desaturate;
- pixbuf_renderer_move(PIXBUF_RENDERER(imd->pr), PIXBUF_RENDERER(source->pr));
+ imd->user_stereo = source->user_stereo;
+
+ pixbuf_renderer_copy(PIXBUF_RENDERER(imd->pr), PIXBUF_RENDERER(source->pr));
if (imd->cm || imd->desaturate)
pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, image_post_process_tile_color_cb, (gpointer) imd, (imd->cm != NULL) );
}
+
/* manipulation */
void image_area_changed(ImageWindow *imd, gint x, gint y, gint width, gint height)
{
if (pixbuf_renderer_get_tiles((PixbufRenderer *)imd->pr)) return;
- image_change_complete(imd, image_zoom_get(imd), FALSE);
+ image_change_complete(imd, image_zoom_get(imd));
}
void image_scroll(ImageWindow *imd, gint x, gint y)
pixbuf_renderer_set_scroll_center(PIXBUF_RENDERER(imd->pr), x, y);
}
-
-#if 0
-void image_alter(ImageWindow *imd, AlterType type)
-{
- if (pixbuf_renderer_get_tiles((PixbufRenderer *)imd->pr)) return;
-
- if (imd->il || imd->cm)
- {
- /* still loading, wait till done */
- imd->delay_alter_type = type;
- image_state_set(imd, IMAGE_STATE_ROTATE_USER);
-
- if (imd->cm && (imd->state & IMAGE_STATE_ROTATE_AUTO))
- {
- image_state_unset(imd, IMAGE_STATE_ROTATE_AUTO);
- }
- return;
- }
-
- image_alter_real(imd, type, TRUE);
-}
-#endif
-
void image_zoom_adjust(ImageWindow *imd, gdouble increment)
{
pixbuf_renderer_zoom_adjust((PixbufRenderer *)imd->pr, increment);
pixbuf_renderer_zoom_set((PixbufRenderer *)imd->pr, zoom);
}
-void image_zoom_set_fill_geometry(ImageWindow *imd, gint vertical)
+void image_zoom_set_fill_geometry(ImageWindow *imd, gboolean vertical)
{
PixbufRenderer *pr;
gdouble zoom;
if (vertical)
{
- zoom = (gdouble)pr->window_height / height;
+ zoom = (gdouble)pr->viewport_height / height;
}
else
{
- zoom = (gdouble)pr->window_width / width;
+ zoom = (gdouble)pr->viewport_width / width;
}
if (zoom < 1.0)
return g_strdup_printf("%.*f :%s%.*f", pl, l, approx, pr, r);
}
-gdouble image_zoom_get_default(ImageWindow *imd, gint mode)
+gdouble image_zoom_get_default(ImageWindow *imd)
{
- gdouble zoom;
+ gdouble zoom = 1.0;
- if (mode == ZOOM_RESET_ORIGINAL)
- {
- zoom = 1.0;
- }
- else if (mode == ZOOM_RESET_FIT_WINDOW)
- {
+ switch (options->image.zoom_mode)
+ {
+ case ZOOM_RESET_ORIGINAL:
+ break;
+ case ZOOM_RESET_FIT_WINDOW:
zoom = 0.0;
- }
- else
- {
- if (imd)
- {
- zoom = image_zoom_get(imd);
- }
- else
- {
- zoom = 1.0;
- }
- }
+ break;
+ case ZOOM_RESET_NONE:
+ if (imd) zoom = image_zoom_get(imd);
+ break;
+ }
return zoom;
}
+/* stereo */
+gint image_stereo_get(ImageWindow *imd)
+{
+ return pixbuf_renderer_stereo_get((PixbufRenderer *)imd->pr);
+}
+
+void image_stereo_set(ImageWindow *imd, gint stereo_mode)
+{
+ DEBUG_1("Setting stereo mode %04x for imd %p", stereo_mode, imd);
+ pixbuf_renderer_stereo_set((PixbufRenderer *)imd->pr, stereo_mode);
+}
+
+void image_stereo_swap(ImageWindow *imd)
+{
+ gint stereo_mode = pixbuf_renderer_stereo_get((PixbufRenderer *)imd->pr);
+ stereo_mode ^= PR_STEREO_SWAP;
+ pixbuf_renderer_stereo_set((PixbufRenderer *)imd->pr, stereo_mode);
+}
+
+StereoPixbufData image_stereo_pixbuf_get(ImageWindow *imd)
+{
+ return imd->user_stereo;
+}
+
+void image_stereo_pixbuf_set(ImageWindow *imd, StereoPixbufData stereo_mode)
+{
+ imd->user_stereo = stereo_mode;
+ image_reload(imd);
+}
+
/* read ahead */
void image_prebuffer_set(ImageWindow *imd, FileData *fd)
if (fd)
{
- image_read_ahead_set(imd, fd);
+ if (!file_cache_get(image_get_cache(), fd))
+ {
+ image_read_ahead_set(imd, fd);
+ }
}
else
{
}
}
-static gint image_auto_refresh_cb(gpointer data)
+static void image_notify_cb(FileData *fd, NotifyType type, gpointer data)
{
ImageWindow *imd = data;
- time_t newtime;
if (!imd || !image_get_pixbuf(imd) ||
- imd->il || !imd->image_fd ||
- !options->update_on_time_change) return TRUE;
-
- newtime = filetime(imd->image_fd->path);
- if (newtime > 0 && newtime != imd->mtime)
- {
- imd->mtime = newtime;
+ /* imd->il || */ /* loading in progress - do not check - it should start from the beginning anyway */
+ !imd->image_fd || /* nothing to reload */
+ imd->state == IMAGE_STATE_NONE /* loading not started, no need to reload */
+ ) return;
+
+ if ((type & NOTIFY_REREAD) && fd == imd->image_fd)
+ {
+ /* there is no need to reload on NOTIFY_CHANGE,
+ modified files should be detacted anyway and NOTIFY_REREAD should be recieved
+ or they are removed from the filelist completely on "move" and "delete"
+ */
+ DEBUG_1("Notify image: %s %04x", fd->path, type);
image_reload(imd);
}
-
- return TRUE;
}
-/* image auto refresh on time stamp change, in 1/1000's second, -1 disables */
-
-void image_auto_refresh(ImageWindow *imd, gint interval)
+void image_auto_refresh_enable(ImageWindow *imd, gboolean enable)
{
- if (!imd) return;
- if (pixbuf_renderer_get_tiles((PixbufRenderer *)imd->pr)) return;
-
- if (imd->auto_refresh_id > -1)
- {
- g_source_remove(imd->auto_refresh_id);
- imd->auto_refresh_id = -1;
- imd->auto_refresh_interval = -1;
- }
-
- if (interval < 0) return;
+ if (!enable && imd->auto_refresh && imd->image_fd)
+ file_data_unregister_real_time_monitor(imd->image_fd);
- if (interval == 0) interval = IMAGE_AUTO_REFRESH_TIME;
+ if (enable && !imd->auto_refresh && imd->image_fd)
+ file_data_register_real_time_monitor(imd->image_fd);
- imd->auto_refresh_id = g_timeout_add((guint32)interval, image_auto_refresh_cb, imd);
- imd->auto_refresh_interval = interval;
+ imd->auto_refresh = enable;
}
-void image_top_window_set_sync(ImageWindow *imd, gint allow_sync)
+void image_top_window_set_sync(ImageWindow *imd, gboolean allow_sync)
{
imd->top_window_sync = allow_sync;
pixbuf_renderer_set_color((PixbufRenderer *)imd->pr, color);
}
+void image_background_set_color_from_options(ImageWindow *imd, gboolean fullscreen)
+{
+ GdkColor *color = NULL;
+
+ if ((options->image.use_custom_border_color && !fullscreen) ||
+ (options->image.use_custom_border_color_in_fullscreen && fullscreen))
+ {
+ color = &options->image.border_color;
+ }
+
+ image_background_set_color(imd, color);
+}
+
void image_color_profile_set(ImageWindow *imd,
- gint input_type, gint screen_type,
- gint use_image)
+ gint input_type,
+ gboolean use_image)
{
if (!imd) return;
- if (input_type < 0 || input_type >= COLOR_PROFILE_FILE + COLOR_PROFILE_INPUTS ||
- screen_type < 0 || screen_type > 1)
+ if (input_type < 0 || input_type >= COLOR_PROFILE_FILE + COLOR_PROFILE_INPUTS)
{
return;
}
imd->color_profile_input = input_type;
- imd->color_profile_screen = screen_type;
imd->color_profile_use_image = use_image;
}
-gint image_color_profile_get(ImageWindow *imd,
- gint *input_type, gint *screen_type,
- gint *use_image)
+gboolean image_color_profile_get(ImageWindow *imd,
+ gint *input_type,
+ gboolean *use_image)
{
if (!imd) return FALSE;
if (input_type) *input_type = imd->color_profile_input;
- if (screen_type) *screen_type = imd->color_profile_screen;
if (use_image) *use_image = imd->color_profile_use_image;
return TRUE;
}
-void image_color_profile_set_use(ImageWindow *imd, gint enable)
+void image_color_profile_set_use(ImageWindow *imd, gboolean enable)
{
if (!imd) return;
imd->color_profile_enable = enable;
}
-gint image_color_profile_get_use(ImageWindow *imd)
+gboolean image_color_profile_get_use(ImageWindow *imd)
{
if (!imd) return FALSE;
return imd->color_profile_enable;
}
-gint image_color_profile_get_from_image(ImageWindow *imd)
+gboolean image_color_profile_get_status(ImageWindow *imd, gchar **image_profile, gchar **screen_profile)
{
+ ColorMan *cm;
if (!imd) return FALSE;
+
+ cm = imd->cm;
+ if (!cm) return FALSE;
+ return color_man_get_status(cm, image_profile, screen_profile);
- return imd->color_profile_from_image;
}
-void image_set_delay_flip(ImageWindow *imd, gint delay)
+void image_set_delay_flip(ImageWindow *imd, gboolean delay)
{
if (!imd ||
imd->delay_flip == delay) return;
}
}
-void image_to_root_window(ImageWindow *imd, gint scaled)
+void image_to_root_window(ImageWindow *imd, gboolean scaled)
{
+#if !GTK_CHECK_VERSION(3,0,0)
GdkScreen *screen;
GdkWindow *rootwindow;
GdkPixmap *pixmap;
screen = gtk_widget_get_screen(imd->widget);
rootwindow = gdk_screen_get_root_window(screen);
- if (gdk_drawable_get_visual(rootwindow) != gdk_visual_get_system()) return;
+ if (gdk_window_get_visual(rootwindow) != gdk_visual_get_system()) return;
if (scaled)
{
pb = gdk_pixbuf_scale_simple(pixbuf, width, height, (GdkInterpType)options->image.zoom_quality);
- gdk_pixbuf_render_pixmap_and_mask (pb, &pixmap, NULL, 128);
+ gdk_pixbuf_render_pixmap_and_mask(pb, &pixmap, NULL, 128);
gdk_window_set_back_pixmap(rootwindow, pixmap, FALSE);
gdk_window_clear(rootwindow);
g_object_unref(pb);
g_object_unref(pixmap);
gdk_flush();
+#endif
}
void image_select(ImageWindow *imd, gboolean select)
{
- if (imd->has_frame)
+ if (!imd->has_frame) return;
+
+ if (select)
{
- if (select)
- {
- gtk_widget_set_state(imd->widget, GTK_STATE_SELECTED);
- gtk_widget_set_state(imd->pr, GTK_STATE_NORMAL); /* do not propagate */
- }
- else
- gtk_widget_set_state(imd->widget, GTK_STATE_NORMAL);
+ gtk_widget_set_state(imd->widget, GTK_STATE_SELECTED);
+ gtk_widget_set_state(imd->pr, GTK_STATE_NORMAL); /* do not propagate */
}
+ else
+ gtk_widget_set_state(imd->widget, GTK_STATE_NORMAL);
}
-
-
void image_set_selectable(ImageWindow *imd, gboolean selectable)
+{
+ if (!imd->has_frame) return;
+
+ gtk_frame_set_shadow_type(GTK_FRAME(imd->frame), GTK_SHADOW_NONE);
+ gtk_container_set_border_width(GTK_CONTAINER(imd->frame), selectable ? 4 : 0);
+}
+
+void image_grab_focus(ImageWindow *imd)
{
if (imd->has_frame)
{
- if (selectable)
- {
- gtk_frame_set_shadow_type(GTK_FRAME(imd->frame), GTK_SHADOW_NONE);
- gtk_container_set_border_width (GTK_CONTAINER (imd->frame), 4);
- }
- else
- {
- gtk_frame_set_shadow_type(GTK_FRAME(imd->frame), GTK_SHADOW_NONE);
- gtk_container_set_border_width (GTK_CONTAINER (imd->frame), 0);
- }
+ gtk_widget_grab_focus(imd->frame);
+ }
+ else
+ {
+ gtk_widget_grab_focus(imd->widget);
}
}
+
/*
*-------------------------------------------------------------------
* prefs sync
g_object_set(G_OBJECT(imd->pr), "zoom_quality", options->image.zoom_quality,
"zoom_2pass", options->image.zoom_2pass,
"zoom_expand", options->image.zoom_to_fit_allow_expand,
- "dither_quality", options->image.dither_quality,
"scroll_reset", options->image.scroll_reset_method,
"cache_display", options->image.tile_cache_max,
"window_fit", (imd->top_window_sync && options->image.fit_window_to_image),
NULL);
pixbuf_renderer_set_parent((PixbufRenderer *)imd->pr, (GtkWindow *)imd->top_window);
+
+ image_stereo_set(imd, options->stereo.mode);
+ pixbuf_renderer_stereo_fixed_set((PixbufRenderer *)imd->pr,
+ options->stereo.fixed_w, options->stereo.fixed_h,
+ options->stereo.fixed_x1, options->stereo.fixed_y1,
+ options->stereo.fixed_x2, options->stereo.fixed_y2);
}
void image_options_sync(void)
{
image_list = g_list_remove(image_list, imd);
+ if (imd->auto_refresh && imd->image_fd)
+ file_data_unregister_real_time_monitor(imd->image_fd);
+
+ file_data_unregister_notify_func(image_notify_cb, imd);
+
image_reset(imd);
image_read_ahead_cancel(imd);
- image_post_buffer_set(imd, NULL, NULL, -1);
- image_auto_refresh(imd, -1);
file_data_unref(imd->image_fd);
g_free(imd->title);
g_free(imd->title_right);
-
- if (imd->histogram) histogram_free(imd->histogram);
-
g_free(imd);
}
-static void image_destroy_cb(GtkObject *widget, gpointer data)
+static void image_destroy_cb(GtkWidget *widget, gpointer data)
{
ImageWindow *imd = data;
image_free(imd);
}
+#if GTK_CHECK_VERSION(3,0,0)
+gboolean selectable_frame_draw_cb(GtkWidget *widget, cairo_t *cr, gpointer data)
+{
+ GtkAllocation allocation;
+ gtk_widget_get_allocation(widget, &allocation);
+ gtk_paint_flat_box(gtk_widget_get_style(widget),
+ cr,
+ gtk_widget_get_state(widget),
+ gtk_frame_get_shadow_type(GTK_FRAME(widget)),
+ widget,
+ NULL,
+ allocation.x + 3, allocation.y + 3,
+ allocation.width - 6, allocation.height - 6);
+
+ if (gtk_widget_has_focus(widget))
+ {
+ gtk_paint_focus(gtk_widget_get_style(widget), cr, GTK_STATE_ACTIVE,
+ widget, "image_window",
+ allocation.x, allocation.y,
+ allocation.width - 1, allocation.height - 1);
+ }
+ else
+ {
+ gtk_paint_shadow(gtk_widget_get_style(widget), cr, GTK_STATE_NORMAL, GTK_SHADOW_IN,
+ widget, "image_window",
+ allocation.x, allocation.y,
+ allocation.width - 1, allocation.height - 1);
+ }
+ return FALSE;
+}
-gboolean selectable_frame_expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
+#else
+gboolean selectable_frame_expose_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data)
{
- gtk_paint_flat_box(widget->style,
- widget->window,
- widget->state,
- GTK_FRAME (widget)->shadow_type,
+ GtkAllocation allocation;
+ gtk_widget_get_allocation(widget, &allocation);
+ gtk_paint_flat_box(gtk_widget_get_style(widget),
+ gtk_widget_get_window(widget),
+ gtk_widget_get_state(widget),
+ gtk_frame_get_shadow_type(GTK_FRAME(widget)),
NULL,
widget,
NULL,
- widget->allocation.x + 3, widget->allocation.y + 3,
- widget->allocation.width - 6, widget->allocation.height - 6);
-
+ allocation.x + 3, allocation.y + 3,
+ allocation.width - 6, allocation.height - 6);
+ if (gtk_widget_has_focus(widget))
+ {
+ gtk_paint_focus(gtk_widget_get_style(widget), gtk_widget_get_window(widget), GTK_STATE_ACTIVE,
+ &event->area, widget, "image_window",
+ allocation.x, allocation.y,
+ allocation.width - 1, allocation.height - 1);
+ }
+ else
+ {
+ gtk_paint_shadow(gtk_widget_get_style(widget), gtk_widget_get_window(widget), GTK_STATE_NORMAL, GTK_SHADOW_IN,
+ &event->area, widget, "image_window",
+ allocation.x, allocation.y,
+ allocation.width - 1, allocation.height - 1);
+ }
return FALSE;
}
+#endif
void image_set_frame(ImageWindow *imd, gboolean frame)
if (frame)
{
imd->frame = gtk_frame_new(NULL);
- gtk_widget_ref(imd->pr);
+ g_object_ref(imd->pr);
if (imd->has_frame != -1) gtk_container_remove(GTK_CONTAINER(imd->widget), imd->pr);
gtk_container_add(GTK_CONTAINER(imd->frame), imd->pr);
- gtk_widget_unref(imd->pr);
- g_signal_connect (G_OBJECT (imd->frame), "expose_event",
- G_CALLBACK (selectable_frame_expose_cb), NULL);
- GTK_WIDGET_SET_FLAGS(imd->frame, GTK_CAN_FOCUS);
+ g_object_unref(imd->pr);
+ gtk_widget_set_can_focus(imd->frame, TRUE);
+ gtk_widget_set_app_paintable(imd->frame, TRUE);
+
+#if GTK_CHECK_VERSION(3,0,0)
+ g_signal_connect(G_OBJECT(imd->frame), "draw",
+ G_CALLBACK(selectable_frame_draw_cb), NULL);
+#else
+ g_signal_connect(G_OBJECT(imd->frame), "expose_event",
+ G_CALLBACK(selectable_frame_expose_cb), NULL);
+#endif
g_signal_connect(G_OBJECT(imd->frame), "focus_in_event",
G_CALLBACK(image_focus_in_cb), imd);
- g_signal_connect(G_OBJECT(imd->frame), "focus_out_event",
- G_CALLBACK(image_focus_out_cb), imd);
-
- g_signal_connect_after(G_OBJECT(imd->frame), "expose_event",
- G_CALLBACK(image_focus_expose), imd);
-
- gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->frame);
- gtk_widget_show(imd->frame);
+ gtk_box_pack_start(GTK_BOX(imd->widget), imd->frame, TRUE, TRUE, 0);
+ gtk_widget_show(imd->frame);
}
else
{
- gtk_widget_ref(imd->pr);
+ g_object_ref(imd->pr);
if (imd->frame)
{
gtk_container_remove(GTK_CONTAINER(imd->frame), imd->pr);
gtk_widget_destroy(imd->frame);
imd->frame = NULL;
}
- gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->pr);
- gtk_widget_unref(imd->pr);
+ gtk_box_pack_start(GTK_BOX(imd->widget), imd->pr, TRUE, TRUE, 0);
+
+ g_object_unref(imd->pr);
}
gtk_widget_show(imd->pr);
imd->has_frame = frame;
}
-ImageWindow *image_new(gint frame)
+ImageWindow *image_new(gboolean frame)
{
ImageWindow *imd;
imd = g_new0(ImageWindow, 1);
- imd->top_window = NULL;
- imd->title = NULL;
- imd->title_right = NULL;
- imd->title_show_zoom = FALSE;
-
imd->unknown = TRUE;
-
imd->has_frame = -1; /* not initialized; for image_set_frame */
- imd->top_window_sync = FALSE;
-
imd->delay_alter_type = ALTER_NONE;
-
- imd->read_ahead_il = NULL;
- imd->read_ahead_pixbuf = NULL;
- imd->read_ahead_fd = NULL;
-
- imd->completed = FALSE;
imd->state = IMAGE_STATE_NONE;
-
- imd->color_profile_enable = FALSE;
- imd->color_profile_input = 0;
- imd->color_profile_screen = 0;
- imd->color_profile_use_image = FALSE;
imd->color_profile_from_image = COLOR_PROFILE_NONE;
-
- imd->auto_refresh_id = -1;
- imd->auto_refresh_interval = -1;
-
- imd->delay_flip = FALSE;
-
- imd->func_update = NULL;
- imd->func_complete = NULL;
- imd->func_tile_request = NULL;
- imd->func_tile_dispose = NULL;
-
- imd->func_button = NULL;
- imd->func_scroll = NULL;
-
imd->orientation = 1;
- imd->histogram_enabled = FALSE; /* TODO: option */
-
imd->pr = GTK_WIDGET(pixbuf_renderer_new());
image_options_set(imd);
-
imd->widget = gtk_vbox_new(0, 0);
image_set_frame(imd, frame);
g_signal_connect(G_OBJECT(imd->pr), "drag",
G_CALLBACK(image_drag_cb), imd);
+ file_data_register_notify_func(image_notify_cb, imd, NOTIFY_PRIORITY_LOW);
+
image_list = g_list_append(image_list, imd);
return imd;
}
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
projects / geeqie.git / blobdiff