annotate src/image-overlay.c @ 999:bbed8e9a5d33

Indentation fixes.
author zas_
date Tue, 26 Aug 2008 21:19:33 +0000
parents 6ca2c5fd7b13
children 616b14da08c2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1 /*
196
f6e307c7bad6 rename GQview -> Geeqie over the code
nadvornik
parents: 155
diff changeset
2 * Geeqie
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
3 * (C) 2006 John Ellis
475
48c8e49b571c updated copyright in source files
nadvornik
parents: 469
diff changeset
4 * Copyright (C) 2008 The Geeqie Team
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
5 *
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
6 * Author: John Ellis
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
7 *
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
8 * This software is released under the GNU General Public License (GNU GPL).
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
9 * Please read the included file COPYING for more information.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
10 * This software comes with no warranty of any kind, use at your own risk!
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
11 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
12
281
9995c5fb202a gqview.h -> main.h
zas_
parents: 275
diff changeset
13 #include "main.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
14 #include "image-overlay.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
15
650
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
16 #include "bar_info.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
17 #include "collect.h"
218
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
18 #include "exif.h"
586
905688aa2317 split filelist.c to filefilter.c and filedata.c
nadvornik
parents: 532
diff changeset
19 #include "filedata.h"
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
20 #include "histogram.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
21 #include "image.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
22 #include "img-view.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
23 #include "layout.h"
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
24 #include "pixbuf-renderer.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
25 #include "pixbuf_util.h"
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
26 #include "ui_fileops.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
27
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
28 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
29 *----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
30 * image overlay
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
31 *----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
32 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
33
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
34
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
35 typedef struct _OverlayStateData OverlayStateData;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
36 struct _OverlayStateData {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
37 ImageWindow *imd;
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
38 ImageState changed_states;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
39
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
40 Histogram *histogram;
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
41
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
42 OsdShowFlags show;
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
43
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
44 gint ovl_info;
822
df541dc41707 Allow to set image overlay info position through options:
zas_
parents: 821
diff changeset
45
df541dc41707 Allow to set image overlay info position through options:
zas_
parents: 821
diff changeset
46 gint x;
df541dc41707 Allow to set image overlay info position through options:
zas_
parents: 821
diff changeset
47 gint y;
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
48
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
49 gint icon_time[IMAGE_OSD_COUNT];
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
50 gint icon_id[IMAGE_OSD_COUNT];
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
51
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
52 gint idle_id;
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
53 gint timer_id;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
54 gulong destroy_id;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
55 };
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
56
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
57
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
58 typedef struct _OSDIcon OSDIcon;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
59 struct _OSDIcon {
122
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
60 gint reset; /* reset on new image */
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
61 gint x; /* x, y offset */
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
62 gint y;
122
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
63 gchar *key; /* inline pixbuf */
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
64 };
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
65
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
66 static OSDIcon osd_icons[] = {
122
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
67 { TRUE, 0, 0, NULL }, /* none */
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
68 { TRUE, -10, -10, NULL }, /* auto rotated */
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
69 { TRUE, -10, -10, NULL }, /* user rotated */
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
70 { TRUE, -40, -10, NULL }, /* color embedded */
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
71 { TRUE, -70, -10, NULL }, /* first image */
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
72 { TRUE, -70, -10, NULL }, /* last image */
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
73 { FALSE, -70, -10, NULL }, /* osd enabled */
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
74 { FALSE, 0, 0, NULL }
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
75 };
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
76
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
77 #define OSD_DATA "overlay-data"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
78
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
79 #define IMAGE_OSD_DEFAULT_DURATION 30
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
80
290
4bbde8a38ad4 improved histogram drawing
nadvornik
parents: 281
diff changeset
81 #define HISTOGRAM_HEIGHT 140
620
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
82 #define HISTOGRAM_WIDTH 256
469
a05c72927e23 Rename few functions and replace fullscreen info with image overlay template string.
zas_
parents: 468
diff changeset
83
481
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
84 static void image_osd_timer_schedule(OverlayStateData *osd);
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
85
733
57f759d012c7 Modify set_default_image_overlay_template_string() to accept the pointer to
zas_
parents: 671
diff changeset
86 void set_image_overlay_template_string(gchar **template_string, const gchar *value)
469
a05c72927e23 Rename few functions and replace fullscreen info with image overlay template string.
zas_
parents: 468
diff changeset
87 {
733
57f759d012c7 Modify set_default_image_overlay_template_string() to accept the pointer to
zas_
parents: 671
diff changeset
88 g_assert(template_string);
57f759d012c7 Modify set_default_image_overlay_template_string() to accept the pointer to
zas_
parents: 671
diff changeset
89
57f759d012c7 Modify set_default_image_overlay_template_string() to accept the pointer to
zas_
parents: 671
diff changeset
90 g_free(*template_string);
57f759d012c7 Modify set_default_image_overlay_template_string() to accept the pointer to
zas_
parents: 671
diff changeset
91 *template_string = g_strdup(value);
57f759d012c7 Modify set_default_image_overlay_template_string() to accept the pointer to
zas_
parents: 671
diff changeset
92 }
57f759d012c7 Modify set_default_image_overlay_template_string() to accept the pointer to
zas_
parents: 671
diff changeset
93
57f759d012c7 Modify set_default_image_overlay_template_string() to accept the pointer to
zas_
parents: 671
diff changeset
94
57f759d012c7 Modify set_default_image_overlay_template_string() to accept the pointer to
zas_
parents: 671
diff changeset
95 void set_default_image_overlay_template_string(gchar **template_string)
57f759d012c7 Modify set_default_image_overlay_template_string() to accept the pointer to
zas_
parents: 671
diff changeset
96 {
57f759d012c7 Modify set_default_image_overlay_template_string() to accept the pointer to
zas_
parents: 671
diff changeset
97 set_image_overlay_template_string(template_string, DEFAULT_OVERLAY_INFO);
469
a05c72927e23 Rename few functions and replace fullscreen info with image overlay template string.
zas_
parents: 468
diff changeset
98 }
a05c72927e23 Rename few functions and replace fullscreen info with image overlay template string.
zas_
parents: 468
diff changeset
99
615
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
100 static OverlayStateData *image_get_osd_data(ImageWindow *imd)
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
101 {
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
102 OverlayStateData *osd;
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
103
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
104 if (!imd) return NULL;
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
105
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
106 g_assert(imd->pr);
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
107
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
108 osd = g_object_get_data(G_OBJECT(imd->pr), "IMAGE_OVERLAY_DATA");
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
109 return osd;
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
110 }
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
111
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
112 static void image_set_osd_data(ImageWindow *imd, OverlayStateData *osd)
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
113 {
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
114 g_assert(imd);
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
115 g_assert(imd->pr);
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
116 g_object_set_data(G_OBJECT(imd->pr), "IMAGE_OVERLAY_DATA", osd);
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
117 }
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
118
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
119 /*
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
120 *----------------------------------------------------------------------------
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
121 * image histogram
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
122 *----------------------------------------------------------------------------
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
123 */
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
124
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
125
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
126 void image_osd_histogram_chan_toggle(ImageWindow *imd)
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
127 {
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
128 OverlayStateData *osd = image_get_osd_data(imd);
613
d06f422a6673 image_osd_histogram_chan_toggle(), image_osd_histogram_log_toggle():
zas_
parents: 586
diff changeset
129
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
130 if (!osd || !osd->histogram) return;
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
131
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
132 histogram_set_channel(osd->histogram, (histogram_get_channel(osd->histogram) +1)%HCHAN_COUNT);
613
d06f422a6673 image_osd_histogram_chan_toggle(), image_osd_histogram_log_toggle():
zas_
parents: 586
diff changeset
133 image_osd_update(imd);
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
134 }
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
135
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
136 void image_osd_histogram_log_toggle(ImageWindow *imd)
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
137 {
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
138 OverlayStateData *osd = image_get_osd_data(imd);
613
d06f422a6673 image_osd_histogram_chan_toggle(), image_osd_histogram_log_toggle():
zas_
parents: 586
diff changeset
139
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
140 if (!osd || !osd->histogram) return;
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
141
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
142 histogram_set_mode(osd->histogram, !histogram_get_mode(osd->histogram));
613
d06f422a6673 image_osd_histogram_chan_toggle(), image_osd_histogram_log_toggle():
zas_
parents: 586
diff changeset
143 image_osd_update(imd);
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
144 }
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
145
481
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
146 void image_osd_toggle(ImageWindow *imd)
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
147 {
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
148 OverlayStateData *osd;
503
e5023cced4e5 Fix image overlay displayed only on second "I" press in layout view.
zas_
parents: 483
diff changeset
149
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
150 if (!imd) return;
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
151
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
152 osd = image_get_osd_data(imd);
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
153 if (!osd)
481
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
154 {
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
155 image_osd_set(imd, OSD_SHOW_INFO | OSD_SHOW_STATUS);
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
156 return;
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
157 }
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
158
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
159 if (osd->show != OSD_SHOW_NOTHING)
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
160 {
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
161 if (osd->show & OSD_SHOW_HISTOGRAM)
481
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
162 {
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
163 image_osd_set(imd, OSD_SHOW_NOTHING);
481
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
164 }
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
165 else
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
166 {
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
167 image_osd_set(imd, osd->show | OSD_SHOW_HISTOGRAM);
481
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
168 }
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
169 }
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
170 }
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
171
650
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
172 static gchar *keywords_to_string(FileData *fd)
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
173 {
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
174 GList *keywords;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
175 GString *kwstr = NULL;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
176 gchar *ret = NULL;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
177
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
178 g_assert(fd);
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
179
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
180 if (comment_read(fd, &keywords, NULL))
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
181 {
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
182 GList *work = keywords;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
183
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
184 while (work)
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
185 {
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
186 gchar *kw = work->data;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
187 work = work->next;
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 986
diff changeset
188
650
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
189 if (!kw) continue;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
190 if (!kwstr)
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
191 kwstr = g_string_new("");
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
192 else
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
193 g_string_append(kwstr, ", ");
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
194
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
195 g_string_append(kwstr, kw);
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
196 }
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
197 }
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
198
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
199 if (kwstr)
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
200 {
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
201 ret = kwstr->str;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
202 g_string_free(kwstr, FALSE);
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
203 }
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
204
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
205 return ret;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
206 }
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
207
218
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
208 static gchar *image_osd_mkinfo(const gchar *str, ImageWindow *imd, GHashTable *vars)
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
209 {
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
210 gchar delim = '%', imp = '|', sep[] = " - ";
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
211 gchar *start, *end;
736
a7289f9e8d29 Fix signed vs unsigned warnings.
zas_
parents: 733
diff changeset
212 guint pos, prev;
866
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
213 gboolean want_separator = FALSE;
218
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
214 gchar *name, *data;
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
215 GString *new;
218
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
216 gchar *ret;
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
217
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
218 if (!str || !*str) return g_strdup("");
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
219
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
220 new = g_string_new(str);
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
221
218
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
222 prev = 0;
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
223
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
224 while (TRUE)
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
225 {
736
a7289f9e8d29 Fix signed vs unsigned warnings.
zas_
parents: 733
diff changeset
226 guint limit = 0;
298
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
227 gchar *trunc = NULL;
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
228 gchar *limpos = NULL;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
229 gchar *extra = NULL;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
230 gchar *extrapos = NULL;
298
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
231 gchar *p;
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
232
218
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
233 start = strchr(new->str, delim);
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
234 if (!start)
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
235 break;
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
236 end = strchr(start+1, delim);
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
237 if (!end)
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
238 break;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
239
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
240 /* Search for optionnal modifiers
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
241 * %name:99:extra% -> name = "name", limit=99, extra = "extra"
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
242 */
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
243 for (p = start + 1; p < end; p++)
298
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
244 {
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
245 if (p[0] == ':')
298
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
246 {
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
247 if (g_ascii_isdigit(p[1]) && !limpos)
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
248 {
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
249 limpos = p + 1;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
250 if (!trunc) trunc = p;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
251 }
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
252 else
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
253 {
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
254 extrapos = p + 1;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
255 if (!trunc) trunc = p;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
256 break;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
257 }
298
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
258 }
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
259 }
218
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
260
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
261 if (limpos)
736
a7289f9e8d29 Fix signed vs unsigned warnings.
zas_
parents: 733
diff changeset
262 limit = (guint) atoi(limpos);
298
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
263
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
264 if (extrapos)
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
265 extra = g_strndup(extrapos, end - extrapos);
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
266
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
267 name = g_strndup(start+1, (trunc ? trunc : end)-start-1);
650
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
268 pos = start - new->str;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
269 data = NULL;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
270
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
271 if (strcmp(name, "keywords") == 0)
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
272 {
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
273 data = keywords_to_string(imd->image_fd);
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
274 }
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
275 else if (strcmp(name, "comment") == 0)
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
276 {
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
277 comment_read(imd->image_fd, NULL, &data);
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
278 }
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
279 else
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
280 {
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 986
diff changeset
281 /*
865
8d0c91a0f461 do not read keywords and comment between exif_read_fd and exif_free_fd
nadvornik
parents: 862
diff changeset
282 keywords and comment can't be read between exif_read_fd and exif_free_fd calls
8d0c91a0f461 do not read keywords and comment between exif_read_fd and exif_free_fd
nadvornik
parents: 862
diff changeset
283 because fd->exif does not count references
8d0c91a0f461 do not read keywords and comment between exif_read_fd and exif_free_fd
nadvornik
parents: 862
diff changeset
284 on the other hand, it is OK to call it in the loop because it is cached
8d0c91a0f461 do not read keywords and comment between exif_read_fd and exif_free_fd
nadvornik
parents: 862
diff changeset
285 */
8d0c91a0f461 do not read keywords and comment between exif_read_fd and exif_free_fd
nadvornik
parents: 862
diff changeset
286
8d0c91a0f461 do not read keywords and comment between exif_read_fd and exif_free_fd
nadvornik
parents: 862
diff changeset
287 ExifData *exif;
8d0c91a0f461 do not read keywords and comment between exif_read_fd and exif_free_fd
nadvornik
parents: 862
diff changeset
288 exif = exif_read_fd(imd->image_fd);
8d0c91a0f461 do not read keywords and comment between exif_read_fd and exif_free_fd
nadvornik
parents: 862
diff changeset
289
650
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
290 data = g_strdup(g_hash_table_lookup(vars, name));
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
291 if (data && strcmp(name, "zoom") == 0) imd->overlay_show_zoom = TRUE;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
292 if (!data && exif)
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
293 data = exif_get_data_as_text(exif, name);
865
8d0c91a0f461 do not read keywords and comment between exif_read_fd and exif_free_fd
nadvornik
parents: 862
diff changeset
294 exif_free_fd(imd->image_fd, exif);
650
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
295 }
866
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
296
299
49eaa6463492 Do not display ... if not truncated.
zas_
parents: 298
diff changeset
297 if (data && *data && limit > 0 && strlen(data) > limit + 3)
298
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
298 {
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
299 gchar *new_data = g_strdup_printf("%-*.*s...", limit, limit, data);
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
300 g_free(data);
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
301 data = new_data;
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
302 }
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
303
483
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
304 if (data)
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
305 {
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
306 /* Since we use pango markup to display, we need to escape here */
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
307 gchar *escaped = g_markup_escape_text(data, -1);
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
308 g_free(data);
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
309 data = escaped;
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
310 }
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
311
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
312 if (extra)
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
313 {
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
314 if (data && *data)
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
315 {
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
316 /* Display data between left and right parts of extra string
752
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
317 * the data is expressed by a '*' character. A '*' may be escaped
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 986
diff changeset
318 * by a \. You should escape all '*' characters, do not rely on the
752
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
319 * current implementation which only replaces the first unescaped '*'.
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
320 * If no "*" is present, the extra string is just appended to data string.
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
321 * Pango mark up is accepted in left and right parts.
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
322 * Any \n is replaced by a newline
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
323 * Examples:
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
324 * "<i>*</i>\n" -> data is displayed in italics ended with a newline
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
325 * "\n" -> ended with newline
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
326 * "ISO *" -> prefix data with "ISO " (ie. "ISO 100")
752
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
327 * "\**\*" -> prefix data with a star, and append a star (ie. "*100*")
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
328 * "\\*" -> prefix data with an anti slash (ie "\100")
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
329 * "Collection <b>*</b>\n" -> display data in bold prefixed by "Collection " and a newline is appended
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
330 *
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
331 * FIXME: using background / foreground colors lead to weird results.
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
332 */
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
333 gchar *new_data;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
334 gchar *left = NULL;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
335 gchar *right = extra;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
336 gchar *p;
736
a7289f9e8d29 Fix signed vs unsigned warnings.
zas_
parents: 733
diff changeset
337 guint len = strlen(extra);
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
338
752
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
339 /* Search for left and right parts and unescape characters */
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
340 for (p = extra; *p; p++, len--)
752
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
341 if (p[0] == '\\')
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
342 {
752
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
343 if (p[1] == 'n')
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
344 {
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
345 memmove(p+1, p+2, --len);
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
346 p[0] = '\n';
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
347 }
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
348 else if (p[1] != '\0')
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
349 memmove(p, p+1, len--); // includes \0
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
350 }
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
351 else if (p[0] == '*' && !left)
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
352 {
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
353 right = p + 1;
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
354 left = extra;
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
355 }
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
356
752
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
357 if (left) right[-1] = '\0';
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
358
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
359 new_data = g_strdup_printf("%s%s%s", left ? left : "", data, right);
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
360 g_free(data);
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
361 data = new_data;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
362 }
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
363 g_free(extra);
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 986
diff changeset
364 }
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
365
218
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
366 g_string_erase(new, pos, end-start+1);
866
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
367 if (data && *data)
218
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
368 {
866
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
369 if (want_separator)
218
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
370 {
866
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
371 /* insert separator */
218
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
372 g_string_insert(new, pos, sep);
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
373 pos += strlen(sep);
986
533694a9675c Fix another missing separator bug in image overlay. This one was occuring with default string when no ISO data was available from exif.
zas_
parents: 963
diff changeset
374 want_separator = FALSE;
218
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
375 }
866
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
376
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
377 g_string_insert(new, pos, data);
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
378 pos += strlen(data);
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
379 }
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
380
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
381 if (pos-prev >= 1 && new->str[pos] == imp)
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
382 {
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
383 /* pipe character is replaced by a separator, delete it
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
384 * and raise a flag if needed */
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
385 g_string_erase(new, pos--, 1);
986
533694a9675c Fix another missing separator bug in image overlay. This one was occuring with default string when no ISO data was available from exif.
zas_
parents: 963
diff changeset
386 want_separator |= (data && *data);
866
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
387 }
986
533694a9675c Fix another missing separator bug in image overlay. This one was occuring with default string when no ISO data was available from exif.
zas_
parents: 963
diff changeset
388
533694a9675c Fix another missing separator bug in image overlay. This one was occuring with default string when no ISO data was available from exif.
zas_
parents: 963
diff changeset
389 if (new->str[pos] == '\n') want_separator = FALSE;
533694a9675c Fix another missing separator bug in image overlay. This one was occuring with default string when no ISO data was available from exif.
zas_
parents: 963
diff changeset
390
866
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
391 prev = pos - 1;
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
392
218
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
393 g_free(name);
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
394 g_free(data);
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
395 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
396
218
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
397 /* search and destroy empty lines */
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
398 end = new->str;
245
62f2f8f7cb2d Add parenthesis around affection to clear a gcc warning.
zas_
parents: 218
diff changeset
399 while ((start = strchr(end, '\n')))
218
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
400 {
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
401 end = start;
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
402 while (*++(end) == '\n')
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
403 ;
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
404 g_string_erase(new, start-new->str, end-start-1);
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
405 }
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
406
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
407 g_strchomp(new->str);
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
408
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
409 ret = new->str;
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
410 g_string_free(new, FALSE);
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
411
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
412 return ret;
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
413 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
414
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
415 typedef enum {
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
416 OSDT_NONE = 0,
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
417 OSDT_FREE = 1 << 0,
963
323dab9321bb Fix double escaping of image overlay text.
zas_
parents: 888
diff changeset
418 OSDT_NO_DUP = 1 << 1
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
419 } OsdTemplateFlags;
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
420
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
421 static void osd_template_insert(GHashTable *vars, gchar *keyword, gchar *value, OsdTemplateFlags flags)
861
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
422 {
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
423 if (!value)
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
424 {
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
425 g_hash_table_insert(vars, keyword, g_strdup(""));
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
426 return;
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
427 }
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
428
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
429 if (flags & OSDT_NO_DUP)
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
430 {
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
431 g_hash_table_insert(vars, keyword, value);
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
432 return;
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
433 }
963
323dab9321bb Fix double escaping of image overlay text.
zas_
parents: 888
diff changeset
434 else
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
435 {
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
436 g_hash_table_insert(vars, keyword, g_strdup(value));
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
437 }
861
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
438
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
439 if (flags & OSDT_FREE) g_free((gpointer) value);
861
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
440 }
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
441
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
442 static GdkPixbuf *image_osd_info_render(OverlayStateData *osd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
443 {
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
444 GdkPixbuf *pixbuf = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
445 gint width, height;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
446 PangoLayout *layout;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
447 const gchar *name;
275
dc69ea2dcf76 fixed histogram label
nadvornik
parents: 273
diff changeset
448 gchar *text;
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
449 GdkPixbuf *imgpixbuf = NULL;
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
450 gboolean with_hist;
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 986
diff changeset
451 ImageWindow *imd = osd->imd;
617
aa883b6d2ef6 image_osd_info_render(): if there's no fd, just return.
zas_
parents: 616
diff changeset
452 FileData *fd = image_get_fd(imd);
aa883b6d2ef6 image_osd_info_render(): if there's no fd, just return.
zas_
parents: 616
diff changeset
453
aa883b6d2ef6 image_osd_info_render(): if there's no fd, just return.
zas_
parents: 616
diff changeset
454 if (!fd) return NULL;
218
f4a0555794a9 Customizable info overlay in fullscreen, based on the patch posted to gqview-devel list by Timo on 2007-09-10.
zas_
parents: 216
diff changeset
455
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
456 name = image_get_name(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
457 if (name)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
458 {
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
459 gint n, t;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
460 CollectionData *cd;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
461 CollectInfo *info;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
462 GHashTable *vars;
861
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
463
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
464 vars = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
465
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
466 cd = image_get_collection(imd, &info);
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
467 if (cd)
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
468 {
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
469 t = g_list_length(cd->list);
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
470 n = g_list_index(cd->list, info) + 1;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
471 if (cd->name)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
472 {
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
473 if (file_extension_match(cd->name, GQ_COLLECTION_EXT))
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
474 osd_template_insert(vars, "collection", remove_extension_from_path(cd->name), OSDT_FREE);
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
475 else
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
476 osd_template_insert(vars, "collection", cd->name, OSDT_NONE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
477 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
478 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
479 {
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
480 osd_template_insert(vars, "collection", _("Untitled"), OSDT_NONE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
481 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
482 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
483 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
484 {
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
485 LayoutWindow *lw = layout_find_by_image(imd);
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
486 if (lw)
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
487 {
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
488 if (lw->slideshow)
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
489 {
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
490 n = g_list_length(lw->slideshow->list_done);
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
491 t = n + g_list_length(lw->slideshow->list);
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
492 if (n == 0) n = t;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
493 }
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
494 else
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
495 {
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
496 t = layout_list_count(lw, NULL);
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
497 n = layout_list_get_index(lw, image_get_fd(lw->image)) + 1;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
498 }
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
499 }
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
500 else if (view_window_find_image(imd, &n, &t))
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
501 {
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
502 n++;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
503 }
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
504 else
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
505 {
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
506 t = 1;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
507 n = 1;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
508 }
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
509
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
510 if (n < 1) n = 1;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
511 if (t < 1) t = 1;
480
805c3258d228 Make histogram depends on image window not layout window.
zas_
parents: 475
diff changeset
512
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
513 osd_template_insert(vars, "collection", NULL, OSDT_NONE);
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
514 }
861
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
515
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
516 osd_template_insert(vars, "number", g_strdup_printf("%d", n), OSDT_NO_DUP);
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
517 osd_template_insert(vars, "total", g_strdup_printf("%d", t), OSDT_NO_DUP);
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
518 osd_template_insert(vars, "name", (gchar *) name, OSDT_NONE);
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 986
diff changeset
519 osd_template_insert(vars, "date", imd->image_fd ? ((gchar *) text_from_time(imd->image_fd->date)) : "", OSDT_NONE);
888
d8e1e820cee7 reload changed images
nadvornik
parents: 887
diff changeset
520 osd_template_insert(vars, "size", imd->image_fd ? (text_from_size_abrev(imd->image_fd->size)) : g_strdup(""), OSDT_FREE);
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
521 osd_template_insert(vars, "zoom", image_zoom_get_as_text(imd), OSDT_FREE);
861
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
522
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
523 if (!imd->unknown)
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
524 {
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
525 gint w, h;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
526
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
527 if (imd->delay_flip &&
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
528 imd->il && imd->il->pixbuf &&
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
529 image_get_pixbuf(imd) != imd->il->pixbuf)
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
530 {
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
531 w = gdk_pixbuf_get_width(imd->il->pixbuf);
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
532 h = gdk_pixbuf_get_height(imd->il->pixbuf);
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
533 imgpixbuf = imd->il->pixbuf;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
534 }
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
535 else
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
536 {
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
537 image_get_image_size(imd, &w, &h);
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
538 imgpixbuf = (PIXBUF_RENDERER(imd->pr))->pixbuf;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
539 }
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
540
861
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
541
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
542 osd_template_insert(vars, "width", g_strdup_printf("%d", w), OSDT_NO_DUP);
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
543 osd_template_insert(vars, "height", g_strdup_printf("%d", h), OSDT_NO_DUP);
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
544 osd_template_insert(vars, "res", g_strdup_printf("%d × %d", w, h), OSDT_FREE);
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
545 }
861
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
546 else
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
547 {
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
548 osd_template_insert(vars, "width", NULL, OSDT_NONE);
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
549 osd_template_insert(vars, "height", NULL, OSDT_NONE);
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
550 osd_template_insert(vars, "res", NULL, OSDT_NONE);
861
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
551 }
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
552
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
553 text = image_osd_mkinfo(options->image_overlay.common.template_string, imd, vars);
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
554 g_hash_table_destroy(vars);
415
4f7362028062 Add zoom ratio display to OSD in fullscreen mode.
zas_
parents: 411
diff changeset
555
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
556 } else {
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
557 /* When does this occur ?? */
861
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
558 text = g_markup_escape_text(_("Untitled"), -1);
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
559 }
132
661cd91e5a7e First implementation of marks for all photos.
bruclik
parents: 122
diff changeset
560
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
561 with_hist = (imgpixbuf && (osd->show & OSD_SHOW_HISTOGRAM) && osd->histogram && (!imd->il || imd->il->done));
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
562
133
532c42d5ed4d compilation fix
bruclik
parents: 132
diff changeset
563 {
265
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
564 gint active_marks = 0;
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
565 gint mark;
275
dc69ea2dcf76 fixed histogram label
nadvornik
parents: 273
diff changeset
566 gchar *text2;
263
c7fefb0a4b78 Display marks in overlay info only if at least one is set.
zas_
parents: 245
diff changeset
567
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
568 for (mark = 0; mark < FILEDATA_MARKS_SIZE; mark++)
263
c7fefb0a4b78 Display marks in overlay info only if at least one is set.
zas_
parents: 245
diff changeset
569 {
800
a25b228978a0 various notification improvements
nadvornik
parents: 783
diff changeset
570 active_marks += file_data_get_mark(fd, mark);
265
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
571 }
263
c7fefb0a4b78 Display marks in overlay info only if at least one is set.
zas_
parents: 245
diff changeset
572
265
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
573 if (active_marks > 0)
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
574 {
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
575 GString *buf = g_string_sized_new(FILEDATA_MARKS_SIZE * 2);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
576
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
577 for (mark = 0; mark < FILEDATA_MARKS_SIZE; mark++)
265
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
578 {
800
a25b228978a0 various notification improvements
nadvornik
parents: 783
diff changeset
579 g_string_append_printf(buf, file_data_get_mark(fd, mark) ? " <span background='#FF00FF'>%c</span>" : " %c", '1' + mark);
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 986
diff changeset
580 }
265
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
581
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
582 if (*text)
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
583 text2 = g_strdup_printf("%s\n%s", text, buf->str);
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
584 else
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
585 text2 = g_strdup(buf->str);
265
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
586 g_string_free(buf, TRUE);
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
587 g_free(text);
275
dc69ea2dcf76 fixed histogram label
nadvornik
parents: 273
diff changeset
588 text = text2;
265
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
589 }
275
dc69ea2dcf76 fixed histogram label
nadvornik
parents: 273
diff changeset
590
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 986
diff changeset
591 if (with_hist)
290
4bbde8a38ad4 improved histogram drawing
nadvornik
parents: 281
diff changeset
592 {
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
593 gchar *escaped_histogram_label = g_markup_escape_text(histogram_label(osd->histogram), -1);
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
594 if (*text)
483
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
595 text2 = g_strdup_printf("%s\n%s", text, escaped_histogram_label);
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
596 else
483
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
597 text2 = g_strdup(escaped_histogram_label);
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
598 g_free(escaped_histogram_label);
290
4bbde8a38ad4 improved histogram drawing
nadvornik
parents: 281
diff changeset
599 g_free(text);
4bbde8a38ad4 improved histogram drawing
nadvornik
parents: 281
diff changeset
600 text = text2;
4bbde8a38ad4 improved histogram drawing
nadvornik
parents: 281
diff changeset
601 }
155
d06bccc7551e show active marks in image overlay
nadvornik
parents: 133
diff changeset
602 }
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
603
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
604 layout = gtk_widget_create_pango_layout(imd->pr, NULL);
275
dc69ea2dcf76 fixed histogram label
nadvornik
parents: 273
diff changeset
605 pango_layout_set_markup(layout, text, -1);
dc69ea2dcf76 fixed histogram label
nadvornik
parents: 273
diff changeset
606 g_free(text);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
607
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
608 pango_layout_get_pixel_size(layout, &width, &height);
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
609 /* with empty text width is set to 0, but not height) */
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
610 if (width == 0)
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
611 height = 0;
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
612 else if (height == 0)
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
613 width = 0;
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
614 if (width > 0) width += 10;
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
615 if (height > 0) height += 10;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
616
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
617 if (with_hist)
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
618 {
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
619 histogram_read(osd->histogram, imgpixbuf);
620
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
620 if (width < HISTOGRAM_WIDTH + 10) width = HISTOGRAM_WIDTH + 10;
290
4bbde8a38ad4 improved histogram drawing
nadvornik
parents: 281
diff changeset
621 height += HISTOGRAM_HEIGHT + 5;
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
622 }
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
623
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
624 if (width > 0 && height > 0)
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
625 {
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
626 /* TODO: make osd color configurable --Zas */
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
627 pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, width, height);
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
628 pixbuf_set_rect_fill(pixbuf, 3, 3, width-6, height-6, 240, 240, 240, 210);
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
629 pixbuf_set_rect(pixbuf, 0, 0, width, height, 240, 240, 240, 80, 1, 1, 1, 1);
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
630 pixbuf_set_rect(pixbuf, 1, 1, width-2, height-2, 240, 240, 240, 130, 1, 1, 1, 1);
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
631 pixbuf_set_rect(pixbuf, 2, 2, width-4, height-4, 240, 240, 240, 180, 1, 1, 1, 1);
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
632 pixbuf_pixel_set(pixbuf, 0, 0, 0, 0, 0, 0);
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
633 pixbuf_pixel_set(pixbuf, width - 1, 0, 0, 0, 0, 0);
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
634 pixbuf_pixel_set(pixbuf, 0, height - 1, 0, 0, 0, 0);
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
635 pixbuf_pixel_set(pixbuf, width - 1, height - 1, 0, 0, 0, 0);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
636
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
637 if (with_hist)
620
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
638 {
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
639 gint x = 5;
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
640 gint y = height - HISTOGRAM_HEIGHT - 5;
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
641 gint w = width - 10;
760
649b44dd558b Fix histogram grid - patch by Uwe Ohse
nadvornik
parents: 752
diff changeset
642 float xoffset = 0;
620
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
643 gint subdiv = 5;
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
644 gint c = 160;
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
645 gint alpha = 250;
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
646 gint i;
760
649b44dd558b Fix histogram grid - patch by Uwe Ohse
nadvornik
parents: 752
diff changeset
647 float add = w / (float)subdiv;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
648
620
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
649 for (i = 0; i < subdiv; i++)
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
650 {
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
651 gint d = (i > 0 ? 0 : 1);
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
652
760
649b44dd558b Fix histogram grid - patch by Uwe Ohse
nadvornik
parents: 752
diff changeset
653 pixbuf_set_rect(pixbuf, x + xoffset + 0.5, y, add + d + 0.5, HISTOGRAM_HEIGHT, c, c, c, alpha, d, 1, 1, 1);
649b44dd558b Fix histogram grid - patch by Uwe Ohse
nadvornik
parents: 752
diff changeset
654 xoffset += add+d;
620
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
655 }
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
656
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
657 histogram_draw(osd->histogram, pixbuf, x, y, w, HISTOGRAM_HEIGHT);
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
658 }
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
659 pixbuf_draw_layout(pixbuf, layout, imd->pr, 5, 5, 0, 0, 0, 255);
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
660 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
661
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
662 g_object_unref(G_OBJECT(layout));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
663
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
664 return pixbuf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
665 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
666
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
667 static GdkPixbuf *image_osd_icon_pixbuf(ImageOSDFlag flag)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
668 {
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
669 static GdkPixbuf **icons = NULL;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
670 GdkPixbuf *icon = NULL;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
671
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
672 if (!icons) icons = g_new0(GdkPixbuf *, IMAGE_OSD_COUNT);
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
673 if (icons[flag]) return icons[flag];
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
674
122
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
675 if (osd_icons[flag].key)
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
676 {
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
677 icon = pixbuf_inline(osd_icons[flag].key);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
678 }
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
679
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
680 if (!icon)
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
681 {
122
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
682 icon = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 24, 24);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
683 pixbuf_set_rect_fill(icon, 1, 1, 22, 22, 255, 255, 255, 200);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
684 pixbuf_set_rect(icon, 0, 0, 24, 24, 0, 0, 0, 128, 1, 1, 1, 1);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
685 switch (flag)
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
686 {
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
687 case IMAGE_OSD_ROTATE_AUTO:
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
688 pixbuf_set_rect(icon, 3, 8, 11, 12,
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
689 0, 0, 0, 255,
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
690 3, 0, 3, 0);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
691 pixbuf_draw_triangle(icon, 14, 3, 6, 12,
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
692 20, 9, 14, 15, 14, 3,
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
693 0, 0, 0, 255);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
694 break;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
695 case IMAGE_OSD_ROTATE_USER:
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
696 break;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
697 case IMAGE_OSD_COLOR:
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
698 pixbuf_set_rect_fill(icon, 3, 3, 18, 6, 200, 0, 0, 255);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
699 pixbuf_set_rect_fill(icon, 3, 9, 18, 6, 0, 200, 0, 255);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
700 pixbuf_set_rect_fill(icon, 3, 15, 18, 6, 0, 0, 200, 255);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
701 break;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
702 case IMAGE_OSD_FIRST:
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
703 pixbuf_set_rect(icon, 3, 3, 18, 18, 0, 0, 0, 200, 3, 3, 3, 0);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
704 pixbuf_draw_triangle(icon, 6, 5, 12, 6,
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
705 12, 5, 18, 11, 6, 11,
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
706 0, 0, 0, 255);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
707 break;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
708 case IMAGE_OSD_LAST:
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
709 pixbuf_set_rect(icon, 3, 3, 18, 18, 0, 0, 0, 200, 3, 3, 0, 3);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
710 pixbuf_draw_triangle(icon, 6, 12, 12, 6,
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
711 12, 18, 6, 12, 18, 12,
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
712 0, 0, 0, 255);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
713 break;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
714 case IMAGE_OSD_ICON:
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
715 pixbuf_set_rect_fill(icon, 11, 3, 3, 12, 0, 0, 0, 255);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
716 pixbuf_set_rect_fill(icon, 11, 17, 3, 3, 0, 0, 0, 255);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
717 break;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
718 default:
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
719 break;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
720 }
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
721 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
722
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
723 icons[flag] = icon;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
724
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
725 return icon;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
726 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
727
821
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
728 static gint image_overlay_add(ImageWindow *imd, GdkPixbuf *pixbuf, gint x, gint y,
857
7d387a25b1ec Use flags instead of int parameters for pixbuf_renderer_overlay_add().
zas_
parents: 844
diff changeset
729 OverlayRendererFlags flags)
821
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
730 {
857
7d387a25b1ec Use flags instead of int parameters for pixbuf_renderer_overlay_add().
zas_
parents: 844
diff changeset
731 return pixbuf_renderer_overlay_add((PixbufRenderer *)imd->pr, pixbuf, x, y, flags);
821
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
732 }
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
733
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
734 static void image_overlay_set(ImageWindow *imd, gint id, GdkPixbuf *pixbuf, gint x, gint y)
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
735 {
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
736 pixbuf_renderer_overlay_set((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
737 }
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
738
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
739 #if 0 /* unused for now */
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
740 static gint image_overlay_get(ImageWindow *imd, gint id, GdkPixbuf **pixbuf, gint *x, gint *y)
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
741 {
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
742 return pixbuf_renderer_overlay_get((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
743 }
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
744 #endif
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
745
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
746 static void image_overlay_remove(ImageWindow *imd, gint id)
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
747 {
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
748 pixbuf_renderer_overlay_remove((PixbufRenderer *)imd->pr, id);
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
749 }
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
750
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
751 static void image_osd_icon_show(OverlayStateData *osd, ImageOSDFlag flag)
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
752 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
753 GdkPixbuf *pixbuf;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
754
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
755 if (osd->icon_id[flag]) return;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
756
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
757 pixbuf = image_osd_icon_pixbuf(flag);
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
758 if (!pixbuf) return;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
759
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
760 osd->icon_id[flag] = image_overlay_add(osd->imd, pixbuf,
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
761 osd_icons[flag].x, osd_icons[flag].y,
857
7d387a25b1ec Use flags instead of int parameters for pixbuf_renderer_overlay_add().
zas_
parents: 844
diff changeset
762 OVL_RELATIVE);
118
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
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
765 static void image_osd_icon_hide(OverlayStateData *osd, ImageOSDFlag flag)
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
766 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
767 if (osd->icon_id[flag])
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
768 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
769 image_overlay_remove(osd->imd, osd->icon_id[flag]);
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
770 osd->icon_id[flag] = 0;
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
771 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
772 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
773
886
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
774 static void image_osd_icons_reset_time(OverlayStateData *osd)
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
775 {
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
776 gint i;
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
777
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
778 for (i = 0; i < IMAGE_OSD_COUNT; i++)
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
779 {
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
780 if (osd_icons[i].reset)
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
781 {
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
782 osd->icon_time[i] = 0;
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
783 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
784 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
785 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
786
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
787 static void image_osd_icons_update(OverlayStateData *osd)
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
788 {
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
789 gint i;
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
790
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
791 for (i = 0; i < IMAGE_OSD_COUNT; i++)
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
792 {
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
793 if (osd->icon_time[i] > 0)
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
794 {
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
795 image_osd_icon_show(osd, i);
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
796 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
797 else
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
798 {
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
799 image_osd_icon_hide(osd, i);
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
800 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
801 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
802 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
803
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
804 static void image_osd_icons_hide(OverlayStateData *osd)
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
805 {
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
806 gint i;
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
807
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
808 for (i = 0; i < IMAGE_OSD_COUNT; i++)
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
809 {
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
810 image_osd_icon_hide(osd, i);
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
811 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
812 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
813
887
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
814 static void image_osd_info_show(OverlayStateData *osd, GdkPixbuf *pixbuf)
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
815 {
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
816 if (osd->ovl_info == 0)
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
817 {
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
818 osd->ovl_info = image_overlay_add(osd->imd, pixbuf, osd->x, osd->y, OVL_RELATIVE);
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
819 }
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
820 else
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
821 {
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
822 image_overlay_set(osd->imd, osd->ovl_info, pixbuf, osd->x, osd->y);
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
823 }
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
824 }
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
825
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
826 static void image_osd_info_hide(OverlayStateData *osd)
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
827 {
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
828 if (osd->ovl_info == 0) return;
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
829
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
830 image_overlay_remove(osd->imd, osd->ovl_info);
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
831 osd->ovl_info = 0;
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
832 }
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
833
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
834 static gint image_osd_update_cb(gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
835 {
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
836 OverlayStateData *osd = data;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
837
415
4f7362028062 Add zoom ratio display to OSD in fullscreen mode.
zas_
parents: 411
diff changeset
838 osd->imd->overlay_show_zoom = FALSE;
4f7362028062 Add zoom ratio display to OSD in fullscreen mode.
zas_
parents: 411
diff changeset
839
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
840 if (osd->show & OSD_SHOW_INFO)
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
841 {
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
842 if (osd->changed_states & IMAGE_STATE_IMAGE)
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
843 {
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
844 GdkPixbuf *pixbuf;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
845
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
846 pixbuf = image_osd_info_render(osd);
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
847 if (pixbuf)
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
848 {
887
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
849 image_osd_info_show(osd, pixbuf);
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
850 g_object_unref(pixbuf);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
851 }
887
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
852 else
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
853 {
887
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
854 image_osd_info_hide(osd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
855 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
856 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
857 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
858 else
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
859 {
887
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
860 image_osd_info_hide(osd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
861 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
862
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
863 if (osd->show & OSD_SHOW_STATUS)
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
864 {
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
865 if (osd->changed_states & IMAGE_STATE_IMAGE)
886
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
866 image_osd_icons_reset_time(osd);
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
867
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
868 if (osd->changed_states & IMAGE_STATE_COLOR_ADJ)
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
869 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
870 osd->icon_time[IMAGE_OSD_COLOR] = IMAGE_OSD_DEFAULT_DURATION + 1;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
871 image_osd_timer_schedule(osd);
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
872 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
873
122
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
874 if (osd->changed_states & IMAGE_STATE_ROTATE_AUTO)
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
875 {
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
876 gint n = 0;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
877
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
878 if (osd->imd->state & IMAGE_STATE_ROTATE_AUTO)
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
879 {
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
880 n = 1;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
881 if (!osd->imd->cm) n += IMAGE_OSD_DEFAULT_DURATION;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
882 }
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
883
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
884 osd->icon_time[IMAGE_OSD_ROTATE_AUTO] = n;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
885 image_osd_timer_schedule(osd);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
886 }
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
887
886
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
888 image_osd_icons_update(osd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
889 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
890 else
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
891 {
886
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
892 image_osd_icons_hide(osd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
893 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
894
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
895 if (osd->imd->il && osd->imd->il->done)
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
896 osd->changed_states = IMAGE_STATE_NONE;
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
897 osd->idle_id = -1;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
898 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
899 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
900
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
901 static void image_osd_update_schedule(OverlayStateData *osd, gint force)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
902 {
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
903 if (force) osd->changed_states |= IMAGE_STATE_IMAGE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
904
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
905 if (osd->idle_id == -1)
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
906 {
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
907 osd->idle_id = g_idle_add_full(G_PRIORITY_HIGH, image_osd_update_cb, osd, NULL);
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
908 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
909 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
910
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
911 void image_osd_update(ImageWindow *imd)
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
912 {
615
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
913 OverlayStateData *osd = image_get_osd_data(imd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
914
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
915 if (!osd) return;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
916
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
917 image_osd_update_schedule(osd, TRUE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
918 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
919
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
920 static gint image_osd_timer_cb(gpointer data)
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
921 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
922 OverlayStateData *osd = data;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
923 gint done = TRUE;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
924 gint changed = FALSE;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
925 gint i;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
926
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
927 for (i = 0; i < IMAGE_OSD_COUNT; i++)
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
928 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
929 if (osd->icon_time[i] > 1)
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
930 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
931 osd->icon_time[i]--;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
932 if (osd->icon_time[i] < 2)
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
933 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
934 osd->icon_time[i] = 0;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
935 changed = TRUE;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
936 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
937 else
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
938 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
939 done = FALSE;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
940 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
941 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
942 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
943
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
944 if (changed) image_osd_update_schedule(osd, FALSE);
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
945
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
946 if (done)
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
947 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
948 osd->timer_id = -1;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
949 return FALSE;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
950 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
951
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
952 return TRUE;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
953 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
954
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
955 static void image_osd_timer_schedule(OverlayStateData *osd)
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
956 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
957 if (osd->timer_id == -1)
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
958 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
959 osd->timer_id = g_timeout_add(100, image_osd_timer_cb, osd);
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
960 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
961 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
962
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
963 static void image_osd_state_cb(ImageWindow *imd, ImageState state, gpointer data)
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
964 {
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
965 OverlayStateData *osd = data;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
966
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
967 osd->changed_states |= state;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
968 image_osd_update_schedule(osd, FALSE);
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
969 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
970
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
971 static void image_osd_free(OverlayStateData *osd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
972 {
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
973 if (!osd) return;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
974
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
975 if (osd->idle_id != -1) g_source_remove(osd->idle_id);
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
976 if (osd->timer_id != -1) g_source_remove(osd->timer_id);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
977
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
978 if (osd->imd)
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
979 {
615
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
980 image_set_osd_data(osd->imd, NULL);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
981 g_signal_handler_disconnect(osd->imd->pr, osd->destroy_id);
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
982
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
983 image_set_state_func(osd->imd, NULL, NULL);
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
984
887
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
985 image_osd_info_hide(osd);
886
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
986 image_osd_icons_hide(osd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
987 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
988
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
989 if (osd->histogram) histogram_free(osd->histogram);
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
990
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
991 g_free(osd);
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
992 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
993
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
994 static void image_osd_remove(ImageWindow *imd)
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
995 {
615
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
996 OverlayStateData *osd = image_get_osd_data(imd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
997
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
998 if (osd) image_osd_free(osd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
999 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1000
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1001 static void image_osd_destroy_cb(GtkWidget *widget, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1002 {
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1003 OverlayStateData *osd = data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1004
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1005 osd->imd = NULL;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1006 image_osd_free(osd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1007 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1008
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
1009 static void image_osd_enable(ImageWindow *imd, OsdShowFlags show)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1010 {
615
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
1011 OverlayStateData *osd = image_get_osd_data(imd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1012
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1013 if (!osd)
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1014 {
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1015 osd = g_new0(OverlayStateData, 1);
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1016 osd->imd = imd;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1017 osd->idle_id = -1;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1018 osd->timer_id = -1;
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1019 osd->show = OSD_SHOW_NOTHING;
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1020 osd->histogram = NULL;
822
df541dc41707 Allow to set image overlay info position through options:
zas_
parents: 821
diff changeset
1021 osd->x = options->image_overlay.common.x;
df541dc41707 Allow to set image overlay info position through options:
zas_
parents: 821
diff changeset
1022 osd->y = options->image_overlay.common.y;
df541dc41707 Allow to set image overlay info position through options:
zas_
parents: 821
diff changeset
1023
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1024 osd->destroy_id = g_signal_connect(G_OBJECT(imd->pr), "destroy",
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1025 G_CALLBACK(image_osd_destroy_cb), osd);
615
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
1026 image_set_osd_data(imd, osd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1027
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1028 image_set_state_func(osd->imd, image_osd_state_cb, osd);
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1029 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1030
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1031 if (show & OSD_SHOW_HISTOGRAM)
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1032 osd->histogram = histogram_new();
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1033 else if (osd->histogram)
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1034 {
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1035 histogram_free(osd->histogram);
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1036 osd->histogram = NULL;
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1037 }
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1038
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1039 if (show & OSD_SHOW_STATUS)
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1040 image_osd_icon(imd, IMAGE_OSD_ICON, -1);
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1041
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
1042 if (show != osd->show)
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
1043 image_osd_update_schedule(osd, TRUE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1044
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
1045 osd->show = show;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1046 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1047
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
1048 void image_osd_set(ImageWindow *imd, OsdShowFlags show)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1049 {
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1050 if (!imd) return;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1051
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
1052 if (show == OSD_SHOW_NOTHING)
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1053 {
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1054 image_osd_remove(imd);
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1055 return;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1056 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1057
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
1058 image_osd_enable(imd, show);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1059 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1060
621
734b6b0a3356 image_osd_get() now returns OsdShowFlags.
zas_
parents: 620
diff changeset
1061 OsdShowFlags image_osd_get(ImageWindow *imd)
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1062 {
615
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
1063 OverlayStateData *osd = image_get_osd_data(imd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1064
621
734b6b0a3356 image_osd_get() now returns OsdShowFlags.
zas_
parents: 620
diff changeset
1065 return osd ? osd->show : OSD_SHOW_NOTHING;
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1066 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1067
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1068 /* duration:
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1069 0 = hide
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1070 1 = show
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1071 2+ = show for duration tenths of a second
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1072 -1 = use default duration
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1073 */
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1074 void image_osd_icon(ImageWindow *imd, ImageOSDFlag flag, gint duration)
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1075 {
615
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
1076 OverlayStateData *osd = image_get_osd_data(imd);
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1077
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1078 if (!osd) return;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1079
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1080 if (flag < IMAGE_OSD_NONE || flag >= IMAGE_OSD_COUNT) return;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1081 if (duration < 0) duration = IMAGE_OSD_DEFAULT_DURATION;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1082 if (duration > 1) duration += 1;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1083
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1084 osd->icon_time[flag] = duration;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1085
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1086 image_osd_update_schedule(osd, FALSE);
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1087 image_osd_timer_schedule(osd);
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1088 }