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