annotate src/image.c @ 919:3a939c88305c

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