Mercurial > geeqie
annotate src/img-view.c @ 503:e5023cced4e5
Fix image overlay displayed only on second "I" press in layout view.
author | zas_ |
---|---|
date | Wed, 23 Apr 2008 23:47:53 +0000 |
parents | a33badd85f16 |
children | f9bf33be53ff |
rev | line source |
---|---|
1 | 1 /* |
196 | 2 * Geeqie |
94
50dc5a14d37b
Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents:
91
diff
changeset
|
3 * (C) 2006 John Ellis |
475 | 4 * Copyright (C) 2008 The Geeqie Team |
1 | 5 * |
6 * Author: John Ellis | |
7 * | |
9 | 8 * This software is released under the GNU General Public License (GNU GPL). |
9 * Please read the included file COPYING for more information. | |
10 * This software comes with no warranty of any kind, use at your own risk! | |
1 | 11 */ |
12 | |
9 | 13 |
281 | 14 #include "main.h" |
9 | 15 #include "img-view.h" |
16 | |
17 #include "collect.h" | |
18 #include "collect-io.h" | |
19 #include "dnd.h" | |
20 #include "editors.h" | |
21 #include "filelist.h" | |
22 #include "fullscreen.h" | |
1 | 23 #include "image.h" |
9 | 24 #include "image-overlay.h" |
25 #include "info.h" | |
368
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
26 #include "layout.h" |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
27 #include "layout_image.h" |
9 | 28 #include "menu.h" |
23
17acca639a86
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
9
diff
changeset
|
29 #include "pixbuf-renderer.h" |
91
d063f97503b7
Wed Nov 1 11:39:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
89
diff
changeset
|
30 #include "pixbuf_util.h" |
94
50dc5a14d37b
Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents:
91
diff
changeset
|
31 #include "print.h" |
9 | 32 #include "slideshow.h" |
33 #include "utilops.h" | |
34 #include "ui_bookmark.h" | |
35 #include "ui_fileops.h" | |
36 #include "ui_menu.h" | |
37 | |
1 | 38 #include <gdk/gdkkeysyms.h> /* for keyboard values */ |
39 | |
9 | 40 |
41 typedef struct _ViewWindow ViewWindow; | |
42 struct _ViewWindow | |
43 { | |
44 GtkWidget *window; | |
45 ImageWindow *imd; | |
46 FullScreenData *fs; | |
47 SlideShowData *ss; | |
48 | |
49 GList *list; | |
50 GList *list_pointer; | |
51 }; | |
52 | |
53 | |
54 static GList *view_window_list = NULL; | |
55 | |
56 | |
57 static GtkWidget *view_popup_menu(ViewWindow *vw); | |
58 static void view_fullscreen_toggle(ViewWindow *vw, gint force_off); | |
59 static void view_overlay_toggle(ViewWindow *vw); | |
60 | |
61 static void view_slideshow_next(ViewWindow *vw); | |
62 static void view_slideshow_prev(ViewWindow *vw); | |
63 static void view_slideshow_start(ViewWindow *vw); | |
64 static void view_slideshow_stop(ViewWindow *vw); | |
65 | |
66 static void view_window_close(ViewWindow *vw); | |
67 | |
68 static void view_window_dnd_init(ViewWindow *vw); | |
69 | |
70 | |
71 /* | |
72 *----------------------------------------------------------------------------- | |
73 * misc | |
74 *----------------------------------------------------------------------------- | |
442 | 75 */ |
9 | 76 |
77 static ImageWindow *view_window_active_image(ViewWindow *vw) | |
78 { | |
79 if (vw->fs) return vw->fs->imd; | |
80 | |
81 return vw->imd; | |
82 } | |
83 | |
84 static void view_window_set_list(ViewWindow *vw, GList *list) | |
85 { | |
86 | |
138 | 87 filelist_free(vw->list); |
9 | 88 vw->list = NULL; |
89 vw->list_pointer = NULL; | |
90 | |
138 | 91 vw->list = filelist_copy(list); |
9 | 92 } |
93 | |
94 static gint view_window_contains_collection(ViewWindow *vw) | |
95 { | |
96 CollectionData *cd; | |
97 CollectInfo *info; | |
98 | |
99 cd = image_get_collection(view_window_active_image(vw), &info); | |
100 | |
101 return (cd && info); | |
102 } | |
103 | |
104 static void view_collection_step(ViewWindow *vw, gint next) | |
105 { | |
106 ImageWindow *imd = view_window_active_image(vw); | |
107 CollectionData *cd; | |
108 CollectInfo *info; | |
109 CollectInfo *read_ahead_info = NULL; | |
110 | |
111 cd = image_get_collection(imd, &info); | |
112 | |
113 if (!cd || !info) return; | |
114 | |
115 if (next) | |
116 { | |
117 info = collection_next_by_info(cd, info); | |
334 | 118 if (options->image.enable_read_ahead) |
9 | 119 { |
120 read_ahead_info = collection_next_by_info(cd, info); | |
121 if (!read_ahead_info) read_ahead_info = collection_prev_by_info(cd, info); | |
122 } | |
123 } | |
124 else | |
125 { | |
126 info = collection_prev_by_info(cd, info); | |
334 | 127 if (options->image.enable_read_ahead) |
9 | 128 { |
129 read_ahead_info = collection_prev_by_info(cd, info); | |
130 if (!read_ahead_info) read_ahead_info = collection_next_by_info(cd, info); | |
131 } | |
132 } | |
133 | |
134 if (info) | |
135 { | |
334 | 136 image_change_from_collection(imd, cd, info, image_zoom_get_default(imd, options->image.zoom_mode)); |
9 | 137 |
138 | 138 if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd); |
9 | 139 } |
442 | 140 |
9 | 141 } |
142 | |
143 static void view_collection_step_to_end(ViewWindow *vw, gint last) | |
144 { | |
145 ImageWindow *imd = view_window_active_image(vw); | |
146 CollectionData *cd; | |
147 CollectInfo *info; | |
148 CollectInfo *read_ahead_info = NULL; | |
149 | |
150 cd = image_get_collection(imd, &info); | |
151 | |
152 if (!cd || !info) return; | |
153 | |
154 if (last) | |
155 { | |
156 info = collection_get_last(cd); | |
334 | 157 if (options->image.enable_read_ahead) read_ahead_info = collection_prev_by_info(cd, info); |
9 | 158 } |
159 else | |
160 { | |
161 info = collection_get_first(cd); | |
334 | 162 if (options->image.enable_read_ahead) read_ahead_info = collection_next_by_info(cd, info); |
9 | 163 } |
164 | |
165 if (info) | |
166 { | |
334 | 167 image_change_from_collection(imd, cd, info, image_zoom_get_default(imd, options->image.zoom_mode)); |
138 | 168 if (read_ahead_info) image_prebuffer_set(imd, read_ahead_info->fd); |
9 | 169 } |
170 } | |
171 | |
172 static void view_list_step(ViewWindow *vw, gint next) | |
173 { | |
174 ImageWindow *imd = view_window_active_image(vw); | |
138 | 175 FileData *fd; |
9 | 176 GList *work; |
177 GList *work_ahead; | |
178 | |
179 if (!vw->list) return; | |
180 | |
138 | 181 fd = image_get_fd(imd); |
182 if (!fd) return; | |
9 | 183 |
184 if (g_list_position(vw->list, vw->list_pointer) >= 0) | |
185 { | |
186 work = vw->list_pointer; | |
187 } | |
188 else | |
189 { | |
190 gint found = FALSE; | |
191 | |
192 work = vw->list; | |
193 while (work && !found) | |
194 { | |
138 | 195 FileData *temp; |
9 | 196 |
197 temp = work->data; | |
198 | |
138 | 199 if (fd == temp) |
9 | 200 { |
201 found = TRUE; | |
202 } | |
203 else | |
204 { | |
205 work = work->next; | |
206 } | |
207 } | |
208 } | |
209 if (!work) return; | |
210 | |
211 work_ahead = NULL; | |
212 if (next) | |
213 { | |
214 work = work->next; | |
215 if (work) work_ahead = work->next; | |
216 } | |
217 else | |
218 { | |
219 work = work->prev; | |
220 if (work) work_ahead = work->prev; | |
221 } | |
118
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
222 |
9 | 223 if (!work) return; |
224 | |
225 vw->list_pointer = work; | |
138 | 226 fd = work->data; |
334 | 227 image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode)); |
9 | 228 |
334 | 229 if (options->image.enable_read_ahead && work_ahead) |
9 | 230 { |
138 | 231 FileData *next_fd = work_ahead->data; |
232 image_prebuffer_set(imd, next_fd); | |
9 | 233 } |
234 } | |
235 | |
236 static void view_list_step_to_end(ViewWindow *vw, gint last) | |
237 { | |
238 ImageWindow *imd = view_window_active_image(vw); | |
138 | 239 FileData *fd; |
9 | 240 GList *work; |
241 GList *work_ahead; | |
242 | |
243 if (!vw->list) return; | |
244 | |
245 if (last) | |
246 { | |
247 work = g_list_last(vw->list); | |
248 work_ahead = work->prev; | |
249 } | |
250 else | |
251 { | |
252 work = vw->list; | |
253 work_ahead = work->next; | |
254 } | |
255 | |
256 vw->list_pointer = work; | |
138 | 257 fd = work->data; |
334 | 258 image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode)); |
9 | 259 |
334 | 260 if (options->image.enable_read_ahead && work_ahead) |
9 | 261 { |
138 | 262 FileData *next_fd = work_ahead->data; |
263 image_prebuffer_set(imd, next_fd); | |
9 | 264 } |
265 } | |
266 | |
267 static void view_step_next(ViewWindow *vw) | |
268 { | |
269 if (vw->ss) | |
270 { | |
271 view_slideshow_next(vw); | |
272 } | |
273 else if (vw->list) | |
274 { | |
275 view_list_step(vw, TRUE); | |
276 } | |
277 else | |
278 { | |
279 view_collection_step(vw, TRUE); | |
280 } | |
281 } | |
282 | |
283 static void view_step_prev(ViewWindow *vw) | |
284 { | |
285 if (vw->ss) | |
286 { | |
287 view_slideshow_prev(vw); | |
288 } | |
289 else if (vw->list) | |
290 { | |
291 view_list_step(vw, FALSE); | |
292 } | |
293 else | |
294 { | |
295 view_collection_step(vw, FALSE); | |
296 } | |
297 } | |
298 | |
299 static void view_step_to_end(ViewWindow *vw, gint last) | |
300 { | |
301 if (vw->list) | |
302 { | |
303 view_list_step_to_end(vw, last); | |
304 } | |
305 else | |
306 { | |
307 view_collection_step_to_end(vw, last); | |
308 } | |
309 } | |
310 | |
1 | 311 /* |
312 *----------------------------------------------------------------------------- | |
313 * view window keyboard | |
314 *----------------------------------------------------------------------------- | |
315 */ | |
316 | |
9 | 317 static void view_window_menu_pos_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data) |
318 { | |
319 ViewWindow *vw = data; | |
320 ImageWindow *imd; | |
321 | |
322 imd = view_window_active_image(vw); | |
23
17acca639a86
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
9
diff
changeset
|
323 gdk_window_get_origin(imd->pr->window, x, y); |
9 | 324 popup_menu_position_clamp(menu, x, y, 0); |
325 } | |
326 | |
1 | 327 static gint view_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data) |
328 { | |
9 | 329 ViewWindow *vw = data; |
330 ImageWindow *imd; | |
84
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
331 gint stop_signal; |
9 | 332 GtkWidget *menu; |
1 | 333 gint x = 0; |
334 gint y = 0; | |
335 | |
9 | 336 imd = view_window_active_image(vw); |
337 | |
84
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
338 stop_signal = TRUE; |
1 | 339 switch (event->keyval) |
340 { | |
9 | 341 case GDK_Left: case GDK_KP_Left: |
1 | 342 x -= 1; |
343 break; | |
9 | 344 case GDK_Right: case GDK_KP_Right: |
1 | 345 x += 1; |
346 break; | |
9 | 347 case GDK_Up: case GDK_KP_Up: |
1 | 348 y -= 1; |
349 break; | |
9 | 350 case GDK_Down: case GDK_KP_Down: |
1 | 351 y += 1; |
84
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
352 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
353 default: |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
354 stop_signal = FALSE; |
1 | 355 break; |
9 | 356 } |
357 | |
84
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
358 if (x != 0 || y!= 0) |
9 | 359 { |
84
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
360 if (event->state & GDK_SHIFT_MASK) |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
361 { |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
362 x *= 3; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
363 y *= 3; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
364 } |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
365 |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
366 keyboard_scroll_calc(&x, &y, event); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
367 image_scroll(imd, x, y); |
1 | 368 } |
369 | |
84
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
370 if (stop_signal) return stop_signal; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
371 |
1 | 372 if (event->state & GDK_CONTROL_MASK) |
373 { | |
374 gint n = -1; | |
84
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
375 |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
376 stop_signal = TRUE; |
1 | 377 switch (event->keyval) |
378 { | |
379 case '1': | |
380 n = 0; | |
381 break; | |
382 case '2': | |
383 n = 1; | |
384 break; | |
385 case '3': | |
386 n = 2; | |
387 break; | |
388 case '4': | |
389 n = 3; | |
390 break; | |
391 case '5': | |
392 n = 4; | |
393 break; | |
394 case '6': | |
395 n = 5; | |
396 break; | |
397 case '7': | |
398 n = 6; | |
399 break; | |
400 case '8': | |
401 n = 7; | |
402 break; | |
9 | 403 case '9': |
404 n = 8; | |
405 break; | |
406 case '0': | |
407 n = 9; | |
408 break; | |
409 case 'C': case 'c': | |
138 | 410 file_util_copy(image_get_fd(imd), NULL, NULL, imd->widget); |
9 | 411 break; |
412 case 'M': case 'm': | |
138 | 413 file_util_move(image_get_fd(imd), NULL, NULL, imd->widget); |
9 | 414 break; |
415 case 'R': case 'r': | |
138 | 416 file_util_rename(image_get_fd(imd), NULL, imd->widget); |
9 | 417 break; |
418 case 'D': case 'd': | |
138 | 419 file_util_delete(image_get_fd(imd), NULL, imd->widget); |
9 | 420 break; |
421 case 'P': case 'p': | |
479
5212d4fed37f
Ensure Properties dialog is displayed above fullscreen window.
zas_
parents:
475
diff
changeset
|
422 info_window_new(image_get_fd(imd), NULL, vw->fs ? vw->fs->window : NULL); |
9 | 423 break; |
424 case 'W': case 'w': | |
425 view_window_close(vw); | |
426 break; | |
84
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
427 default: |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
428 stop_signal = FALSE; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
429 break; |
1 | 430 } |
431 if (n != -1) | |
432 { | |
60
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
23
diff
changeset
|
433 if (!editor_window_flag_set(n)) |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
23
diff
changeset
|
434 { |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
23
diff
changeset
|
435 view_fullscreen_toggle(vw, TRUE); |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
23
diff
changeset
|
436 } |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
23
diff
changeset
|
437 imd = view_window_active_image(vw); |
138 | 438 start_editor_from_file(n, image_get_fd(imd)); |
1 | 439 } |
440 } | |
9 | 441 else if (event->state & GDK_SHIFT_MASK) |
1 | 442 { |
84
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
443 stop_signal = TRUE; |
9 | 444 switch (event->keyval) |
445 { | |
446 case 'R': case 'r': | |
447 image_alter(imd, ALTER_ROTATE_180); | |
448 break; | |
449 case 'M': case 'm': | |
450 image_alter(imd, ALTER_MIRROR); | |
451 break; | |
452 case 'F': case 'f': | |
453 image_alter(imd, ALTER_FLIP); | |
454 break; | |
82
a4c1b7014e6e
Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
455 case 'G': case 'g': |
a4c1b7014e6e
Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
456 image_alter(imd, ALTER_DESATURATE); |
a4c1b7014e6e
Thu Oct 19 15:20:51 2006 John Ellis <johne@verizon.net>
gqview
parents:
64
diff
changeset
|
457 break; |
94
50dc5a14d37b
Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents:
91
diff
changeset
|
458 case 'P': case 'p': |
50dc5a14d37b
Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents:
91
diff
changeset
|
459 { |
138 | 460 FileData *fd; |
94
50dc5a14d37b
Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents:
91
diff
changeset
|
461 |
50dc5a14d37b
Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents:
91
diff
changeset
|
462 view_fullscreen_toggle(vw, TRUE); |
50dc5a14d37b
Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents:
91
diff
changeset
|
463 imd = view_window_active_image(vw); |
138 | 464 fd = image_get_fd(imd); |
465 print_window_new(fd, | |
466 fd ? g_list_append(NULL, file_data_ref(fd)) : NULL, | |
467 filelist_copy(vw->list), vw->window); | |
94
50dc5a14d37b
Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents:
91
diff
changeset
|
468 } |
50dc5a14d37b
Thu Nov 2 17:51:31 2006 John Ellis <johne@verizon.net>
gqview
parents:
91
diff
changeset
|
469 break; |
9 | 470 default: |
84
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
471 stop_signal = FALSE; |
9 | 472 break; |
473 } | |
1 | 474 } |
442 | 475 else |
1 | 476 { |
84
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
477 stop_signal = TRUE; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
478 switch (event->keyval) |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
479 { |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
480 case GDK_Page_Up: case GDK_KP_Page_Up: |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
481 case GDK_BackSpace: |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
482 case 'B': case 'b': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
483 view_step_prev(vw); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
484 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
485 case GDK_Page_Down: case GDK_KP_Page_Down: |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
486 case GDK_space: |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
487 case 'N': case 'n': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
488 view_step_next(vw); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
489 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
490 case GDK_Home: case GDK_KP_Home: |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
491 view_step_to_end(vw, FALSE); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
492 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
493 case GDK_End: case GDK_KP_End: |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
494 view_step_to_end(vw, TRUE); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
495 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
496 case '+': case '=': case GDK_KP_Add: |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
497 image_zoom_adjust(imd, get_zoom_increment()); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
498 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
499 case '-': case GDK_KP_Subtract: |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
500 image_zoom_adjust(imd, -get_zoom_increment()); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
501 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
502 case 'X': case 'x': case GDK_KP_Multiply: |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
503 image_zoom_set(imd, 0.0); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
504 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
505 case 'Z': case 'z': case GDK_KP_Divide: case '1': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
506 image_zoom_set(imd, 1.0); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
507 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
508 case '2': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
509 image_zoom_set(imd, 2.0); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
510 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
511 case '3': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
512 image_zoom_set(imd, 3.0); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
513 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
514 case '4': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
515 image_zoom_set(imd, 4.0); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
516 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
517 case '7': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
518 image_zoom_set(imd, -4.0); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
519 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
520 case '8': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
521 image_zoom_set(imd, -3.0); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
522 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
523 case '9': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
524 image_zoom_set(imd, -2.0); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
525 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
526 case 'W': case 'w': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
527 image_zoom_set_fill_geometry(imd, FALSE); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
528 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
529 case 'H': case 'h': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
530 image_zoom_set_fill_geometry(imd, TRUE); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
531 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
532 case 'R': case 'r': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
533 image_reload(imd); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
534 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
535 case 'S': case 's': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
536 if (vw->ss) |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
537 { |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
538 view_slideshow_stop(vw); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
539 } |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
540 else |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
541 { |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
542 view_slideshow_start(vw); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
543 } |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
544 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
545 case 'P': case 'p': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
546 slideshow_pause_toggle(vw->ss); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
547 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
548 case 'F': case 'f': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
549 case 'V': case 'v': |
86
cade6a52a165
Mon Oct 23 05:34:29 2006 John Ellis <johne@verizon.net>
gqview
parents:
84
diff
changeset
|
550 case GDK_F11: |
84
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
551 view_fullscreen_toggle(vw, FALSE); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
552 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
553 case 'I': case 'i': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
554 view_overlay_toggle(vw); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
555 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
556 case ']': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
557 image_alter(imd, ALTER_ROTATE_90); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
558 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
559 case '[': |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
560 image_alter(imd, ALTER_ROTATE_90_CC); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
561 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
562 case GDK_Delete: case GDK_KP_Delete: |
341
15c6b94545a2
Move safe_delete* and in place rename options to file_ops
zas_
parents:
339
diff
changeset
|
563 if (options->file_ops.enable_delete_key) |
84
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
564 { |
138 | 565 file_util_delete(image_get_fd(imd), NULL, imd->widget); |
84
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
566 } |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
567 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
568 case GDK_Escape: |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
569 if (vw->fs) |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
570 { |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
571 view_fullscreen_toggle(vw, TRUE); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
572 } |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
573 else |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
574 { |
89
b3149a34d0dd
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
575 view_window_close(vw); |
84
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
576 } |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
577 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
578 case GDK_Menu: |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
579 case GDK_F10: |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
580 menu = view_popup_menu(vw); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
581 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
582 view_window_menu_pos_cb, vw, 0, GDK_CURRENT_TIME); |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
583 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
584 default: |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
585 stop_signal = FALSE; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
586 break; |
ba3c39002a24
Fri Oct 20 08:00:08 2006 John Ellis <johne@verizon.net>
gqview
parents:
82
diff
changeset
|
587 } |
1 | 588 } |
589 | |
590 return stop_signal; | |
591 } | |
592 | |
593 /* | |
594 *----------------------------------------------------------------------------- | |
595 * view window main routines | |
596 *----------------------------------------------------------------------------- | |
442 | 597 */ |
1 | 598 |
9 | 599 static void button_cb(ImageWindow *imd, gint button, guint32 time, |
600 gdouble x, gdouble y, guint state, gpointer data) | |
601 { | |
602 ViewWindow *vw = data; | |
603 GtkWidget *menu; | |
604 | |
605 switch (button) | |
606 { | |
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
446
diff
changeset
|
607 case MOUSE_BUTTON_LEFT: |
9 | 608 view_step_next(vw); |
609 break; | |
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
446
diff
changeset
|
610 case MOUSE_BUTTON_MIDDLE: |
9 | 611 view_step_prev(vw); |
612 break; | |
448
a73cc0fa14d0
Use explicit names for mouse buttons instead of numbers.
zas_
parents:
446
diff
changeset
|
613 case MOUSE_BUTTON_RIGHT: |
9 | 614 menu = view_popup_menu(vw); |
615 gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, time); | |
616 break; | |
617 default: | |
618 break; | |
619 } | |
620 } | |
621 | |
622 static void scroll_cb(ImageWindow *imd, GdkScrollDirection direction, guint32 time, | |
623 gdouble x, gdouble y, guint state, gpointer data) | |
1 | 624 { |
9 | 625 ViewWindow *vw = data; |
626 | |
627 if (state & GDK_CONTROL_MASK) | |
628 { | |
629 switch (direction) | |
630 { | |
631 case GDK_SCROLL_UP: | |
632 image_zoom_adjust_at_point(imd, get_zoom_increment(), x, y); | |
633 break; | |
634 case GDK_SCROLL_DOWN: | |
635 image_zoom_adjust_at_point(imd, -get_zoom_increment(), x, y); | |
636 break; | |
637 default: | |
638 break; | |
639 } | |
640 } | |
318 | 641 else if ( (state & GDK_SHIFT_MASK) != (options->mousewheel_scrolls)) |
9 | 642 { |
643 switch (direction) | |
644 { | |
645 case GDK_SCROLL_UP: | |
646 image_scroll(imd, 0, -MOUSEWHEEL_SCROLL_SIZE); | |
647 break; | |
648 case GDK_SCROLL_DOWN: | |
649 image_scroll(imd, 0, MOUSEWHEEL_SCROLL_SIZE); | |
650 break; | |
651 case GDK_SCROLL_LEFT: | |
652 image_scroll(imd, -MOUSEWHEEL_SCROLL_SIZE, 0); | |
653 break; | |
654 case GDK_SCROLL_RIGHT: | |
655 image_scroll(imd, MOUSEWHEEL_SCROLL_SIZE, 0); | |
656 break; | |
657 default: | |
658 break; | |
659 } | |
660 } | |
661 else | |
662 { | |
663 switch (direction) | |
664 { | |
665 case GDK_SCROLL_UP: | |
666 view_step_prev(vw); | |
667 break; | |
668 case GDK_SCROLL_DOWN: | |
669 view_step_next(vw); | |
670 break; | |
671 default: | |
672 break; | |
673 } | |
674 } | |
675 } | |
676 | |
677 static void view_image_set_buttons(ViewWindow *vw, ImageWindow *imd) | |
678 { | |
679 image_set_button_func(imd, button_cb, vw); | |
680 image_set_scroll_func(imd, scroll_cb, vw); | |
681 } | |
682 | |
683 static void view_fullscreen_stop_func(FullScreenData *fs, gpointer data) | |
684 { | |
685 ViewWindow *vw = data; | |
686 | |
687 vw->fs = NULL; | |
688 | |
689 if (vw->ss) vw->ss->imd = vw->imd; | |
1 | 690 } |
691 | |
9 | 692 static void view_fullscreen_toggle(ViewWindow *vw, gint force_off) |
4 | 693 { |
9 | 694 if (force_off && !vw->fs) return; |
695 | |
696 if (vw->fs) | |
697 { | |
122
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
118
diff
changeset
|
698 if (image_osd_get(vw->fs->imd, NULL, NULL)) |
117
0c2e1f0a001b
Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents:
94
diff
changeset
|
699 { |
122
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
118
diff
changeset
|
700 image_osd_set(vw->imd, TRUE, TRUE); |
117
0c2e1f0a001b
Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents:
94
diff
changeset
|
701 } |
9 | 702 |
117
0c2e1f0a001b
Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents:
94
diff
changeset
|
703 fullscreen_stop(vw->fs); |
9 | 704 } |
705 else | |
706 { | |
707 vw->fs = fullscreen_start(vw->window, vw->imd, view_fullscreen_stop_func, vw); | |
708 | |
709 view_image_set_buttons(vw, vw->fs->imd); | |
710 g_signal_connect(G_OBJECT(vw->fs->window), "key_press_event", | |
711 G_CALLBACK(view_window_key_press_cb), vw); | |
712 | |
713 if (vw->ss) vw->ss->imd = vw->fs->imd; | |
714 | |
122
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
118
diff
changeset
|
715 if (image_osd_get(vw->imd, NULL, NULL)) |
9 | 716 { |
117
0c2e1f0a001b
Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents:
94
diff
changeset
|
717 image_osd_set(vw->imd, FALSE, FALSE); |
122
e2a8b7f2165b
Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents:
118
diff
changeset
|
718 image_osd_set(vw->fs->imd, TRUE, TRUE); |
9 | 719 } |
720 } | |
721 } | |
722 | |
723 static void view_overlay_toggle(ViewWindow *vw) | |
724 { | |
725 ImageWindow *imd; | |
726 | |
727 imd = view_window_active_image(vw); | |
481
67a612985686
Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents:
479
diff
changeset
|
728 |
67a612985686
Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents:
479
diff
changeset
|
729 image_osd_toggle(imd); |
9 | 730 } |
731 | |
732 static void view_slideshow_next(ViewWindow *vw) | |
733 { | |
734 if (vw->ss) slideshow_next(vw->ss); | |
4 | 735 } |
736 | |
9 | 737 static void view_slideshow_prev(ViewWindow *vw) |
738 { | |
739 if (vw->ss) slideshow_prev(vw->ss); | |
740 } | |
741 | |
742 static void view_slideshow_stop_func(SlideShowData *fs, gpointer data) | |
743 { | |
744 ViewWindow *vw = data; | |
118
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
745 GList *work; |
138 | 746 FileData *fd; |
9 | 747 |
748 vw->ss = NULL; | |
118
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
749 |
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
750 work = vw->list; |
138 | 751 fd = image_get_fd(view_window_active_image(vw)); |
118
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
752 while (work) |
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
753 { |
138 | 754 FileData *temp; |
118
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
755 |
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
756 temp = work->data; |
138 | 757 if (fd == temp) |
118
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
758 { |
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
759 vw->list_pointer = work; |
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
760 work = NULL; |
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
761 } |
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
762 else |
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
763 { |
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
764 work = work->next; |
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
765 } |
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
766 } |
9 | 767 } |
768 | |
769 static void view_slideshow_start(ViewWindow *vw) | |
4 | 770 { |
9 | 771 if (!vw->ss) |
772 { | |
773 CollectionData *cd; | |
774 CollectInfo *info; | |
775 | |
776 if (vw->list) | |
777 { | |
138 | 778 vw->ss = slideshow_start_from_filelist(view_window_active_image(vw), |
779 filelist_copy(vw->list), | |
9 | 780 view_slideshow_stop_func, vw); |
781 vw->list_pointer = NULL; | |
782 return; | |
783 } | |
784 | |
785 cd = image_get_collection(view_window_active_image(vw), &info); | |
786 if (cd && info) | |
787 { | |
788 vw->ss = slideshow_start_from_collection(view_window_active_image(vw), cd, | |
789 view_slideshow_stop_func, vw, info); | |
790 } | |
791 } | |
792 } | |
793 | |
794 static void view_slideshow_stop(ViewWindow *vw) | |
795 { | |
796 if (vw->ss) slideshow_free(vw->ss); | |
797 } | |
798 | |
89
b3149a34d0dd
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
799 static void view_window_destroy_cb(GtkWidget *widget, gpointer data) |
9 | 800 { |
89
b3149a34d0dd
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
801 ViewWindow *vw = data; |
b3149a34d0dd
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
802 |
9 | 803 view_window_list = g_list_remove(view_window_list, vw); |
804 | |
805 view_slideshow_stop(vw); | |
89
b3149a34d0dd
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
806 fullscreen_stop(vw->fs); |
b3149a34d0dd
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
807 |
138 | 808 filelist_free(vw->list); |
89
b3149a34d0dd
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
809 g_free(vw); |
b3149a34d0dd
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
810 } |
b3149a34d0dd
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
811 |
b3149a34d0dd
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
812 static void view_window_close(ViewWindow *vw) |
b3149a34d0dd
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
813 { |
b3149a34d0dd
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
814 view_slideshow_stop(vw); |
9 | 815 view_fullscreen_toggle(vw, TRUE); |
816 gtk_widget_destroy(vw->window); | |
4 | 817 } |
818 | |
1 | 819 static gint view_window_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer data) |
820 { | |
9 | 821 ViewWindow *vw = data; |
822 | |
823 view_window_close(vw); | |
1 | 824 return TRUE; |
825 } | |
826 | |
138 | 827 static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionData *cd, CollectInfo *info) |
1 | 828 { |
9 | 829 ViewWindow *vw; |
1 | 830 GtkAllocation req_size; |
9 | 831 GdkGeometry geometry; |
1 | 832 gint w, h; |
9 | 833 |
138 | 834 if (!fd && !list && (!cd || !info)) return NULL; |
9 | 835 |
836 vw = g_new0(ViewWindow, 1); | |
837 vw->fs = NULL; | |
838 vw->ss = NULL; | |
839 vw->list = NULL; | |
840 vw->list_pointer = NULL; | |
841 | |
289
6a7298988a7a
Simplify and unify gtk_window creation with the help of
zas_
parents:
288
diff
changeset
|
842 vw->window = window_new(GTK_WINDOW_TOPLEVEL, "view", PIXBUF_INLINE_ICON_VIEW, NULL, NULL); |
9 | 843 |
844 geometry.min_width = 8; | |
845 geometry.min_height = 8; | |
846 gtk_window_set_geometry_hints(GTK_WINDOW(vw->window), NULL, &geometry, GDK_HINT_MIN_SIZE); | |
1 | 847 |
9 | 848 gtk_window_set_resizable(GTK_WINDOW(vw->window), TRUE); |
442 | 849 gtk_container_set_border_width(GTK_CONTAINER(vw->window), 0); |
9 | 850 |
851 vw->imd = image_new(FALSE); | |
852 | |
339
de1c2cd06fce
Rename user_specified_window_background and window_background_color
zas_
parents:
334
diff
changeset
|
853 image_background_set_color(vw->imd, options->image.use_custom_border_color ? &options->image.border_color : NULL); |
9 | 854 |
288
d1f74154463e
Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents:
281
diff
changeset
|
855 image_attach_window(vw->imd, vw->window, NULL, GQ_APPNAME, TRUE); |
9 | 856 |
857 image_auto_refresh(vw->imd, 0); | |
858 image_top_window_set_sync(vw->imd, TRUE); | |
859 | |
860 gtk_container_add(GTK_CONTAINER(vw->window), vw->imd->widget); | |
861 gtk_widget_show(vw->imd->widget); | |
862 | |
863 view_window_dnd_init(vw); | |
1 | 864 |
9 | 865 view_image_set_buttons(vw, vw->imd); |
1 | 866 |
89
b3149a34d0dd
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
867 g_signal_connect(G_OBJECT(vw->window), "destroy", |
b3149a34d0dd
Sat Oct 28 14:41:10 2006 John Ellis <johne@verizon.net>
gqview
parents:
86
diff
changeset
|
868 G_CALLBACK(view_window_destroy_cb), vw); |
9 | 869 g_signal_connect(G_OBJECT(vw->window), "delete_event", |
870 G_CALLBACK(view_window_delete_cb), vw); | |
871 g_signal_connect(G_OBJECT(vw->window), "key_press_event", | |
872 G_CALLBACK(view_window_key_press_cb), vw); | |
873 if (cd && info) | |
874 { | |
334 | 875 image_change_from_collection(vw->imd, cd, info, image_zoom_get_default(NULL, options->image.zoom_mode)); |
876 if (options->image.enable_read_ahead) | |
9 | 877 { |
878 CollectInfo * r_info = collection_next_by_info(cd, info); | |
879 if (!r_info) r_info = collection_prev_by_info(cd, info); | |
138 | 880 if (r_info) image_prebuffer_set(vw->imd, r_info->fd); |
9 | 881 } |
882 } | |
883 else if (list) | |
884 { | |
885 view_window_set_list(vw, list); | |
886 vw->list_pointer = vw->list; | |
334 | 887 image_change_fd(vw->imd, (FileData *)vw->list->data, image_zoom_get_default(NULL, options->image.zoom_mode)); |
1 | 888 |
334 | 889 if (options->image.enable_read_ahead) |
9 | 890 { |
891 GList *work = vw->list->next; | |
138 | 892 if (work) image_prebuffer_set(vw->imd, (FileData *)work->data); |
9 | 893 } |
894 } | |
895 else | |
896 { | |
334 | 897 image_change_fd(vw->imd, fd, image_zoom_get_default(NULL, options->image.zoom_mode)); |
9 | 898 } |
1 | 899 |
9 | 900 if (image_zoom_get(vw->imd) == 0.0) |
901 { | |
23
17acca639a86
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
9
diff
changeset
|
902 pixbuf_renderer_get_image_size(PIXBUF_RENDERER(vw->imd->pr), &w, &h); |
9 | 903 } |
904 else | |
905 { | |
23
17acca639a86
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
9
diff
changeset
|
906 pixbuf_renderer_get_scaled_size(PIXBUF_RENDERER(vw->imd->pr), &w, &h); |
9 | 907 } |
334 | 908 if (options->image.limit_window_size) |
1 | 909 { |
334 | 910 gint mw = gdk_screen_width() * options->image.max_window_size / 100; |
911 gint mh = gdk_screen_height() * options->image.max_window_size / 100; | |
1 | 912 |
913 if (w > mw) w = mw; | |
914 if (h > mh) h = mh; | |
915 } | |
916 | |
9 | 917 gtk_window_set_default_size(GTK_WINDOW(vw->window), w, h); |
1 | 918 req_size.x = req_size.y = 0; |
919 req_size.width = w; | |
920 req_size.height = h; | |
9 | 921 gtk_widget_size_allocate(GTK_WIDGET(vw->window), &req_size); |
922 | |
23
17acca639a86
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
9
diff
changeset
|
923 gtk_widget_set_size_request(vw->imd->pr, w, h); |
9 | 924 |
925 gtk_widget_show(vw->window); | |
926 | |
927 view_window_list = g_list_append(view_window_list, vw); | |
928 | |
929 return vw; | |
930 } | |
931 | |
932 static void view_window_collection_unref_cb(GtkWidget *widget, gpointer data) | |
933 { | |
934 CollectionData *cd = data; | |
935 | |
936 collection_unref(cd); | |
937 } | |
938 | |
138 | 939 void view_window_new(FileData *fd) |
9 | 940 { |
138 | 941 if (file_extension_match(fd->path, ".gqv")) |
9 | 942 { |
943 ViewWindow *vw; | |
944 CollectionData *cd; | |
945 CollectInfo *info; | |
946 | |
138 | 947 cd = collection_new(fd->path); |
358 | 948 if (collection_load(cd, fd->path, COLLECTION_LOAD_NONE)) |
9 | 949 { |
950 info = collection_get_first(cd); | |
951 } | |
952 else | |
953 { | |
954 collection_unref(cd); | |
955 cd = NULL; | |
956 info = NULL; | |
957 } | |
958 vw = real_view_window_new(NULL, NULL, cd, info); | |
959 if (vw && cd) | |
960 { | |
961 g_signal_connect(G_OBJECT(vw->window), "destroy", | |
962 G_CALLBACK(view_window_collection_unref_cb), cd); | |
963 } | |
964 } | |
442 | 965 else if (isdir(fd->path)) |
9 | 966 { |
967 GList *list = NULL; | |
1 | 968 |
138 | 969 if (filelist_read(fd->path, &list, NULL)) |
9 | 970 { |
138 | 971 list = filelist_sort_path(list); |
972 list = filelist_filter(list, FALSE); | |
9 | 973 } |
974 real_view_window_new(NULL, list, NULL, NULL); | |
138 | 975 filelist_free(list); |
9 | 976 } |
977 else | |
978 { | |
138 | 979 real_view_window_new(fd, NULL, NULL, NULL); |
9 | 980 } |
981 } | |
982 | |
983 void view_window_new_from_list(GList *list) | |
984 { | |
985 real_view_window_new(NULL, list, NULL, NULL); | |
986 } | |
987 | |
988 void view_window_new_from_collection(CollectionData *cd, CollectInfo *info) | |
989 { | |
990 real_view_window_new(NULL, NULL, cd, info); | |
991 } | |
992 | |
993 /* | |
994 *----------------------------------------------------------------------------- | |
995 * public | |
996 *----------------------------------------------------------------------------- | |
997 */ | |
998 | |
999 void view_window_colors_update(void) | |
1000 { | |
1001 GList *work; | |
1 | 1002 |
9 | 1003 work = view_window_list; |
1004 while (work) | |
1005 { | |
1006 ViewWindow *vw = work->data; | |
1007 work = work->next; | |
1008 | |
339
de1c2cd06fce
Rename user_specified_window_background and window_background_color
zas_
parents:
334
diff
changeset
|
1009 image_background_set_color(vw->imd, options->image.use_custom_border_color ? &options->image.border_color : NULL); |
9 | 1010 } |
1011 } | |
1012 | |
1013 gint view_window_find_image(ImageWindow *imd, gint *index, gint *total) | |
1014 { | |
1015 GList *work; | |
1016 | |
1017 work = view_window_list; | |
1018 while (work) | |
1019 { | |
1020 ViewWindow *vw = work->data; | |
1021 work = work->next; | |
1022 | |
1023 if (vw->imd == imd || | |
1024 (vw->fs && vw->fs->imd == imd)) | |
1025 { | |
1026 if (vw->ss) | |
1027 { | |
1028 gint n; | |
118
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1029 gint t; |
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1030 |
9 | 1031 n = g_list_length(vw->ss->list_done); |
118
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1032 t = n + g_list_length(vw->ss->list); |
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1033 if (n == 0) n = t; |
9 | 1034 if (index) *index = n - 1; |
118
ac0f7f942c4d
Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents:
117
diff
changeset
|
1035 if (total) *total = t; |
9 | 1036 } |
1037 else | |
1038 { | |
1039 if (index) *index = g_list_position(vw->list, vw->list_pointer); | |
1040 if (total) *total = g_list_length(vw->list); | |
1041 } | |
1042 return TRUE; | |
1043 } | |
1044 } | |
1045 | |
1046 return FALSE; | |
1 | 1047 } |
1048 | |
1049 /* | |
1050 *----------------------------------------------------------------------------- | |
1051 * view window menu routines and callbacks | |
1052 *----------------------------------------------------------------------------- | |
442 | 1053 */ |
1 | 1054 |
9 | 1055 static void view_new_window_cb(GtkWidget *widget, gpointer data) |
1 | 1056 { |
9 | 1057 ViewWindow *vw = data; |
1058 CollectionData *cd; | |
1059 CollectInfo *info; | |
1060 | |
1061 cd = image_get_collection(vw->imd, &info); | |
1062 | |
1063 if (cd && info) | |
1064 { | |
1065 view_window_new_from_collection(cd, info); | |
1066 } | |
1067 else | |
1068 { | |
138 | 1069 view_window_new(image_get_fd(vw->imd)); |
9 | 1070 } |
1 | 1071 } |
1072 | |
9 | 1073 static void view_edit_cb(GtkWidget *widget, gpointer data) |
1 | 1074 { |
9 | 1075 ViewWindow *vw; |
60
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
23
diff
changeset
|
1076 ImageWindow *imd; |
9 | 1077 gint n; |
1078 | |
1079 vw = submenu_item_get_data(widget); | |
1080 n = GPOINTER_TO_INT(data); | |
1081 if (!vw) return; | |
1082 | |
60
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
23
diff
changeset
|
1083 if (!editor_window_flag_set(n)) |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
23
diff
changeset
|
1084 { |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
23
diff
changeset
|
1085 view_fullscreen_toggle(vw, TRUE); |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
23
diff
changeset
|
1086 } |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
23
diff
changeset
|
1087 |
9c0c402b0ef3
Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents:
23
diff
changeset
|
1088 imd = view_window_active_image(vw); |
138 | 1089 start_editor_from_file(n, image_get_fd(imd)); |
1 | 1090 } |
1091 | |
9 | 1092 static void view_alter_cb(GtkWidget *widget, gpointer data) |
1093 { | |
1094 ViewWindow *vw; | |
1095 AlterType type; | |
1096 | |
1097 vw = submenu_item_get_data(widget); | |
1098 type = GPOINTER_TO_INT(data); | |
1099 | |
1100 if (!vw) return; | |
1101 image_alter(vw->imd, type); | |
1102 } | |
1103 | |
1104 static void view_info_cb(GtkWidget *widget, gpointer data) | |
3 | 1105 { |
9 | 1106 ViewWindow *vw = data; |
1107 ImageWindow *imd; | |
1108 | |
1109 imd = view_window_active_image(vw); | |
479
5212d4fed37f
Ensure Properties dialog is displayed above fullscreen window.
zas_
parents:
475
diff
changeset
|
1110 info_window_new(image_get_fd(imd), NULL, vw->fs ? vw->fs->window : NULL); |
9 | 1111 } |
1112 | |
1113 static void view_wallpaper_cb(GtkWidget *widget, gpointer data) | |
1114 { | |
1115 ViewWindow *vw = data; | |
1116 ImageWindow *imd; | |
1117 | |
1118 imd = view_window_active_image(vw); | |
1119 image_to_root_window(imd, (image_zoom_get(imd) == 0.0)); | |
3 | 1120 } |
1121 | |
1 | 1122 static void view_zoom_in_cb(GtkWidget *widget, gpointer data) |
1123 { | |
9 | 1124 ViewWindow *vw = data; |
1125 | |
1126 image_zoom_adjust(view_window_active_image(vw), get_zoom_increment()); | |
1 | 1127 } |
1128 | |
1129 static void view_zoom_out_cb(GtkWidget *widget, gpointer data) | |
1130 { | |
9 | 1131 ViewWindow *vw = data; |
1132 | |
1133 image_zoom_adjust(view_window_active_image(vw), -get_zoom_increment()); | |
1 | 1134 } |
1135 | |
1136 static void view_zoom_1_1_cb(GtkWidget *widget, gpointer data) | |
1137 { | |
9 | 1138 ViewWindow *vw = data; |
1139 | |
1140 image_zoom_set(view_window_active_image(vw), 1.0); | |
1 | 1141 } |
1142 | |
1143 static void view_zoom_fit_cb(GtkWidget *widget, gpointer data) | |
1144 { | |
9 | 1145 ViewWindow *vw = data; |
1146 | |
1147 image_zoom_set(view_window_active_image(vw), 0.0); | |
1 | 1148 } |
1149 | |
1150 static void view_copy_cb(GtkWidget *widget, gpointer data) | |
1151 { | |
9 | 1152 ViewWindow *vw = data; |
1153 ImageWindow *imd; | |
1154 | |
1155 imd = view_window_active_image(vw); | |
138 | 1156 file_util_copy(image_get_fd(imd), NULL, NULL, imd->widget); |
1 | 1157 } |
1158 | |
1159 static void view_move_cb(GtkWidget *widget, gpointer data) | |
1160 { | |
9 | 1161 ViewWindow *vw = data; |
1162 ImageWindow *imd; | |
1163 | |
1164 imd = view_window_active_image(vw); | |
138 | 1165 file_util_move(image_get_fd(imd), NULL, NULL, imd->widget); |
1 | 1166 } |
1167 | |
1168 static void view_rename_cb(GtkWidget *widget, gpointer data) | |
1169 { | |
9 | 1170 ViewWindow *vw = data; |
1171 ImageWindow *imd; | |
1172 | |
1173 imd = view_window_active_image(vw); | |
138 | 1174 file_util_rename(image_get_fd(imd), NULL, imd->widget); |
1 | 1175 } |
1176 | |
1177 static void view_delete_cb(GtkWidget *widget, gpointer data) | |
1178 { | |
9 | 1179 ViewWindow *vw = data; |
1180 ImageWindow *imd; | |
1181 | |
1182 imd = view_window_active_image(vw); | |
138 | 1183 file_util_delete(image_get_fd(imd), NULL, imd->widget); |
9 | 1184 } |
1185 | |
497 | 1186 static void view_copy_path_cb(GtkWidget *widget, gpointer data) |
1187 { | |
1188 ViewWindow *vw = data; | |
1189 ImageWindow *imd; | |
1190 | |
1191 imd = view_window_active_image(vw); | |
1192 file_util_copy_path_to_clipboard(image_get_fd(imd)); | |
1193 } | |
1194 | |
9 | 1195 static void view_fullscreen_cb(GtkWidget *widget, gpointer data) |
1196 { | |
1197 ViewWindow *vw = data; | |
1198 | |
1199 view_fullscreen_toggle(vw, FALSE); | |
1200 } | |
1201 | |
1202 static void view_slideshow_start_cb(GtkWidget *widget, gpointer data) | |
1203 { | |
1204 ViewWindow *vw = data; | |
1205 | |
1206 view_slideshow_start(vw); | |
1207 } | |
1208 | |
1209 static void view_slideshow_stop_cb(GtkWidget *widget, gpointer data) | |
1210 { | |
1211 ViewWindow *vw = data; | |
1212 | |
1213 view_slideshow_stop(vw); | |
1214 } | |
1215 | |
1216 static void view_slideshow_pause_cb(GtkWidget *widget, gpointer data) | |
1217 { | |
1218 ViewWindow *vw = data; | |
1219 | |
1220 slideshow_pause_toggle(vw->ss); | |
1 | 1221 } |
1222 | |
1223 static void view_close_cb(GtkWidget *widget, gpointer data) | |
1224 { | |
9 | 1225 ViewWindow *vw = data; |
1226 | |
1227 view_window_close(vw); | |
1228 } | |
1229 | |
368
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1230 static LayoutWindow *view_new_layout_with_path(const gchar *path) |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1231 { |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1232 LayoutWindow *nw; |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1233 |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1234 nw = layout_new(NULL, FALSE, FALSE); |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1235 layout_sort_set(nw, options->file_sort.method, options->file_sort.ascending); |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1236 layout_set_path(nw, path); |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1237 return nw; |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1238 } |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1239 |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1240 |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1241 static void view_set_layout_path_cb(GtkWidget *widget, gpointer data) |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1242 { |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1243 ViewWindow *vw = data; |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1244 LayoutWindow *lw; |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1245 const gchar *path; |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1246 ImageWindow *imd; |
442 | 1247 |
368
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1248 imd = view_window_active_image(vw); |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1249 |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1250 if (!imd || !imd->image_fd) return; |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1251 path = imd->image_fd->path; |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1252 if (!path) return; |
442 | 1253 |
368
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1254 lw = layout_find_by_image_fd(imd); |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1255 if (lw) |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1256 layout_set_path(lw, path); |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1257 else |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1258 view_new_layout_with_path(path); |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1259 view_window_close(vw); |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1260 } |
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1261 |
9 | 1262 static GtkWidget *view_popup_menu(ViewWindow *vw) |
1263 { | |
1264 GtkWidget *menu; | |
1265 GtkWidget *item; | |
1266 | |
1267 menu = popup_menu_short_lived(); | |
1268 | |
1269 menu_item_add_stock(menu, _("Zoom _in"), GTK_STOCK_ZOOM_IN, G_CALLBACK(view_zoom_in_cb), vw); | |
1270 menu_item_add_stock(menu, _("Zoom _out"), GTK_STOCK_ZOOM_OUT, G_CALLBACK(view_zoom_out_cb), vw); | |
1271 menu_item_add_stock(menu, _("Zoom _1:1"), GTK_STOCK_ZOOM_100, G_CALLBACK(view_zoom_1_1_cb), vw); | |
1272 menu_item_add_stock(menu, _("Fit image to _window"), GTK_STOCK_ZOOM_FIT, G_CALLBACK(view_zoom_fit_cb), vw); | |
1273 menu_item_add_divider(menu); | |
1274 | |
1275 item = submenu_add_edit(menu, NULL, G_CALLBACK(view_edit_cb), vw); | |
1276 menu_item_add_divider(item); | |
1277 menu_item_add(item, _("Set as _wallpaper"), G_CALLBACK(view_wallpaper_cb), vw); | |
1278 | |
1279 submenu_add_alter(menu, G_CALLBACK(view_alter_cb), vw); | |
1280 | |
1281 menu_item_add_stock(menu, _("_Properties"), GTK_STOCK_PROPERTIES, G_CALLBACK(view_info_cb), vw); | |
1282 | |
1283 menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(view_new_window_cb), vw); | |
368
95fe470440ad
New Go to directory view feature that permits to find and display the directory
zas_
parents:
358
diff
changeset
|
1284 item = menu_item_add(menu, _("_Go to directory view"), G_CALLBACK(view_set_layout_path_cb), vw); |
9 | 1285 |
1286 menu_item_add_divider(menu); | |
1287 menu_item_add_stock(menu, _("_Copy..."), GTK_STOCK_COPY, G_CALLBACK(view_copy_cb), vw); | |
1288 menu_item_add(menu, _("_Move..."), G_CALLBACK(view_move_cb), vw); | |
1289 menu_item_add(menu, _("_Rename..."), G_CALLBACK(view_rename_cb), vw); | |
1290 menu_item_add_stock(menu, _("_Delete..."), GTK_STOCK_DELETE, G_CALLBACK(view_delete_cb), vw); | |
497 | 1291 if (options->show_copy_path) |
1292 menu_item_add(menu, _("_Copy path"), G_CALLBACK(view_copy_path_cb), vw); | |
9 | 1293 |
1294 menu_item_add_divider(menu); | |
1295 | |
1296 if (vw->ss) | |
1297 { | |
1298 menu_item_add(menu, _("_Stop slideshow"), G_CALLBACK(view_slideshow_stop_cb), vw); | |
1299 if (slideshow_paused(vw->ss)) | |
1300 { | |
1301 item = menu_item_add(menu, _("Continue slides_how"), | |
1302 G_CALLBACK(view_slideshow_pause_cb), vw); | |
1303 } | |
1304 else | |
1305 { | |
1306 item = menu_item_add(menu, _("Pause slides_how"), | |
1307 G_CALLBACK(view_slideshow_pause_cb), vw); | |
1308 } | |
1309 } | |
1310 else | |
1311 { | |
1312 item = menu_item_add(menu, _("_Start slideshow"), G_CALLBACK(view_slideshow_start_cb), vw); | |
1313 gtk_widget_set_sensitive(item, (vw->list != NULL) || view_window_contains_collection(vw)); | |
1314 item = menu_item_add(menu, _("Pause slides_how"), G_CALLBACK(view_slideshow_pause_cb), vw); | |
1315 gtk_widget_set_sensitive(item, FALSE); | |
1316 } | |
1317 | |
1318 if (vw->fs) | |
1319 { | |
1320 menu_item_add(menu, _("Exit _full screen"), G_CALLBACK(view_fullscreen_cb), vw); | |
1321 } | |
1322 else | |
1323 { | |
1324 menu_item_add(menu, _("_Full screen"), G_CALLBACK(view_fullscreen_cb), vw); | |
1325 } | |
1326 | |
1327 menu_item_add_divider(menu); | |
1328 menu_item_add_stock(menu, _("C_lose window"), GTK_STOCK_CLOSE, G_CALLBACK(view_close_cb), vw); | |
1329 | |
1330 return menu; | |
1331 } | |
1332 | |
1333 /* | |
1334 *------------------------------------------------------------------- | |
1335 * dnd confirm dir | |
1336 *------------------------------------------------------------------- | |
1337 */ | |
1338 | |
1339 typedef struct { | |
1340 ViewWindow *vw; | |
1341 GList *list; | |
1342 } CViewConfirmD; | |
1343 | |
1344 static void view_dir_list_cancel(GtkWidget *widget, gpointer data) | |
1345 { | |
1346 /* do nothing */ | |
1347 } | |
1348 | |
1349 static void view_dir_list_do(ViewWindow *vw, GList *list, gint skip, gint recurse) | |
1350 { | |
1351 GList *work; | |
1352 | |
1353 view_window_set_list(vw, NULL); | |
1354 | |
1355 work = list; | |
1356 while (work) | |
1357 { | |
138 | 1358 FileData *fd = work->data; |
9 | 1359 work = work->next; |
1360 | |
138 | 1361 if (isdir(fd->path)) |
9 | 1362 { |
1363 if (!skip) | |
1364 { | |
1365 GList *list = NULL; | |
1366 | |
1367 if (recurse) | |
1368 { | |
138 | 1369 list = filelist_recursive(fd->path); |
9 | 1370 } |
1371 else | |
138 | 1372 { /*FIXME */ |
1373 filelist_read(fd->path, &list, NULL); | |
1374 list = filelist_sort_path(list); | |
1375 list = filelist_filter(list, FALSE); | |
9 | 1376 } |
1377 if (list) vw->list = g_list_concat(vw->list, list); | |
1378 } | |
1379 } | |
1380 else | |
1381 { | |
1382 /* FIXME: no filtering here */ | |
138 | 1383 vw->list = g_list_append(vw->list, file_data_ref(fd)); |
9 | 1384 } |
1385 } | |
1386 | |
1387 if (vw->list) | |
1388 { | |
138 | 1389 FileData *fd; |
9 | 1390 |
1391 vw->list_pointer = vw->list; | |
138 | 1392 fd = vw->list->data; |
334 | 1393 image_change_fd(vw->imd, fd, image_zoom_get_default(vw->imd, options->image.zoom_mode)); |
9 | 1394 |
1395 work = vw->list->next; | |
334 | 1396 if (options->image.enable_read_ahead && work) |
9 | 1397 { |
138 | 1398 fd = work->data; |
1399 image_prebuffer_set(vw->imd, fd); | |
9 | 1400 } |
1401 } | |
1402 else | |
1403 { | |
334 | 1404 image_change_fd(vw->imd, NULL, image_zoom_get_default(vw->imd, options->image.zoom_mode)); |
9 | 1405 } |
1406 } | |
1407 | |
1408 static void view_dir_list_add(GtkWidget *widget, gpointer data) | |
1409 { | |
1410 CViewConfirmD *d = data; | |
1411 view_dir_list_do(d->vw, d->list, FALSE, FALSE); | |
1412 } | |
1413 | |
1414 static void view_dir_list_recurse(GtkWidget *widget, gpointer data) | |
1415 { | |
1416 CViewConfirmD *d = data; | |
1417 view_dir_list_do(d->vw, d->list, FALSE, TRUE); | |
1418 } | |
1419 | |
1420 static void view_dir_list_skip(GtkWidget *widget, gpointer data) | |
1421 { | |
1422 CViewConfirmD *d = data; | |
1423 view_dir_list_do(d->vw, d->list, TRUE, FALSE); | |
1424 } | |
1425 | |
1426 static void view_dir_list_destroy(GtkWidget *widget, gpointer data) | |
1427 { | |
1428 CViewConfirmD *d = data; | |
442 | 1429 filelist_free(d->list); |
1430 g_free(d); | |
9 | 1431 } |
1432 | |
1433 static GtkWidget *view_confirm_dir_list(ViewWindow *vw, GList *list) | |
1434 { | |
1435 GtkWidget *menu; | |
1436 CViewConfirmD *d; | |
1437 | |
1438 d = g_new(CViewConfirmD, 1); | |
1439 d->vw = vw; | |
1440 d->list = list; | |
1441 | |
1442 menu = popup_menu_short_lived(); | |
1443 g_signal_connect(G_OBJECT(menu), "destroy", | |
1444 G_CALLBACK(view_dir_list_destroy), d); | |
1445 | |
1446 menu_item_add_stock(menu, _("Dropped list includes folders."), GTK_STOCK_DND_MULTIPLE, NULL, NULL); | |
1447 menu_item_add_divider(menu); | |
1448 menu_item_add_stock(menu, _("_Add contents"), GTK_STOCK_OK, G_CALLBACK(view_dir_list_add), d); | |
1449 menu_item_add_stock(menu, _("Add contents _recursive"), GTK_STOCK_ADD, G_CALLBACK(view_dir_list_recurse), d); | |
1450 menu_item_add_stock(menu, _("_Skip folders"), GTK_STOCK_REMOVE, G_CALLBACK(view_dir_list_skip), d); | |
1451 menu_item_add_divider(menu); | |
1452 menu_item_add_stock(menu, _("Cancel"), GTK_STOCK_CANCEL, G_CALLBACK(view_dir_list_cancel), d); | |
1453 | |
1454 return menu; | |
1 | 1455 } |
1456 | |
9 | 1457 /* |
1458 *----------------------------------------------------------------------------- | |
1459 * image drag and drop routines | |
1460 *----------------------------------------------------------------------------- | |
1461 */ | |
1462 | |
1463 static void view_window_get_dnd_data(GtkWidget *widget, GdkDragContext *context, | |
1464 gint x, gint y, | |
1465 GtkSelectionData *selection_data, guint info, | |
1466 guint time, gpointer data) | |
1 | 1467 { |
9 | 1468 ViewWindow *vw = data; |
1469 ImageWindow *imd; | |
1470 | |
23
17acca639a86
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
9
diff
changeset
|
1471 if (gtk_drag_get_source_widget(context) == vw->imd->pr) return; |
9 | 1472 |
1473 imd = vw->imd; | |
1474 | |
1475 if (info == TARGET_URI_LIST || info == TARGET_APP_COLLECTION_MEMBER) | |
1476 { | |
1477 CollectionData *source; | |
1478 GList *list; | |
1479 GList *info_list; | |
1480 | |
1481 if (info == TARGET_URI_LIST) | |
1482 { | |
1483 GList *work; | |
1484 | |
138 | 1485 list = uri_filelist_from_text((gchar *)selection_data->data, TRUE); |
9 | 1486 |
1487 work = list; | |
1488 while (work) | |
1489 { | |
138 | 1490 FileData *fd = work->data; |
1491 if (isdir(fd->path)) | |
9 | 1492 { |
1493 GtkWidget *menu; | |
1494 menu = view_confirm_dir_list(vw, list); | |
1495 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, time); | |
1496 return; | |
1497 } | |
1498 work = work->next; | |
1499 } | |
1500 | |
138 | 1501 list = filelist_filter(list, FALSE); |
9 | 1502 |
1503 source = NULL; | |
1504 info_list = NULL; | |
1505 } | |
1506 else | |
1507 { | |
1508 source = collection_from_dnd_data((gchar *)selection_data->data, &list, &info_list); | |
1509 } | |
1510 | |
1511 if (list) | |
1512 { | |
138 | 1513 FileData *fd; |
9 | 1514 |
138 | 1515 fd = list->data; |
1516 if (isfile(fd->path)) | |
9 | 1517 { |
1518 view_slideshow_stop(vw); | |
1519 view_window_set_list(vw, NULL); | |
1 | 1520 |
9 | 1521 if (source && info_list) |
1522 { | |
334 | 1523 image_change_from_collection(imd, source, info_list->data, image_zoom_get_default(imd, options->image.zoom_mode)); |
9 | 1524 } |
1525 else | |
1526 { | |
1527 if (list->next) | |
1528 { | |
1529 vw->list = list; | |
1530 list = NULL; | |
1531 | |
1532 vw->list_pointer = vw->list; | |
1533 } | |
334 | 1534 image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode)); |
9 | 1535 } |
1536 } | |
1537 } | |
138 | 1538 filelist_free(list); |
9 | 1539 g_list_free(info_list); |
1540 } | |
1541 } | |
1542 | |
1543 static void view_window_set_dnd_data(GtkWidget *widget, GdkDragContext *context, | |
1544 GtkSelectionData *selection_data, guint info, | |
1545 guint time, gpointer data) | |
1546 { | |
1547 ViewWindow *vw = data; | |
138 | 1548 FileData *fd; |
9 | 1549 |
138 | 1550 fd = image_get_fd(vw->imd); |
1 | 1551 |
138 | 1552 if (fd) |
9 | 1553 { |
1554 gchar *text = NULL; | |
1555 gint len; | |
1556 gint plain_text; | |
1557 GList *list; | |
1 | 1558 |
9 | 1559 switch (info) |
1560 { | |
1561 case TARGET_URI_LIST: | |
1562 plain_text = FALSE; | |
1563 break; | |
1564 case TARGET_TEXT_PLAIN: | |
1565 default: | |
1566 plain_text = TRUE; | |
1567 break; | |
1568 } | |
138 | 1569 list = g_list_append(NULL, fd); |
1570 text = uri_text_from_filelist(list, &len, plain_text); | |
9 | 1571 g_list_free(list); |
1572 if (text) | |
1573 { | |
1574 gtk_selection_data_set (selection_data, selection_data->target, | |
64
04ff0df3ad2f
Mon Aug 15 17:13:57 2005 John Ellis <johne@verizon.net>
gqview
parents:
60
diff
changeset
|
1575 8, (guchar *)text, len); |
9 | 1576 g_free(text); |
1577 } | |
1578 } | |
1579 else | |
1580 { | |
1581 gtk_selection_data_set (selection_data, selection_data->target, | |
1582 8, NULL, 0); | |
1583 } | |
1 | 1584 } |
1585 | |
9 | 1586 static void view_window_dnd_init(ViewWindow *vw) |
1587 { | |
1588 ImageWindow *imd; | |
1 | 1589 |
9 | 1590 imd = vw->imd; |
1591 | |
23
17acca639a86
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
9
diff
changeset
|
1592 gtk_drag_source_set(imd->pr, GDK_BUTTON2_MASK, |
9 | 1593 dnd_file_drag_types, dnd_file_drag_types_count, |
1594 GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK); | |
23
17acca639a86
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
9
diff
changeset
|
1595 g_signal_connect(G_OBJECT(imd->pr), "drag_data_get", |
9 | 1596 G_CALLBACK(view_window_set_dnd_data), vw); |
1597 | |
23
17acca639a86
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
9
diff
changeset
|
1598 gtk_drag_dest_set(imd->pr, |
9 | 1599 GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP, |
1600 dnd_file_drop_types, dnd_file_drop_types_count, | |
442 | 1601 GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK); |
23
17acca639a86
##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents:
9
diff
changeset
|
1602 g_signal_connect(G_OBJECT(imd->pr), "drag_data_received", |
9 | 1603 G_CALLBACK(view_window_get_dnd_data), vw); |
1604 } | |
1605 | |
1606 /* | |
1607 *----------------------------------------------------------------------------- | |
1608 * maintenance (for rename, move, remove) | |
1609 *----------------------------------------------------------------------------- | |
1610 */ | |
1611 | |
138 | 1612 static void view_real_removed(ViewWindow *vw, FileData *fd, GList *ignore_list) |
9 | 1613 { |
1614 ImageWindow *imd; | |
138 | 1615 FileData *image_fd; |
9 | 1616 |
1617 imd = view_window_active_image(vw); | |
138 | 1618 image_fd = image_get_fd(imd); |
9 | 1619 |
138 | 1620 if (image_fd && image_fd == fd) |
9 | 1621 { |
1622 if (vw->list) | |
1623 { | |
1624 view_list_step(vw, TRUE); | |
138 | 1625 if (image_get_fd(imd) == image_fd) |
9 | 1626 { |
1627 view_list_step(vw, FALSE); | |
1628 } | |
1629 } | |
1630 else if (view_window_contains_collection(vw)) | |
1631 { | |
1632 view_collection_step(vw, TRUE); | |
138 | 1633 if (image_get_fd(imd) == image_fd) |
9 | 1634 { |
1635 view_collection_step(vw, FALSE); | |
1636 } | |
1637 } | |
138 | 1638 if (image_get_fd(imd) == image_fd) |
9 | 1639 { |
334 | 1640 image_change_fd(imd, NULL, image_zoom_get_default(imd, options->image.zoom_mode)); |
9 | 1641 } |
1642 } | |
1643 | |
1644 if (vw->list) | |
1645 { | |
1646 GList *work; | |
1647 GList *old; | |
1648 | |
1649 old = vw->list_pointer; | |
1650 | |
1651 work = vw->list; | |
1652 while (work) | |
1653 { | |
138 | 1654 FileData *chk_fd; |
9 | 1655 GList *chk_link; |
1656 | |
138 | 1657 chk_fd = work->data; |
9 | 1658 chk_link = work; |
1659 work = work->next; | |
1660 | |
138 | 1661 if (chk_fd == fd) |
9 | 1662 { |
1663 if (vw->list_pointer == chk_link) | |
1664 { | |
1665 vw->list_pointer = (chk_link->next) ? chk_link->next : chk_link->prev; | |
1666 } | |
138 | 1667 vw->list = g_list_remove(vw->list, chk_fd); |
1668 file_data_unref(chk_fd); | |
9 | 1669 } |
1670 } | |
1671 | |
1672 /* handles stepping correctly when same image is in the list more than once */ | |
1673 if (old && old != vw->list_pointer) | |
1674 { | |
138 | 1675 FileData *fd; |
9 | 1676 |
1677 if (vw->list_pointer) | |
1678 { | |
138 | 1679 fd = vw->list_pointer->data; |
9 | 1680 } |
1681 else | |
1682 { | |
138 | 1683 fd = NULL; |
9 | 1684 } |
1685 | |
334 | 1686 image_change_fd(imd, fd, image_zoom_get_default(imd, options->image.zoom_mode)); |
9 | 1687 } |
1688 } | |
1689 | |
117
0c2e1f0a001b
Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents:
94
diff
changeset
|
1690 image_osd_update(imd); |
9 | 1691 } |
1692 | |
138 | 1693 static void view_real_moved(ViewWindow *vw, FileData *fd) |
9 | 1694 { |
138 | 1695 /* |
9 | 1696 ImageWindow *imd; |
1697 const gchar *image_path; | |
1698 | |
1699 imd = view_window_active_image(vw); | |
138 | 1700 */ |
1701 /* | |
9 | 1702 image_path = image_get_path(imd); |
1703 | |
138 | 1704 if (image_path && strcmp(image_path, fd->change->source) == 0) |
9 | 1705 { |
138 | 1706 image_set_fd(imd, dest); |
9 | 1707 } |
138 | 1708 */ |
1709 /* | |
9 | 1710 if (vw->list) |
1711 { | |
1712 GList *work; | |
1713 work = vw->list; | |
1714 while (work) | |
1715 { | |
1716 gchar *chk_path; | |
1717 | |
1718 chk_path = work->data; | |
1719 | |
1720 if (strcmp(chk_path, source) == 0) | |
1721 { | |
1722 work->data = g_strdup(dest); | |
1723 g_free(chk_path); | |
1724 } | |
1725 | |
1726 work = work->next; | |
1727 } | |
1728 } | |
138 | 1729 */ |
9 | 1730 } |
1731 | |
138 | 1732 void view_window_maint_removed(FileData *fd, GList *ignore_list) |
9 | 1733 { |
1734 GList *work = view_window_list; | |
1735 while (work) | |
1736 { | |
1737 ViewWindow *vw = work->data; | |
1738 work = work->next; | |
1739 | |
138 | 1740 view_real_removed(vw, fd, ignore_list); |
9 | 1741 } |
1742 } | |
1743 | |
138 | 1744 void view_window_maint_moved(FileData *fd) |
9 | 1745 { |
1746 GList *work = view_window_list; | |
1747 while (work) | |
1748 { | |
1749 ViewWindow *vw = work->data; | |
1750 work = work->next; | |
1751 | |
138 | 1752 view_real_moved(vw, fd); |
9 | 1753 } |
1754 } |