annotate src/image.c @ 1031:999919edcb7b

fixed handling of broken images
author nadvornik
date Wed, 03 Sep 2008 19:52:11 +0000
parents b0db0bd74dba
children 7c87b324b9bb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1 /*
196
f6e307c7bad6 rename GQview -> Geeqie over the code
nadvornik
parents: 188
diff changeset
2 * Geeqie
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
3 * (C) 2006 John Ellis
475
48c8e49b571c updated copyright in source files
nadvornik
parents: 449
diff changeset
4 * Copyright (C) 2008 The Geeqie Team
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
5 *
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
6 * Author: John Ellis
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
7 *
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
8 * This software is released under the GNU General Public License (GNU GPL).
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
9 * Please read the included file COPYING for more information.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
10 * This software comes with no warranty of any kind, use at your own risk!
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
11 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
12
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
13
281
9995c5fb202a gqview.h -> main.h
zas_
parents: 273
diff changeset
14 #include "main.h"
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
15 #include "image.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
16
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
17
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
18 #include "collect.h"
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
19 #include "color-man.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
20 #include "exif.h"
480
805c3258d228 Make histogram depends on image window not layout window.
zas_
parents: 475
diff changeset
21 #include "histogram.h"
507
135570a8bd96 Move debug macros from main.h to new debug.h.
zas_
parents: 506
diff changeset
22 #include "image-load.h"
415
4f7362028062 Add zoom ratio display to OSD in fullscreen mode.
zas_
parents: 414
diff changeset
23 #include "image-overlay.h"
284
84c4618cd1cb Fix missing header files inclusions.
zas_
parents: 281
diff changeset
24 #include "layout.h"
84c4618cd1cb Fix missing header files inclusions.
zas_
parents: 281
diff changeset
25 #include "layout_image.h"
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
26 #include "pixbuf-renderer.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
27 #include "pixbuf_util.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
28 #include "ui_fileops.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
29
586
905688aa2317 split filelist.c to filefilter.c and filedata.c
nadvornik
parents: 530
diff changeset
30 #include "filedata.h"
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
31 #include "filecache.h"
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
32
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
33 #include <math.h>
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
34
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
35
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
36 /* size of the image loader buffer (512 bytes x defined number) */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
37 #define IMAGE_LOAD_BUFFER_COUNT 8
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
38
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
39 /* define this so that more bytes are read per idle loop on larger images (> 1MB) */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
40 #define IMAGE_THROTTLE_LARGER_IMAGES 1
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
41
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
42 /* throttle factor to increase read bytes by (2 is double, 3 is triple, etc.) */
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
43 #define IMAGE_THROTTLE_FACTOR 32
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
44
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
45 /* the file size at which throttling take place */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
46 #define IMAGE_THROTTLE_THRESHOLD 1048576
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
47
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
48 static GList *image_list = NULL;
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
49
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
50
61
0c912a2d94f1 Mon Jun 13 20:22:58 2005 John Ellis <johne@verizon.net>
gqview
parents: 42
diff changeset
51 static void image_update_title(ImageWindow *imd);
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
52 static void image_read_ahead_start(ImageWindow *imd);
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
53 static void image_cache_set(ImageWindow *imd, FileData *fd);
61
0c912a2d94f1 Mon Jun 13 20:22:58 2005 John Ellis <johne@verizon.net>
gqview
parents: 42
diff changeset
54
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
55 /*
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
56 *-------------------------------------------------------------------
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
57 * 'signals'
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
58 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
59 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
60
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
61 static void image_click_cb(PixbufRenderer *pr, GdkEventButton *event, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
62 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
63 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
64
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
65 if (imd->func_button)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
66 {
868
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 863
diff changeset
67 imd->func_button(imd, event, imd->data_button);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
68 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
69 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
70
128
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
71 static void image_drag_cb(PixbufRenderer *pr, GdkEventButton *event, gpointer data)
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
72 {
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
73 ImageWindow *imd = data;
129
89fc00ffbce2 started relative scroll, keep scroll position
nadvornik
parents: 128
diff changeset
74 gint width, height;
128
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
75
129
89fc00ffbce2 started relative scroll, keep scroll position
nadvornik
parents: 128
diff changeset
76 pixbuf_renderer_get_scaled_size(pr, &width, &height);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
77
128
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
78 if (imd->func_drag)
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
79 {
868
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 863
diff changeset
80 imd->func_drag(imd, event,
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 863
diff changeset
81 (gfloat)(pr->drag_last_x - event->x) / width,
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 863
diff changeset
82 (gfloat)(pr->drag_last_y - event->y) / height,
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 863
diff changeset
83 imd->data_button);
128
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
84 }
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
85 }
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
86
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
87 static void image_scroll_notify_cb(PixbufRenderer *pr, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
88 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
89 ImageWindow *imd = data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
90
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
91 if (imd->func_scroll_notify && pr->scale)
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
92 {
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
93 imd->func_scroll_notify(imd,
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
94 (gint)((gdouble)pr->x_scroll / pr->scale),
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
95 (gint)((gdouble)pr->y_scroll / pr->scale),
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
96 (gint)((gdouble)pr->image_width - pr->vis_width / pr->scale),
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
97 (gint)((gdouble)pr->image_height - pr->vis_height / pr->scale),
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
98 imd->data_scroll_notify);
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
99 }
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
100 }
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
101
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
102 static void image_update_util(ImageWindow *imd)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
103 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
104 if (imd->func_update) imd->func_update(imd, imd->data_update);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
105 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
106
25
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
107 static void image_zoom_cb(PixbufRenderer *pr, gdouble zoom, gpointer data)
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
108 {
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
109 ImageWindow *imd = data;
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
110
61
0c912a2d94f1 Mon Jun 13 20:22:58 2005 John Ellis <johne@verizon.net>
gqview
parents: 42
diff changeset
111 if (imd->title_show_zoom) image_update_title(imd);
415
4f7362028062 Add zoom ratio display to OSD in fullscreen mode.
zas_
parents: 414
diff changeset
112 if (imd->overlay_show_zoom) image_osd_update(imd);
4f7362028062 Add zoom ratio display to OSD in fullscreen mode.
zas_
parents: 414
diff changeset
113
25
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
114 image_update_util(imd);
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
115 }
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
116
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
117 static void image_complete_util(ImageWindow *imd, gint preload)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
118 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
119 if (imd->il && image_get_pixbuf(imd) != image_loader_get_pixbuf(imd->il)) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
120
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
121 DEBUG_1("%s image load completed \"%s\" (%s)", get_exec_time(),
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
122 (preload) ? (imd->read_ahead_fd ? imd->read_ahead_fd->path : "null") :
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
123 (imd->image_fd ? imd->image_fd->path : "null"),
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
124 (preload) ? "preload" : "current");
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
125
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
126 if (!preload) imd->completed = TRUE;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
127 if (imd->func_complete) imd->func_complete(imd, preload, imd->data_complete);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
128 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
129
25
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
130 static void image_render_complete_cb(PixbufRenderer *pr, gpointer data)
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
131 {
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
132 ImageWindow *imd = data;
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
133
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
134 image_complete_util(imd, FALSE);
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
135 }
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
136
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
137 static void image_state_set(ImageWindow *imd, ImageState state)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
138 {
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
139 if (state == IMAGE_STATE_NONE)
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
140 {
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
141 imd->state = state;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
142 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
143 else
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
144 {
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
145 imd->state |= state;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
146 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
147 if (imd->func_state) imd->func_state(imd, state, imd->data_state);
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
148 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
149
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
150 static void image_state_unset(ImageWindow *imd, ImageState state)
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
151 {
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
152 imd->state &= ~state;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
153 if (imd->func_state) imd->func_state(imd, state, imd->data_state);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
154 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
155
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
156 /*
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
157 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
158 * misc
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
159 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
160 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
161
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
162 static void image_update_title(ImageWindow *imd)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
163 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
164 gchar *title = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
165 gchar *zoom = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
166 gchar *collection = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
167
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
168 if (!imd->top_window) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
169
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
170 if (imd->collection && collection_to_number(imd->collection) >= 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
171 {
987
9c75ab848cd4 Mark forgotten string for translation.
zas_
parents: 954
diff changeset
172 const gchar *name = imd->collection->name;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
173 if (!name) name = _("Untitled");
987
9c75ab848cd4 Mark forgotten string for translation.
zas_
parents: 954
diff changeset
174 collection = g_strdup_printf(_(" (Collection %s)"), name);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
175 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
176
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
177 if (imd->title_show_zoom)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
178 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
179 gchar *buf = image_zoom_get_as_text(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
180 zoom = g_strconcat(" [", buf, "]", NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
181 g_free(buf);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
182 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
183
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
184 title = g_strdup_printf("%s%s%s%s%s%s",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
185 imd->title ? imd->title : "",
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
186 imd->image_fd ? imd->image_fd->name : "",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
187 zoom ? zoom : "",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
188 collection ? collection : "",
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
189 imd->image_fd ? " - " : "",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
190 imd->title_right ? imd->title_right : "");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
191
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
192 gtk_window_set_title(GTK_WINDOW(imd->top_window), title);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
193
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
194 g_free(title);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
195 g_free(zoom);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
196 g_free(collection);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
197 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
198
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
199 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
200 *-------------------------------------------------------------------
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
201 * rotation, flip, etc.
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
202 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
203 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
204
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
205 static gint image_post_process_color(ImageWindow *imd, gint start_row, ExifData *exif, gint run_in_bg)
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
206 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
207 ColorMan *cm;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
208 ColorManProfileType input_type;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
209 ColorManProfileType screen_type;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
210 const gchar *input_file;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
211 const gchar *screen_file;
1000
4fe8f9656107 For the sake of consistency, use glib basic types everywhere.
zas_
parents: 995
diff changeset
212 guchar *profile = NULL;
449
115db540bd0c read color profiles from jpeg also with Exiv2
nadvornik
parents: 446
diff changeset
213 guint profile_len;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
214
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
215 if (imd->cm) return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
216
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
217 if (imd->color_profile_input >= COLOR_PROFILE_FILE &&
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
218 imd->color_profile_input < COLOR_PROFILE_FILE + COLOR_PROFILE_INPUTS)
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
219 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
220 gint n;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
221
430
a254a7102af5 fixed color profile index
nadvornik
parents: 426
diff changeset
222 n = imd->color_profile_input - COLOR_PROFILE_FILE;
327
049d6b00cc14 Rename color profile options.
zas_
parents: 320
diff changeset
223 if (!options->color_profile.input_file[n]) return FALSE;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
224
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
225 input_type = COLOR_PROFILE_FILE;
327
049d6b00cc14 Rename color profile options.
zas_
parents: 320
diff changeset
226 input_file = options->color_profile.input_file[n];
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
227 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
228 else if (imd->color_profile_input >= COLOR_PROFILE_SRGB &&
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
229 imd->color_profile_input < COLOR_PROFILE_FILE)
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
230 {
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
231 input_type = imd->color_profile_input;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
232 input_file = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
233 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
234 else
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
235 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
236 return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
237 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
238
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
239 if (imd->color_profile_screen == 1 &&
327
049d6b00cc14 Rename color profile options.
zas_
parents: 320
diff changeset
240 options->color_profile.screen_file)
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
241 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
242 screen_type = COLOR_PROFILE_FILE;
327
049d6b00cc14 Rename color profile options.
zas_
parents: 320
diff changeset
243 screen_file = options->color_profile.screen_file;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
244 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
245 else if (imd->color_profile_screen == 0)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
246 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
247 screen_type = COLOR_PROFILE_SRGB;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
248 screen_file = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
249 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
250 else
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
251 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
252 return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
253 }
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
254 imd->color_profile_from_image = COLOR_PROFILE_NONE;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
255
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
256 if (imd->color_profile_use_image && exif)
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
257 {
449
115db540bd0c read color profiles from jpeg also with Exiv2
nadvornik
parents: 446
diff changeset
258 profile = exif_get_color_profile(exif, &profile_len);
115db540bd0c read color profiles from jpeg also with Exiv2
nadvornik
parents: 446
diff changeset
259 if (!profile)
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
260 {
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
261 gint cs;
424
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
262 gchar *interop_index;
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
263
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
264 /* ColorSpace == 1 specifies sRGB per EXIF 2.2 */
424
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
265 if (!exif_get_integer(exif, "Exif.Photo.ColorSpace", &cs)) cs = 0;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
266 interop_index = exif_get_data_as_text(exif, "Exif.Iop.InteroperabilityIndex");
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
267
424
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
268 if (cs == 1)
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
269 {
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
270 input_type = COLOR_PROFILE_SRGB;
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
271 input_file = NULL;
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
272 imd->color_profile_from_image = COLOR_PROFILE_SRGB;
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
273
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
274 DEBUG_1("Found EXIF ColorSpace of sRGB");
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
275 }
424
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
276 if (cs == 2 || (interop_index && !strcmp(interop_index, "R03")))
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
277 {
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
278 input_type = COLOR_PROFILE_ADOBERGB;
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
279 input_file = NULL;
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
280 imd->color_profile_from_image = COLOR_PROFILE_ADOBERGB;
424
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
281
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
282 DEBUG_1("Found EXIF ColorSpace of AdobeRGB");
424
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
283 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
284
424
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
285 g_free(interop_index);
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
286 }
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
287 }
176
695e1ad3b169 simplified exif.h, moved implementation-specific stuff to exif-int.h
nadvornik
parents: 175
diff changeset
288
449
115db540bd0c read color profiles from jpeg also with Exiv2
nadvornik
parents: 446
diff changeset
289 if (profile)
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
290 {
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
291 DEBUG_1("Found embedded color profile");
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
292 imd->color_profile_from_image = COLOR_PROFILE_MEM;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
293
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
294 cm = color_man_new_embedded(run_in_bg ? imd : NULL, NULL,
449
115db540bd0c read color profiles from jpeg also with Exiv2
nadvornik
parents: 446
diff changeset
295 profile, profile_len,
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
296 screen_type, screen_file);
449
115db540bd0c read color profiles from jpeg also with Exiv2
nadvornik
parents: 446
diff changeset
297 g_free(profile);
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
298 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
299 else
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
300 {
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
301 cm = color_man_new(run_in_bg ? imd : NULL, NULL,
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
302 input_type, input_file,
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
303 screen_type, screen_file);
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
304 }
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
305
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
306 if (cm)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
307 {
116
1bd40943dc2a Tue Nov 28 13:17:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 115
diff changeset
308 if (start_row > 0)
1bd40943dc2a Tue Nov 28 13:17:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 115
diff changeset
309 {
1bd40943dc2a Tue Nov 28 13:17:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 115
diff changeset
310 cm->row = start_row;
1bd40943dc2a Tue Nov 28 13:17:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 115
diff changeset
311 cm->incremental_sync = TRUE;
1bd40943dc2a Tue Nov 28 13:17:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 115
diff changeset
312 }
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
313
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
314 imd->cm = (gpointer)cm;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
315 #if 0
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
316 if (run_in_bg) color_man_start_bg(imd->cm, image_post_process_color_cb, imd);
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
317 #endif
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
318 return TRUE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
319 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
320
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
321 return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
322 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
323
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
324
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
325 static void image_post_process_tile_color_cb(PixbufRenderer *pr, GdkPixbuf **pixbuf, gint x, gint y, gint w, gint h, gpointer data)
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
326 {
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
327 ImageWindow *imd = (ImageWindow *)data;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
328 if (imd->cm) color_man_correct_region(imd->cm, *pixbuf, x, y, w, h);
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
329 if (imd->desaturate) pixbuf_desaturate_rect(*pixbuf, x, y, w, h);
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
330
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
331 }
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
332
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
333 void image_alter(ImageWindow *imd, AlterType type)
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
334 {
691
631d626c1f6b Fix some incomplete initialization warnings.
zas_
parents: 671
diff changeset
335 static const gint rotate_90[] = {1, 6, 7, 8, 5, 2, 3, 4, 1};
631d626c1f6b Fix some incomplete initialization warnings.
zas_
parents: 671
diff changeset
336 static const gint rotate_90_cc[] = {1, 8, 5, 6, 7, 4, 1, 2, 3};
631d626c1f6b Fix some incomplete initialization warnings.
zas_
parents: 671
diff changeset
337 static const gint rotate_180[] = {1, 3, 4, 1, 2, 7, 8, 5, 6};
631d626c1f6b Fix some incomplete initialization warnings.
zas_
parents: 671
diff changeset
338 static const gint mirror[] = {1, 2, 1, 4, 3, 6, 5, 8, 7};
631d626c1f6b Fix some incomplete initialization warnings.
zas_
parents: 671
diff changeset
339 static const gint flip[] = {1, 4, 3, 2, 1, 8, 7, 6, 5};
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
340
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
341
994
c879a4c14f33 Fixed segfaulting when alter image in directory without images.
bruclik
parents: 987
diff changeset
342 if (!imd || !imd->pr || !imd->image_fd) return;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
343
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
344 if (imd->orientation < 1 || imd->orientation > 8) imd->orientation = 1;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
345
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
346 switch (type)
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
347 {
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
348 case ALTER_ROTATE_90:
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
349 imd->orientation = rotate_90[imd->orientation];
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
350 break;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
351 case ALTER_ROTATE_90_CC:
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
352 imd->orientation = rotate_90_cc[imd->orientation];
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
353 break;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
354 case ALTER_ROTATE_180:
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
355 imd->orientation = rotate_180[imd->orientation];
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
356 break;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
357 case ALTER_MIRROR:
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
358 imd->orientation = mirror[imd->orientation];
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
359 break;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
360 case ALTER_FLIP:
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
361 imd->orientation = flip[imd->orientation];
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
362 break;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
363 case ALTER_DESATURATE:
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
364 imd->desaturate = !imd->desaturate;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
365 break;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
366 case ALTER_NONE:
439
1cca0b614cba Add a way to restore original state in Adjust menu.
zas_
parents: 437
diff changeset
367 imd->orientation = imd->image_fd->exif_orientation ? imd->image_fd->exif_orientation : 1;
1cca0b614cba Add a way to restore original state in Adjust menu.
zas_
parents: 437
diff changeset
368 imd->desaturate = FALSE;
1cca0b614cba Add a way to restore original state in Adjust menu.
zas_
parents: 437
diff changeset
369 break;
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
370 default:
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
371 return;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
372 break;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
373 }
434
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
374
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
375 if (type != ALTER_NONE && type != ALTER_DESATURATE)
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
376 {
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
377 if (imd->image_fd->user_orientation == 0) file_data_ref(imd->image_fd);
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
378 imd->image_fd->user_orientation = imd->orientation;
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
379 }
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
380 else
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
381 {
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
382 if (imd->image_fd->user_orientation != 0) file_data_unref(imd->image_fd);
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
383 imd->image_fd->user_orientation = 0;
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
384 }
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
385
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
386 pixbuf_renderer_set_orientation((PixbufRenderer *)imd->pr, imd->orientation);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
387 if (imd->cm || imd->desaturate)
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
388 pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, image_post_process_tile_color_cb, (gpointer) imd, (imd->cm != NULL) );
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
389 else
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
390 pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, NULL, NULL, TRUE);
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
391 }
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
392
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
393
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
394 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
395 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
396 * read ahead (prebuffer)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
397 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
398 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
399
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
400 static void image_read_ahead_cancel(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
401 {
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
402 DEBUG_1("%s read ahead cancelled for :%s", get_exec_time(), imd->read_ahead_fd ? imd->read_ahead_fd->path : "null");
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
403
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
404 image_loader_free(imd->read_ahead_il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
405 imd->read_ahead_il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
406
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
407 file_data_unref(imd->read_ahead_fd);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
408 imd->read_ahead_fd = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
409 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
410
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
411 static void image_read_ahead_done_cb(ImageLoader *il, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
412 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
413 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
414
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
415 DEBUG_1("%s read ahead done for :%s", get_exec_time(), imd->read_ahead_fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
416
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
417 if (!imd->read_ahead_fd->pixbuf)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
418 {
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
419 imd->read_ahead_fd->pixbuf = image_loader_get_pixbuf(imd->read_ahead_il);
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
420 if (imd->read_ahead_fd->pixbuf)
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
421 {
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
422 g_object_ref(imd->read_ahead_fd->pixbuf);
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
423 image_cache_set(imd, imd->read_ahead_fd);
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
424 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
425 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
426 image_loader_free(imd->read_ahead_il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
427 imd->read_ahead_il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
428
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
429 image_complete_util(imd, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
430 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
431
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
432 static void image_read_ahead_error_cb(ImageLoader *il, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
433 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
434 /* we even treat errors as success, maybe at least some of the file was ok */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
435 image_read_ahead_done_cb(il, data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
436 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
437
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
438 static void image_read_ahead_start(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
439 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
440 /* already started ? */
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
441 if (!imd->read_ahead_fd || imd->read_ahead_il || imd->read_ahead_fd->pixbuf) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
442
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
443 /* still loading ?, do later */
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
444 if (imd->il /*|| imd->cm*/) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
445
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
446 DEBUG_1("%s read ahead started for :%s", get_exec_time(), imd->read_ahead_fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
447
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
448 imd->read_ahead_il = image_loader_new(imd->read_ahead_fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
449
1012
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
450 g_signal_connect (G_OBJECT(imd->read_ahead_il), "error", (GCallback)image_read_ahead_error_cb, imd);
1027
b0db0bd74dba fixed read ahead callback
nadvornik
parents: 1012
diff changeset
451 g_signal_connect (G_OBJECT(imd->read_ahead_il), "done", (GCallback)image_read_ahead_done_cb, imd);
1012
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
452
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
453 if (!image_loader_start(imd->read_ahead_il))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
454 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
455 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
456 image_complete_util(imd, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
457 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
458 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
459
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
460 static void image_read_ahead_set(ImageWindow *imd, FileData *fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
461 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
462 if (imd->read_ahead_fd && fd && imd->read_ahead_fd == fd) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
463
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
464 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
465
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
466 imd->read_ahead_fd = file_data_ref(fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
467
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
468 DEBUG_1("read ahead set to :%s", imd->read_ahead_fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
469
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
470 image_read_ahead_start(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
471 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
472
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
473 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
474 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
475 * post buffering
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
476 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
477 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
478
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
479 static void image_cache_release_cb(FileData *fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
480 {
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
481 g_object_unref(fd->pixbuf);
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
482 fd->pixbuf = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
483 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
484
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
485 static FileCacheData *image_get_cache()
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
486 {
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
487 static FileCacheData *cache = NULL;
848
e1d158ac6d36 cache size made configurable
nadvornik
parents: 847
diff changeset
488 if (!cache) cache = file_cache_new(image_cache_release_cb, 1);
e1d158ac6d36 cache size made configurable
nadvornik
parents: 847
diff changeset
489 file_cache_set_max_size(cache, (gulong)options->image.image_cache_max * 1048576); /* update from options */
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
490 return cache;
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
491 }
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
492
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
493 static void image_cache_set(ImageWindow *imd, FileData *fd)
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
494 {
847
77fc0ea3457d measure pixbuf cache size in bytes
nadvornik
parents: 846
diff changeset
495 g_assert(fd->pixbuf);
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
496
847
77fc0ea3457d measure pixbuf cache size in bytes
nadvornik
parents: 846
diff changeset
497 file_cache_put(image_get_cache(), fd, (gulong)gdk_pixbuf_get_rowstride(fd->pixbuf) * (gulong)gdk_pixbuf_get_height(fd->pixbuf));
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
498 }
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
499
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
500 static gint image_cache_get(ImageWindow *imd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
501 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
502 gint success;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
503
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
504 success = file_cache_get(image_get_cache(), imd->image_fd);
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
505 if (success)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
506 {
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
507 g_assert(imd->image_fd->pixbuf);
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
508 image_change_pixbuf(imd, imd->image_fd->pixbuf, image_zoom_get(imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
509 }
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
510
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
511 file_cache_dump(image_get_cache());
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
512 return success;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
513 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
514
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
515 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
516 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
517 * loading
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
518 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
519 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
520
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
521 static void image_load_pixbuf_ready(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
522 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
523 if (image_get_pixbuf(imd) || !imd->il) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
524
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
525 image_change_pixbuf(imd, image_loader_get_pixbuf(imd->il), image_zoom_get(imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
526 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
527
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
528 static void image_load_area_cb(ImageLoader *il, guint x, guint y, guint w, guint h, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
529 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
530 ImageWindow *imd = data;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
531 PixbufRenderer *pr;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
532
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
533 pr = (PixbufRenderer *)imd->pr;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
534
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
535 if (imd->delay_flip &&
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
536 pr->pixbuf != image_loader_get_pixbuf(il))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
537 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
538 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
539 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
540
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
541 if (!pr->pixbuf) image_load_pixbuf_ready(imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
542
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
543 pixbuf_renderer_area_changed(pr, x, y, w, h);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
544 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
545
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
546 static void image_load_done_cb(ImageLoader *il, gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
547 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
548 ImageWindow *imd = data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
549
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
550 DEBUG_1("%s image done", get_exec_time());
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
551
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
552 g_object_set(G_OBJECT(imd->pr), "loading", FALSE, NULL);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
553 image_state_unset(imd, IMAGE_STATE_LOADING);
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
554
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
555 if (options->image.enable_read_ahead && imd->image_fd && !imd->image_fd->pixbuf && image_loader_get_pixbuf(imd->il))
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
556 {
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
557 imd->image_fd->pixbuf = gdk_pixbuf_ref(image_loader_get_pixbuf(imd->il));
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
558 image_cache_set(imd, imd->image_fd);
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
559 }
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
560
1031
999919edcb7b fixed handling of broken images
nadvornik
parents: 1027
diff changeset
561 if (!image_loader_get_pixbuf(imd->il))
999919edcb7b fixed handling of broken images
nadvornik
parents: 1027
diff changeset
562 {
999919edcb7b fixed handling of broken images
nadvornik
parents: 1027
diff changeset
563 GdkPixbuf *pixbuf;
999919edcb7b fixed handling of broken images
nadvornik
parents: 1027
diff changeset
564
999919edcb7b fixed handling of broken images
nadvornik
parents: 1027
diff changeset
565 pixbuf = pixbuf_inline(PIXBUF_INLINE_BROKEN);
999919edcb7b fixed handling of broken images
nadvornik
parents: 1027
diff changeset
566 image_change_pixbuf(imd, pixbuf, image_zoom_get(imd));
999919edcb7b fixed handling of broken images
nadvornik
parents: 1027
diff changeset
567 g_object_unref(pixbuf);
999919edcb7b fixed handling of broken images
nadvornik
parents: 1027
diff changeset
568
999919edcb7b fixed handling of broken images
nadvornik
parents: 1027
diff changeset
569 imd->unknown = TRUE;
999919edcb7b fixed handling of broken images
nadvornik
parents: 1027
diff changeset
570 }
999919edcb7b fixed handling of broken images
nadvornik
parents: 1027
diff changeset
571 else if (imd->delay_flip &&
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
572 image_get_pixbuf(imd) != image_loader_get_pixbuf(imd->il))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
573 {
42
606fcf461a68 Sat May 14 13:04:23 2005 John Ellis <johne@verizon.net>
gqview
parents: 29
diff changeset
574 g_object_set(G_OBJECT(imd->pr), "complete", FALSE, NULL);
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
575 image_change_pixbuf(imd, image_loader_get_pixbuf(imd->il), image_zoom_get(imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
576 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
577
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
578 image_loader_free(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
579 imd->il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
580
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
581 // image_post_process(imd, TRUE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
582
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
583 image_read_ahead_start(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
584 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
585
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
586 static void image_load_error_cb(ImageLoader *il, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
587 {
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
588 DEBUG_1("%s image error", get_exec_time());
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
589
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
590 /* even on error handle it like it was done,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
591 * since we have a pixbuf with _something_ */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
592
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
593 image_load_done_cb(il, data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
594 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
595
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
596 #ifdef IMAGE_THROTTLE_LARGER_IMAGES
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
597 static void image_load_buffer_throttle(ImageLoader *il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
598 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
599 if (!il || il->bytes_total < IMAGE_THROTTLE_THRESHOLD) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
600
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
601 /* Larger image files usually have larger chunks of data per pixel...
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
602 * So increase the buffer read size so that the rendering chunks called
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
603 * are also larger.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
604 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
605
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
606 image_loader_set_buffer_size(il, IMAGE_LOAD_BUFFER_COUNT * IMAGE_THROTTLE_FACTOR);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
607 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
608 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
609
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
610 /* this read ahead is located here merely for the callbacks, above */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
611
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
612 static gint image_read_ahead_check(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
613 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
614 if (!imd->read_ahead_fd) return FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
615 if (imd->il) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
616
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
617 if (!imd->image_fd || imd->read_ahead_fd != imd->image_fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
618 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
619 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
620 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
621 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
622
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
623 if (imd->read_ahead_il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
624 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
625 imd->il = imd->read_ahead_il;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
626 imd->read_ahead_il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
627
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
628 /* override the old signals */
1012
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
629 g_signal_handlers_disconnect_matched(G_OBJECT(imd->il), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, imd);
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
630 g_signal_connect (G_OBJECT(imd->il), "area_ready", (GCallback)image_load_area_cb, imd);
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
631 g_signal_connect (G_OBJECT(imd->il), "error", (GCallback)image_load_error_cb, imd);
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
632 g_signal_connect (G_OBJECT(imd->il), "done", (GCallback)image_load_done_cb, imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
633 image_loader_set_buffer_size(imd->il, IMAGE_LOAD_BUFFER_COUNT);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
634
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
635 #ifdef IMAGE_THROTTLE_LARGER_IMAGES
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
636 image_load_buffer_throttle(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
637 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
638
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
639 g_object_set(G_OBJECT(imd->pr), "loading", TRUE, NULL);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
640 image_state_set(imd, IMAGE_STATE_LOADING);
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
641
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
642 if (!imd->delay_flip)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
643 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
644 image_change_pixbuf(imd, image_loader_get_pixbuf(imd->il), image_zoom_get(imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
645 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
646
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
647 file_data_unref(imd->read_ahead_fd);
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
648 imd->read_ahead_fd = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
649 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
650 }
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
651 else if (imd->read_ahead_fd->pixbuf)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
652 {
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
653 image_change_pixbuf(imd, imd->read_ahead_fd->pixbuf, image_zoom_get(imd));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
654
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
655 file_data_unref(imd->read_ahead_fd);
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
656 imd->read_ahead_fd = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
657
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
658 // image_post_process(imd, FALSE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
659 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
660 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
661
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
662 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
663 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
664 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
665
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
666 static gint image_load_begin(ImageWindow *imd, FileData *fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
667 {
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
668 DEBUG_1("%s image begin", get_exec_time());
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
669
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
670 if (imd->il) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
671
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
672 imd->completed = FALSE;
25
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
673 g_object_set(G_OBJECT(imd->pr), "complete", FALSE, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
674
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
675 if (image_cache_get(imd))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
676 {
847
77fc0ea3457d measure pixbuf cache size in bytes
nadvornik
parents: 846
diff changeset
677 DEBUG_1("from cache: %s", imd->image_fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
678 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
679 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
680
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
681 if (image_read_ahead_check(imd))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
682 {
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
683 DEBUG_1("from read ahead buffer: %s", imd->image_fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
684 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
685 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
686
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
687 if (!imd->delay_flip && image_get_pixbuf(imd))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
688 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
689 PixbufRenderer *pr;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
690
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
691 pr = PIXBUF_RENDERER(imd->pr);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
692 if (pr->pixbuf) g_object_unref(pr->pixbuf);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
693 pr->pixbuf = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
694 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
695
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
696 g_object_set(G_OBJECT(imd->pr), "loading", TRUE, NULL);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
697
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
698 imd->il = image_loader_new(fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
699
1012
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
700 g_signal_connect (G_OBJECT(imd->il), "area_ready", (GCallback)image_load_area_cb, imd);
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
701 g_signal_connect (G_OBJECT(imd->il), "error", (GCallback)image_load_error_cb, imd);
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
702 g_signal_connect (G_OBJECT(imd->il), "done", (GCallback)image_load_done_cb, imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
703 image_loader_set_buffer_size(imd->il, IMAGE_LOAD_BUFFER_COUNT);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
704
1012
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
705 if (!image_loader_start(imd->il))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
706 {
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
707 DEBUG_1("image start error");
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
708
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
709 g_object_set(G_OBJECT(imd->pr), "loading", FALSE, NULL);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
710
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
711 image_loader_free(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
712 imd->il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
713
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
714 image_complete_util(imd, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
715
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
716 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
717 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
718
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
719 image_state_set(imd, IMAGE_STATE_LOADING);
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
720
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
721 #ifdef IMAGE_THROTTLE_LARGER_IMAGES
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
722 image_load_buffer_throttle(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
723 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
724
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
725 if (!imd->delay_flip && !image_get_pixbuf(imd)) image_load_pixbuf_ready(imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
726
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
727 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
728 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
729
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
730 static void image_reset(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
731 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
732 /* stops anything currently being done */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
733
506
fc9c8a3e1a8b Handle the newline in DEBUG_N() macro instead of adding one
zas_
parents: 495
diff changeset
734 DEBUG_1("%s image reset", get_exec_time());
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
735
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
736 g_object_set(G_OBJECT(imd->pr), "loading", FALSE, NULL);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
737
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
738 image_loader_free(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
739 imd->il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
740
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
741 color_man_free((ColorMan *)imd->cm);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
742 imd->cm = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
743
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
744 imd->delay_alter_type = ALTER_NONE;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
745
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
746 image_state_set(imd, IMAGE_STATE_NONE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
747 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
748
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
749 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
750 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
751 * image changer
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
752 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
753 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
754
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
755 static void image_change_complete(ImageWindow *imd, gdouble zoom, gint new)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
756 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
757 image_reset(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
758
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
759 if (imd->image_fd && isfile(imd->image_fd->path))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
760 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
761 PixbufRenderer *pr;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
762
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
763 pr = PIXBUF_RENDERER(imd->pr);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
764 pr->zoom = zoom; /* store the zoom, needed by the loader */
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
765
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
766 if (image_load_begin(imd, imd->image_fd))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
767 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
768 imd->unknown = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
769 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
770 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
771 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
772 GdkPixbuf *pixbuf;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
773
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
774 pixbuf = pixbuf_inline(PIXBUF_INLINE_BROKEN);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
775 image_change_pixbuf(imd, pixbuf, zoom);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
776 g_object_unref(pixbuf);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
777
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
778 imd->unknown = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
779 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
780 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
781 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
782 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
783 if (imd->image_fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
784 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
785 GdkPixbuf *pixbuf;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
786
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
787 pixbuf = pixbuf_inline(PIXBUF_INLINE_BROKEN);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
788 image_change_pixbuf(imd, pixbuf, zoom);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
789 g_object_unref(pixbuf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
790 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
791 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
792 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
793 image_change_pixbuf(imd, NULL, zoom);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
794 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
795 imd->unknown = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
796 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
797
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
798 image_update_util(imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
799 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
800
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
801 static void image_change_real(ImageWindow *imd, FileData *fd,
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
802 CollectionData *cd, CollectInfo *info, gdouble zoom)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
803 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
804
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
805 imd->collection = cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
806 imd->collection_info = info;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
807
888
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
808 if (imd->auto_refresh && imd->image_fd)
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
809 file_data_unregister_real_time_monitor(imd->image_fd);
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
810
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
811 file_data_unref(imd->image_fd);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
812 imd->image_fd = file_data_ref(fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
813
888
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
814
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
815 image_change_complete(imd, zoom, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
816
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
817 image_update_title(imd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
818 image_state_set(imd, IMAGE_STATE_IMAGE);
888
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
819
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
820 if (imd->auto_refresh && imd->image_fd)
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
821 file_data_register_real_time_monitor(imd->image_fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
822 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
823
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
824 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
825 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
826 * focus stuff
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
827 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
828 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
829
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
830 static void image_focus_paint(ImageWindow *imd, gint has_focus, GdkRectangle *area)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
831 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
832 GtkWidget *widget;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
833
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
834 widget = imd->widget;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
835 if (!widget->window) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
836
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
837 if (has_focus)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
838 {
512
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
839 gtk_paint_focus(widget->style, widget->window, GTK_STATE_ACTIVE,
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
840 area, widget, "image_window",
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
841 widget->allocation.x, widget->allocation.y,
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
842 widget->allocation.width - 1, widget->allocation.height - 1);
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
843 }
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
844 else
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
845 {
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
846 gtk_paint_shadow(widget->style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_IN,
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
847 area, widget, "image_window",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
848 widget->allocation.x, widget->allocation.y,
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
849 widget->allocation.width - 1, widget->allocation.height - 1);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
850 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
851 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
852
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
853 static gint image_focus_expose(GtkWidget *widget, GdkEventExpose *event, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
854 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
855 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
856
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
857 image_focus_paint(imd, GTK_WIDGET_HAS_FOCUS(widget), &event->area);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
858 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
859 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
860
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
861 static gint image_focus_in_cb(GtkWidget *widget, GdkEventFocus *event, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
862 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
863 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
864
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
865 GTK_WIDGET_SET_FLAGS(imd->widget, GTK_HAS_FOCUS);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
866 image_focus_paint(imd, TRUE, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
867
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
868 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
869 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
870
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
871 static gint image_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
872 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
873 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
874
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
875 GTK_WIDGET_UNSET_FLAGS(imd->widget, GTK_HAS_FOCUS);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
876 image_focus_paint(imd, FALSE, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
877
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
878 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
879 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
880
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
881 static gint image_scroll_cb(GtkWidget *widget, GdkEventScroll *event, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
882 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
883 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
884
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
885 if (imd->func_scroll &&
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
886 event && event->type == GDK_SCROLL)
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
887 {
868
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 863
diff changeset
888 imd->func_scroll(imd, event, imd->data_scroll);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
889 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
890 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
891
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
892 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
893 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
894
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
895 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
896 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
897 * public interface
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
898 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
899 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
900
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
901 void image_attach_window(ImageWindow *imd, GtkWidget *window,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
902 const gchar *title, const gchar *title_right, gint show_zoom)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
903 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
904 imd->top_window = window;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
905 g_free(imd->title);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
906 imd->title = g_strdup(title);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
907 g_free(imd->title_right);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
908 imd->title_right = g_strdup(title_right);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
909 imd->title_show_zoom = show_zoom;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
910
334
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
911 if (!options->image.fit_window_to_image) window = NULL;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
912
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
913 pixbuf_renderer_set_parent((PixbufRenderer *)imd->pr, (GtkWindow *)window);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
914
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
915 image_update_title(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
916 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
917
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
918 void image_set_update_func(ImageWindow *imd,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
919 void (*func)(ImageWindow *imd, gpointer data),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
920 gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
921 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
922 imd->func_update = func;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
923 imd->data_update = data;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
924 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
925
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
926 void image_set_complete_func(ImageWindow *imd,
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
927 void (*func)(ImageWindow *imd, gint preload, gpointer data),
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
928 gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
929 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
930 imd->func_complete = func;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
931 imd->data_complete = data;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
932 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
933
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
934 void image_set_state_func(ImageWindow *imd,
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
935 void (*func)(ImageWindow *imd, ImageState state, gpointer data),
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
936 gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
937 {
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
938 imd->func_state = func;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
939 imd->data_state = data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
940 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
941
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
942
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
943 void image_set_button_func(ImageWindow *imd,
868
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 863
diff changeset
944 void (*func)(ImageWindow *, GdkEventButton *event, gpointer),
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
945 gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
946 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
947 imd->func_button = func;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
948 imd->data_button = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
949 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
950
128
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
951 void image_set_drag_func(ImageWindow *imd,
868
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 863
diff changeset
952 void (*func)(ImageWindow *, GdkEventButton *event, gdouble dx, gdouble dy, gpointer),
128
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
953 gpointer data)
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
954 {
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
955 imd->func_drag = func;
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
956 imd->data_drag = data;
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
957 }
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
958
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
959 void image_set_scroll_func(ImageWindow *imd,
868
db6977f8b0f1 Reduce number of parameters (mostly unused), just pass the event pointer.
zas_
parents: 863
diff changeset
960 void (*func)(ImageWindow *, GdkEventScroll *event, gpointer),
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
961 gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
962 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
963 imd->func_scroll = func;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
964 imd->data_scroll = data;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
965 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
966
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
967 void image_set_scroll_notify_func(ImageWindow *imd,
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
968 void (*func)(ImageWindow *imd, gint x, gint y, gint width, gint height, gpointer data),
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
969 gpointer data)
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
970 {
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
971 imd->func_scroll_notify = func;
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
972 imd->data_scroll_notify = data;
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
973 }
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
974
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
975 /* path, name */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
976
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
977 const gchar *image_get_path(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
978 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
979 if (imd->image_fd == NULL) return NULL;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
980 return imd->image_fd->path;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
981 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
982
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
983 const gchar *image_get_name(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
984 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
985 if (imd->image_fd == NULL) return NULL;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
986 return imd->image_fd->name;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
987 }
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
988
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
989 FileData *image_get_fd(ImageWindow *imd)
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
990 {
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
991 return imd->image_fd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
992 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
993
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
994 /* merely changes path string, does not change the image! */
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
995 void image_set_fd(ImageWindow *imd, FileData *fd)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
996 {
888
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
997 if (imd->auto_refresh && imd->image_fd)
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
998 file_data_unregister_real_time_monitor(imd->image_fd);
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
999
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1000 file_data_unref(imd->image_fd);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1001 imd->image_fd = file_data_ref(fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1002
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1003 image_update_title(imd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
1004 image_state_set(imd, IMAGE_STATE_IMAGE);
888
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1005
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1006 if (imd->auto_refresh && imd->image_fd)
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1007 file_data_register_real_time_monitor(imd->image_fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1008 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1009
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1010 /* load a new image */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1011
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1012 void image_change_fd(ImageWindow *imd, FileData *fd, gdouble zoom)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1013 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1014 if (imd->image_fd == fd) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1015
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1016 image_change_real(imd, fd, NULL, NULL, zoom);
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1017 }
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1018
530
1d67ef911fa8 fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents: 513
diff changeset
1019 gint image_get_image_size(ImageWindow *imd, gint *width, gint *height)
1d67ef911fa8 fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents: 513
diff changeset
1020 {
1d67ef911fa8 fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents: 513
diff changeset
1021 return pixbuf_renderer_get_image_size(PIXBUF_RENDERER(imd->pr), width, height);
1d67ef911fa8 fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents: 513
diff changeset
1022 }
1d67ef911fa8 fixed connected zoom and scroll that didn't work in some cases
nadvornik
parents: 513
diff changeset
1023
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1024 GdkPixbuf *image_get_pixbuf(ImageWindow *imd)
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1025 {
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1026 return pixbuf_renderer_get_pixbuf((PixbufRenderer *)imd->pr);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1027 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1028
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1029 void image_change_pixbuf(ImageWindow *imd, GdkPixbuf *pixbuf, gdouble zoom)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1030 {
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1031
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1032 ExifData *exif = NULL;
437
f707aa712b1f Fix the case "orientation from FileData, color profile from exif".
zas_
parents: 434
diff changeset
1033 gint read_exif_for_color_profile = (imd->color_profile_enable && imd->color_profile_use_image);
f707aa712b1f Fix the case "orientation from FileData, color profile from exif".
zas_
parents: 434
diff changeset
1034 gint read_exif_for_orientation = FALSE;
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1035
434
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
1036 if (imd->image_fd && imd->image_fd->user_orientation)
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
1037 imd->orientation = imd->image_fd->user_orientation;
437
f707aa712b1f Fix the case "orientation from FileData, color profile from exif".
zas_
parents: 434
diff changeset
1038 else if (options->image.exif_rotate_enable)
f707aa712b1f Fix the case "orientation from FileData, color profile from exif".
zas_
parents: 434
diff changeset
1039 read_exif_for_orientation = TRUE;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1040
437
f707aa712b1f Fix the case "orientation from FileData, color profile from exif".
zas_
parents: 434
diff changeset
1041 if (read_exif_for_color_profile || read_exif_for_orientation)
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1042 {
437
f707aa712b1f Fix the case "orientation from FileData, color profile from exif".
zas_
parents: 434
diff changeset
1043 gint orientation;
f707aa712b1f Fix the case "orientation from FileData, color profile from exif".
zas_
parents: 434
diff changeset
1044
449
115db540bd0c read color profiles from jpeg also with Exiv2
nadvornik
parents: 446
diff changeset
1045 exif = exif_read_fd(imd->image_fd);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1046
437
f707aa712b1f Fix the case "orientation from FileData, color profile from exif".
zas_
parents: 434
diff changeset
1047 if (exif && read_exif_for_orientation)
f707aa712b1f Fix the case "orientation from FileData, color profile from exif".
zas_
parents: 434
diff changeset
1048 {
439
1cca0b614cba Add a way to restore original state in Adjust menu.
zas_
parents: 437
diff changeset
1049 if (exif_get_integer(exif, "Exif.Image.Orientation", &orientation))
437
f707aa712b1f Fix the case "orientation from FileData, color profile from exif".
zas_
parents: 434
diff changeset
1050 imd->orientation = orientation;
f707aa712b1f Fix the case "orientation from FileData, color profile from exif".
zas_
parents: 434
diff changeset
1051 else
f707aa712b1f Fix the case "orientation from FileData, color profile from exif".
zas_
parents: 434
diff changeset
1052 imd->orientation = 1;
439
1cca0b614cba Add a way to restore original state in Adjust menu.
zas_
parents: 437
diff changeset
1053 imd->image_fd->exif_orientation = imd->orientation;
437
f707aa712b1f Fix the case "orientation from FileData, color profile from exif".
zas_
parents: 434
diff changeset
1054 }
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1055 }
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1056
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1057 pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, NULL, NULL, FALSE);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1058 if (imd->cm)
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1059 {
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1060 color_man_free(imd->cm);
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1061 imd->cm = NULL;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1062 }
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1063
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1064 pixbuf_renderer_set_pixbuf((PixbufRenderer *)imd->pr, pixbuf, zoom);
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1065 pixbuf_renderer_set_orientation((PixbufRenderer *)imd->pr, imd->orientation);
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1066
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1067 if (imd->color_profile_enable)
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1068 {
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1069 if (!image_post_process_color(imd, 0, exif, FALSE))
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1070 {
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1071 /* fixme: note error to user */
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1072 // image_state_set(imd, IMAGE_STATE_COLOR_ADJ);
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1073 }
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1074 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1075
954
ed0fc0986928 do not free unallocated exif data
nadvornik
parents: 903
diff changeset
1076 if (read_exif_for_color_profile || read_exif_for_orientation)
ed0fc0986928 do not free unallocated exif data
nadvornik
parents: 903
diff changeset
1077 exif_free_fd(imd->image_fd, exif);
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1078
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1079 if (imd->cm || imd->desaturate)
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1080 pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, image_post_process_tile_color_cb, (gpointer) imd, (imd->cm != NULL) );
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1081
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
1082 image_state_set(imd, IMAGE_STATE_IMAGE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1083 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1084
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1085 void image_change_from_collection(ImageWindow *imd, CollectionData *cd, CollectInfo *info, gdouble zoom)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1086 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1087 if (!cd || !info || !g_list_find(cd->list, info)) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1088
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1089 image_change_real(imd, info->fd, cd, info, zoom);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1090 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1091
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1092 CollectionData *image_get_collection(ImageWindow *imd, CollectInfo **info)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1093 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1094 if (collection_to_number(imd->collection) >= 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1095 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1096 if (g_list_find(imd->collection->list, imd->collection_info) != NULL)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1097 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1098 if (info) *info = imd->collection_info;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1099 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1100 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1101 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1102 if (info) *info = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1103 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1104 return imd->collection;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1105 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1106
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1107 if (info) *info = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1108 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1109 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1110
1012
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1111 static void image_loader_sync_read_ahead_data(ImageLoader *il, gpointer old_data, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1112 {
1012
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1113 if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (GCallback)image_read_ahead_error_cb, old_data))
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1114 g_signal_connect (G_OBJECT(il), "error", (GCallback)image_read_ahead_error_cb, data);
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1115
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1116 if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (GCallback)image_read_ahead_done_cb, old_data))
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1117 g_signal_connect (G_OBJECT(il), "done", (GCallback)image_read_ahead_done_cb, data);
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1118 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1119
1012
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1120 static void image_loader_sync_data(ImageLoader *il, gpointer old_data, gpointer data)
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1121 {
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1122 if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (GCallback)image_load_area_cb, old_data))
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1123 g_signal_connect (G_OBJECT(il), "area_ready", (GCallback)image_load_area_cb, data);
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1124
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1125 if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (GCallback)image_load_error_cb, old_data))
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1126 g_signal_connect (G_OBJECT(il), "error", (GCallback)image_load_error_cb, data);
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1127
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1128 if (g_signal_handlers_disconnect_by_func(G_OBJECT(il), (GCallback)image_load_done_cb, old_data))
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1129 g_signal_connect (G_OBJECT(il), "done", (GCallback)image_load_done_cb, data);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1130 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1131
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1132 /* this is more like a move function
24
104e34f9ab1f Wed Mar 23 00:22:28 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1133 * it moves most data from source to imd
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1134 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1135 void image_change_from_image(ImageWindow *imd, ImageWindow *source)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1136 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1137 if (imd == source) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1138
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1139 imd->unknown = source->unknown;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1140
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1141 imd->collection = source->collection;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1142 imd->collection_info = source->collection_info;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1143
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1144 image_loader_free(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1145 imd->il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1146
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
1147 image_set_fd(imd, image_get_fd(source));
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
1148
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
1149
24
104e34f9ab1f Wed Mar 23 00:22:28 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1150 if (source->il)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1151 {
863
8ddd00cc8b69 fixed crash in entering fullscreen during loading
nadvornik
parents: 848
diff changeset
1152 imd->il = source->il;
8ddd00cc8b69 fixed crash in entering fullscreen during loading
nadvornik
parents: 848
diff changeset
1153 source->il = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1154
1012
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1155 image_loader_sync_data(imd->il, source, imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1156
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1157 imd->delay_alter_type = source->delay_alter_type;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1158 source->delay_alter_type = ALTER_NONE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1159 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1160
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1161 imd->color_profile_enable = source->color_profile_enable;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1162 imd->color_profile_input = source->color_profile_input;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1163 imd->color_profile_screen = source->color_profile_screen;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1164 imd->color_profile_use_image = source->color_profile_use_image;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1165 color_man_free((ColorMan *)imd->cm);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1166 imd->cm = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1167 if (source->cm)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1168 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1169 ColorMan *cm;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1170
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1171 imd->cm = source->cm;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1172 source->cm = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1173
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1174 cm = (ColorMan *)imd->cm;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1175 cm->imd = imd;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1176 cm->func_done_data = imd;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1177 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1178
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1179 image_loader_free(imd->read_ahead_il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1180 imd->read_ahead_il = source->read_ahead_il;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1181 source->read_ahead_il = NULL;
1012
fe82830ab8fd converted image loader to a GObject and use signals for notification
nadvornik
parents: 1000
diff changeset
1182 if (imd->read_ahead_il) image_loader_sync_read_ahead_data(imd->read_ahead_il, source, imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1183
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1184 file_data_unref(imd->read_ahead_fd);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1185 imd->read_ahead_fd = source->read_ahead_fd;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1186 source->read_ahead_fd = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1187
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1188 imd->completed = source->completed;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1189 imd->state = source->state;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1190 source->state = IMAGE_STATE_NONE;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1191
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1192 imd->orientation = source->orientation;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1193 imd->desaturate = source->desaturate;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1194
24
104e34f9ab1f Wed Mar 23 00:22:28 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1195 pixbuf_renderer_move(PIXBUF_RENDERER(imd->pr), PIXBUF_RENDERER(source->pr));
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1196
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1197 if (imd->cm || imd->desaturate)
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1198 pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, image_post_process_tile_color_cb, (gpointer) imd, (imd->cm != NULL) );
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1199 else
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1200 pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, NULL, NULL, TRUE);
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1201
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1202 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1203
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1204 /* manipulation */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1205
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1206 void image_area_changed(ImageWindow *imd, gint x, gint y, gint width, gint height)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1207 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1208 pixbuf_renderer_area_changed((PixbufRenderer *)imd->pr, x, y, width, height);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1209 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1210
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1211 void image_reload(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1212 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1213 if (pixbuf_renderer_get_tiles((PixbufRenderer *)imd->pr)) return;
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1214
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1215 image_change_complete(imd, image_zoom_get(imd), FALSE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1216 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1217
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1218 void image_scroll(ImageWindow *imd, gint x, gint y)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1219 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1220 pixbuf_renderer_scroll((PixbufRenderer *)imd->pr, x, y);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1221 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1222
13
ef790149ae21 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 12
diff changeset
1223 void image_scroll_to_point(ImageWindow *imd, gint x, gint y,
ef790149ae21 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 12
diff changeset
1224 gdouble x_align, gdouble y_align)
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1225 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1226 pixbuf_renderer_scroll_to_point((PixbufRenderer *)imd->pr, x, y, x_align, y_align);
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1227 }
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1228
131
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1229 void image_get_scroll_center(ImageWindow *imd, gdouble *x, gdouble *y)
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1230 {
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1231 pixbuf_renderer_get_scroll_center(PIXBUF_RENDERER(imd->pr), x, y);
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1232 }
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1233
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1234 void image_set_scroll_center(ImageWindow *imd, gdouble x, gdouble y)
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1235 {
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1236 pixbuf_renderer_set_scroll_center(PIXBUF_RENDERER(imd->pr), x, y);
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1237 }
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1238
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1239 void image_zoom_adjust(ImageWindow *imd, gdouble increment)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1240 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1241 pixbuf_renderer_zoom_adjust((PixbufRenderer *)imd->pr, increment);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1242 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1243
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1244 void image_zoom_adjust_at_point(ImageWindow *imd, gdouble increment, gint x, gint y)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1245 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1246 pixbuf_renderer_zoom_adjust_at_point((PixbufRenderer *)imd->pr, increment, x, y);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1247 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1248
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1249 void image_zoom_set_limits(ImageWindow *imd, gdouble min, gdouble max)
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1250 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1251 pixbuf_renderer_zoom_set_limits((PixbufRenderer *)imd->pr, min, max);
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1252 }
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1253
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1254 void image_zoom_set(ImageWindow *imd, gdouble zoom)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1255 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1256 pixbuf_renderer_zoom_set((PixbufRenderer *)imd->pr, zoom);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1257 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1258
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1259 void image_zoom_set_fill_geometry(ImageWindow *imd, gint vertical)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1260 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1261 PixbufRenderer *pr;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1262 gdouble zoom;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1263 gint width, height;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1264
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1265 pr = (PixbufRenderer *)imd->pr;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1266
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1267 if (!pixbuf_renderer_get_pixbuf(pr) ||
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1268 !pixbuf_renderer_get_image_size(pr, &width, &height)) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1269
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1270 if (vertical)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1271 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1272 zoom = (gdouble)pr->window_height / height;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1273 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1274 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1275 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1276 zoom = (gdouble)pr->window_width / width;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1277 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1278
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1279 if (zoom < 1.0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1280 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1281 zoom = 0.0 - 1.0 / zoom;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1282 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1283
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1284 pixbuf_renderer_zoom_set(pr, zoom);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1285 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1286
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1287 gdouble image_zoom_get(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1288 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1289 return pixbuf_renderer_zoom_get((PixbufRenderer *)imd->pr);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1290 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1291
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1292 gdouble image_zoom_get_real(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1293 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1294 return pixbuf_renderer_zoom_get_scale((PixbufRenderer *)imd->pr);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1295 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1296
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1297 gchar *image_zoom_get_as_text(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1298 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1299 gdouble zoom;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1300 gdouble scale;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1301 gdouble l = 1.0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1302 gdouble r = 1.0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1303 gint pl = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1304 gint pr = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1305 gchar *approx = " ";
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1306
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1307 zoom = image_zoom_get(imd);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1308 scale = image_zoom_get_real(imd);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1309
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1310 if (zoom > 0.0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1311 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1312 l = zoom;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1313 }
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1314 else if (zoom < 0.0)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1315 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1316 r = 0.0 - zoom;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1317 }
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1318 else if (zoom == 0.0 && scale != 0.0)
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1319 {
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1320 if (scale >= 1.0)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1321 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1322 l = scale;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1323 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1324 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1325 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1326 r = 1.0 / scale;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1327 }
415
4f7362028062 Add zoom ratio display to OSD in fullscreen mode.
zas_
parents: 414
diff changeset
1328 approx = "~";
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1329 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1330
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1331 if (rint(l) != l) pl = 1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1332 if (rint(r) != r) pr = 1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1333
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1334 return g_strdup_printf("%.*f :%s%.*f", pl, l, approx, pr, r);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1335 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1336
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1337 gdouble image_zoom_get_default(ImageWindow *imd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1338 {
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1339 gdouble zoom = 1.0;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1340
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1341 switch (options->image.zoom_mode)
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1342 {
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1343 case ZOOM_RESET_ORIGINAL:
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1344 break;
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1345 case ZOOM_RESET_FIT_WINDOW:
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1346 zoom = 0.0;
885
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1347 break;
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1348 case ZOOM_RESET_NONE:
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1349 if (imd) zoom = image_zoom_get(imd);
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1350 break;
ad420f2eb789 Use a specific enum for image.zoom_mode values (ZoomMode) and
zas_
parents: 868
diff changeset
1351 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1352
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1353 return zoom;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1354 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1355
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1356 /* read ahead */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1357
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1358 void image_prebuffer_set(ImageWindow *imd, FileData *fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1359 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1360 if (pixbuf_renderer_get_tiles((PixbufRenderer *)imd->pr)) return;
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1361
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1362 if (fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1363 {
846
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
1364 if (!file_cache_get(image_get_cache(), fd))
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
1365 {
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
1366 image_read_ahead_set(imd, fd);
8911a4f0e56c simple cache for loaded pixbufs
nadvornik
parents: 844
diff changeset
1367 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1368 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1369 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1370 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1371 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1372 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1373 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1374
888
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1375 static void image_notify_cb(FileData *fd, NotifyType type, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1376 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1377 ImageWindow *imd = data;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1378
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1379 if (!imd || !image_get_pixbuf(imd) ||
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 994
diff changeset
1380 /* imd->il || */ /* loading in progress - do not check - it should start from the beginning anyway */
891
841b387dd877 fixed test for changed files in cache
nadvornik
parents: 890
diff changeset
1381 !imd->image_fd || /* nothing to reload */
903
c93823609f15 periodic testing of changed files can be now disabled
nadvornik
parents: 891
diff changeset
1382 imd->state == IMAGE_STATE_NONE /* loading not started, no need to reload */
c93823609f15 periodic testing of changed files can be now disabled
nadvornik
parents: 891
diff changeset
1383 ) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1384
888
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1385 if (type == NOTIFY_TYPE_REREAD && fd == imd->image_fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1386 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1387 image_reload(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1388 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1389 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1390
888
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1391 void image_auto_refresh_enable(ImageWindow *imd, gboolean enable)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1392 {
888
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1393 if (!enable && imd->auto_refresh && imd->image_fd)
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1394 file_data_unregister_real_time_monitor(imd->image_fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1395
888
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1396 if (enable && !imd->auto_refresh && imd->image_fd)
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1397 file_data_register_real_time_monitor(imd->image_fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1398
888
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1399 imd->auto_refresh = enable;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1400 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1401
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1402 void image_top_window_set_sync(ImageWindow *imd, gint allow_sync)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1403 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1404 imd->top_window_sync = allow_sync;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1405
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1406 g_object_set(G_OBJECT(imd->pr), "window_fit", allow_sync, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1407 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1408
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1409 void image_background_set_color(ImageWindow *imd, GdkColor *color)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1410 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1411 pixbuf_renderer_set_color((PixbufRenderer *)imd->pr, color);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1412 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1413
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1414 void image_color_profile_set(ImageWindow *imd,
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1415 gint input_type, gint screen_type,
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1416 gint use_image)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1417 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1418 if (!imd) return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1419
432
96f8389c36de fixed max. number of profiles
nadvornik
parents: 430
diff changeset
1420 if (input_type < 0 || input_type >= COLOR_PROFILE_FILE + COLOR_PROFILE_INPUTS ||
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1421 screen_type < 0 || screen_type > 1)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1422 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1423 return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1424 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1425
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1426 imd->color_profile_input = input_type;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1427 imd->color_profile_screen = screen_type;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1428 imd->color_profile_use_image = use_image;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1429 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1430
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1431 gint image_color_profile_get(ImageWindow *imd,
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1432 gint *input_type, gint *screen_type,
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1433 gint *use_image)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1434 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1435 if (!imd) return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1436
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1437 if (input_type) *input_type = imd->color_profile_input;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1438 if (screen_type) *screen_type = imd->color_profile_screen;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1439 if (use_image) *use_image = imd->color_profile_use_image;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1440
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1441 return TRUE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1442 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1443
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1444 void image_color_profile_set_use(ImageWindow *imd, gint enable)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1445 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1446 if (!imd) return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1447
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1448 if (imd->color_profile_enable == enable) return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1449
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1450 imd->color_profile_enable = enable;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1451 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1452
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1453 gint image_color_profile_get_use(ImageWindow *imd)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1454 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1455 if (!imd) return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1456
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1457 return imd->color_profile_enable;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1458 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1459
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
1460 gint image_color_profile_get_from_image(ImageWindow *imd)
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
1461 {
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
1462 if (!imd) return FALSE;
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
1463
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
1464 return imd->color_profile_from_image;
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
1465 }
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
1466
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1467 void image_set_delay_flip(ImageWindow *imd, gint delay)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1468 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1469 if (!imd ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1470 imd->delay_flip == delay) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1471
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1472 imd->delay_flip = delay;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1473
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1474 g_object_set(G_OBJECT(imd->pr), "delay_flip", delay, NULL);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1475
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1476 if (!imd->delay_flip && imd->il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1477 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1478 PixbufRenderer *pr;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1479
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1480 pr = PIXBUF_RENDERER(imd->pr);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1481 if (pr->pixbuf) g_object_unref(pr->pixbuf);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1482 pr->pixbuf = NULL;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1483
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1484 image_load_pixbuf_ready(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1485 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1486 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1487
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1488 void image_to_root_window(ImageWindow *imd, gint scaled)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1489 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1490 GdkScreen *screen;
3
gqview
parents: 1
diff changeset
1491 GdkWindow *rootwindow;
gqview
parents: 1
diff changeset
1492 GdkPixmap *pixmap;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1493 GdkPixbuf *pixbuf;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1494 GdkPixbuf *pb;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1495 gint width, height;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1496
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1497 if (!imd) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1498
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1499 pixbuf = image_get_pixbuf(imd);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1500 if (!pixbuf) return;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1501
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1502 screen = gtk_widget_get_screen(imd->widget);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1503 rootwindow = gdk_screen_get_root_window(screen);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1504 if (gdk_drawable_get_visual(rootwindow) != gdk_visual_get_system()) return;
3
gqview
parents: 1
diff changeset
1505
gqview
parents: 1
diff changeset
1506 if (scaled)
gqview
parents: 1
diff changeset
1507 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1508 width = gdk_screen_width();
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1509 height = gdk_screen_height();
3
gqview
parents: 1
diff changeset
1510 }
gqview
parents: 1
diff changeset
1511 else
gqview
parents: 1
diff changeset
1512 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1513 pixbuf_renderer_get_scaled_size((PixbufRenderer *)imd->pr, &width, &height);
3
gqview
parents: 1
diff changeset
1514 }
gqview
parents: 1
diff changeset
1515
334
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1516 pb = gdk_pixbuf_scale_simple(pixbuf, width, height, (GdkInterpType)options->image.zoom_quality);
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1517
512
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
1518 gdk_pixbuf_render_pixmap_and_mask(pb, &pixmap, NULL, 128);
3
gqview
parents: 1
diff changeset
1519 gdk_window_set_back_pixmap(rootwindow, pixmap, FALSE);
gqview
parents: 1
diff changeset
1520 gdk_window_clear(rootwindow);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1521 g_object_unref(pb);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1522 g_object_unref(pixmap);
3
gqview
parents: 1
diff changeset
1523
gqview
parents: 1
diff changeset
1524 gdk_flush();
gqview
parents: 1
diff changeset
1525 }
gqview
parents: 1
diff changeset
1526
127
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1527 void image_select(ImageWindow *imd, gboolean select)
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1528 {
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1529 if (imd->has_frame)
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1530 {
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1531 if (select)
127
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1532 {
154
6bcd037bf176 fixed image focus
nadvornik
parents: 151
diff changeset
1533 gtk_widget_set_state(imd->widget, GTK_STATE_SELECTED);
151
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1534 gtk_widget_set_state(imd->pr, GTK_STATE_NORMAL); /* do not propagate */
127
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1535 }
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1536 else
154
6bcd037bf176 fixed image focus
nadvornik
parents: 151
diff changeset
1537 gtk_widget_set_state(imd->widget, GTK_STATE_NORMAL);
127
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1538 }
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1539 }
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1540
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1541
174
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1542
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1543 void image_set_selectable(ImageWindow *imd, gboolean selectable)
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1544 {
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1545 if (imd->has_frame)
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1546 {
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1547 if (selectable)
174
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1548 {
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1549 gtk_frame_set_shadow_type(GTK_FRAME(imd->frame), GTK_SHADOW_NONE);
513
985fdfebd89e Remove whitespace between function name and first parenthesis for the sake of consistency. (pass 2)
zas_
parents: 512
diff changeset
1550 gtk_container_set_border_width(GTK_CONTAINER(imd->frame), 4);
174
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1551 }
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1552 else
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1553 {
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1554 gtk_frame_set_shadow_type(GTK_FRAME(imd->frame), GTK_SHADOW_NONE);
513
985fdfebd89e Remove whitespace between function name and first parenthesis for the sake of consistency. (pass 2)
zas_
parents: 512
diff changeset
1555 gtk_container_set_border_width(GTK_CONTAINER(imd->frame), 0);
174
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1556 }
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1557 }
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1558 }
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1559
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1560 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1561 *-------------------------------------------------------------------
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1562 * prefs sync
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1563 *-------------------------------------------------------------------
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1564 */
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1565
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1566 static void image_options_set(ImageWindow *imd)
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1567 {
334
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1568 g_object_set(G_OBJECT(imd->pr), "zoom_quality", options->image.zoom_quality,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1569 "zoom_2pass", options->image.zoom_2pass,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1570 "zoom_expand", options->image.zoom_to_fit_allow_expand,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1571 "dither_quality", options->image.dither_quality,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1572 "scroll_reset", options->image.scroll_reset_method,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1573 "cache_display", options->image.tile_cache_max,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1574 "window_fit", (imd->top_window_sync && options->image.fit_window_to_image),
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1575 "window_limit", options->image.limit_window_size,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1576 "window_limit_value", options->image.max_window_size,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1577 "autofit_limit", options->image.limit_autofit_size,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1578 "autofit_limit_value", options->image.max_autofit_size,
209
ad78ad18523a configurable frame around image - geeqie_autofit_maxsize.patch by Laurent MONIN
nadvornik
parents: 208
diff changeset
1579
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1580 NULL);
27
9c24765c2d3a Sat Apr 2 17:28:16 2005 John Ellis <johne@verizon.net>
gqview
parents: 26
diff changeset
1581
9c24765c2d3a Sat Apr 2 17:28:16 2005 John Ellis <johne@verizon.net>
gqview
parents: 26
diff changeset
1582 pixbuf_renderer_set_parent((PixbufRenderer *)imd->pr, (GtkWindow *)imd->top_window);
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1583 }
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1584
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1585 void image_options_sync(void)
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1586 {
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1587 GList *work;
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1588
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1589 work = image_list;
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1590 while (work)
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1591 {
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1592 ImageWindow *imd;
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1593
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1594 imd = work->data;
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1595 work = work->next;
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1596
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1597 image_options_set(imd);
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1598 }
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1599 }
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1600
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1601 /*
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1602 *-------------------------------------------------------------------
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1603 * init / destroy
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1604 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1605 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1606
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1607 static void image_free(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1608 {
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1609 image_list = g_list_remove(image_list, imd);
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1610
888
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1611 if (imd->auto_refresh && imd->image_fd)
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1612 file_data_unregister_real_time_monitor(imd->image_fd);
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1613
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1614 file_data_unregister_notify_func(image_notify_cb, imd);
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1615
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1616 image_reset(imd);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1617
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1618 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1619
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1620 file_data_unref(imd->image_fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1621 g_free(imd->title);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1622 g_free(imd->title_right);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1623 g_free(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1624 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1625
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1626 static void image_destroy_cb(GtkObject *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1627 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1628 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1629 image_free(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1630 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1631
512
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
1632 gboolean selectable_frame_expose_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data)
151
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1633 {
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1634 gtk_paint_flat_box(widget->style,
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1635 widget->window,
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1636 widget->state,
512
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
1637 (GTK_FRAME(widget))->shadow_type,
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1638 NULL,
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1639 widget,
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1640 NULL,
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1641 widget->allocation.x + 3, widget->allocation.y + 3,
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1642 widget->allocation.width - 6, widget->allocation.height - 6);
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1643
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1644
151
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1645 return FALSE;
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1646 }
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1647
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1648
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1649 void image_set_frame(ImageWindow *imd, gboolean frame)
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1650 {
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1651 frame = !!frame;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1652
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1653 if (frame == imd->has_frame) return;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1654
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1655 gtk_widget_hide(imd->pr);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1656
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1657 if (frame)
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1658 {
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1659 imd->frame = gtk_frame_new(NULL);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1660 gtk_widget_ref(imd->pr);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1661 if (imd->has_frame != -1) gtk_container_remove(GTK_CONTAINER(imd->widget), imd->pr);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1662 gtk_container_add(GTK_CONTAINER(imd->frame), imd->pr);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1663 gtk_widget_unref(imd->pr);
512
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
1664 g_signal_connect(G_OBJECT(imd->frame), "expose_event",
f9bf33be53ff Remove whitespace between function name and first parenthesis for the sake of consistency.
zas_
parents: 507
diff changeset
1665 G_CALLBACK(selectable_frame_expose_cb), NULL);
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1666
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1667 GTK_WIDGET_SET_FLAGS(imd->frame, GTK_CAN_FOCUS);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1668 g_signal_connect(G_OBJECT(imd->frame), "focus_in_event",
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1669 G_CALLBACK(image_focus_in_cb), imd);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1670 g_signal_connect(G_OBJECT(imd->frame), "focus_out_event",
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1671 G_CALLBACK(image_focus_out_cb), imd);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1672
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1673 g_signal_connect_after(G_OBJECT(imd->frame), "expose_event",
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1674 G_CALLBACK(image_focus_expose), imd);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1675
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1676
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1677 gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->frame);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1678 gtk_widget_show(imd->frame);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1679 }
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1680 else
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1681 {
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1682 gtk_widget_ref(imd->pr);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1683 if (imd->frame)
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1684 {
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1685 gtk_container_remove(GTK_CONTAINER(imd->frame), imd->pr);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1686 gtk_widget_destroy(imd->frame);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1687 imd->frame = NULL;
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1688 }
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1689 gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->pr);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1690 gtk_widget_unref(imd->pr);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1691 }
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1692
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1693 gtk_widget_show(imd->pr);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1694
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1695 imd->has_frame = frame;
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1696 }
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1697
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1698 ImageWindow *image_new(gint frame)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1699 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1700 ImageWindow *imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1701
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1702 imd = g_new0(ImageWindow, 1);
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1703
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1704 imd->top_window = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1705 imd->title = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1706 imd->title_right = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1707 imd->title_show_zoom = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1708
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1709 imd->unknown = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1710
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1711 imd->has_frame = -1; /* not initialized; for image_set_frame */
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1712 imd->top_window_sync = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1713
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1714 imd->delay_alter_type = ALTER_NONE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1715
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1716 imd->read_ahead_il = NULL;
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1717 imd->read_ahead_fd = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1718
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1719 imd->completed = FALSE;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1720 imd->state = IMAGE_STATE_NONE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1721
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1722 imd->color_profile_enable = FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1723 imd->color_profile_input = 0;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1724 imd->color_profile_screen = 0;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1725 imd->color_profile_use_image = FALSE;
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
1726 imd->color_profile_from_image = COLOR_PROFILE_NONE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1727
888
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1728 imd->auto_refresh = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1729
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1730 imd->delay_flip = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1731
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1732 imd->func_update = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1733 imd->func_complete = NULL;
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1734 imd->func_tile_request = NULL;
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1735 imd->func_tile_dispose = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1736
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1737 imd->func_button = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1738 imd->func_scroll = NULL;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1739
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1740 imd->orientation = 1;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1741
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1742 imd->pr = GTK_WIDGET(pixbuf_renderer_new());
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1743
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1744 image_options_set(imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1745
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 439
diff changeset
1746
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1747 imd->widget = gtk_vbox_new(0, 0);
151
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1748
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1749 image_set_frame(imd, frame);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1750
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1751 image_set_selectable(imd, 0);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1752
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1753 g_signal_connect(G_OBJECT(imd->pr), "clicked",
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1754 G_CALLBACK(image_click_cb), imd);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1755 g_signal_connect(G_OBJECT(imd->pr), "scroll_notify",
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1756 G_CALLBACK(image_scroll_notify_cb), imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1757
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1758 g_signal_connect(G_OBJECT(imd->pr), "scroll_event",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1759 G_CALLBACK(image_scroll_cb), imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1760
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1761 g_signal_connect(G_OBJECT(imd->pr), "destroy",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1762 G_CALLBACK(image_destroy_cb), imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1763
25
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
1764 g_signal_connect(G_OBJECT(imd->pr), "zoom",
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
1765 G_CALLBACK(image_zoom_cb), imd);
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
1766 g_signal_connect(G_OBJECT(imd->pr), "render_complete",
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
1767 G_CALLBACK(image_render_complete_cb), imd);
128
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
1768 g_signal_connect(G_OBJECT(imd->pr), "drag",
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
1769 G_CALLBACK(image_drag_cb), imd);
25
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
1770
888
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1771 file_data_register_notify_func(image_notify_cb, imd, NOTIFY_PRIORITY_LOW);
d8e1e820cee7 reload changed images
nadvornik
parents: 885
diff changeset
1772
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1773 image_list = g_list_append(image_list, imd);
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1774
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1775 return imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1776 }