annotate src/image.c @ 434:1b0aee2b162e

Keep image orientation set by the user during the session.
author zas_
date Sat, 19 Apr 2008 21:50:05 +0000
parents 96f8389c36de
children f707aa712b1f
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
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
4 *
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
5 * Author: John Ellis
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
6 *
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
7 * 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
8 * Please read the included file COPYING for more information.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
9 * This software comes with no warranty of any kind, use at your own risk!
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
10 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
11
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
12
281
9995c5fb202a gqview.h -> main.h
zas_
parents: 273
diff changeset
13 #include "main.h"
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
14 #include "image.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
15
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 #include "image-load.h"
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"
415
4f7362028062 Add zoom ratio display to OSD in fullscreen mode.
zas_
parents: 414
diff changeset
21 #include "image-overlay.h"
284
84c4618cd1cb Fix missing header files inclusions.
zas_
parents: 281
diff changeset
22 #include "layout.h"
84c4618cd1cb Fix missing header files inclusions.
zas_
parents: 281
diff changeset
23 #include "layout_image.h"
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
24 #include "pixbuf-renderer.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
25 #include "pixbuf_util.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
26 #include "ui_fileops.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
27
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
28 #include "filelist.h"
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
29
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
30 #include <math.h>
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
31
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
32
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
33 /* size of the image loader buffer (512 bytes x defined number) */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
34 #define IMAGE_LOAD_BUFFER_COUNT 8
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 /* 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
37 #define IMAGE_THROTTLE_LARGER_IMAGES 1
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 /* 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
40 #define IMAGE_THROTTLE_FACTOR 32
9
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 /* the file size at which throttling take place */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
43 #define IMAGE_THROTTLE_THRESHOLD 1048576
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 #define IMAGE_AUTO_REFRESH_TIME 3000
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
46
1
b3e0e515fabf Initial revision
gqview
parents:
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);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
52 static void image_post_process(ImageWindow *imd, gint clamp);
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
53 static void image_read_ahead_start(ImageWindow *imd);
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 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
67 imd->func_button(imd, event->button, event->time,
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
68 event->x, event->y, event->state, imd->data_button);
9
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 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
71
128
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
72 static void image_drag_cb(PixbufRenderer *pr, GdkEventButton *event, gpointer data)
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
73 {
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
74 ImageWindow *imd = data;
129
89fc00ffbce2 started relative scroll, keep scroll position
nadvornik
parents: 128
diff changeset
75 gint width, height;
128
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
76
129
89fc00ffbce2 started relative scroll, keep scroll position
nadvornik
parents: 128
diff changeset
77 pixbuf_renderer_get_scaled_size(pr, &width, &height);
89fc00ffbce2 started relative scroll, keep scroll position
nadvornik
parents: 128
diff changeset
78
128
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
79 if (imd->func_drag)
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
80 {
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
81 imd->func_drag(imd, event->button, event->time,
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
82 event->x, event->y, event->state,
129
89fc00ffbce2 started relative scroll, keep scroll position
nadvornik
parents: 128
diff changeset
83 (gfloat)(pr->drag_last_x - event->x) / width, (gfloat)(pr->drag_last_y - event->y) / height,
128
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
84 imd->data_button);
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 }
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
87
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
88 static void image_scroll_notify_cb(PixbufRenderer *pr, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
89 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
90 ImageWindow *imd = data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
91
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
92 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
93 {
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
94 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
95 (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
96 (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
97 (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
98 (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
99 imd->data_scroll_notify);
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 }
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
102
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
103 static void image_update_util(ImageWindow *imd)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
104 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
105 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
106 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
107
25
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
108 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
109 {
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
110 ImageWindow *imd = data;
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
111
61
0c912a2d94f1 Mon Jun 13 20:22:58 2005 John Ellis <johne@verizon.net>
gqview
parents: 42
diff changeset
112 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
113 if (imd->overlay_show_zoom) image_osd_update(imd);
4f7362028062 Add zoom ratio display to OSD in fullscreen mode.
zas_
parents: 414
diff changeset
114
25
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
115 image_update_util(imd);
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
116 }
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
117
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
118 static void image_complete_util(ImageWindow *imd, gint preload)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
119 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
120 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
121
386
0226daf8c30b in debug mode print time information on selected events
nadvornik
parents: 334
diff changeset
122 if (debug) printf("%s image load completed \"%s\" (%s)\n", get_exec_time(),
203
f8d31b393c2e fixed crashes with --debug
nadvornik
parents: 196
diff changeset
123 (preload) ? (imd->read_ahead_fd ? imd->read_ahead_fd->path : "null") :
f8d31b393c2e fixed crashes with --debug
nadvornik
parents: 196
diff changeset
124 (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
125 (preload) ? "preload" : "current");
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
126
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
127 if (!preload) imd->completed = TRUE;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
128 if (imd->func_complete) imd->func_complete(imd, preload, imd->data_complete);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
129 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
130
25
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
131 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
132 {
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
133 ImageWindow *imd = data;
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
134
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
135 image_complete_util(imd, FALSE);
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
136 }
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
137
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
138 static void image_state_set(ImageWindow *imd, ImageState state)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
139 {
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
140 if (state == IMAGE_STATE_NONE)
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
141 {
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
142 imd->state = state;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
143 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
144 else
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
145 {
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
146 imd->state |= state;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
147 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
148 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
149 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
150
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
151 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
152 {
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
153 imd->state &= ~state;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
154 if (imd->func_state) imd->func_state(imd, state, imd->data_state);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
155 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
156
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
157 /*
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
158 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
159 * misc
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
163 static void image_update_title(ImageWindow *imd)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
164 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
165 gchar *title = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
166 gchar *zoom = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
167 gchar *collection = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
168
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
169 if (!imd->top_window) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
170
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
171 if (imd->collection && collection_to_number(imd->collection) >= 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
172 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
173 const gchar *name;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
174 name = imd->collection->name;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
175 if (!name) name = _("Untitled");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
176 collection = g_strdup_printf(" (Collection %s)", name);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
177 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
178
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
179 if (imd->title_show_zoom)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
180 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
181 gchar *buf = image_zoom_get_as_text(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
182 zoom = g_strconcat(" [", buf, "]", NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
183 g_free(buf);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
184 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
185
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
186 title = g_strdup_printf("%s%s%s%s%s%s",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
187 imd->title ? imd->title : "",
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
188 imd->image_fd ? imd->image_fd->name : "",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
189 zoom ? zoom : "",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
190 collection ? collection : "",
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
191 imd->image_fd ? " - " : "",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
192 imd->title_right ? imd->title_right : "");
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 gtk_window_set_title(GTK_WINDOW(imd->top_window), title);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
195
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
196 g_free(title);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
197 g_free(zoom);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
198 g_free(collection);
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
201 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
202 *-------------------------------------------------------------------
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
203 * rotation, flip, etc.
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
204 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
205 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
206
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
207
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
208 #if 0
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
209
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
210 static void image_alter_real(ImageWindow *imd, AlterType type, gint clamp)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
211 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
212 PixbufRenderer *pr;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
213 GdkPixbuf *new = NULL;
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
214 gint exif_rotate;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
215 gint x, y;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
216 gint t;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
217
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
218 pr = (PixbufRenderer *)imd->pr;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
219
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
220 exif_rotate = (imd->delay_alter_type != ALTER_NONE && (imd->state & IMAGE_STATE_ROTATE_AUTO));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
221 imd->delay_alter_type = ALTER_NONE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
222
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
223 if (!pr->pixbuf) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
224
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
225 x = pr->x_scroll + (pr->vis_width / 2);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
226 y = pr->y_scroll + (pr->vis_height / 2);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
227
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
228 switch (type)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
229 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
230 case ALTER_ROTATE_90:
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
231 new = pixbuf_copy_rotate_90(pr->pixbuf, FALSE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
232 t = x;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
233 x = pr->height - y;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
234 y = t;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
235 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
236 case ALTER_ROTATE_90_CC:
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
237 new = pixbuf_copy_rotate_90(pr->pixbuf, TRUE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
238 t = x;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
239 x = y;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
240 y = pr->width - t;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
241 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
242 case ALTER_ROTATE_180:
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
243 new = pixbuf_copy_mirror(pr->pixbuf, TRUE, TRUE);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
244 x = pr->width - x;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
245 y = pr->height - y;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
246 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
247 case ALTER_MIRROR:
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
248 new = pixbuf_copy_mirror(pr->pixbuf, TRUE, FALSE);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
249 x = pr->width - x;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
250 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
251 case ALTER_FLIP:
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
252 new = pixbuf_copy_mirror(pr->pixbuf, FALSE, TRUE);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
253 y = pr->height - y;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
254 break;
82
a4c1b7014e6e Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
gqview
parents: 61
diff changeset
255 case ALTER_DESATURATE:
a4c1b7014e6e Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
gqview
parents: 61
diff changeset
256 pixbuf_desaturate_rect(pr->pixbuf,
a4c1b7014e6e Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
gqview
parents: 61
diff changeset
257 0, 0, pr->image_width, pr->image_height);
a4c1b7014e6e Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
gqview
parents: 61
diff changeset
258 image_area_changed(imd, 0, 0, pr->image_width, pr->image_height);
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 244
diff changeset
259 layout_image_overlay_update(layout_find_by_image(imd));
82
a4c1b7014e6e Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
gqview
parents: 61
diff changeset
260 break;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
261 case ALTER_NONE:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
262 default:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
263 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
264 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
265 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
266
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
267 if (!new) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
268
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
269 pixbuf_renderer_set_pixbuf(pr, new, pr->zoom);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
270 g_object_unref(new);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
271
109
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
272 if (clamp && pr->zoom != 0.0 && pr->scale != 0.0)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
273 {
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
274 if (exif_rotate)
109
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
275 {
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
276 switch (pr->scroll_reset)
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
277 {
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
278 case PR_SCROLL_RESET_NOCHANGE:
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
279 break;
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
280 case PR_SCROLL_RESET_CENTER:
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
281 x = (gint)((gdouble)pr->image_width / 2.0 * pr->scale);
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
282 y = (gint)((gdouble)pr->image_height / 2.0 * pr->scale);
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
283 break;
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
284 case PR_SCROLL_RESET_TOPLEFT:
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
285 default:
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
286 x = 0;
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
287 y = 0;
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
288 break;
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
289 }
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
290 }
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
291 pixbuf_renderer_scroll_to_point(pr, (gint)((gdouble)x / pr->scale),
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
292 (gint)((gdouble)y / pr->scale),
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
293 0.50, 0.50);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
294 }
122
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
295
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
296 if (exif_rotate) image_state_set(imd, IMAGE_STATE_ROTATE_AUTO);
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 244
diff changeset
297 layout_image_overlay_update(layout_find_by_image(imd));
386
0226daf8c30b in debug mode print time information on selected events
nadvornik
parents: 334
diff changeset
298 if (debug) printf("%s image postprocess done: %s\n", get_exec_time(), imd->image_fd->name);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
299 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
300
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
301 static void image_post_process_alter(ImageWindow *imd, gint clamp)
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
302 {
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
303 if (imd->delay_alter_type != ALTER_NONE)
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 image_alter_real(imd, imd->delay_alter_type, clamp);
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
306 }
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
307 }
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
308
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
309
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
310 static void image_post_process_color_cb(ColorMan *cm, ColorManReturnType type, gpointer data)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
311 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
312 ImageWindow *imd = data;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
313
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
314 color_man_free(cm);
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
315 if (type == COLOR_RETURN_IMAGE_CHANGED)
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
316 {
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
317 if (cm == imd->cm) imd->cm = NULL;
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
318 return;
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
319 }
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
320
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
321 imd->cm = NULL;
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
322 image_state_set(imd, IMAGE_STATE_COLOR_ADJ);
386
0226daf8c30b in debug mode print time information on selected events
nadvornik
parents: 334
diff changeset
323 if (debug) printf("%s image postprocess cm done: %s\n", get_exec_time(), imd->image_fd->name);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
324
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
325 image_post_process_alter(imd, FALSE);
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
326
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
327 image_read_ahead_start(imd);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
328 }
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
329 #endif
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
330
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
331 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
332 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
333 ColorMan *cm;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
334 ColorManProfileType input_type;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
335 ColorManProfileType screen_type;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
336 const gchar *input_file;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
337 const gchar *screen_file;
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
338 ExifItem *item = NULL;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
339
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
340 if (imd->cm) return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
341
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
342 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
343 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
344 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
345 gint n;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
346
430
a254a7102af5 fixed color profile index
nadvornik
parents: 426
diff changeset
347 n = imd->color_profile_input - COLOR_PROFILE_FILE;
327
049d6b00cc14 Rename color profile options.
zas_
parents: 320
diff changeset
348 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
349
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
350 input_type = COLOR_PROFILE_FILE;
327
049d6b00cc14 Rename color profile options.
zas_
parents: 320
diff changeset
351 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
352 }
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
353 else if (imd->color_profile_input >= COLOR_PROFILE_SRGB &&
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
354 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
355 {
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
356 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
357 input_file = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
358 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
359 else
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
360 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
361 return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
362 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
363
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
364 if (imd->color_profile_screen == 1 &&
327
049d6b00cc14 Rename color profile options.
zas_
parents: 320
diff changeset
365 options->color_profile.screen_file)
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
366 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
367 screen_type = COLOR_PROFILE_FILE;
327
049d6b00cc14 Rename color profile options.
zas_
parents: 320
diff changeset
368 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
369 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
370 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
371 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
372 screen_type = COLOR_PROFILE_SRGB;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
373 screen_file = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
374 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
375 else
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
376 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
377 return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
378 }
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
379 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
380
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
381 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
382 {
222
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 209
diff changeset
383 item = exif_get_item(exif, "Exif.Image.InterColorProfile");
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
384 if (!item)
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
385 {
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
386 gint cs;
424
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
387 gchar *interop_index;
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
388
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
389 /* ColorSpace == 1 specifies sRGB per EXIF 2.2 */
424
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
390 if (!exif_get_integer(exif, "Exif.Photo.ColorSpace", &cs)) cs = 0;
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
391 interop_index = exif_get_data_as_text(exif, "Exif.Iop.InteroperabilityIndex");
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
392
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
393 if (cs == 1)
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
394 {
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
395 input_type = COLOR_PROFILE_SRGB;
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
396 input_file = NULL;
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
397 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
398
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
399 if (debug) printf("Found EXIF ColorSpace of sRGB\n");
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
400 }
424
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
401 if (cs == 2 || (interop_index && !strcmp(interop_index, "R03")))
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
402 {
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
403 input_type = COLOR_PROFILE_ADOBERGB;
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
404 input_file = NULL;
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
405 imd->color_profile_from_image = COLOR_PROFILE_ADOBERGB;
424
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
406
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
407 if (debug) printf("Found EXIF ColorSpace of AdobeRGB\n");
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
408 }
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
409
26c6e768bd47 first support for AdobeRGB colorspace
nadvornik
parents: 415
diff changeset
410 g_free(interop_index);
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
411 }
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
412 }
176
695e1ad3b169 simplified exif.h, moved implementation-specific stuff to exif-int.h
nadvornik
parents: 175
diff changeset
413
695e1ad3b169 simplified exif.h, moved implementation-specific stuff to exif-int.h
nadvornik
parents: 175
diff changeset
414 if (item && exif_item_get_format_id(item) == EXIF_FORMAT_UNDEFINED)
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
415 {
244
7754bfc0d98a Fix a signedness warning.
zas_
parents: 222
diff changeset
416 unsigned char *data;
176
695e1ad3b169 simplified exif.h, moved implementation-specific stuff to exif-int.h
nadvornik
parents: 175
diff changeset
417 guint data_len;
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
418 if (debug) printf("Found embedded color profile\n");
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
419 imd->color_profile_from_image = COLOR_PROFILE_MEM;
176
695e1ad3b169 simplified exif.h, moved implementation-specific stuff to exif-int.h
nadvornik
parents: 175
diff changeset
420
244
7754bfc0d98a Fix a signedness warning.
zas_
parents: 222
diff changeset
421 data = (unsigned char *) exif_item_get_data(item, &data_len);
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
422
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
423 cm = color_man_new_embedded(run_in_bg ? imd : NULL, NULL,
176
695e1ad3b169 simplified exif.h, moved implementation-specific stuff to exif-int.h
nadvornik
parents: 175
diff changeset
424 data, data_len,
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
425 screen_type, screen_file);
414
49c1cbe058ae partially fixed reading embedded color profiles with exiv2
nadvornik
parents: 398
diff changeset
426 g_free(data);
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
427 }
176
695e1ad3b169 simplified exif.h, moved implementation-specific stuff to exif-int.h
nadvornik
parents: 175
diff changeset
428 else
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
429 {
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
430 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
431 input_type, input_file,
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
432 screen_type, screen_file);
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
433 }
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
434
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
435 if (cm)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
436 {
116
1bd40943dc2a Tue Nov 28 13:17:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 115
diff changeset
437 if (start_row > 0)
1bd40943dc2a Tue Nov 28 13:17:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 115
diff changeset
438 {
1bd40943dc2a Tue Nov 28 13:17:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 115
diff changeset
439 cm->row = start_row;
1bd40943dc2a Tue Nov 28 13:17:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 115
diff changeset
440 cm->incremental_sync = TRUE;
1bd40943dc2a Tue Nov 28 13:17:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 115
diff changeset
441 }
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
442
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
443 imd->cm = (gpointer)cm;
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
444 #if 0
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
445 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
446 #endif
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
447 return TRUE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
448 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
449
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
450 return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
451 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
452
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
453 static void image_post_process(ImageWindow *imd, gint clamp)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
454 {
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
455 #if 0
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
456 ExifData *exif = NULL;
109
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
457
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
458 if (!image_get_pixbuf(imd)) return;
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
459
386
0226daf8c30b in debug mode print time information on selected events
nadvornik
parents: 334
diff changeset
460 if (debug) printf("%s image postprocess: %s\n", get_exec_time(), imd->image_fd->name);
0226daf8c30b in debug mode print time information on selected events
nadvornik
parents: 334
diff changeset
461
334
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
462 if (options->image.exif_rotate_enable ||
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
463 (imd->color_profile_enable && imd->color_profile_use_image) )
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
464 {
188
0584cb78aa14 write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents: 181
diff changeset
465 exif = exif_read_fd(imd->image_fd, (imd->color_profile_enable && imd->color_profile_use_image));
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
466 }
334
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
467 if (options->image.exif_rotate_enable && exif)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
468 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
469 gint orientation;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
470
180
e6c8cf017d68 more exiv2 fixes
nadvornik
parents: 177
diff changeset
471 if (exif_get_integer(exif, "Exif.Image.Orientation", &orientation))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
472 {
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
473 gint rotate = TRUE;
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
474
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
475 /* see http://jpegclub.org/exif_orientation.html
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
476 1 2 3 4 5 6 7 8
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 888888 888888 88 88 8888888888 88 88 8888888888
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
479 88 88 88 88 88 88 88 88 88 88 88 88
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
480 8888 8888 8888 8888 88 8888888888 8888888888 88
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
481 88 88 88 88
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
482 88 88 888888 888888
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 switch (orientation)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
485 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
486 case EXIF_ORIENTATION_TOP_LEFT:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
487 /* normal -- nothing to do */
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
488 rotate = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
489 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
490 case EXIF_ORIENTATION_TOP_RIGHT:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
491 /* mirrored */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
492 imd->delay_alter_type = ALTER_MIRROR;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
493 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
494 case EXIF_ORIENTATION_BOTTOM_RIGHT:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
495 /* upside down */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
496 imd->delay_alter_type = ALTER_ROTATE_180;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
497 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
498 case EXIF_ORIENTATION_BOTTOM_LEFT:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
499 /* flipped */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
500 imd->delay_alter_type = ALTER_FLIP;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
501 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
502 case EXIF_ORIENTATION_LEFT_TOP:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
503 /* not implemented -- too wacky to fix in one step */
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
504 rotate = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
505 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
506 case EXIF_ORIENTATION_RIGHT_TOP:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
507 /* rotated -90 (270) */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
508 imd->delay_alter_type = ALTER_ROTATE_90;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
509 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
510 case EXIF_ORIENTATION_RIGHT_BOTTOM:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
511 /* not implemented -- too wacky to fix in one step */
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
512 rotate = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
513 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
514 case EXIF_ORIENTATION_LEFT_BOTTOM:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
515 /* rotated 90 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
516 imd->delay_alter_type = ALTER_ROTATE_90_CC;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
517 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
518 default:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
519 /* The other values are out of range */
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
520 rotate = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
521 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
522 }
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
523
122
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
524 if (rotate) image_state_set(imd, IMAGE_STATE_ROTATE_AUTO);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
525 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
526 }
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
527 if (imd->color_profile_enable)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
528 {
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
529 if (!image_post_process_color(imd, 0, exif, TRUE))
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
530 {
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
531 /* fixme: note error to user */
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
532 image_state_set(imd, IMAGE_STATE_COLOR_ADJ);
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
533 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
534 }
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
535
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
536
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
537 if (!imd->cm) image_post_process_alter(imd, clamp);
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
538
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
539 exif_free(exif);
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
540 #endif
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
541 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
542
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
543 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
544 {
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
545 ImageWindow *imd = (ImageWindow *)data;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
546 if (imd->cm) color_man_correct_region(imd->cm, *pixbuf, x, y, w, h);
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
547 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
548
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
549 }
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
550
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
551 void image_alter(ImageWindow *imd, AlterType type)
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
552 {
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
553
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
554 const static gint rotate_90[] = {1, 6, 7, 8, 5, 2, 3, 4, 1};
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
555 const static gint rotate_90_cc[] = {1, 8, 5, 6, 7, 4, 1, 2, 3};
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
556 const static gint rotate_180[] = {1, 3, 4, 1, 2, 7, 8, 5, 6};
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
557 const static gint mirror[] = {1, 2, 1, 4, 3, 6, 5, 8, 7};
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
558 const static gint flip[] = {1, 4, 3, 2, 1, 8, 7, 6, 5};
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
559
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
560
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
561 if (!imd || !imd->pr) return;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
562
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
563 if (imd->orientation < 1 || imd->orientation > 8) imd->orientation = 1;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
564
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
565 switch (type)
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
566 {
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
567 case ALTER_ROTATE_90:
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
568 imd->orientation = rotate_90[imd->orientation];
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
569 break;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
570 case ALTER_ROTATE_90_CC:
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
571 imd->orientation = rotate_90_cc[imd->orientation];
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
572 break;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
573 case ALTER_ROTATE_180:
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
574 imd->orientation = rotate_180[imd->orientation];
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
575 break;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
576 case ALTER_MIRROR:
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
577 imd->orientation = mirror[imd->orientation];
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
578 break;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
579 case ALTER_FLIP:
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
580 imd->orientation = flip[imd->orientation];
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
581 break;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
582 case ALTER_DESATURATE:
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
583 imd->desaturate = !imd->desaturate;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
584 break;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
585 case ALTER_NONE:
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
586 default:
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
587 return;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
588 break;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
589 }
434
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
590
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
591 if (type != ALTER_NONE && type != ALTER_DESATURATE)
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
592 {
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
593 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
594 imd->image_fd->user_orientation = imd->orientation;
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
595 }
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
596 else
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
597 {
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
598 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
599 imd->image_fd->user_orientation = 0;
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
600 }
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
601
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
602 pixbuf_renderer_set_orientation((PixbufRenderer *)imd->pr, imd->orientation);
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
603 if (imd->cm || imd->desaturate)
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
604 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
605 else
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
606 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
607 }
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
608
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
609
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
610 /*
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 * read ahead (prebuffer)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
613 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
614 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
615
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
616 static void image_read_ahead_cancel(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
617 {
386
0226daf8c30b in debug mode print time information on selected events
nadvornik
parents: 334
diff changeset
618 if (debug) printf("%s read ahead cancelled for :%s\n", 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
619
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
620 image_loader_free(imd->read_ahead_il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
621 imd->read_ahead_il = NULL;
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_pixbuf) g_object_unref(imd->read_ahead_pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
624 imd->read_ahead_pixbuf = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
625
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
626 file_data_unref(imd->read_ahead_fd);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
627 imd->read_ahead_fd = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
628 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
629
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
630 static void image_read_ahead_done_cb(ImageLoader *il, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
631 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
632 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
633
386
0226daf8c30b in debug mode print time information on selected events
nadvornik
parents: 334
diff changeset
634 if (debug) printf("%s read ahead done for :%s\n", get_exec_time(), imd->read_ahead_fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
635
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
636 imd->read_ahead_pixbuf = image_loader_get_pixbuf(imd->read_ahead_il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
637 if (imd->read_ahead_pixbuf)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
638 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
639 g_object_ref(imd->read_ahead_pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
640 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
641 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
642 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
643 imd->read_ahead_pixbuf = pixbuf_inline(PIXBUF_INLINE_BROKEN);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
644 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
645 image_loader_free(imd->read_ahead_il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
646 imd->read_ahead_il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
647
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
648 image_complete_util(imd, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
649 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
650
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
651 static void image_read_ahead_error_cb(ImageLoader *il, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
652 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
653 /* 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
654 image_read_ahead_done_cb(il, data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
655 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
656
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
657 static void image_read_ahead_start(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
658 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
659 /* already started ? */
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
660 if (!imd->read_ahead_fd || imd->read_ahead_il || imd->read_ahead_pixbuf) return;
9
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 /* still loading ?, do later */
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
663 if (imd->il /*|| imd->cm*/) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
664
386
0226daf8c30b in debug mode print time information on selected events
nadvornik
parents: 334
diff changeset
665 if (debug) printf("%s read ahead started for :%s\n", get_exec_time(), imd->read_ahead_fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
666
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
667 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
668
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
669 image_loader_set_error_func(imd->read_ahead_il, image_read_ahead_error_cb, imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
670 if (!image_loader_start(imd->read_ahead_il, image_read_ahead_done_cb, imd))
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 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
673 image_complete_util(imd, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
674 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
675 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
676
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
677 static void image_read_ahead_set(ImageWindow *imd, FileData *fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
678 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
679 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
680
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
681 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
682
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
683 imd->read_ahead_fd = file_data_ref(fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
684
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
685 if (debug) printf("read ahead set to :%s\n", imd->read_ahead_fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
686
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
687 image_read_ahead_start(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
688 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
689
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
690 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
691 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
692 * post buffering
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
693 *-------------------------------------------------------------------
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
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
696 static void image_post_buffer_set(ImageWindow *imd, FileData *fd, GdkPixbuf *pixbuf, gint color_row)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
697 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
698 file_data_unref(imd->prev_fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
699 if (imd->prev_pixbuf) g_object_unref(imd->prev_pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
700
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
701 if (fd && pixbuf)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
702 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
703 imd->prev_fd = file_data_ref(fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
704
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
705 g_object_ref(pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
706 imd->prev_pixbuf = pixbuf;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
707 imd->prev_color_row = color_row;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
708 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
709 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
710 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
711 imd->prev_fd = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
712 imd->prev_pixbuf = NULL;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
713 imd->prev_color_row = -1;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
714 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
715
386
0226daf8c30b in debug mode print time information on selected events
nadvornik
parents: 334
diff changeset
716 if (debug) printf("%s post buffer set: %s\n", get_exec_time(), fd ? fd->path : "null");
9
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
719 static gint image_post_buffer_get(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
720 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
721 gint success;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
722
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
723 if (imd->prev_pixbuf &&
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
724 imd->image_fd && imd->prev_fd && imd->image_fd == imd->prev_fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
725 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
726 image_change_pixbuf(imd, imd->prev_pixbuf, image_zoom_get(imd));
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
727 if (imd->prev_color_row >= 0)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
728 {
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
729 ExifData *exif = NULL;
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
730
188
0584cb78aa14 write comment and keywords to xmp, sidecars are used if exist
nadvornik
parents: 181
diff changeset
731 if (imd->color_profile_use_image) exif = exif_read_fd(imd->image_fd, TRUE);
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
732 // image_post_process_color(imd, imd->prev_color_row, exif, TRUE);
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
733 exif_free(exif);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
734 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
735 success = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
736 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
737 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
738 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
739 success = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
740 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
741
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
742 if (imd->prev_pixbuf) g_object_unref(imd->prev_pixbuf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
743 imd->prev_pixbuf = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
744
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
745 file_data_unref(imd->prev_fd);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
746 imd->prev_fd = NULL;
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 return success;
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 /*
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 * loading
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 */
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 static void image_load_pixbuf_ready(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
758 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
759 if (image_get_pixbuf(imd) || !imd->il) return;
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 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
762 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
763
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
764 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
765 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
766 ImageWindow *imd = data;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
767 PixbufRenderer *pr;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
768
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
769 pr = (PixbufRenderer *)imd->pr;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
770
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
771 if (imd->delay_flip &&
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
772 pr->pixbuf != image_loader_get_pixbuf(il))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
773 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
774 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
775 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
776
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
777 if (!pr->pixbuf) image_load_pixbuf_ready(imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
778
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
779 pixbuf_renderer_area_changed(pr, x, y, w, h);
9
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
782 static void image_load_done_cb(ImageLoader *il, gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
783 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
784 ImageWindow *imd = data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
785
386
0226daf8c30b in debug mode print time information on selected events
nadvornik
parents: 334
diff changeset
786 if (debug) printf ("%s image done\n", get_exec_time());
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
787
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
788 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
789 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
790
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
791 if (imd->delay_flip &&
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
792 image_get_pixbuf(imd) != image_loader_get_pixbuf(imd->il))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
793 {
42
606fcf461a68 Sat May 14 13:04:23 2005 John Ellis <johne@verizon.net>
gqview
parents: 29
diff changeset
794 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
795 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
796 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
797
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
798 image_loader_free(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
799 imd->il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
800
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
801 image_post_process(imd, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
802
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
803 image_read_ahead_start(imd);
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
806 static void image_load_error_cb(ImageLoader *il, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
807 {
386
0226daf8c30b in debug mode print time information on selected events
nadvornik
parents: 334
diff changeset
808 if (debug) printf ("%s image error\n", get_exec_time());
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
809
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
810 /* even on error handle it like it was done,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
811 * since we have a pixbuf with _something_ */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
812
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
813 image_load_done_cb(il, data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
814 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
815
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
816 #ifdef IMAGE_THROTTLE_LARGER_IMAGES
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
817 static void image_load_buffer_throttle(ImageLoader *il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
818 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
819 if (!il || il->bytes_total < IMAGE_THROTTLE_THRESHOLD) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
820
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
821 /* Larger image files usually have larger chunks of data per pixel...
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
822 * 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
823 * are also larger.
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 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
827 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
828 #endif
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 /* this read ahead is located here merely for the callbacks, above */
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 static gint image_read_ahead_check(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
833 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
834 if (!imd->read_ahead_fd) return FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
835 if (imd->il) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
836
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
837 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
838 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
839 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
840 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
841 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
842
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
843 if (imd->read_ahead_il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
844 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
845 imd->il = imd->read_ahead_il;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
846 imd->read_ahead_il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
847
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
848 /* override the old signals */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
849 image_loader_set_area_ready_func(imd->il, image_load_area_cb, imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
850 image_loader_set_error_func(imd->il, image_load_error_cb, imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
851 image_loader_set_buffer_size(imd->il, IMAGE_LOAD_BUFFER_COUNT);
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 #ifdef IMAGE_THROTTLE_LARGER_IMAGES
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
854 image_load_buffer_throttle(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
855 #endif
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 /* do this one directly (probably should add a set func) */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
858 imd->il->func_done = image_load_done_cb;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
859
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
860 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
861 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
862
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
863 if (!imd->delay_flip)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
864 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
865 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
866 }
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 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
869 return TRUE;
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 else if (imd->read_ahead_pixbuf)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
872 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
873 image_change_pixbuf(imd, imd->read_ahead_pixbuf, image_zoom_get(imd));
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
874 g_object_unref(imd->read_ahead_pixbuf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
875 imd->read_ahead_pixbuf = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
876
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
877 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
878
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
879 image_post_process(imd, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
880 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
881 }
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 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
884 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
885 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
886
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
887 static gint image_load_begin(ImageWindow *imd, FileData *fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
888 {
386
0226daf8c30b in debug mode print time information on selected events
nadvornik
parents: 334
diff changeset
889 if (debug) printf ("%s image begin \n", get_exec_time());
9
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 if (imd->il) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
892
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
893 imd->completed = FALSE;
25
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
894 g_object_set(G_OBJECT(imd->pr), "complete", FALSE, NULL);
9
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 if (image_post_buffer_get(imd))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
897 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
898 if (debug) printf("from post buffer: %s\n", imd->image_fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
899 return TRUE;
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
902 if (image_read_ahead_check(imd))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
903 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
904 if (debug) printf("from read ahead buffer: %s\n", imd->image_fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
905 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
906 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
907
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
908 if (!imd->delay_flip && image_get_pixbuf(imd))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
909 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
910 PixbufRenderer *pr;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
911
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
912 pr = PIXBUF_RENDERER(imd->pr);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
913 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
914 pr->pixbuf = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
915 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
916
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
917 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
918
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
919 imd->il = image_loader_new(fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
920
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
921 image_loader_set_area_ready_func(imd->il, image_load_area_cb, imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
922 image_loader_set_error_func(imd->il, image_load_error_cb, imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
923 image_loader_set_buffer_size(imd->il, IMAGE_LOAD_BUFFER_COUNT);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
924
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
925 if (!image_loader_start(imd->il, image_load_done_cb, imd))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
926 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
927 if (debug) printf("image start error\n");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
928
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
929 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
930
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
931 image_loader_free(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
932 imd->il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
933
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
934 image_complete_util(imd, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
935
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
936 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
937 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
938
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
939 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
940
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
941 #ifdef IMAGE_THROTTLE_LARGER_IMAGES
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
942 image_load_buffer_throttle(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
943 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
944
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
945 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
946
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
947 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
948 }
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 static void image_reset(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
951 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
952 /* stops anything currently being done */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
953
386
0226daf8c30b in debug mode print time information on selected events
nadvornik
parents: 334
diff changeset
954 if (debug) printf("%s image reset\n", get_exec_time());
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
955
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
956 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
957
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
958 image_loader_free(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
959 imd->il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
960
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
961 color_man_free((ColorMan *)imd->cm);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
962 imd->cm = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
963
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
964 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
965
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
966 image_state_set(imd, IMAGE_STATE_NONE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
967 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
968
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
969 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
970 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
971 * image changer
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
972 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
973 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
974
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
975 static void image_change_complete(ImageWindow *imd, gdouble zoom, gint new)
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 image_reset(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 && isfile(imd->image_fd->path))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
980 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
981 PixbufRenderer *pr;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
982
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
983 pr = PIXBUF_RENDERER(imd->pr);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
984 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
985
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
986 if (image_load_begin(imd, imd->image_fd))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
987 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
988 imd->unknown = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
989 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
990 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
991 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
992 GdkPixbuf *pixbuf;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
993
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
994 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
995 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
996 g_object_unref(pixbuf);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
997
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
998 imd->unknown = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
999 }
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1000 imd->size = filesize(imd->image_fd->path);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1001 imd->mtime = filetime(imd->image_fd->path);
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 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1004 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1005 if (imd->image_fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1006 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1007 GdkPixbuf *pixbuf;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1008
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1009 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
1010 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
1011 g_object_unref(pixbuf);
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1012 imd->mtime = filetime(imd->image_fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1013 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1014 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1015 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1016 image_change_pixbuf(imd, NULL, zoom);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1017 imd->mtime = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1018 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1019 imd->unknown = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1020 imd->size = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1021 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1022
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1023 image_update_util(imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1024 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1025
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1026 static void image_change_real(ImageWindow *imd, FileData *fd,
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1027 CollectionData *cd, CollectInfo *info, gdouble zoom)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1028 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1029 GdkPixbuf *pixbuf;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1030 GdkPixbuf *prev_pixbuf = NULL;
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1031 FileData *prev_fd = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1032 gint prev_clear = FALSE;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1033 gint prev_color_row = -1;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1034
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1035 imd->collection = cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1036 imd->collection_info = info;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1037
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1038 pixbuf = image_get_pixbuf(imd);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1039
334
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1040 if (options->image.enable_read_ahead && imd->image_fd && pixbuf)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1041 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1042 if (imd->il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1043 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1044 /* current image is not finished */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1045 prev_clear = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1046 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1047 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1048 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1049 prev_fd = file_data_ref(imd->image_fd);
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1050 prev_pixbuf = pixbuf;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1051 g_object_ref(prev_pixbuf);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1052
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1053 if (imd->cm)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1054 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1055 ColorMan *cm;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1056
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1057 cm = (ColorMan *)imd->cm;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1058 prev_color_row = cm->row;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1059 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1060 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1061 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1062
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1063 file_data_unref(imd->image_fd);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1064 imd->image_fd = file_data_ref(fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1065
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1066 image_change_complete(imd, zoom, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1067
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1068 if (prev_pixbuf)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1069 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1070 image_post_buffer_set(imd, prev_fd, prev_pixbuf, prev_color_row);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1071 file_data_unref(prev_fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1072 g_object_unref(prev_pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1073 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1074 else if (prev_clear)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1075 {
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1076 image_post_buffer_set(imd, NULL, NULL, -1);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1077 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1078
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1079 image_update_title(imd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
1080 image_state_set(imd, IMAGE_STATE_IMAGE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1081 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1082
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 * focus stuff
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 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1088
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1089 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
1090 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1091 GtkWidget *widget;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1092
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1093 widget = imd->widget;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1094 if (!widget->window) return;
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 (has_focus)
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 gtk_paint_focus (widget->style, widget->window, GTK_STATE_ACTIVE,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1099 area, widget, "image_window",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1100 widget->allocation.x, widget->allocation.y,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1101 widget->allocation.width - 1, widget->allocation.height - 1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1102 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1103 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1104 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1105 gtk_paint_shadow (widget->style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_IN,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1106 area, widget, "image_window",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1107 widget->allocation.x, widget->allocation.y,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1108 widget->allocation.width - 1, widget->allocation.height - 1);
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 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1111
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1112 static gint image_focus_expose(GtkWidget *widget, GdkEventExpose *event, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1113 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1114 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1115
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1116 image_focus_paint(imd, GTK_WIDGET_HAS_FOCUS(widget), &event->area);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1117 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1118 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1119
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1120 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
1121 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1122 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1123
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1124 GTK_WIDGET_SET_FLAGS(imd->widget, GTK_HAS_FOCUS);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1125 image_focus_paint(imd, TRUE, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1126
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1127 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1128 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1129
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1130 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
1131 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1132 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1133
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1134 GTK_WIDGET_UNSET_FLAGS(imd->widget, GTK_HAS_FOCUS);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1135 image_focus_paint(imd, FALSE, NULL);
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 return TRUE;
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1140 gint image_overlay_add(ImageWindow *imd, GdkPixbuf *pixbuf, gint x, gint y,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1141 gint relative, gint always)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1142 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1143 return pixbuf_renderer_overlay_add((PixbufRenderer *)imd->pr, pixbuf, x, y, relative, always);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1144 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1145
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1146 void image_overlay_set(ImageWindow *imd, gint id, GdkPixbuf *pixbuf, gint x, gint y)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1147 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1148 pixbuf_renderer_overlay_set((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1149 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1150
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1151 gint image_overlay_get(ImageWindow *imd, gint id, GdkPixbuf **pixbuf, gint *x, gint *y)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1152 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1153 return pixbuf_renderer_overlay_get((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1154 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1155
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1156 void image_overlay_remove(ImageWindow *imd, gint id)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1157 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1158 pixbuf_renderer_overlay_remove((PixbufRenderer *)imd->pr, id);
9
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1161 static gint image_scroll_cb(GtkWidget *widget, GdkEventScroll *event, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1162 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1163 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1164
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1165 if (imd->func_scroll &&
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1166 event && event->type == GDK_SCROLL)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1167 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1168 imd->func_scroll(imd, event->direction, event->time,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1169 event->x, event->y, event->state, imd->data_scroll);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1170 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1171 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1172
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1173 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1174 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1175
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1176 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1177 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1178 * public interface
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1179 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1180 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1181
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1182 void image_attach_window(ImageWindow *imd, GtkWidget *window,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1183 const gchar *title, const gchar *title_right, gint show_zoom)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1184 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1185 imd->top_window = window;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1186 g_free(imd->title);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1187 imd->title = g_strdup(title);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1188 g_free(imd->title_right);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1189 imd->title_right = g_strdup(title_right);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1190 imd->title_show_zoom = show_zoom;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1191
334
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1192 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
1193
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1194 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
1195
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1196 image_update_title(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1197 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1198
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1199 void image_set_update_func(ImageWindow *imd,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1200 void (*func)(ImageWindow *imd, gpointer data),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1201 gpointer data)
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 imd->func_update = func;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1204 imd->data_update = data;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1205 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1206
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1207 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
1208 void (*func)(ImageWindow *imd, gint preload, gpointer data),
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1209 gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1210 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1211 imd->func_complete = func;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1212 imd->data_complete = data;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1213 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1214
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
1215 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
1216 void (*func)(ImageWindow *imd, ImageState state, gpointer data),
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1217 gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1218 {
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
1219 imd->func_state = func;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
1220 imd->data_state = data;
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1223
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1224 void image_set_button_func(ImageWindow *imd,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1225 void (*func)(ImageWindow *, gint button, guint32 time, gdouble x, gdouble y, guint state, gpointer),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1226 gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1227 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1228 imd->func_button = func;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1229 imd->data_button = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1230 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1231
128
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
1232 void image_set_drag_func(ImageWindow *imd,
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
1233 void (*func)(ImageWindow *, gint button, guint32 time, gdouble x, gdouble y, guint state, gdouble dx, gdouble dy, gpointer),
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
1234 gpointer data)
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
1235 {
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
1236 imd->func_drag = func;
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
1237 imd->data_drag = data;
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
1238 }
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
1239
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1240 void image_set_scroll_func(ImageWindow *imd,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1241 void (*func)(ImageWindow *, GdkScrollDirection direction, guint32 time, gdouble x, gdouble y, guint state, gpointer),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1242 gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1243 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1244 imd->func_scroll = func;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1245 imd->data_scroll = data;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1246 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1247
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1248 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
1249 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
1250 gpointer data)
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1251 {
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1252 imd->func_scroll_notify = func;
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1253 imd->data_scroll_notify = data;
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1254 }
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1255
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1256 /* path, name */
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 const gchar *image_get_path(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1259 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1260 if (imd->image_fd == NULL) return NULL;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1261 return imd->image_fd->path;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1262 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1263
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1264 const gchar *image_get_name(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1265 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1266 if (imd->image_fd == NULL) return NULL;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1267 return imd->image_fd->name;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1268 }
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1269
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1270 FileData *image_get_fd(ImageWindow *imd)
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1271 {
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1272 return imd->image_fd;
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1275 /* merely changes path string, does not change the image! */
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1276 void image_set_fd(ImageWindow *imd, FileData *fd)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1277 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1278 file_data_unref(imd->image_fd);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1279 imd->image_fd = file_data_ref(fd);
9
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 image_update_title(imd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
1282 image_state_set(imd, IMAGE_STATE_IMAGE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1283 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1284
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1285 /* load a new image */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1286
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1287 void image_change_fd(ImageWindow *imd, FileData *fd, gdouble zoom)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1288 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1289 if (imd->image_fd == fd) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1290
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1291 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
1292 }
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1293
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1294 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
1295 {
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1296 return pixbuf_renderer_get_pixbuf((PixbufRenderer *)imd->pr);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1297 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1298
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1299 void image_change_pixbuf(ImageWindow *imd, GdkPixbuf *pixbuf, gdouble zoom)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1300 {
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1301
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1302 ExifData *exif = NULL;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1303 gint orientation;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1304
434
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
1305 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
1306 imd->orientation = imd->image_fd->user_orientation;
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
1307 else if (options->image.exif_rotate_enable ||
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1308 (imd->color_profile_enable && imd->color_profile_use_image) )
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1309 {
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1310 exif = exif_read_fd(imd->image_fd, (imd->color_profile_enable && imd->color_profile_use_image));
434
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
1311
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
1312 if (options->image.exif_rotate_enable && exif && exif_get_integer(exif, "Exif.Image.Orientation", &orientation))
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
1313 imd->orientation = orientation;
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
1314 else
1b0aee2b162e Keep image orientation set by the user during the session.
zas_
parents: 432
diff changeset
1315 imd->orientation = 1;
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1316 }
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1317
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1318 pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, NULL, NULL, FALSE);
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1319 if (imd->cm)
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1320 {
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1321 color_man_free(imd->cm);
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1322 imd->cm = NULL;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1323 }
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1324
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1325 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
1326 pixbuf_renderer_set_orientation((PixbufRenderer *)imd->pr, imd->orientation);
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1327
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1328 if (imd->color_profile_enable)
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1329 {
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1330 if (!image_post_process_color(imd, 0, exif, FALSE))
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1331 {
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1332 /* fixme: note error to user */
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1333 // image_state_set(imd, IMAGE_STATE_COLOR_ADJ);
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1334 }
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1335 }
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1336
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1337 exif_free(exif);
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1338
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1339 if (imd->cm || imd->desaturate)
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1340 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
1341
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
1342 image_state_set(imd, IMAGE_STATE_IMAGE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1343 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1344
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1345 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
1346 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1347 if (!cd || !info || !g_list_find(cd->list, info)) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1348
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1349 image_change_real(imd, info->fd, cd, info, zoom);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1350 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1351
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1352 CollectionData *image_get_collection(ImageWindow *imd, CollectInfo **info)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1353 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1354 if (collection_to_number(imd->collection) >= 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1355 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1356 if (g_list_find(imd->collection->list, imd->collection_info) != NULL)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1357 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1358 if (info) *info = imd->collection_info;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1359 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1360 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1361 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1362 if (info) *info = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1363 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1364 return imd->collection;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1365 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1366
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1367 if (info) *info = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1368 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1369 }
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 static void image_loader_sync_data(ImageLoader *il, gpointer data)
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 /* change data for the callbacks directly */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1374
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1375 il->data_area_ready = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1376 il->data_error = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1377 il->data_done = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1378 il->data_percent = data;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1379 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1380
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1381 /* 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
1382 * it moves most data from source to imd
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1383 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1384 void image_change_from_image(ImageWindow *imd, ImageWindow *source)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1385 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1386 if (imd == source) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1387
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1388 imd->unknown = source->unknown;
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 imd->collection = source->collection;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1391 imd->collection_info = source->collection_info;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1392 imd->size = source->size;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1393 imd->mtime = source->mtime;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1394
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1395 image_set_fd(imd, image_get_fd(source));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1396
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1397 image_loader_free(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1398 imd->il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1399
24
104e34f9ab1f Wed Mar 23 00:22:28 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1400 if (source->il)
9
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 imd->il = source->il;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1403 source->il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1404
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1405 image_loader_sync_data(imd->il, imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1406
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1407 imd->delay_alter_type = source->delay_alter_type;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1408 source->delay_alter_type = ALTER_NONE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1409 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1410
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1411 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
1412 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
1413 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
1414 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
1415 color_man_free((ColorMan *)imd->cm);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1416 imd->cm = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1417 if (source->cm)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1418 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1419 ColorMan *cm;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1420
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1421 imd->cm = source->cm;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1422 source->cm = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1423
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1424 cm = (ColorMan *)imd->cm;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1425 cm->imd = imd;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1426 cm->func_done_data = imd;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1427 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1428
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1429 image_loader_free(imd->read_ahead_il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1430 imd->read_ahead_il = source->read_ahead_il;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1431 source->read_ahead_il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1432 if (imd->read_ahead_il) image_loader_sync_data(imd->read_ahead_il, imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1433
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1434 if (imd->read_ahead_pixbuf) g_object_unref(imd->read_ahead_pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1435 imd->read_ahead_pixbuf = source->read_ahead_pixbuf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1436 source->read_ahead_pixbuf = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1437
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1438 file_data_unref(imd->read_ahead_fd);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1439 imd->read_ahead_fd = source->read_ahead_fd;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1440 source->read_ahead_fd = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1441
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1442 if (imd->prev_pixbuf) g_object_unref(imd->prev_pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1443 imd->prev_pixbuf = source->prev_pixbuf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1444 source->prev_pixbuf = NULL;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1445 imd->prev_color_row = source->prev_color_row;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1446 source->prev_color_row = -1;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1447
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1448 file_data_unref(imd->prev_fd);
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1449 imd->prev_fd = source->prev_fd;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1450 source->prev_fd = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1451
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1452 imd->completed = source->completed;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1453 imd->state = source->state;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1454 source->state = IMAGE_STATE_NONE;
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1455
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1456 imd->orientation = source->orientation;
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1457 imd->desaturate = source->desaturate;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1458
24
104e34f9ab1f Wed Mar 23 00:22:28 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1459 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
1460
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1461 if (imd->cm || imd->desaturate)
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1462 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
1463 else
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1464 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
1465
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1466 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1467
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1468 /* manipulation */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1469
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1470 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
1471 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1472 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
1473 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1474
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1475 void image_reload(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1476 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1477 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
1478
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1479 image_change_complete(imd, image_zoom_get(imd), FALSE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1480 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1481
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1482 void image_scroll(ImageWindow *imd, gint x, gint y)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1483 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1484 pixbuf_renderer_scroll((PixbufRenderer *)imd->pr, x, y);
9
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
13
ef790149ae21 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 12
diff changeset
1487 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
1488 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
1489 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1490 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
1491 }
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1492
131
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1493 void image_get_scroll_center(ImageWindow *imd, gdouble *x, gdouble *y)
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1494 {
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1495 pixbuf_renderer_get_scroll_center(PIXBUF_RENDERER(imd->pr), x, y);
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1496 }
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1497
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1498 void image_set_scroll_center(ImageWindow *imd, gdouble x, gdouble y)
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1499 {
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1500 pixbuf_renderer_set_scroll_center(PIXBUF_RENDERER(imd->pr), x, y);
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1501 }
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1502
b1acdfc7271b relative scroll is working; some cleanup
nadvornik
parents: 129
diff changeset
1503
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1504 #if 0
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1505 void image_alter(ImageWindow *imd, AlterType type)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1506 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1507 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
1508
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1509 if (imd->il || imd->cm)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1510 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1511 /* still loading, wait till done */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1512 imd->delay_alter_type = type;
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
1513 image_state_set(imd, IMAGE_STATE_ROTATE_USER);
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
1514
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
1515 if (imd->cm && (imd->state & IMAGE_STATE_ROTATE_AUTO))
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
1516 {
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 116
diff changeset
1517 image_state_unset(imd, IMAGE_STATE_ROTATE_AUTO);
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
1518 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1519 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1520 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1521
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
1522 image_alter_real(imd, type, TRUE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1523 }
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
1524 #endif
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1525
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1526 void image_zoom_adjust(ImageWindow *imd, gdouble increment)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1527 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1528 pixbuf_renderer_zoom_adjust((PixbufRenderer *)imd->pr, increment);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1529 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1530
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1531 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
1532 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1533 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
1534 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1535
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1536 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
1537 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1538 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
1539 }
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1540
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1541 void image_zoom_set(ImageWindow *imd, gdouble zoom)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1542 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1543 pixbuf_renderer_zoom_set((PixbufRenderer *)imd->pr, zoom);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1544 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1545
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1546 void image_zoom_set_fill_geometry(ImageWindow *imd, gint vertical)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1547 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1548 PixbufRenderer *pr;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1549 gdouble zoom;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1550 gint width, height;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1551
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1552 pr = (PixbufRenderer *)imd->pr;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1553
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1554 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
1555 !pixbuf_renderer_get_image_size(pr, &width, &height)) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1556
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1557 if (vertical)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1558 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1559 zoom = (gdouble)pr->window_height / height;
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 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1562 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1563 zoom = (gdouble)pr->window_width / width;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1564 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1565
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1566 if (zoom < 1.0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1567 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1568 zoom = 0.0 - 1.0 / zoom;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1569 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1570
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1571 pixbuf_renderer_zoom_set(pr, zoom);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1572 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1573
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1574 gdouble image_zoom_get(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1575 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1576 return pixbuf_renderer_zoom_get((PixbufRenderer *)imd->pr);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1577 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1578
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1579 gdouble image_zoom_get_real(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1580 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1581 return pixbuf_renderer_zoom_get_scale((PixbufRenderer *)imd->pr);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1582 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1583
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1584 gchar *image_zoom_get_as_text(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1585 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1586 gdouble zoom;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1587 gdouble scale;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1588 gdouble l = 1.0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1589 gdouble r = 1.0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1590 gint pl = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1591 gint pr = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1592 gchar *approx = " ";
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1593
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1594 zoom = image_zoom_get(imd);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1595 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
1596
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1597 if (zoom > 0.0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1598 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1599 l = zoom;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1600 }
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1601 else if (zoom < 0.0)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1602 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1603 r = 0.0 - zoom;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1604 }
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1605 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
1606 {
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1607 if (scale >= 1.0)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1608 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1609 l = scale;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1610 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1611 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1612 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1613 r = 1.0 / scale;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1614 }
415
4f7362028062 Add zoom ratio display to OSD in fullscreen mode.
zas_
parents: 414
diff changeset
1615 approx = "~";
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1616 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1617
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1618 if (rint(l) != l) pl = 1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1619 if (rint(r) != r) pr = 1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1620
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1621 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
1622 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1623
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1624 gdouble image_zoom_get_default(ImageWindow *imd, gint mode)
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 gdouble zoom;
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 if (mode == ZOOM_RESET_ORIGINAL)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1629 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1630 zoom = 1.0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1631 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1632 else if (mode == ZOOM_RESET_FIT_WINDOW)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1633 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1634 zoom = 0.0;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1635 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1636 else
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1637 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1638 if (imd)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1639 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1640 zoom = image_zoom_get(imd);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1641 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1642 else
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1643 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1644 zoom = 1.0;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1645 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1646 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1647
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1648 return zoom;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1649 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1650
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1651 /* read ahead */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1652
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1653 void image_prebuffer_set(ImageWindow *imd, FileData *fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1654 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1655 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
1656
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1657 if (fd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1658 {
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1659 image_read_ahead_set(imd, fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1660 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1661 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1662 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1663 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1664 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1665 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1666
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1667 static gint image_auto_refresh_cb(gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1668 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1669 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1670 time_t newtime;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1671
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1672 if (!imd || !image_get_pixbuf(imd) ||
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1673 imd->il || !imd->image_fd ||
320
c74af1cbd61a Move more options to ConfOptions.
zas_
parents: 318
diff changeset
1674 !options->update_on_time_change) return TRUE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1675
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1676 newtime = filetime(imd->image_fd->path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1677 if (newtime > 0 && newtime != imd->mtime)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1678 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1679 imd->mtime = newtime;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1680 image_reload(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1681 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1682
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1683 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1684 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1685
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1686 /* image auto refresh on time stamp change, in 1/1000's second, -1 disables */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1687
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1688 void image_auto_refresh(ImageWindow *imd, gint interval)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1689 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1690 if (!imd) return;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1691 if (pixbuf_renderer_get_tiles((PixbufRenderer *)imd->pr)) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1692
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1693 if (imd->auto_refresh_id > -1)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1694 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1695 g_source_remove(imd->auto_refresh_id);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1696 imd->auto_refresh_id = -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1697 imd->auto_refresh_interval = -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1698 }
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 if (interval < 0) return;
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 if (interval == 0) interval = IMAGE_AUTO_REFRESH_TIME;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1703
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1704 imd->auto_refresh_id = g_timeout_add((guint32)interval, image_auto_refresh_cb, imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1705 imd->auto_refresh_interval = interval;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1706 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1707
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1708 void image_top_window_set_sync(ImageWindow *imd, gint allow_sync)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1709 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1710 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
1711
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1712 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
1713 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1714
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1715 void image_background_set_color(ImageWindow *imd, GdkColor *color)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1716 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1717 pixbuf_renderer_set_color((PixbufRenderer *)imd->pr, color);
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
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1720 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
1721 gint input_type, gint screen_type,
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1722 gint use_image)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1723 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1724 if (!imd) return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1725
432
96f8389c36de fixed max. number of profiles
nadvornik
parents: 430
diff changeset
1726 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
1727 screen_type < 0 || screen_type > 1)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1728 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1729 return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1730 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1731
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1732 imd->color_profile_input = input_type;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1733 imd->color_profile_screen = screen_type;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1734 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
1735 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1736
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1737 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
1738 gint *input_type, gint *screen_type,
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1739 gint *use_image)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1740 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1741 if (!imd) return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1742
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1743 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
1744 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
1745 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
1746
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1747 return TRUE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1748 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1749
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1750 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
1751 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1752 if (!imd) return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1753
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1754 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
1755
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1756 imd->color_profile_enable = enable;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1757 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1758
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1759 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
1760 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1761 if (!imd) return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1762
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1763 return imd->color_profile_enable;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1764 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1765
426
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
1766 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
1767 {
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
1768 if (!imd) return FALSE;
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
1769
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
1770 return imd->color_profile_from_image;
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
1771 }
9fe0ca1b5263 show the AdobeRGB profile in the menu, indicate input profile from image
nadvornik
parents: 424
diff changeset
1772
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1773 void image_set_delay_flip(ImageWindow *imd, gint delay)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1774 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1775 if (!imd ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1776 imd->delay_flip == delay) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1777
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1778 imd->delay_flip = delay;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1779
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1780 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
1781
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1782 if (!imd->delay_flip && imd->il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1783 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1784 PixbufRenderer *pr;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1785
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1786 pr = PIXBUF_RENDERER(imd->pr);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1787 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
1788 pr->pixbuf = NULL;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1789
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1790 image_load_pixbuf_ready(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1791 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1792 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1793
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1794 void image_to_root_window(ImageWindow *imd, gint scaled)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1795 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1796 GdkScreen *screen;
3
gqview
parents: 1
diff changeset
1797 GdkWindow *rootwindow;
gqview
parents: 1
diff changeset
1798 GdkPixmap *pixmap;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1799 GdkPixbuf *pixbuf;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1800 GdkPixbuf *pb;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1801 gint width, height;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1802
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1803 if (!imd) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1804
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1805 pixbuf = image_get_pixbuf(imd);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1806 if (!pixbuf) return;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1807
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1808 screen = gtk_widget_get_screen(imd->widget);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1809 rootwindow = gdk_screen_get_root_window(screen);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1810 if (gdk_drawable_get_visual(rootwindow) != gdk_visual_get_system()) return;
3
gqview
parents: 1
diff changeset
1811
gqview
parents: 1
diff changeset
1812 if (scaled)
gqview
parents: 1
diff changeset
1813 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1814 width = gdk_screen_width();
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1815 height = gdk_screen_height();
3
gqview
parents: 1
diff changeset
1816 }
gqview
parents: 1
diff changeset
1817 else
gqview
parents: 1
diff changeset
1818 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1819 pixbuf_renderer_get_scaled_size((PixbufRenderer *)imd->pr, &width, &height);
3
gqview
parents: 1
diff changeset
1820 }
gqview
parents: 1
diff changeset
1821
334
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1822 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
1823
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1824 gdk_pixbuf_render_pixmap_and_mask (pb, &pixmap, NULL, 128);
3
gqview
parents: 1
diff changeset
1825 gdk_window_set_back_pixmap(rootwindow, pixmap, FALSE);
gqview
parents: 1
diff changeset
1826 gdk_window_clear(rootwindow);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1827 g_object_unref(pb);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1828 g_object_unref(pixmap);
3
gqview
parents: 1
diff changeset
1829
gqview
parents: 1
diff changeset
1830 gdk_flush();
gqview
parents: 1
diff changeset
1831 }
gqview
parents: 1
diff changeset
1832
127
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1833 void image_select(ImageWindow *imd, gboolean select)
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1834 {
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1835 if (imd->has_frame)
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1836 {
151
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1837 if (select)
127
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1838 {
154
6bcd037bf176 fixed image focus
nadvornik
parents: 151
diff changeset
1839 gtk_widget_set_state(imd->widget, GTK_STATE_SELECTED);
151
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1840 gtk_widget_set_state(imd->pr, GTK_STATE_NORMAL); /* do not propagate */
127
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1841 }
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1842 else
154
6bcd037bf176 fixed image focus
nadvornik
parents: 151
diff changeset
1843 gtk_widget_set_state(imd->widget, GTK_STATE_NORMAL);
127
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1844 }
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1845 }
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1846
271afad04d07 implemented split windows
nadvornik
parents: 122
diff changeset
1847
174
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1848
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1849 void image_set_selectable(ImageWindow *imd, gboolean selectable)
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1850 {
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1851 if (imd->has_frame)
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1852 {
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1853 if (selectable)
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1854 {
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1855 gtk_frame_set_shadow_type(GTK_FRAME(imd->frame), GTK_SHADOW_NONE);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1856 gtk_container_set_border_width (GTK_CONTAINER (imd->frame), 4);
174
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1857 }
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1858 else
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1859 {
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1860 gtk_frame_set_shadow_type(GTK_FRAME(imd->frame), GTK_SHADOW_NONE);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1861 gtk_container_set_border_width (GTK_CONTAINER (imd->frame), 0);
174
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1862 }
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1863 }
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1864 }
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1865
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1866 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1867 *-------------------------------------------------------------------
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1868 * prefs sync
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1869 *-------------------------------------------------------------------
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1870 */
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1871
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1872 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
1873 {
334
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1874 g_object_set(G_OBJECT(imd->pr), "zoom_quality", options->image.zoom_quality,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1875 "zoom_2pass", options->image.zoom_2pass,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1876 "zoom_expand", options->image.zoom_to_fit_allow_expand,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1877 "dither_quality", options->image.dither_quality,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1878 "scroll_reset", options->image.scroll_reset_method,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1879 "cache_display", options->image.tile_cache_max,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1880 "window_fit", (imd->top_window_sync && options->image.fit_window_to_image),
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1881 "window_limit", options->image.limit_window_size,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1882 "window_limit_value", options->image.max_window_size,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1883 "autofit_limit", options->image.limit_autofit_size,
df868b947aa0 Rename image-related options.
zas_
parents: 327
diff changeset
1884 "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
1885
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1886 NULL);
27
9c24765c2d3a Sat Apr 2 17:28:16 2005 John Ellis <johne@verizon.net>
gqview
parents: 26
diff changeset
1887
9c24765c2d3a Sat Apr 2 17:28:16 2005 John Ellis <johne@verizon.net>
gqview
parents: 26
diff changeset
1888 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
1889 }
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1890
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1891 void image_options_sync(void)
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1892 {
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1893 GList *work;
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1894
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1895 work = image_list;
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1896 while (work)
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1897 {
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1898 ImageWindow *imd;
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1899
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1900 imd = work->data;
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1901 work = work->next;
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1902
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1903 image_options_set(imd);
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1904 }
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1905 }
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1906
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1907 /*
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1908 *-------------------------------------------------------------------
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1909 * init / destroy
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1910 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1911 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1912
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1913 static void image_free(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1914 {
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1915 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
1916
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1917 image_reset(imd);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1918
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1919 image_read_ahead_cancel(imd);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1920 image_post_buffer_set(imd, NULL, NULL, -1);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1921 image_auto_refresh(imd, -1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1922
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
1923 file_data_unref(imd->image_fd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1924 g_free(imd->title);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1925 g_free(imd->title_right);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1926
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1927 g_free(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1928 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1929
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1930 static void image_destroy_cb(GtkObject *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1931 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1932 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1933 image_free(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1934 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1935
151
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1936 gboolean selectable_frame_expose_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1937 {
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1938 gtk_paint_flat_box(widget->style,
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1939 widget->window,
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1940 widget->state,
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1941 GTK_FRAME (widget)->shadow_type,
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1942 NULL,
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1943 widget,
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1944 NULL,
174
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1945 widget->allocation.x + 3, widget->allocation.y + 3,
126724275319 improved drawing of image frames
nadvornik
parents: 154
diff changeset
1946 widget->allocation.width - 6, widget->allocation.height - 6);
151
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1947
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1948
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1949 return FALSE;
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1950 }
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1951
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
1952
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1953 void image_set_frame(ImageWindow *imd, gboolean frame)
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1954 {
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1955 frame = !!frame;
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1956
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1957 if (frame == imd->has_frame) return;
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1958
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1959 gtk_widget_hide(imd->pr);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1960
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1961 if (frame)
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1962 {
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1963 imd->frame = gtk_frame_new(NULL);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1964 gtk_widget_ref(imd->pr);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1965 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
1966 gtk_container_add(GTK_CONTAINER(imd->frame), imd->pr);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1967 gtk_widget_unref(imd->pr);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1968 g_signal_connect (G_OBJECT (imd->frame), "expose_event",
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1969 G_CALLBACK (selectable_frame_expose_cb), NULL);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1970
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1971 GTK_WIDGET_SET_FLAGS(imd->frame, GTK_CAN_FOCUS);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1972 g_signal_connect(G_OBJECT(imd->frame), "focus_in_event",
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1973 G_CALLBACK(image_focus_in_cb), imd);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1974 g_signal_connect(G_OBJECT(imd->frame), "focus_out_event",
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1975 G_CALLBACK(image_focus_out_cb), imd);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1976
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1977 g_signal_connect_after(G_OBJECT(imd->frame), "expose_event",
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1978 G_CALLBACK(image_focus_expose), imd);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1979
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1980
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1981 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
1982 gtk_widget_show(imd->frame);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1983 }
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1984 else
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1985 {
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1986 gtk_widget_ref(imd->pr);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1987 if (imd->frame)
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1988 {
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1989 gtk_container_remove(GTK_CONTAINER(imd->frame), imd->pr);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1990 gtk_widget_destroy(imd->frame);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1991 imd->frame = NULL;
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1992 }
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1993 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
1994 gtk_widget_unref(imd->pr);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1995 }
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1996
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1997 gtk_widget_show(imd->pr);
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1998
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
1999 imd->has_frame = frame;
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
2000 }
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
2001
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2002 ImageWindow *image_new(gint frame)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2003 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2004 ImageWindow *imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2005
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2006 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
2007
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2008 imd->top_window = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2009 imd->title = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2010 imd->title_right = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2011 imd->title_show_zoom = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2012
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2013 imd->unknown = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2014
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
2015 imd->has_frame = -1; /* not initialized; for image_set_frame */
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2016 imd->top_window_sync = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2017
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2018 imd->delay_alter_type = ALTER_NONE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2019
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2020 imd->read_ahead_il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2021 imd->read_ahead_pixbuf = NULL;
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 131
diff changeset
2022 imd->read_ahead_fd = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2023
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2024 imd->completed = FALSE;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
2025 imd->state = IMAGE_STATE_NONE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
2026
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
2027 imd->color_profile_enable = FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
2028 imd->color_profile_input = 0;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
2029 imd->color_profile_screen = 0;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
2030 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
2031 imd->color_profile_from_image = COLOR_PROFILE_NONE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2032
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2033 imd->auto_refresh_id = -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2034 imd->auto_refresh_interval = -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2035
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2036 imd->delay_flip = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2037
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2038 imd->func_update = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2039 imd->func_complete = NULL;
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
2040 imd->func_tile_request = NULL;
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
2041 imd->func_tile_dispose = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2042
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2043 imd->func_button = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2044 imd->func_scroll = NULL;
398
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
2045
c4080362d619 image post-processing (rotation and color management) moved to
nadvornik
parents: 386
diff changeset
2046 imd->orientation = 1;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2047
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
2048 imd->pr = GTK_WIDGET(pixbuf_renderer_new());
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2049
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
2050 image_options_set(imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2051
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
2052
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
2053 imd->widget = gtk_vbox_new(0, 0);
151
344d4ab0e20a improved drawing of frame around selected image
nadvornik
parents: 138
diff changeset
2054
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
2055 image_set_frame(imd, frame);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2056
175
682705e0c0e0 do not show frame for full-window images
nadvornik
parents: 174
diff changeset
2057 image_set_selectable(imd, 0);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2058
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
2059 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
2060 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
2061 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
2062 G_CALLBACK(image_scroll_notify_cb), imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2063
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
2064 g_signal_connect(G_OBJECT(imd->pr), "scroll_event",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2065 G_CALLBACK(image_scroll_cb), imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2066
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
2067 g_signal_connect(G_OBJECT(imd->pr), "destroy",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2068 G_CALLBACK(image_destroy_cb), imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2069
25
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
2070 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
2071 G_CALLBACK(image_zoom_cb), imd);
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
2072 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
2073 G_CALLBACK(image_render_complete_cb), imd);
128
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
2074 g_signal_connect(G_OBJECT(imd->pr), "drag",
98e2632b5d3d improved connected scroll and active image switching
nadvornik
parents: 127
diff changeset
2075 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
2076
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
2077 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
2078
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2079 return imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2080 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2081