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