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