annotate src/image.c @ 334:df868b947aa0

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