annotate src/image.c @ 116:1bd40943dc2a

Tue Nov 28 13:17:18 2006 John Ellis <johne@verizon.net> * image.c: When resuming a previous color adjustment, set the display to update incrementally to avoid user confusion of why half of image is color adjusted.
author gqview
date Tue, 28 Nov 2006 18:20:56 +0000
parents 53b2bfdcff69
children 0c2e1f0a001b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1 /*
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
2 * GQview
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
3 * (C) 2006 John Ellis
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
4 *
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
5 * Author: John Ellis
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
6 *
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
7 * This software is released under the GNU General Public License (GNU GPL).
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
8 * Please read the included file COPYING for more information.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
9 * This software comes with no warranty of any kind, use at your own risk!
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
10 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
11
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
12
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
13 #include "gqview.h"
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
14 #include "image.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
15
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
16
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
17 #include "image-load.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
18 #include "collect.h"
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
19 #include "color-man.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
20 #include "exif.h"
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
21 #include "pixbuf-renderer.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
22 #include "pixbuf_util.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
23 #include "ui_fileops.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
24
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
25 #include <math.h>
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
26
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
27
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
28 /* size of the image loader buffer (512 bytes x defined number) */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
29 #define IMAGE_LOAD_BUFFER_COUNT 8
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
30
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
31 /* 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
32 #define IMAGE_THROTTLE_LARGER_IMAGES 1
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
33
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
34 /* throttle factor to increase read bytes by (2 is double, 3 is triple, etc.) */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
35 #define IMAGE_THROTTLE_FACTOR 4
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
36
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
37 /* the file size at which throttling take place */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
38 #define IMAGE_THROTTLE_THRESHOLD 1048576
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
39
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
40 #define IMAGE_AUTO_REFRESH_TIME 3000
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
41
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
42
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
43 static GList *image_list = NULL;
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
44
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
45
61
0c912a2d94f1 Mon Jun 13 20:22:58 2005 John Ellis <johne@verizon.net>
gqview
parents: 42
diff changeset
46 static void image_update_title(ImageWindow *imd);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
47 static void image_post_process(ImageWindow *imd, gint clamp);
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
48 static void image_read_ahead_start(ImageWindow *imd);
61
0c912a2d94f1 Mon Jun 13 20:22:58 2005 John Ellis <johne@verizon.net>
gqview
parents: 42
diff changeset
49
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
50 /*
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
51 *-------------------------------------------------------------------
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
52 * 'signals'
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
53 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
54 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
55
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
56 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
57 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
58 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
59
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
60 if (imd->func_button)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
61 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
62 imd->func_button(imd, event->button, event->time,
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
63 event->x, event->y, event->state, imd->data_button);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
64 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
65 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
66
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
67 static void image_scroll_notify_cb(PixbufRenderer *pr, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
68 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
69 ImageWindow *imd = data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
70
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
71 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
72 {
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
73 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
74 (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
75 (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
76 (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
77 (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
78 imd->data_scroll_notify);
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
79 }
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
80 }
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
81
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
82 static void image_update_util(ImageWindow *imd)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
83 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
84 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
85 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
86
25
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
87 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
88 {
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
89 ImageWindow *imd = data;
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
90
61
0c912a2d94f1 Mon Jun 13 20:22:58 2005 John Ellis <johne@verizon.net>
gqview
parents: 42
diff changeset
91 if (imd->title_show_zoom) image_update_title(imd);
25
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
92 image_update_util(imd);
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
93 }
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
94
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
95 static void image_complete_util(ImageWindow *imd, gint preload)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
96 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
97 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
98
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
99 if (debug) printf("image load completed \"%s\" (%s)\n",
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
100 (preload) ? imd->read_ahead_path : imd->image_path,
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
101 (preload) ? "preload" : "current");
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
102
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
103 if (!preload) imd->completed = TRUE;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
104 if (imd->func_complete) imd->func_complete(imd, preload, imd->data_complete);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
105 }
b3e0e515fabf Initial revision
gqview
parents:
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_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
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
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
111 image_complete_util(imd, FALSE);
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
112 }
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
113
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
114 static void image_new_util(ImageWindow *imd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
115 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
116 if (imd->func_new) imd->func_new(imd, imd->data_new);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
117 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
118
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
119 /*
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
120 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
121 * misc
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
122 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
123 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
124
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
125 static void image_update_title(ImageWindow *imd)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
126 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
127 gchar *title = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
128 gchar *zoom = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
129 gchar *collection = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
130
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
131 if (!imd->top_window) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
132
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
133 if (imd->collection && collection_to_number(imd->collection) >= 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
134 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
135 const gchar *name;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
136 name = imd->collection->name;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
137 if (!name) name = _("Untitled");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
138 collection = g_strdup_printf(" (Collection %s)", name);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
139 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
140
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
141 if (imd->title_show_zoom)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
142 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
143 gchar *buf = image_zoom_get_as_text(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
144 zoom = g_strconcat(" [", buf, "]", NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
145 g_free(buf);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
146 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
147
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
148 title = g_strdup_printf("%s%s%s%s%s%s",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
149 imd->title ? imd->title : "",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
150 imd->image_name ? imd->image_name : "",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
151 zoom ? zoom : "",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
152 collection ? collection : "",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
153 imd->image_name ? " - " : "",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
154 imd->title_right ? imd->title_right : "");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
155
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
156 gtk_window_set_title(GTK_WINDOW(imd->top_window), title);
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 g_free(title);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
159 g_free(zoom);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
160 g_free(collection);
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
163 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
164 *-------------------------------------------------------------------
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
165 * rotation, flip, etc.
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
166 *-------------------------------------------------------------------
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
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
169 static void image_alter_real(ImageWindow *imd, AlterType type, gint clamp)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
170 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
171 PixbufRenderer *pr;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
172 GdkPixbuf *new = NULL;
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
173 gint exif_rotate;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
174 gint x, y;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
175 gint t;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
176
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
177 pr = (PixbufRenderer *)imd->pr;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
178
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
179 exif_rotate = (imd->delay_alter_type != ALTER_NONE && (imd->state & IMAGE_STATE_ROTATE_AUTO));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
180 imd->delay_alter_type = ALTER_NONE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
181
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
182 if (!pr->pixbuf) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
183
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
184 x = pr->x_scroll + (pr->vis_width / 2);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
185 y = pr->y_scroll + (pr->vis_height / 2);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
186
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
187 switch (type)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
188 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
189 case ALTER_ROTATE_90:
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
190 new = pixbuf_copy_rotate_90(pr->pixbuf, FALSE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
191 t = x;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
192 x = pr->height - y;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
193 y = t;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
194 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
195 case ALTER_ROTATE_90_CC:
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
196 new = pixbuf_copy_rotate_90(pr->pixbuf, TRUE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
197 t = x;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
198 x = y;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
199 y = pr->width - t;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
200 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
201 case ALTER_ROTATE_180:
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
202 new = pixbuf_copy_mirror(pr->pixbuf, TRUE, TRUE);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
203 x = pr->width - x;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
204 y = pr->height - y;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
205 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
206 case ALTER_MIRROR:
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
207 new = pixbuf_copy_mirror(pr->pixbuf, TRUE, FALSE);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
208 x = pr->width - x;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
209 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
210 case ALTER_FLIP:
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
211 new = pixbuf_copy_mirror(pr->pixbuf, FALSE, TRUE);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
212 y = pr->height - y;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
213 break;
82
a4c1b7014e6e Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
gqview
parents: 61
diff changeset
214 case ALTER_DESATURATE:
a4c1b7014e6e Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
gqview
parents: 61
diff changeset
215 pixbuf_desaturate_rect(pr->pixbuf,
a4c1b7014e6e Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
gqview
parents: 61
diff changeset
216 0, 0, pr->image_width, pr->image_height);
a4c1b7014e6e Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
gqview
parents: 61
diff changeset
217 image_area_changed(imd, 0, 0, pr->image_width, pr->image_height);
a4c1b7014e6e Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
gqview
parents: 61
diff changeset
218 break;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
219 case ALTER_NONE:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
220 default:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
221 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
222 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
223 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
224
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
225 if (!new) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
226
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
227 pixbuf_renderer_set_pixbuf(pr, new, pr->zoom);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
228 g_object_unref(new);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
229
109
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
230 if (clamp && pr->zoom != 0.0 && pr->scale != 0.0)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
231 {
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
232 if (exif_rotate)
109
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
233 {
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
234 switch (pr->scroll_reset)
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
235 {
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
236 case PR_SCROLL_RESET_NOCHANGE:
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
237 break;
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
238 case PR_SCROLL_RESET_CENTER:
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
239 x = (gint)((gdouble)pr->image_width / 2.0 * pr->scale);
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
240 y = (gint)((gdouble)pr->image_height / 2.0 * pr->scale);
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
241 break;
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
242 case PR_SCROLL_RESET_TOPLEFT:
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
243 default:
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
244 x = 0;
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
245 y = 0;
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
246 break;
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
247 }
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
248 }
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
249 pixbuf_renderer_scroll_to_point(pr, (gint)((gdouble)x / pr->scale),
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
250 (gint)((gdouble)y / pr->scale),
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
251 0.50, 0.50);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
252 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
253 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
254
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
255 static void image_post_process_alter(ImageWindow *imd, gint clamp)
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
256 {
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
257 if (imd->delay_alter_type != ALTER_NONE)
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
258 {
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
259 image_alter_real(imd, imd->delay_alter_type, clamp);
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
260 }
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
261 }
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
262
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
263 static void image_post_process_color_cb(ColorMan *cm, ColorManReturnType type, gpointer data)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
264 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
265 ImageWindow *imd = data;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
266
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
267 color_man_free(cm);
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
268 if (type == COLOR_RETURN_IMAGE_CHANGED)
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
269 {
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
270 if (cm == imd->cm) imd->cm = NULL;
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
271 return;
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
272 }
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
273
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
274 imd->cm = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
275 imd->state |= IMAGE_STATE_COLOR_ADJ;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
276
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
277 image_post_process_alter(imd, FALSE);
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
278
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
279 image_read_ahead_start(imd);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
280 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
281
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
282 static gint image_post_process_color(ImageWindow *imd, gint start_row, ExifData *exif)
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
283 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
284 ColorMan *cm;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
285 ColorManProfileType input_type;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
286 ColorManProfileType screen_type;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
287 const gchar *input_file;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
288 const gchar *screen_file;
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
289 ExifItem *item = NULL;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
290
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
291 if (imd->cm) return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
292
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
293 if (imd->color_profile_input >= 1 &&
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
294 imd->color_profile_input <= COLOR_PROFILE_INPUTS)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
295 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
296 gint n;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
297
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
298 n = imd->color_profile_input - 1;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
299 if (!color_profile_input_file[n]) return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
300
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
301 input_type = COLOR_PROFILE_FILE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
302 input_file = color_profile_input_file[n];
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
303 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
304 else if (imd->color_profile_input == 0)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
305 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
306 input_type = COLOR_PROFILE_SRGB;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
307 input_file = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
308 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
309 else
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
310 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
311 return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
312 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
313
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
314 if (imd->color_profile_screen == 1 &&
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
315 color_profile_screen_file)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
316 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
317 screen_type = COLOR_PROFILE_FILE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
318 screen_file = color_profile_screen_file;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
319 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
320 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
321 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
322 screen_type = COLOR_PROFILE_SRGB;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
323 screen_file = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
324 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
325 else
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
326 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
327 return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
328 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
329
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
330 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
331 {
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
332 item = exif_get_item(exif, "ColorProfile");
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
333 if (!item)
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
334 {
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
335 gint cs;
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
336
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
337 /* ColorSpace == 1 specifies sRGB per EXIF 2.2 */
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
338 if (exif_get_integer(exif, "ColorSpace", &cs) &&
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
339 cs == 1)
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
340 {
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
341 input_type = COLOR_PROFILE_SRGB;
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
342 input_file = NULL;
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
343
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
344 if (debug) printf("Found EXIF ColorSpace of sRGB\n");
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
345 }
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
346 }
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
347 }
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
348 if (item && item->format == EXIF_FORMAT_UNDEFINED)
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
349 {
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
350 if (debug) printf("Found embedded color profile\n");
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
351
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
352 cm = color_man_new_embedded(imd, NULL,
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
353 item->data, item->data_len,
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
354 screen_type, screen_file,
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
355 image_post_process_color_cb, imd);
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
356 }
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
357 else
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
358 {
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
359 cm = color_man_new(imd, NULL,
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
360 input_type, input_file,
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
361 screen_type, screen_file,
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
362 image_post_process_color_cb, imd);
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
363 }
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
364
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
365 if (cm)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
366 {
116
1bd40943dc2a Tue Nov 28 13:17:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 115
diff changeset
367 if (start_row > 0)
1bd40943dc2a Tue Nov 28 13:17:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 115
diff changeset
368 {
1bd40943dc2a Tue Nov 28 13:17:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 115
diff changeset
369 cm->row = start_row;
1bd40943dc2a Tue Nov 28 13:17:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 115
diff changeset
370 cm->incremental_sync = TRUE;
1bd40943dc2a Tue Nov 28 13:17:18 2006 John Ellis <johne@verizon.net>
gqview
parents: 115
diff changeset
371 }
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
372
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
373 imd->cm = (gpointer)cm;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
374 return TRUE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
375 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
376
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
377 return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
378 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
379
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
380 static void image_post_process(ImageWindow *imd, gint clamp)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
381 {
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
382 ExifData *exif = NULL;
109
1818abf306c1 Fri Nov 10 18:11:54 2006 John Ellis <johne@verizon.net>
gqview
parents: 82
diff changeset
383
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
384 if (!image_get_pixbuf(imd)) return;
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
385
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
386 if (exif_rotate_enable ||
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
387 (imd->color_profile_enable && imd->color_profile_use_image) )
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
388 {
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
389 exif = exif_read(imd->image_path, (imd->color_profile_enable && imd->color_profile_use_image));
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
390 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
391
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
392 if (exif_rotate_enable && exif)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
393 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
394 gint orientation;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
395
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
396 if (exif_get_integer(exif, "Orientation", &orientation))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
397 {
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
398 gint rotate = TRUE;
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
399
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
400 /* see http://jpegclub.org/exif_orientation.html
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
401 1 2 3 4 5 6 7 8
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
402
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
403 888888 888888 88 88 8888888888 88 88 8888888888
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
404 88 88 88 88 88 88 88 88 88 88 88 88
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
405 8888 8888 8888 8888 88 8888888888 8888888888 88
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
406 88 88 88 88
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
407 88 88 888888 888888
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
408 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
409 switch (orientation)
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 case EXIF_ORIENTATION_TOP_LEFT:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
412 /* normal -- nothing to do */
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
413 rotate = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
414 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
415 case EXIF_ORIENTATION_TOP_RIGHT:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
416 /* mirrored */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
417 imd->delay_alter_type = ALTER_MIRROR;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
418 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
419 case EXIF_ORIENTATION_BOTTOM_RIGHT:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
420 /* upside down */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
421 imd->delay_alter_type = ALTER_ROTATE_180;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
422 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
423 case EXIF_ORIENTATION_BOTTOM_LEFT:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
424 /* flipped */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
425 imd->delay_alter_type = ALTER_FLIP;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
426 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
427 case EXIF_ORIENTATION_LEFT_TOP:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
428 /* not implemented -- too wacky to fix in one step */
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
429 rotate = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
430 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
431 case EXIF_ORIENTATION_RIGHT_TOP:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
432 /* rotated -90 (270) */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
433 imd->delay_alter_type = ALTER_ROTATE_90;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
434 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
435 case EXIF_ORIENTATION_RIGHT_BOTTOM:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
436 /* not implemented -- too wacky to fix in one step */
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
437 rotate = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
438 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
439 case EXIF_ORIENTATION_LEFT_BOTTOM:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
440 /* rotated 90 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
441 imd->delay_alter_type = ALTER_ROTATE_90_CC;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
442 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
443 default:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
444 /* The other values are out of range */
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
445 rotate = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
446 break;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
447 }
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
448
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
449 if (rotate) imd->state |= IMAGE_STATE_COLOR_ADJ;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
450 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
451 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
452
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
453 if (imd->color_profile_enable)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
454 {
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
455 if (!image_post_process_color(imd, 0, exif))
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
456 {
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
457 /* fixme: note error to user */
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
458 imd->state |= IMAGE_STATE_COLOR_ADJ;
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
459 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
460 }
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
461
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
462 if (!imd->cm) image_post_process_alter(imd, clamp);
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
463
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
464 exif_free(exif);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
465 }
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 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
468 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
469 * read ahead (prebuffer)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
470 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
471 */
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 static void image_read_ahead_cancel(ImageWindow *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 if (debug) printf("read ahead cancelled for :%s\n", imd->read_ahead_path);
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 image_loader_free(imd->read_ahead_il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
478 imd->read_ahead_il = NULL;
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 if (imd->read_ahead_pixbuf) g_object_unref(imd->read_ahead_pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
481 imd->read_ahead_pixbuf = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
482
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
483 g_free(imd->read_ahead_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
484 imd->read_ahead_path = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
485 }
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 static void image_read_ahead_done_cb(ImageLoader *il, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
488 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
489 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
490
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
491 if (debug) printf("read ahead done for :%s\n", imd->read_ahead_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
492
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
493 imd->read_ahead_pixbuf = image_loader_get_pixbuf(imd->read_ahead_il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
494 if (imd->read_ahead_pixbuf)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
495 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
496 g_object_ref(imd->read_ahead_pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
497 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
498 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
499 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
500 imd->read_ahead_pixbuf = pixbuf_inline(PIXBUF_INLINE_BROKEN);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
501 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
502 image_loader_free(imd->read_ahead_il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
503 imd->read_ahead_il = NULL;
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 image_complete_util(imd, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
506 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
507
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
508 static void image_read_ahead_error_cb(ImageLoader *il, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
509 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
510 /* 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
511 image_read_ahead_done_cb(il, data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
512 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
513
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
514 static void image_read_ahead_start(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
515 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
516 /* already started ? */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
517 if (!imd->read_ahead_path || imd->read_ahead_il || imd->read_ahead_pixbuf) return;
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 /* still loading ?, do later */
115
53b2bfdcff69 Tue Nov 28 11:54:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 114
diff changeset
520 if (imd->il || imd->cm) return;
9
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 if (debug) printf("read ahead started for :%s\n", imd->read_ahead_path);
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 imd->read_ahead_il = image_loader_new(imd->read_ahead_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
525
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
526 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
527 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
528 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
529 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
530 image_complete_util(imd, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
531 }
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
534 static void image_read_ahead_set(ImageWindow *imd, const gchar *path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
535 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
536 if (imd->read_ahead_path && path && strcmp(imd->read_ahead_path, path) == 0) return;
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 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
539
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
540 imd->read_ahead_path = g_strdup(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
541
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
542 if (debug) printf("read ahead set to :%s\n", imd->read_ahead_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
543
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
544 image_read_ahead_start(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
545 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
546
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 * post buffering
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
550 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
551 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
552
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
553 static void image_post_buffer_set(ImageWindow *imd, const gchar *path, GdkPixbuf *pixbuf, gint color_row)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
554 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
555 g_free(imd->prev_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
556 if (imd->prev_pixbuf) g_object_unref(imd->prev_pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
557
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
558 if (path && pixbuf)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
559 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
560 imd->prev_path = g_strdup(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
561
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
562 g_object_ref(pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
563 imd->prev_pixbuf = pixbuf;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
564 imd->prev_color_row = color_row;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
565 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
566 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
567 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
568 imd->prev_path = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
569 imd->prev_pixbuf = NULL;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
570 imd->prev_color_row = -1;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
571 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
572
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
573 if (debug) printf("post buffer set: %s\n", path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
574 }
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 static gint image_post_buffer_get(ImageWindow *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 gint success;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
579
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
580 if (imd->prev_pixbuf &&
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
581 imd->image_path && imd->prev_path && strcmp(imd->image_path, imd->prev_path) == 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
582 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
583 image_change_pixbuf(imd, imd->prev_pixbuf, image_zoom_get(imd));
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
584 if (imd->prev_color_row >= 0)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
585 {
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
586 ExifData *exif = NULL;
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
587
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
588 if (imd->color_profile_use_image) exif = exif_read(imd->image_path, TRUE);
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
589 image_post_process_color(imd, imd->prev_color_row, exif);
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
590 exif_free(exif);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
591 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
592 success = TRUE;
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 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
595 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
596 success = FALSE;
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
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
599 if (imd->prev_pixbuf) g_object_unref(imd->prev_pixbuf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
600 imd->prev_pixbuf = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
601
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
602 g_free(imd->prev_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
603 imd->prev_path = NULL;
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 return success;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
606 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
607
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
608 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
609 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
610 * loading
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 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
613
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
614 static void image_load_pixbuf_ready(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
615 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
616 if (image_get_pixbuf(imd) || !imd->il) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
617
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
618 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
619 }
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 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
622 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
623 ImageWindow *imd = data;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
624 PixbufRenderer *pr;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
625
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
626 pr = (PixbufRenderer *)imd->pr;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
627
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
628 if (imd->delay_flip &&
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
629 pr->pixbuf != image_loader_get_pixbuf(il))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
630 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
631 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
632 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
633
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
634 if (!pr->pixbuf) image_load_pixbuf_ready(imd);
9
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 pixbuf_renderer_area_changed(pr, x, y, w, h);
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
639 static void image_load_done_cb(ImageLoader *il, gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
640 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
641 ImageWindow *imd = data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
642
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
643 if (debug) printf ("image done\n");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
644
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
645 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
646
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
647 if (imd->delay_flip &&
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
648 image_get_pixbuf(imd) != image_loader_get_pixbuf(imd->il))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
649 {
42
606fcf461a68 Sat May 14 13:04:23 2005 John Ellis <johne@verizon.net>
gqview
parents: 29
diff changeset
650 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
651 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
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_loader_free(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
655 imd->il = NULL;
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 image_post_process(imd, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
658
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
659 image_read_ahead_start(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
660 }
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 static void image_load_error_cb(ImageLoader *il, gpointer data)
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 if (debug) printf ("image error\n");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
665
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
666 /* even on error handle it like it was done,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
667 * since we have a pixbuf with _something_ */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
668
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
669 image_load_done_cb(il, data);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
670 }
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 #ifdef IMAGE_THROTTLE_LARGER_IMAGES
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
673 static void image_load_buffer_throttle(ImageLoader *il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
674 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
675 if (!il || il->bytes_total < IMAGE_THROTTLE_THRESHOLD) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
676
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
677 /* Larger image files usually have larger chunks of data per pixel...
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
678 * 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
679 * are also larger.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
680 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
681
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
682 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
683 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
684 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
685
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
686 /* this read ahead is located here merely for the callbacks, above */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
687
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
688 static gint image_read_ahead_check(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
689 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
690 if (!imd->read_ahead_path) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
691 if (imd->il) return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
692
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
693 if (!imd->image_path || strcmp(imd->read_ahead_path, imd->image_path) != 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
694 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
695 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
696 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
697 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
698
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
699 if (imd->read_ahead_il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
700 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
701 imd->il = imd->read_ahead_il;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
702 imd->read_ahead_il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
703
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
704 /* override the old signals */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
705 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
706 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
707 image_loader_set_buffer_size(imd->il, IMAGE_LOAD_BUFFER_COUNT);
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 #ifdef IMAGE_THROTTLE_LARGER_IMAGES
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
710 image_load_buffer_throttle(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
711 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
712
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
713 /* do this one directly (probably should add a set func) */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
714 imd->il->func_done = image_load_done_cb;
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 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
717
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
718 if (!imd->delay_flip)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
719 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
720 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
721 }
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 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
724 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
725 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
726 else if (imd->read_ahead_pixbuf)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
727 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
728 image_change_pixbuf(imd, imd->read_ahead_pixbuf, image_zoom_get(imd));
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
729 g_object_unref(imd->read_ahead_pixbuf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
730 imd->read_ahead_pixbuf = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
731
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
732 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
733
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
734 image_post_process(imd, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
735 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
736 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
737
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
738 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
739 return FALSE;
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 static gint image_load_begin(ImageWindow *imd, const gchar *path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
743 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
744 if (debug) printf ("image begin \n");
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 if (imd->il) return FALSE;
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 imd->completed = FALSE;
25
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
749 g_object_set(G_OBJECT(imd->pr), "complete", FALSE, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
750
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
751 if (image_post_buffer_get(imd))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
752 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
753 if (debug) printf("from post buffer: %s\n", imd->image_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
754 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
755 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
756
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
757 if (image_read_ahead_check(imd))
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 if (debug) printf("from read ahead buffer: %s\n", imd->image_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
760 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
761 }
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 if (!imd->delay_flip && image_get_pixbuf(imd))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
764 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
765 PixbufRenderer *pr;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
766
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
767 pr = PIXBUF_RENDERER(imd->pr);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
768 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
769 pr->pixbuf = NULL;
9
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
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
772 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
773
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
774 imd->il = image_loader_new(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
775
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
776 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
777 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
778 image_loader_set_buffer_size(imd->il, IMAGE_LOAD_BUFFER_COUNT);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
779
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
780 if (!image_loader_start(imd->il, image_load_done_cb, imd))
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 if (debug) printf("image start error\n");
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 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
785
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
786 image_loader_free(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
787 imd->il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
788
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
789 image_complete_util(imd, FALSE);
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 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
792 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
793
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
794 #ifdef IMAGE_THROTTLE_LARGER_IMAGES
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
795 image_load_buffer_throttle(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
796 #endif
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
797
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
798 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
799
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
800 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
801 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
802
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
803 static void image_reset(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
804 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
805 /* stops anything currently being done */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
806
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
807 if (debug) printf("image reset\n");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
808
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
809 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
810
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
811 image_loader_free(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
812 imd->il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
813
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
814 color_man_free((ColorMan *)imd->cm);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
815 imd->cm = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
816
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
817 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
818
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
819 imd->state = IMAGE_STATE_NONE;
9
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
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 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
824 * image changer
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
825 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
826 */
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 static void image_change_complete(ImageWindow *imd, gdouble zoom, gint new)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
829 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
830 image_reset(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
831
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
832 if (imd->image_path && isfile(imd->image_path))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
833 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
834 PixbufRenderer *pr;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
835
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
836 pr = PIXBUF_RENDERER(imd->pr);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
837 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
838
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
839 if (image_load_begin(imd, imd->image_path))
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
840 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
841 imd->unknown = FALSE;
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 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
844 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
845 GdkPixbuf *pixbuf;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
846
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
847 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
848 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
849 g_object_unref(pixbuf);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
850
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
851 imd->unknown = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
852 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
853 imd->size = filesize(imd->image_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
854 imd->mtime = filetime(imd->image_path);
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 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
857 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
858 if (imd->image_path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
859 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
860 GdkPixbuf *pixbuf;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
861
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
862 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
863 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
864 g_object_unref(pixbuf);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
865 imd->mtime = filetime(imd->image_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
866 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
867 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
868 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
869 image_change_pixbuf(imd, NULL, zoom);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
870 imd->mtime = 0;
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 imd->unknown = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
873 imd->size = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
874 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
875
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
876 image_update_util(imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
877 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
878
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
879 static void image_change_real(ImageWindow *imd, const gchar *path,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
880 CollectionData *cd, CollectInfo *info, gdouble zoom)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
881 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
882 GdkPixbuf *pixbuf;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
883 GdkPixbuf *prev_pixbuf = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
884 gchar *prev_path = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
885 gint prev_clear = FALSE;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
886 gint prev_color_row = -1;
9
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 imd->collection = cd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
889 imd->collection_info = info;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
890
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
891 pixbuf = image_get_pixbuf(imd);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
892
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
893 if (enable_read_ahead && imd->image_path && pixbuf)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
894 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
895 if (imd->il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
896 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
897 /* current image is not finished */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
898 prev_clear = TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
899 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
900 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
901 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
902 prev_path = g_strdup(imd->image_path);
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
903 prev_pixbuf = pixbuf;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
904 g_object_ref(prev_pixbuf);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
905
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
906 if (imd->cm)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
907 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
908 ColorMan *cm;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
909
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
910 cm = (ColorMan *)imd->cm;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
911 prev_color_row = cm->row;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
912 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
913 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
914 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
915
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
916 g_free(imd->image_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
917 imd->image_path = g_strdup(path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
918 imd->image_name = filename_from_path(imd->image_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
919
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
920 image_change_complete(imd, zoom, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
921
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
922 if (prev_pixbuf)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
923 {
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
924 image_post_buffer_set(imd, prev_path, prev_pixbuf, prev_color_row);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
925 g_free(prev_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
926 g_object_unref(prev_pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
927 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
928 else if (prev_clear)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
929 {
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
930 image_post_buffer_set(imd, NULL, NULL, -1);
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 image_update_title(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
934 image_new_util(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
935 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
936
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 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
939 * focus stuff
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 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
942
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
943 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
944 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
945 GtkWidget *widget;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
946
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
947 widget = imd->widget;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
948 if (!widget->window) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
949
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
950 if (has_focus)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
951 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
952 gtk_paint_focus (widget->style, widget->window, GTK_STATE_ACTIVE,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
953 area, widget, "image_window",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
954 widget->allocation.x, widget->allocation.y,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
955 widget->allocation.width - 1, widget->allocation.height - 1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
956 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
957 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
958 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
959 gtk_paint_shadow (widget->style, widget->window, GTK_STATE_NORMAL, GTK_SHADOW_IN,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
960 area, widget, "image_window",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
961 widget->allocation.x, widget->allocation.y,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
962 widget->allocation.width - 1, widget->allocation.height - 1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
963 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
964 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
965
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
966 static gint image_focus_expose(GtkWidget *widget, GdkEventExpose *event, gpointer data)
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 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
969
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
970 image_focus_paint(imd, GTK_WIDGET_HAS_FOCUS(widget), &event->area);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
971 return TRUE;
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 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
975 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
976 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
977
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
978 GTK_WIDGET_SET_FLAGS(imd->widget, GTK_HAS_FOCUS);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
979 image_focus_paint(imd, TRUE, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
980
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
981 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
982 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
983
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
984 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
985 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
986 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
987
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
988 GTK_WIDGET_UNSET_FLAGS(imd->widget, GTK_HAS_FOCUS);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
989 image_focus_paint(imd, FALSE, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
990
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
991 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
992 }
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 gint image_overlay_add(ImageWindow *imd, GdkPixbuf *pixbuf, gint x, gint y,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
995 gint relative, gint always)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
996 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
997 return pixbuf_renderer_overlay_add((PixbufRenderer *)imd->pr, pixbuf, x, y, relative, always);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
998 }
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 void image_overlay_set(ImageWindow *imd, gint id, GdkPixbuf *pixbuf, gint x, gint y)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1001 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1002 pixbuf_renderer_overlay_set((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1003 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1004
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1005 gint image_overlay_get(ImageWindow *imd, gint id, GdkPixbuf **pixbuf, gint *x, gint *y)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1006 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1007 return pixbuf_renderer_overlay_get((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1008 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1009
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1010 void image_overlay_remove(ImageWindow *imd, gint id)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1011 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1012 pixbuf_renderer_overlay_remove((PixbufRenderer *)imd->pr, id);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1013 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1014
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1015 static gint image_scroll_cb(GtkWidget *widget, GdkEventScroll *event, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1016 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1017 ImageWindow *imd = data;
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 if (imd->func_scroll &&
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1020 event && event->type == GDK_SCROLL)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1021 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1022 imd->func_scroll(imd, event->direction, event->time,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1023 event->x, event->y, event->state, imd->data_scroll);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1024 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1025 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1026
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1027 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1028 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1029
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1030 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1031 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1032 * public interface
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1033 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1034 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1035
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1036 void image_attach_window(ImageWindow *imd, GtkWidget *window,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1037 const gchar *title, const gchar *title_right, gint show_zoom)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1038 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1039 imd->top_window = window;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1040 g_free(imd->title);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1041 imd->title = g_strdup(title);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1042 g_free(imd->title_right);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1043 imd->title_right = g_strdup(title_right);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1044 imd->title_show_zoom = show_zoom;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1045
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1046 if (!fit_window) window = NULL;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1047
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1048 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
1049
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1050 image_update_title(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1051 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1052
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1053 void image_set_update_func(ImageWindow *imd,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1054 void (*func)(ImageWindow *imd, gpointer data),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1055 gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1056 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1057 imd->func_update = func;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1058 imd->data_update = data;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1059 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1060
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1061 void image_set_complete_func(ImageWindow *imd,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1062 void (*func)(ImageWindow *, gint preload, gpointer),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1063 gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1064 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1065 imd->func_complete = func;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1066 imd->data_complete = data;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1067 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1068
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1069 void image_set_new_func(ImageWindow *imd,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1070 void (*func)(ImageWindow *, gpointer),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1071 gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1072 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1073 imd->func_new = func;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1074 imd->data_new = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1075 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1076
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1077
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1078 void image_set_button_func(ImageWindow *imd,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1079 void (*func)(ImageWindow *, gint button, guint32 time, gdouble x, gdouble y, guint state, gpointer),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1080 gpointer data)
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 imd->func_button = func;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1083 imd->data_button = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1084 }
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 void image_set_scroll_func(ImageWindow *imd,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1087 void (*func)(ImageWindow *, GdkScrollDirection direction, guint32 time, gdouble x, gdouble y, guint state, gpointer),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1088 gpointer data)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1089 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1090 imd->func_scroll = func;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1091 imd->data_scroll = data;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1092 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1093
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1094 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
1095 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
1096 gpointer data)
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1097 {
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1098 imd->func_scroll_notify = func;
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1099 imd->data_scroll_notify = data;
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1100 }
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1101
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1102 /* path, name */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1103
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1104 const gchar *image_get_path(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1105 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1106 return imd->image_path;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1107 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1108
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1109 const gchar *image_get_name(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1110 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1111 return imd->image_name;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1112 }
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 /* merely changes path string, does not change the image! */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1115 void image_set_path(ImageWindow *imd, const gchar *newpath)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1116 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1117 g_free(imd->image_path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1118 imd->image_path = g_strdup(newpath);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1119 imd->image_name = filename_from_path(imd->image_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1120
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1121 image_update_title(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1122 image_new_util(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1123 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1124
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1125 /* load a new image */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1126
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1127 void image_change_path(ImageWindow *imd, const gchar *path, gdouble zoom)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1128 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1129 if (imd->image_path == path ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1130 (path && imd->image_path && !strcmp(path, imd->image_path)) ) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1131
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1132 image_change_real(imd, path, NULL, NULL, zoom);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1133 }
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1134
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1135 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
1136 {
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1137 return pixbuf_renderer_get_pixbuf((PixbufRenderer *)imd->pr);
9
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1140 void image_change_pixbuf(ImageWindow *imd, GdkPixbuf *pixbuf, gdouble zoom)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1141 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1142 pixbuf_renderer_set_pixbuf((PixbufRenderer *)imd->pr, pixbuf, zoom);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1143 image_new_util(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1144 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1145
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1146 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
1147 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1148 if (!cd || !info || !g_list_find(cd->list, info)) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1149
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1150 image_change_real(imd, info->path, cd, info, zoom);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1151 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1152
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1153 CollectionData *image_get_collection(ImageWindow *imd, CollectInfo **info)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1154 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1155 if (collection_to_number(imd->collection) >= 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1156 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1157 if (g_list_find(imd->collection->list, imd->collection_info) != NULL)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1158 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1159 if (info) *info = imd->collection_info;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1160 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1161 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1162 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1163 if (info) *info = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1164 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1165 return imd->collection;
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1168 if (info) *info = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1169 return NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1170 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1171
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1172 static void image_loader_sync_data(ImageLoader *il, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1173 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1174 /* change data for the callbacks directly */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1175
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1176 il->data_area_ready = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1177 il->data_error = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1178 il->data_done = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1179 il->data_percent = data;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1180 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1181
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1182 /* 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
1183 * it moves most data from source to imd
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1184 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1185 void image_change_from_image(ImageWindow *imd, ImageWindow *source)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1186 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1187 if (imd == source) return;
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 imd->unknown = source->unknown;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1190
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1191 imd->collection = source->collection;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1192 imd->collection_info = source->collection_info;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1193 imd->size = source->size;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1194 imd->mtime = source->mtime;
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 image_set_path(imd, image_get_path(source));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1197
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1198 image_loader_free(imd->il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1199 imd->il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1200
24
104e34f9ab1f Wed Mar 23 00:22:28 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1201 if (source->il)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1202 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1203 imd->il = source->il;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1204 source->il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1205
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1206 image_loader_sync_data(imd->il, imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1207
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1208 imd->delay_alter_type = source->delay_alter_type;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1209 source->delay_alter_type = ALTER_NONE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1210 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1211
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1212 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
1213 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
1214 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
1215 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
1216 color_man_free((ColorMan *)imd->cm);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1217 imd->cm = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1218 if (source->cm)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1219 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1220 ColorMan *cm;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1221
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1222 imd->cm = source->cm;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1223 source->cm = NULL;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1224
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1225 cm = (ColorMan *)imd->cm;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1226 cm->imd = imd;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1227 cm->func_done_data = imd;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1228 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1229
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1230 image_loader_free(imd->read_ahead_il);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1231 imd->read_ahead_il = source->read_ahead_il;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1232 source->read_ahead_il = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1233 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
1234
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1235 if (imd->read_ahead_pixbuf) g_object_unref(imd->read_ahead_pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1236 imd->read_ahead_pixbuf = source->read_ahead_pixbuf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1237 source->read_ahead_pixbuf = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1238
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1239 g_free(imd->read_ahead_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1240 imd->read_ahead_path = source->read_ahead_path;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1241 source->read_ahead_path = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1242
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1243 if (imd->prev_pixbuf) g_object_unref(imd->prev_pixbuf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1244 imd->prev_pixbuf = source->prev_pixbuf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1245 source->prev_pixbuf = NULL;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1246 imd->prev_color_row = source->prev_color_row;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1247 source->prev_color_row = -1;
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 g_free(imd->prev_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1250 imd->prev_path = source->prev_path;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1251 source->prev_path = NULL;
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 imd->completed = source->completed;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1254 imd->state = source->state;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1255 source->state = IMAGE_STATE_NONE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1256
24
104e34f9ab1f Wed Mar 23 00:22:28 2005 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1257 pixbuf_renderer_move(PIXBUF_RENDERER(imd->pr), PIXBUF_RENDERER(source->pr));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1258 }
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 /* manipulation */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1261
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1262 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
1263 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1264 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
1265 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1266
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1267 void image_reload(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1268 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1269 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
1270
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1271 image_change_complete(imd, image_zoom_get(imd), FALSE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1272 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1273
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1274 void image_scroll(ImageWindow *imd, gint x, gint y)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1275 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1276 pixbuf_renderer_scroll((PixbufRenderer *)imd->pr, x, y);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1277 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1278
13
ef790149ae21 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 12
diff changeset
1279 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
1280 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
1281 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1282 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
1283 }
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1284
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1285 void image_alter(ImageWindow *imd, AlterType type)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1286 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1287 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
1288
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1289 if (imd->il || imd->cm)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1290 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1291 /* still loading, wait till done */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1292 imd->delay_alter_type = type;
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
1293 imd->state |= IMAGE_STATE_ROTATE_USER;
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
1294
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
1295 if (imd->cm && (imd->state & IMAGE_STATE_ROTATE_AUTO))
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
1296 {
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
1297 imd->state &= ~IMAGE_STATE_ROTATE_AUTO;
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
1298 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1299 return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1300 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1301
114
50fc73e08550 Mon Nov 27 01:23:23 2006 John Ellis <johne@verizon.net>
gqview
parents: 113
diff changeset
1302 image_alter_real(imd, type, TRUE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1303 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1304
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1305 void image_zoom_adjust(ImageWindow *imd, gdouble increment)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1306 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1307 pixbuf_renderer_zoom_adjust((PixbufRenderer *)imd->pr, increment);
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 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
1311 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1312 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
1313 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1314
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1315 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
1316 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1317 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
1318 }
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1319
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1320 void image_zoom_set(ImageWindow *imd, gdouble zoom)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1321 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1322 pixbuf_renderer_zoom_set((PixbufRenderer *)imd->pr, zoom);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1323 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1324
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1325 void image_zoom_set_fill_geometry(ImageWindow *imd, gint vertical)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1326 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1327 PixbufRenderer *pr;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1328 gdouble zoom;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1329 gint width, height;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1330
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1331 pr = (PixbufRenderer *)imd->pr;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1332
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1333 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
1334 !pixbuf_renderer_get_image_size(pr, &width, &height)) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1335
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1336 if (vertical)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1337 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1338 zoom = (gdouble)pr->window_height / height;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1339 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1340 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1341 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1342 zoom = (gdouble)pr->window_width / width;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1343 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1344
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1345 if (zoom < 1.0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1346 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1347 zoom = 0.0 - 1.0 / zoom;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1348 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1349
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1350 pixbuf_renderer_zoom_set(pr, zoom);
9
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 gdouble image_zoom_get(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1354 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1355 return pixbuf_renderer_zoom_get((PixbufRenderer *)imd->pr);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1356 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1357
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1358 gdouble image_zoom_get_real(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1359 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1360 return pixbuf_renderer_zoom_get_scale((PixbufRenderer *)imd->pr);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1361 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1362
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1363 gchar *image_zoom_get_as_text(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1364 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1365 gdouble zoom;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1366 gdouble scale;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1367 gdouble l = 1.0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1368 gdouble r = 1.0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1369 gint pl = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1370 gint pr = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1371 gchar *approx = " ";
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1372
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1373 zoom = image_zoom_get(imd);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1374 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
1375
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1376 if (zoom > 0.0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1377 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1378 l = zoom;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1379 }
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1380 else if (zoom < 0.0)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1381 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1382 r = 0.0 - zoom;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1383 }
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1384 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
1385 {
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1386 if (scale >= 1.0)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1387 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1388 l = scale;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1389 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1390 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1391 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1392 r = 1.0 / scale;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1393 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1394 approx = " ~";
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1395 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1396
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1397 if (rint(l) != l) pl = 1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1398 if (rint(r) != r) pr = 1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1399
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1400 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
1401 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1402
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1403 gdouble image_zoom_get_default(ImageWindow *imd, gint mode)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1404 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1405 gdouble zoom;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1406
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1407 if (mode == ZOOM_RESET_ORIGINAL)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1408 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1409 zoom = 1.0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1410 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1411 else if (mode == ZOOM_RESET_FIT_WINDOW)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1412 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1413 zoom = 0.0;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1414 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1415 else
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1416 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1417 if (imd)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1418 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1419 zoom = image_zoom_get(imd);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1420 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1421 else
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1422 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1423 zoom = 1.0;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1424 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1425 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1426
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1427 return zoom;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1428 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1429
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1430 /* read ahead */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1431
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1432 void image_prebuffer_set(ImageWindow *imd, const gchar *path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1433 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1434 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
1435
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1436 if (path)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1437 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1438 image_read_ahead_set(imd, path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1439 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1440 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1441 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1442 image_read_ahead_cancel(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1443 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1444 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1445
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1446 static gint image_auto_refresh_cb(gpointer data)
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 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1449 time_t newtime;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1450
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1451 if (!imd || !image_get_pixbuf(imd) ||
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1452 imd->il || !imd->image_path ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1453 !update_on_time_change) return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1454
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1455 newtime = filetime(imd->image_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1456 if (newtime > 0 && newtime != imd->mtime)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1457 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1458 imd->mtime = newtime;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1459 image_reload(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1460 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1461
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1462 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1463 }
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 /* image auto refresh on time stamp change, in 1/1000's second, -1 disables */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1466
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1467 void image_auto_refresh(ImageWindow *imd, gint interval)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1468 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1469 if (!imd) return;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1470 if (pixbuf_renderer_get_tiles((PixbufRenderer *)imd->pr)) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1471
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1472 if (imd->auto_refresh_id > -1)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1473 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1474 g_source_remove(imd->auto_refresh_id);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1475 imd->auto_refresh_id = -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1476 imd->auto_refresh_interval = -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1477 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1478
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1479 if (interval < 0) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1480
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1481 if (interval == 0) interval = IMAGE_AUTO_REFRESH_TIME;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1482
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1483 imd->auto_refresh_id = g_timeout_add((guint32)interval, image_auto_refresh_cb, imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1484 imd->auto_refresh_interval = interval;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1485 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1486
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1487 void image_top_window_set_sync(ImageWindow *imd, gint allow_sync)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1488 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1489 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
1490
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1491 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
1492 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1493
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1494 void image_background_set_black(ImageWindow *imd, gint black)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1495 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1496 pixbuf_renderer_set_black((PixbufRenderer *)imd->pr, black);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1497 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1498
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1499 void image_background_set_color(ImageWindow *imd, GdkColor *color)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1500 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1501 pixbuf_renderer_set_color((PixbufRenderer *)imd->pr, color);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1502 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1503
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1504 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
1505 gint input_type, gint screen_type,
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1506 gint use_image)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1507 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1508 if (!imd) return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1509
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1510 if (input_type < 0 || input_type > COLOR_PROFILE_INPUTS ||
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1511 screen_type < 0 || screen_type > 1)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1512 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1513 return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1514 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1515
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1516 imd->color_profile_input = input_type;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1517 imd->color_profile_screen = screen_type;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1518 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
1519 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1520
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1521 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
1522 gint *input_type, gint *screen_type,
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1523 gint *use_image)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1524 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1525 if (!imd) return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1526
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1527 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
1528 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
1529 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
1530
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1531 return TRUE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1532 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1533
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1534 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
1535 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1536 if (!imd) return;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1537
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1538 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
1539
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1540 imd->color_profile_enable = enable;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1541 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1542
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1543 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
1544 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1545 if (!imd) return FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1546
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1547 return imd->color_profile_enable;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1548 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1549
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1550 void image_set_delay_flip(ImageWindow *imd, gint delay)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1551 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1552 if (!imd ||
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1553 imd->delay_flip == delay) return;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1554
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1555 imd->delay_flip = delay;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1556
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1557 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
1558
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1559 if (!imd->delay_flip && imd->il)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1560 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1561 PixbufRenderer *pr;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1562
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1563 pr = PIXBUF_RENDERER(imd->pr);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1564 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
1565 pr->pixbuf = NULL;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1566
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1567 image_load_pixbuf_ready(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1568 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1569 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1570
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1571 void image_to_root_window(ImageWindow *imd, gint scaled)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1572 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1573 GdkScreen *screen;
3
gqview
parents: 1
diff changeset
1574 GdkWindow *rootwindow;
gqview
parents: 1
diff changeset
1575 GdkPixmap *pixmap;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1576 GdkPixbuf *pixbuf;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1577 GdkPixbuf *pb;
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1578 gint width, height;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1579
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1580 if (!imd) return;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1581
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1582 pixbuf = image_get_pixbuf(imd);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1583 if (!pixbuf) return;
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1584
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1585 screen = gtk_widget_get_screen(imd->widget);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1586 rootwindow = gdk_screen_get_root_window(screen);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1587 if (gdk_drawable_get_visual(rootwindow) != gdk_visual_get_system()) return;
3
gqview
parents: 1
diff changeset
1588
gqview
parents: 1
diff changeset
1589 if (scaled)
gqview
parents: 1
diff changeset
1590 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1591 width = gdk_screen_width();
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1592 height = gdk_screen_height();
3
gqview
parents: 1
diff changeset
1593 }
gqview
parents: 1
diff changeset
1594 else
gqview
parents: 1
diff changeset
1595 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1596 pixbuf_renderer_get_scaled_size((PixbufRenderer *)imd->pr, &width, &height);
3
gqview
parents: 1
diff changeset
1597 }
gqview
parents: 1
diff changeset
1598
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1599 pb = gdk_pixbuf_scale_simple(pixbuf, width, height, (GdkInterpType)zoom_quality);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1600
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1601 gdk_pixbuf_render_pixmap_and_mask (pb, &pixmap, NULL, 128);
3
gqview
parents: 1
diff changeset
1602 gdk_window_set_back_pixmap(rootwindow, pixmap, FALSE);
gqview
parents: 1
diff changeset
1603 gdk_window_clear(rootwindow);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1604 g_object_unref(pb);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1605 g_object_unref(pixmap);
3
gqview
parents: 1
diff changeset
1606
gqview
parents: 1
diff changeset
1607 gdk_flush();
gqview
parents: 1
diff changeset
1608 }
gqview
parents: 1
diff changeset
1609
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1610 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1611 *-------------------------------------------------------------------
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1612 * prefs sync
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1613 *-------------------------------------------------------------------
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1614 */
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1615
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1616 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
1617 {
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1618 g_object_set(G_OBJECT(imd->pr), "zoom_quality", zoom_quality,
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1619 "zoom_2pass", two_pass_zoom,
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1620 "zoom_expand", zoom_to_fit_expands,
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1621 "dither_quality", dither_quality,
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1622 "scroll_reset", scroll_reset_method,
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1623 "cache_display", tile_cache_max,
29
8a8ec4b3e769 Sun Apr 3 00:36:22 2005 John Ellis <johne@verizon.net>
gqview
parents: 27
diff changeset
1624 "window_fit", (imd->top_window_sync && fit_window),
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1625 "window_limit", limit_window_size,
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1626 "window_limit_value", max_window_size,
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1627 NULL);
27
9c24765c2d3a Sat Apr 2 17:28:16 2005 John Ellis <johne@verizon.net>
gqview
parents: 26
diff changeset
1628
9c24765c2d3a Sat Apr 2 17:28:16 2005 John Ellis <johne@verizon.net>
gqview
parents: 26
diff changeset
1629 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
1630 }
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1631
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1632 void image_options_sync(void)
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1633 {
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1634 GList *work;
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1635
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1636 work = image_list;
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1637 while (work)
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1638 {
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1639 ImageWindow *imd;
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1640
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1641 imd = work->data;
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1642 work = work->next;
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1643
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1644 image_options_set(imd);
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1645 }
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1646 }
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1647
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1648 /*
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1649 *-------------------------------------------------------------------
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1650 * init / destroy
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1651 *-------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1652 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1653
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1654 static void image_free(ImageWindow *imd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1655 {
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1656 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
1657
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1658 image_reset(imd);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1659
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1660 image_read_ahead_cancel(imd);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1661 image_post_buffer_set(imd, NULL, NULL, -1);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1662 image_auto_refresh(imd, -1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1663
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1664 g_free(imd->image_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1665 g_free(imd->title);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1666 g_free(imd->title_right);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1667
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1668 g_free(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1669 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1670
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1671 static void image_destroy_cb(GtkObject *widget, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1672 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1673 ImageWindow *imd = data;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1674 image_free(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1675 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1676
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1690 imd->has_frame = frame;
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;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1696 imd->read_ahead_pixbuf = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1697 imd->read_ahead_path = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1698
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1699 imd->completed = FALSE;
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1700 imd->state = IMAGE_STATE_NONE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1701
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1702 imd->color_profile_enable = FALSE;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1703 imd->color_profile_input = 0;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1704 imd->color_profile_screen = 0;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 109
diff changeset
1705 imd->color_profile_use_image = FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1706
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1707 imd->auto_refresh_id = -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1708 imd->auto_refresh_interval = -1;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1709
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1710 imd->delay_flip = FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1711
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1712 imd->func_update = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1713 imd->func_complete = NULL;
12
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1714 imd->func_tile_request = NULL;
147f4c4b9025 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
1715 imd->func_tile_dispose = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1716
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1717 imd->func_button = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1718 imd->func_scroll = NULL;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1719
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1720 imd->pr = GTK_WIDGET(pixbuf_renderer_new());
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1721
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1722 image_options_set(imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1723
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1724 if (imd->has_frame)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1725 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1726 imd->widget = gtk_frame_new(NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1727 gtk_frame_set_shadow_type(GTK_FRAME(imd->widget), GTK_SHADOW_IN);
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1728 gtk_container_add(GTK_CONTAINER(imd->widget), imd->pr);
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1729 gtk_widget_show(imd->pr);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1730
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1731 GTK_WIDGET_SET_FLAGS(imd->widget, GTK_CAN_FOCUS);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1732 g_signal_connect(G_OBJECT(imd->widget), "focus_in_event",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1733 G_CALLBACK(image_focus_in_cb), imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1734 g_signal_connect(G_OBJECT(imd->widget), "focus_out_event",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1735 G_CALLBACK(image_focus_out_cb), imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1736
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1737 g_signal_connect_after(G_OBJECT(imd->widget), "expose_event",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1738 G_CALLBACK(image_focus_expose), imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1739 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1740 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1741 {
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1742 imd->widget = imd->pr;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1743 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1744
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1745 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
1746 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
1747 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
1748 G_CALLBACK(image_scroll_notify_cb), imd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1749
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1750 g_signal_connect(G_OBJECT(imd->pr), "scroll_event",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1751 G_CALLBACK(image_scroll_cb), imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1752
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 14
diff changeset
1753 g_signal_connect(G_OBJECT(imd->pr), "destroy",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1754 G_CALLBACK(image_destroy_cb), imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1755
25
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
1756 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
1757 G_CALLBACK(image_zoom_cb), imd);
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
1758 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
1759 G_CALLBACK(image_render_complete_cb), imd);
0c3b353b666e Fri Mar 25 22:39:30 2005 John Ellis <johne@verizon.net>
gqview
parents: 24
diff changeset
1760
26
acd9885ebd78 Mon Mar 28 20:23:34 2005 John Ellis <johne@verizon.net>
gqview
parents: 25
diff changeset
1761 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
1762
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1763 return imd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1764 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
1765