annotate src/image-overlay.c @ 1672:994169573393

Complete commit @1747 (intltool usage) With using intltool the localisation will fail cause of missing desktop.in file. Also the old desktop files are obsoleted by this commit. Also it is not necessary any more to have a './' in front of the files in POTFILES.in.
author mow
date Sat, 27 Jun 2009 22:57:56 +0000
parents 9a081164e6e3
children 6146ec0c9ab9
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
1284
8b89e3ff286b Add year 2009 to copyright info everywhere.
zas_
parents: 1238
diff changeset
4 * Copyright (C) 2008 - 2009 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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
16 #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
17 #include "exif.h"
586
905688aa2317 split filelist.c to filefilter.c and filedata.c
nadvornik
parents: 532
diff changeset
18 #include "filedata.h"
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
19 #include "histogram.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
20 #include "image.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
21 #include "img-view.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
22 #include "layout.h"
1178
f6449c17306b Move comments/keywords read and write stuff to new metadata.{c,h}.
zas_
parents: 1177
diff changeset
23 #include "metadata.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"
1011
616b14da08c2 do not access image_loader directly
nadvornik
parents: 995
diff changeset
27 #include "image-load.h"
9
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 *----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
31 * image overlay
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 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
34
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
35
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
36 typedef struct _OverlayStateData OverlayStateData;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
37 struct _OverlayStateData {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
38 ImageWindow *imd;
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
39 ImageState changed_states;
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
40 NotifyType notify;
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
41
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
42 Histogram *histogram;
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
43
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
44 OsdShowFlags show;
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
45
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
46 gint ovl_info;
822
df541dc41707 Allow to set image overlay info position through options:
zas_
parents: 821
diff changeset
47
df541dc41707 Allow to set image overlay info position through options:
zas_
parents: 821
diff changeset
48 gint x;
df541dc41707 Allow to set image overlay info position through options:
zas_
parents: 821
diff changeset
49 gint y;
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
50
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
51 gint icon_time[IMAGE_OSD_COUNT];
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
52 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
53
1523
24a12aa0cb54 Fix up event source ids type: gint -> guint.
zas_
parents: 1498
diff changeset
54 guint idle_id; /* event source id */
24a12aa0cb54 Fix up event source ids type: gint -> guint.
zas_
parents: 1498
diff changeset
55 guint timer_id; /* event source id */
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
56 gulong destroy_id;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
57 };
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
58
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
59
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
60 typedef struct _OSDIcon OSDIcon;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
61 struct _OSDIcon {
1433
b4ad1d201279 Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents: 1367
diff changeset
62 gboolean reset; /* reset on new image */
122
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
63 gint x; /* x, y offset */
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
64 gint y;
122
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
65 gchar *key; /* inline pixbuf */
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
66 };
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
67
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
68 static OSDIcon osd_icons[] = {
122
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
69 { TRUE, 0, 0, NULL }, /* none */
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
70 { TRUE, -10, -10, NULL }, /* auto rotated */
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
71 { TRUE, -10, -10, NULL }, /* user rotated */
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
72 { TRUE, -40, -10, NULL }, /* color embedded */
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
73 { TRUE, -70, -10, NULL }, /* first image */
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
74 { TRUE, -70, -10, NULL }, /* last image */
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
75 { FALSE, -70, -10, NULL }, /* osd enabled */
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
76 { FALSE, 0, 0, NULL }
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
77 };
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
78
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
79 #define OSD_DATA "overlay-data"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
80
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
81 #define IMAGE_OSD_DEFAULT_DURATION 30
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
82
290
4bbde8a38ad4 improved histogram drawing
nadvornik
parents: 281
diff changeset
83 #define HISTOGRAM_HEIGHT 140
620
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
84 #define HISTOGRAM_WIDTH 256
469
a05c72927e23 Rename few functions and replace fullscreen info with image overlay template string.
zas_
parents: 468
diff changeset
85
481
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
86 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
87
733
57f759d012c7 Modify set_default_image_overlay_template_string() to accept the pointer to
zas_
parents: 671
diff changeset
88 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
89 {
733
57f759d012c7 Modify set_default_image_overlay_template_string() to accept the pointer to
zas_
parents: 671
diff changeset
90 g_assert(template_string);
57f759d012c7 Modify set_default_image_overlay_template_string() to accept the pointer to
zas_
parents: 671
diff changeset
91
57f759d012c7 Modify set_default_image_overlay_template_string() to accept the pointer to
zas_
parents: 671
diff changeset
92 g_free(*template_string);
57f759d012c7 Modify set_default_image_overlay_template_string() to accept the pointer to
zas_
parents: 671
diff changeset
93 *template_string = g_strdup(value);
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
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 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
98 {
57f759d012c7 Modify set_default_image_overlay_template_string() to accept the pointer to
zas_
parents: 671
diff changeset
99 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
100 }
a05c72927e23 Rename few functions and replace fullscreen info with image overlay template string.
zas_
parents: 468
diff changeset
101
615
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
102 static OverlayStateData *image_get_osd_data(ImageWindow *imd)
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 OverlayStateData *osd;
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 if (!imd) return NULL;
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 g_assert(imd->pr);
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
109
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
110 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
111 return osd;
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
112 }
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 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
115 {
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
116 g_assert(imd);
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
117 g_assert(imd->pr);
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
118 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
119 }
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
120
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
121 /*
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 * image histogram
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
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
127
1665
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
128 void image_osd_histogram_toggle_channel(ImageWindow *imd)
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
129 {
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
130 OverlayStateData *osd = image_get_osd_data(imd);
613
d06f422a6673 image_osd_histogram_chan_toggle(), image_osd_histogram_log_toggle():
zas_
parents: 586
diff changeset
131
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
132 if (!osd || !osd->histogram) return;
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
133
1312
fcf0e7a6143e Introduce helpers histogram_toggle_channel() and histogram_toggle_mode().
zas_
parents: 1302
diff changeset
134 histogram_toggle_channel(osd->histogram);
613
d06f422a6673 image_osd_histogram_chan_toggle(), image_osd_histogram_log_toggle():
zas_
parents: 586
diff changeset
135 image_osd_update(imd);
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
136 }
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
137
1665
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
138 void image_osd_histogram_toggle_mode(ImageWindow *imd)
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
139 {
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
140 OverlayStateData *osd = image_get_osd_data(imd);
613
d06f422a6673 image_osd_histogram_chan_toggle(), image_osd_histogram_log_toggle():
zas_
parents: 586
diff changeset
141
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
142 if (!osd || !osd->histogram) return;
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
143
1312
fcf0e7a6143e Introduce helpers histogram_toggle_channel() and histogram_toggle_mode().
zas_
parents: 1302
diff changeset
144 histogram_toggle_mode(osd->histogram);
613
d06f422a6673 image_osd_histogram_chan_toggle(), image_osd_histogram_log_toggle():
zas_
parents: 586
diff changeset
145 image_osd_update(imd);
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
146 }
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
147
1665
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
148 void image_osd_histogram_set_channel(ImageWindow *imd, gint chan)
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
149 {
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
150 OverlayStateData *osd = image_get_osd_data(imd);
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
151
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
152 if (!osd || !osd->histogram) return;
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
153
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
154 histogram_set_channel(osd->histogram, chan);
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
155 image_osd_update(imd);
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
156 }
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
157
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
158 void image_osd_histogram_set_mode(ImageWindow *imd, gint mode)
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
159 {
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
160 OverlayStateData *osd = image_get_osd_data(imd);
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
161
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
162 if (!osd || !osd->histogram) return;
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
163
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
164 histogram_set_mode(osd->histogram, mode);
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
165 image_osd_update(imd);
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
166 }
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
167
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
168 gint image_osd_histogram_get_channel(ImageWindow *imd)
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
169 {
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
170 OverlayStateData *osd = image_get_osd_data(imd);
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
171
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
172 if (!osd || !osd->histogram) return HCHAN_DEFAULT;
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
173
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
174 return histogram_get_channel(osd->histogram);
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
175 }
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
176
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
177 gint image_osd_histogram_get_mode(ImageWindow *imd)
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
178 {
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
179 OverlayStateData *osd = image_get_osd_data(imd);
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
180
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
181 if (!osd || !osd->histogram) return 0;
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
182
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
183 return histogram_get_mode(osd->histogram);
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
184 }
9a081164e6e3 improved overlay menu
nadvornik
parents: 1523
diff changeset
185
481
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
186 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
187 {
1447
a10d70ae85e9 fixed segfault in osd called from img-view
nadvornik
parents: 1440
diff changeset
188 OsdShowFlags show;
503
e5023cced4e5 Fix image overlay displayed only on second "I" press in layout view.
zas_
parents: 483
diff changeset
189
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
190 if (!imd) return;
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
191
1447
a10d70ae85e9 fixed segfault in osd called from img-view
nadvornik
parents: 1440
diff changeset
192 show = image_osd_get(imd);
a10d70ae85e9 fixed segfault in osd called from img-view
nadvornik
parents: 1440
diff changeset
193 if (show == OSD_SHOW_NOTHING)
481
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
194 {
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
195 image_osd_set(imd, OSD_SHOW_INFO | OSD_SHOW_STATUS);
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
196 return;
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
197 }
1336
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
198 else
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
199 {
1447
a10d70ae85e9 fixed segfault in osd called from img-view
nadvornik
parents: 1440
diff changeset
200 if (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
201 {
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
202 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
203 }
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
204 else
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
205 {
1447
a10d70ae85e9 fixed segfault in osd called from img-view
nadvornik
parents: 1440
diff changeset
206 image_osd_set(imd, 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
207 }
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
208 }
67a612985686 Merge view_overlay_toggle() and layout_image_overlay_toggle() into new image_osd_toggle().
zas_
parents: 480
diff changeset
209 }
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
210
650
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
211 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
212 {
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
213 GList *keywords;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
214 GString *kwstr = NULL;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
215 gchar *ret = NULL;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
216
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
217 g_assert(fd);
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
218
1288
10073464e6aa use metadata_read_* functions where possible
nadvornik
parents: 1284
diff changeset
219 keywords = metadata_read_list(fd, KEYWORD_KEY, METADATA_PLAIN);
1238
947e603a52c6 simplified metadata interface, dropped metadata_read,
nadvornik
parents: 1191
diff changeset
220
947e603a52c6 simplified metadata interface, dropped metadata_read,
nadvornik
parents: 1191
diff changeset
221 if (keywords)
650
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
222 {
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
223 GList *work = keywords;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
224
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
225 while (work)
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
226 {
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
227 gchar *kw = work->data;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
228 work = work->next;
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 986
diff changeset
229
650
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
230 if (!kw) continue;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
231 if (!kwstr)
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
232 kwstr = g_string_new("");
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
233 else
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
234 g_string_append(kwstr, ", ");
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
235
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
236 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
237 }
1238
947e603a52c6 simplified metadata interface, dropped metadata_read,
nadvornik
parents: 1191
diff changeset
238 string_list_free(keywords);
650
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
239 }
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
240
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
241 if (kwstr)
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
242 {
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
243 ret = kwstr->str;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
244 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
245 }
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
246
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
247 return ret;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
248 }
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
249
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
250 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
251 {
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
252 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
253 gchar *start, *end;
736
a7289f9e8d29 Fix signed vs unsigned warnings.
zas_
parents: 733
diff changeset
254 guint pos, prev;
866
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
255 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
256 gchar *name, *data;
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
257 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
258 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
259
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
260 if (!str || !*str) return g_strdup("");
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
261
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
262 new = g_string_new(str);
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
263
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
264 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
265
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
266 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
267 {
736
a7289f9e8d29 Fix signed vs unsigned warnings.
zas_
parents: 733
diff changeset
268 guint limit = 0;
298
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
269 gchar *trunc = NULL;
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
270 gchar *limpos = NULL;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
271 gchar *extra = NULL;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
272 gchar *extrapos = NULL;
298
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
273 gchar *p;
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
274
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
275 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
276 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
277 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
278 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
279 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
280 break;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
281
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
282 /* Search for optionnal modifiers
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
283 * %name:99:extra% -> name = "name", limit=99, extra = "extra"
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
284 */
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
285 for (p = start + 1; p < end; p++)
298
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
286 {
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
287 if (p[0] == ':')
298
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
288 {
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
289 if (g_ascii_isdigit(p[1]) && !limpos)
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
290 {
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
291 limpos = p + 1;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
292 if (!trunc) trunc = p;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
293 }
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
294 else
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
295 {
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
296 extrapos = p + 1;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
297 if (!trunc) trunc = p;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
298 break;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
299 }
298
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
300 }
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
301 }
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
302
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
303 if (limpos)
736
a7289f9e8d29 Fix signed vs unsigned warnings.
zas_
parents: 733
diff changeset
304 limit = (guint) atoi(limpos);
298
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
305
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
306 if (extrapos)
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
307 extra = g_strndup(extrapos, end - extrapos);
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
308
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
309 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
310 pos = start - new->str;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
311 data = NULL;
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
312
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
313 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
314 {
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
315 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
316 }
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
317 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
318 {
1288
10073464e6aa use metadata_read_* functions where possible
nadvornik
parents: 1284
diff changeset
319 data = metadata_read_string(imd->image_fd, COMMENT_KEY, METADATA_PLAIN);
650
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
320 }
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
321 else
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
322 {
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
323 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
324 if (data && strcmp(name, "zoom") == 0) imd->overlay_show_zoom = TRUE;
1288
10073464e6aa use metadata_read_* functions where possible
nadvornik
parents: 1284
diff changeset
325 if (!data)
10073464e6aa use metadata_read_* functions where possible
nadvornik
parents: 1284
diff changeset
326 data = metadata_read_string(imd->image_fd, name, METADATA_FORMATTED);
650
02e2c135ee0c Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.
zas_
parents: 622
diff changeset
327 }
866
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
328
299
49eaa6463492 Do not display ... if not truncated.
zas_
parents: 298
diff changeset
329 if (data && *data && limit > 0 && strlen(data) > limit + 3)
298
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
330 {
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
331 gchar *new_data = g_strdup_printf("%-*.*s...", limit, limit, data);
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
332 g_free(data);
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
333 data = new_data;
cb93a982fcdd Add the possibility to truncate overlay infos displayed:
zas_
parents: 290
diff changeset
334 }
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
335
483
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
336 if (data)
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
337 {
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
338 /* 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
339 gchar *escaped = g_markup_escape_text(data, -1);
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
340 g_free(data);
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
341 data = escaped;
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
342 }
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
343
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
344 if (extra)
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
345 {
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
346 if (data && *data)
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
347 {
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
348 /* 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
349 * the data is expressed by a '*' character. A '*' may be escaped
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 986
diff changeset
350 * 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
351 * current implementation which only replaces the first unescaped '*'.
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
352 * 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
353 * Pango mark up is accepted in left and right parts.
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
354 * Any \n is replaced by a newline
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
355 * Examples:
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
356 * "<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
357 * "\n" -> ended with newline
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
358 * "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
359 * "\**\*" -> 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
360 * "\\*" -> prefix data with an anti slash (ie "\100")
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
361 * "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
362 *
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
363 * FIXME: using background / foreground colors lead to weird results.
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
364 */
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
365 gchar *new_data;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
366 gchar *left = NULL;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
367 gchar *right = extra;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
368 gchar *p;
736
a7289f9e8d29 Fix signed vs unsigned warnings.
zas_
parents: 733
diff changeset
369 guint len = strlen(extra);
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
370
752
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
371 /* Search for left and right parts and unescape characters */
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
372 for (p = extra; *p; p++, len--)
752
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
373 if (p[0] == '\\')
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
374 {
752
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
375 if (p[1] == 'n')
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
376 {
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
377 memmove(p+1, p+2, --len);
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
378 p[0] = '\n';
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
379 }
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
380 else if (p[1] != '\0')
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
381 memmove(p, p+1, len--); // includes \0
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
382 }
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
383 else if (p[0] == '*' && !left)
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
384 {
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
385 right = p + 1;
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
386 left = extra;
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
387 }
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
388
752
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
389 if (left) right[-1] = '\0';
85c9412d77d2 Allow to escape star characters in the template string with a \.
zas_
parents: 736
diff changeset
390
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
391 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
392 g_free(data);
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
393 data = new_data;
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
394 }
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
395 g_free(extra);
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 986
diff changeset
396 }
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
397
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
398 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
399 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
400 {
866
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
401 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
402 {
866
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
403 /* 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
404 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
405 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
406 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
407 }
866
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
408
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
409 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
410 pos += strlen(data);
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
411 }
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
412
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
413 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
414 {
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
415 /* 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
416 * 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
417 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
418 want_separator |= (data && *data);
866
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
419 }
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
420
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
421 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
422
866
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
423 prev = pos - 1;
c879a9a4f186 image_osd_mkinfo(): pipe replacement by " - " separator was fixed to work correctly with
zas_
parents: 865
diff changeset
424
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
425 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
426 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
427 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
428
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
429 /* 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
430 end = new->str;
245
62f2f8f7cb2d Add parenthesis around affection to clear a gcc warning.
zas_
parents: 218
diff changeset
431 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
432 {
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
433 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
434 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
435 ;
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
436 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
437 }
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
438
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
439 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
440
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
441 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
442 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
443
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
444 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
445 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
446
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
447 typedef enum {
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
448 OSDT_NONE = 0,
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
449 OSDT_FREE = 1 << 0,
963
323dab9321bb Fix double escaping of image overlay text.
zas_
parents: 888
diff changeset
450 OSDT_NO_DUP = 1 << 1
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
451 } OsdTemplateFlags;
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
452
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
453 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
454 {
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
455 if (!value)
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
456 {
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
457 g_hash_table_insert(vars, keyword, g_strdup(""));
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
458 return;
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
459 }
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
460
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
461 if (flags & OSDT_NO_DUP)
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
462 {
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
463 g_hash_table_insert(vars, keyword, value);
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
464 return;
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
465 }
963
323dab9321bb Fix double escaping of image overlay text.
zas_
parents: 888
diff changeset
466 else
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
467 {
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
468 g_hash_table_insert(vars, keyword, g_strdup(value));
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
469 }
861
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
470
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
471 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
472 }
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
473
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
474 static GdkPixbuf *image_osd_info_render(OverlayStateData *osd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
475 {
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
476 GdkPixbuf *pixbuf = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
477 gint width, height;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
478 PangoLayout *layout;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
479 const gchar *name;
275
dc69ea2dcf76 fixed histogram label
nadvornik
parents: 273
diff changeset
480 gchar *text;
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
481 GdkPixbuf *imgpixbuf = NULL;
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
482 gboolean with_hist;
1298
c37f36b97173 added histogram pane
nadvornik
parents: 1297
diff changeset
483 const HistMap *histmap;
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 986
diff changeset
484 ImageWindow *imd = osd->imd;
617
aa883b6d2ef6 image_osd_info_render(): if there's no fd, just return.
zas_
parents: 616
diff changeset
485 FileData *fd = image_get_fd(imd);
aa883b6d2ef6 image_osd_info_render(): if there's no fd, just return.
zas_
parents: 616
diff changeset
486
aa883b6d2ef6 image_osd_info_render(): if there's no fd, just return.
zas_
parents: 616
diff changeset
487 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
488
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
489 name = image_get_name(imd);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
490 if (name)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
491 {
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
492 gint n, t;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
493 CollectionData *cd;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
494 CollectInfo *info;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
495 GHashTable *vars;
861
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
496
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
497 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
498
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
499 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
500 if (cd)
622
54e20abb5c6d Fix display of collection in overlay info.
zas_
parents: 621
diff changeset
501 {
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
502 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
503 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
504 if (cd->name)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
505 {
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
506 if (file_extension_match(cd->name, GQ_COLLECTION_EXT))
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
507 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
508 else
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
509 osd_template_insert(vars, "collection", cd->name, OSDT_NONE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
510 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
511 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
512 {
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
513 osd_template_insert(vars, "collection", _("Untitled"), OSDT_NONE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
514 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
515 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
516 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
517 {
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
518 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
519 if (lw)
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
520 {
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
521 if (lw->slideshow)
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
522 {
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
523 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
524 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
525 if (n == 0) n = t;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
526 }
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
527 else
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
528 {
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
529 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
530 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
531 }
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
532 }
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
533 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
534 {
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
535 n++;
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 else
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
538 {
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
539 t = 1;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
540 n = 1;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
541 }
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
542
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
543 if (n < 1) n = 1;
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
544 if (t < 1) t = 1;
480
805c3258d228 Make histogram depends on image window not layout window.
zas_
parents: 475
diff changeset
545
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
546 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
547 }
861
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
548
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
549 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
550 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
551 osd_template_insert(vars, "name", (gchar *) name, OSDT_NONE);
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 986
diff changeset
552 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
553 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
554 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
555
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
556 if (!imd->unknown)
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
557 {
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
558 gint w, h;
1011
616b14da08c2 do not access image_loader directly
nadvornik
parents: 995
diff changeset
559 GdkPixbuf *load_pixbuf = image_loader_get_pixbuf(imd->il);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
560
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
561 if (imd->delay_flip &&
1011
616b14da08c2 do not access image_loader directly
nadvornik
parents: 995
diff changeset
562 imd->il && load_pixbuf &&
616b14da08c2 do not access image_loader directly
nadvornik
parents: 995
diff changeset
563 image_get_pixbuf(imd) != load_pixbuf)
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
564 {
1011
616b14da08c2 do not access image_loader directly
nadvornik
parents: 995
diff changeset
565 w = gdk_pixbuf_get_width(load_pixbuf);
616b14da08c2 do not access image_loader directly
nadvornik
parents: 995
diff changeset
566 h = gdk_pixbuf_get_height(load_pixbuf);
616b14da08c2 do not access image_loader directly
nadvornik
parents: 995
diff changeset
567 imgpixbuf = load_pixbuf;
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
568 }
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
569 else
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
570 {
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
571 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
572 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
573 }
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
574
861
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
575
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
576 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
577 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
578 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
579 }
861
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
580 else
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
581 {
862
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
582 osd_template_insert(vars, "width", NULL, OSDT_NONE);
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
583 osd_template_insert(vars, "height", NULL, OSDT_NONE);
30e1f4370215 osd_template_insert(): optimize and simplify using flags.
zas_
parents: 861
diff changeset
584 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
585 }
3df5220fbc23 image_osd_info_render(): ensure values are always escaped before using pango_layout_set_markup().
zas_
parents: 860
diff changeset
586
1336
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
587 text = image_osd_mkinfo(options->image_overlay.template_string, imd, vars);
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
588 g_hash_table_destroy(vars);
415
4f7362028062 Add zoom ratio display to OSD in fullscreen mode.
zas_
parents: 411
diff changeset
589
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
590 } else {
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
591 /* 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
592 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
593 }
132
661cd91e5a7e First implementation of marks for all photos.
bruclik
parents: 122
diff changeset
594
1294
7ac9664242b2 histogram caching
nadvornik
parents: 1288
diff changeset
595 with_hist = ((osd->show & OSD_SHOW_HISTOGRAM) && osd->histogram);
7ac9664242b2 histogram caching
nadvornik
parents: 1288
diff changeset
596 if (with_hist)
7ac9664242b2 histogram caching
nadvornik
parents: 1288
diff changeset
597 {
7ac9664242b2 histogram caching
nadvornik
parents: 1288
diff changeset
598 histmap = histmap_get(imd->image_fd);
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
599 if (!histmap)
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
600 {
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
601 histmap_start_idle(imd->image_fd);
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
602 with_hist = FALSE;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
603 }
1294
7ac9664242b2 histogram caching
nadvornik
parents: 1288
diff changeset
604 }
7ac9664242b2 histogram caching
nadvornik
parents: 1288
diff changeset
605
860
1e85eabf4952 image_osd_info_render(): code cleanup and simplification, drop some useless memory allocations.
zas_
parents: 857
diff changeset
606
133
532c42d5ed4d compilation fix
bruclik
parents: 132
diff changeset
607 {
265
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
608 gint active_marks = 0;
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
609 gint mark;
275
dc69ea2dcf76 fixed histogram label
nadvornik
parents: 273
diff changeset
610 gchar *text2;
263
c7fefb0a4b78 Display marks in overlay info only if at least one is set.
zas_
parents: 245
diff changeset
611
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
612 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
613 {
800
a25b228978a0 various notification improvements
nadvornik
parents: 783
diff changeset
614 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
615 }
263
c7fefb0a4b78 Display marks in overlay info only if at least one is set.
zas_
parents: 245
diff changeset
616
265
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
617 if (active_marks > 0)
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
618 {
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
619 GString *buf = g_string_sized_new(FILEDATA_MARKS_SIZE * 2);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
620
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
621 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
622 {
800
a25b228978a0 various notification improvements
nadvornik
parents: 783
diff changeset
623 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
624 }
265
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
625
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
626 if (*text)
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
627 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
628 else
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
629 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
630 g_string_free(buf, TRUE);
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
631 g_free(text);
275
dc69ea2dcf76 fixed histogram label
nadvornik
parents: 273
diff changeset
632 text = text2;
265
3f14da3c3b9a Fix a segfault on fullscreen file deletion reported by Fr«±d«±ric Mantegazza.
zas_
parents: 263
diff changeset
633 }
275
dc69ea2dcf76 fixed histogram label
nadvornik
parents: 273
diff changeset
634
995
6ca2c5fd7b13 Whitespaces cleanup.
zas_
parents: 986
diff changeset
635 if (with_hist)
290
4bbde8a38ad4 improved histogram drawing
nadvornik
parents: 281
diff changeset
636 {
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
637 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
638 if (*text)
483
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
639 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
640 else
483
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
641 text2 = g_strdup(escaped_histogram_label);
c9e3baeda1b1 Correctly escape data before using pango_layout_set_markup().
zas_
parents: 482
diff changeset
642 g_free(escaped_histogram_label);
290
4bbde8a38ad4 improved histogram drawing
nadvornik
parents: 281
diff changeset
643 g_free(text);
4bbde8a38ad4 improved histogram drawing
nadvornik
parents: 281
diff changeset
644 text = text2;
4bbde8a38ad4 improved histogram drawing
nadvornik
parents: 281
diff changeset
645 }
155
d06bccc7551e show active marks in image overlay
nadvornik
parents: 133
diff changeset
646 }
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
647
23
17acca639a86 ##### Note: GQview CVS on sourceforge is not always up to date, please use #####
gqview
parents: 9
diff changeset
648 layout = gtk_widget_create_pango_layout(imd->pr, NULL);
275
dc69ea2dcf76 fixed histogram label
nadvornik
parents: 273
diff changeset
649 pango_layout_set_markup(layout, text, -1);
dc69ea2dcf76 fixed histogram label
nadvornik
parents: 273
diff changeset
650 g_free(text);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
651
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
652 pango_layout_get_pixel_size(layout, &width, &height);
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
653 /* 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
654 if (width == 0)
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
655 height = 0;
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
656 else if (height == 0)
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
657 width = 0;
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
658 if (width > 0) width += 10;
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
659 if (height > 0) height += 10;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
660
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
661 if (with_hist)
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
662 {
620
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
663 if (width < HISTOGRAM_WIDTH + 10) width = HISTOGRAM_WIDTH + 10;
290
4bbde8a38ad4 improved histogram drawing
nadvornik
parents: 281
diff changeset
664 height += HISTOGRAM_HEIGHT + 5;
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
665 }
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents: 265
diff changeset
666
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
667 if (width > 0 && height > 0)
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
668 {
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
669 /* TODO: make osd color configurable --Zas */
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
670 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
671 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
672 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
673 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
674 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
675 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
676 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
677 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
678 pixbuf_pixel_set(pixbuf, width - 1, height - 1, 0, 0, 0, 0);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
679
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
680 if (with_hist)
620
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
681 {
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
682 gint x = 5;
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
683 gint y = height - HISTOGRAM_HEIGHT - 5;
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
684 gint w = width - 10;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 415
diff changeset
685
1302
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
686 pixbuf_set_rect_fill(pixbuf, x, y, w, HISTOGRAM_HEIGHT, 220, 220, 220, 210);
1294
7ac9664242b2 histogram caching
nadvornik
parents: 1288
diff changeset
687 histogram_draw(osd->histogram, histmap, pixbuf, x, y, w, HISTOGRAM_HEIGHT);
620
f335373f44e5 Display a simple grid with histogram.
zas_
parents: 618
diff changeset
688 }
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
689 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
690 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
691
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
692 g_object_unref(G_OBJECT(layout));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
693
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
694 return pixbuf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
695 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
696
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
697 static GdkPixbuf *image_osd_icon_pixbuf(ImageOSDFlag flag)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
698 {
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
699 static GdkPixbuf **icons = NULL;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
700 GdkPixbuf *icon = NULL;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
701
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
702 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
703 if (icons[flag]) return icons[flag];
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
704
122
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
705 if (osd_icons[flag].key)
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
706 {
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
707 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
708 }
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
709
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
710 if (!icon)
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
711 {
122
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
712 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
713 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
714 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
715 switch (flag)
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
716 {
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
717 case IMAGE_OSD_ROTATE_AUTO:
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
718 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
719 0, 0, 0, 255,
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
720 3, 0, 3, 0);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
721 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
722 20, 9, 14, 15, 14, 3,
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
723 0, 0, 0, 255);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
724 break;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
725 case IMAGE_OSD_ROTATE_USER:
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
726 break;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
727 case IMAGE_OSD_COLOR:
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
728 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
729 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
730 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
731 break;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
732 case IMAGE_OSD_FIRST:
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
733 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
734 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
735 12, 5, 18, 11, 6, 11,
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
736 0, 0, 0, 255);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
737 break;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
738 case IMAGE_OSD_LAST:
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
739 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
740 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
741 12, 18, 6, 12, 18, 12,
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
742 0, 0, 0, 255);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
743 break;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
744 case IMAGE_OSD_ICON:
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
745 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
746 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
747 break;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
748 default:
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
749 break;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
750 }
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
751 }
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 icons[flag] = icon;
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 return icon;
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
821
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
758 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
759 OverlayRendererFlags flags)
821
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
760 {
857
7d387a25b1ec Use flags instead of int parameters for pixbuf_renderer_overlay_add().
zas_
parents: 844
diff changeset
761 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
762 }
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
763
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
764 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
765 {
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
766 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
767 }
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
768
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
769 #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
770 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
771 {
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
772 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
773 }
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
774 #endif
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
775
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
776 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
777 {
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
778 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
779 }
fb249b8e63e4 Move some functions from image.[ch] to image-overlay.c and make them static:
zas_
parents: 800
diff changeset
780
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
781 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
782 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
783 GdkPixbuf *pixbuf;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
784
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
785 if (osd->icon_id[flag]) return;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
786
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
787 pixbuf = image_osd_icon_pixbuf(flag);
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
788 if (!pixbuf) return;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
789
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
790 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
791 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
792 OVL_RELATIVE);
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
793 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
794
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
795 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
796 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
797 if (osd->icon_id[flag])
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
798 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
799 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
800 osd->icon_id[flag] = 0;
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
801 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
802 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
803
886
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
804 static void image_osd_icons_reset_time(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 if (osd_icons[i].reset)
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 osd->icon_time[i] = 0;
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
813 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
814 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
815 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
816
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
817 static void image_osd_icons_update(OverlayStateData *osd)
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
818 {
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
819 gint i;
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
820
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
821 for (i = 0; i < IMAGE_OSD_COUNT; i++)
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
822 {
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
823 if (osd->icon_time[i] > 0)
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
824 {
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
825 image_osd_icon_show(osd, i);
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
826 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
827 else
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
828 {
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
829 image_osd_icon_hide(osd, i);
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
830 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
831 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
832 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
833
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
834 static void image_osd_icons_hide(OverlayStateData *osd)
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
835 {
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
836 gint i;
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
837
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
838 for (i = 0; i < IMAGE_OSD_COUNT; i++)
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
839 {
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
840 image_osd_icon_hide(osd, i);
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
841 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
842 }
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
843
887
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
844 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
845 {
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
846 if (osd->ovl_info == 0)
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
847 {
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
848 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
849 }
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
850 else
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
851 {
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
852 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
853 }
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
854 }
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
855
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
856 static void image_osd_info_hide(OverlayStateData *osd)
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
857 {
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
858 if (osd->ovl_info == 0) return;
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
859
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
860 image_overlay_remove(osd->imd, osd->ovl_info);
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
861 osd->ovl_info = 0;
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
862 }
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
863
1433
b4ad1d201279 Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents: 1367
diff changeset
864 static gboolean image_osd_update_cb(gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
865 {
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
866 OverlayStateData *osd = data;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
867
415
4f7362028062 Add zoom ratio display to OSD in fullscreen mode.
zas_
parents: 411
diff changeset
868 osd->imd->overlay_show_zoom = FALSE;
4f7362028062 Add zoom ratio display to OSD in fullscreen mode.
zas_
parents: 411
diff changeset
869
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
870 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
871 {
1297
9b59d40030d2 fixed histogram drawing
nadvornik
parents: 1294
diff changeset
872 /* redraw when the image was changed,
9b59d40030d2 fixed histogram drawing
nadvornik
parents: 1294
diff changeset
873 with histogram we have to redraw also when loading is finished */
9b59d40030d2 fixed histogram drawing
nadvornik
parents: 1294
diff changeset
874 if (osd->changed_states & IMAGE_STATE_IMAGE ||
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
875 (osd->changed_states & IMAGE_STATE_LOADING && osd->show & OSD_SHOW_HISTOGRAM) ||
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
876 osd->notify & NOTIFY_HISTMAP)
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
877 {
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
878 GdkPixbuf *pixbuf;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
879
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
880 pixbuf = image_osd_info_render(osd);
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
881 if (pixbuf)
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
882 {
887
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
883 image_osd_info_show(osd, pixbuf);
410
603206ffa644 Fix OSD display when fullscreen info string is empty.
zas_
parents: 322
diff changeset
884 g_object_unref(pixbuf);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
885 }
887
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
886 else
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
887 {
887
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
888 image_osd_info_hide(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 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
891 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
892 else
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
893 {
887
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
894 image_osd_info_hide(osd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
895 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
896
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
897 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
898 {
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
899 if (osd->changed_states & IMAGE_STATE_IMAGE)
886
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
900 image_osd_icons_reset_time(osd);
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
901
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
902 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
903 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
904 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
905 image_osd_timer_schedule(osd);
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
906 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
907
122
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
908 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
909 {
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
910 gint n = 0;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
911
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
912 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
913 {
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
914 n = 1;
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
915 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
916 }
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
917
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
918 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
919 image_osd_timer_schedule(osd);
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
920 }
e2a8b7f2165b Sat Dec 2 16:44:48 2006 John Ellis <johne@verizon.net>
gqview
parents: 118
diff changeset
921
886
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
922 image_osd_icons_update(osd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
923 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
924 else
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
925 {
886
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
926 image_osd_icons_hide(osd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
927 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
928
1440
3265830658cd fixed a bug in osd updating, it seems that the osd icons work again
nadvornik
parents: 1439
diff changeset
929 osd->changed_states = IMAGE_STATE_NONE;
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
930 osd->notify = 0;
1523
24a12aa0cb54 Fix up event source ids type: gint -> guint.
zas_
parents: 1498
diff changeset
931 osd->idle_id = 0;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
932 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
933 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
934
1433
b4ad1d201279 Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents: 1367
diff changeset
935 static void image_osd_update_schedule(OverlayStateData *osd, gboolean force)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
936 {
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
937 if (force) osd->changed_states |= IMAGE_STATE_IMAGE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
938
1523
24a12aa0cb54 Fix up event source ids type: gint -> guint.
zas_
parents: 1498
diff changeset
939 if (!osd->idle_id)
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
940 {
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
941 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
942 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
943 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
944
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
945 void image_osd_update(ImageWindow *imd)
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
946 {
615
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
947 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
948
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
949 if (!osd) return;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
950
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
951 image_osd_update_schedule(osd, TRUE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
952 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
953
1433
b4ad1d201279 Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents: 1367
diff changeset
954 static gboolean image_osd_timer_cb(gpointer data)
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
955 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
956 OverlayStateData *osd = data;
1433
b4ad1d201279 Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents: 1367
diff changeset
957 gboolean done = TRUE;
b4ad1d201279 Use gboolean where applicable, minor cleanup and indentations fixes.
zas_
parents: 1367
diff changeset
958 gboolean changed = FALSE;
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
959 gint i;
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 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
962 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
963 if (osd->icon_time[i] > 1)
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
964 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
965 osd->icon_time[i]--;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
966 if (osd->icon_time[i] < 2)
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
967 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
968 osd->icon_time[i] = 0;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
969 changed = TRUE;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
970 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
971 else
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
972 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
973 done = FALSE;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
974 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
975 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
976 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
977
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
978 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
979
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
980 if (done)
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
981 {
1523
24a12aa0cb54 Fix up event source ids type: gint -> guint.
zas_
parents: 1498
diff changeset
982 osd->timer_id = 0;
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
983 return FALSE;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
984 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
985
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
986 return TRUE;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
987 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
988
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
989 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
990 {
1523
24a12aa0cb54 Fix up event source ids type: gint -> guint.
zas_
parents: 1498
diff changeset
991 if (!osd->timer_id)
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
992 {
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
993 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
994 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
995 }
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
996
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
997 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
998 {
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
999 OverlayStateData *osd = data;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1000
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1001 osd->changed_states |= state;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1002 image_osd_update_schedule(osd, FALSE);
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1003 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1004
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
1005 static void image_osd_notify_cb(FileData *fd, NotifyType type, gpointer data)
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
1006 {
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
1007 OverlayStateData *osd = data;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
1008
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
1009 if ((type & (NOTIFY_HISTMAP)) && osd->imd && fd == osd->imd->image_fd)
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
1010 {
1498
5f49f305a6b6 improved debug messages
nadvornik
parents: 1447
diff changeset
1011 DEBUG_1("Notify osd: %s %04x", fd->path, type);
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
1012 osd->notify |= type;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
1013 image_osd_update_schedule(osd, FALSE);
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
1014 }
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
1015 }
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
1016
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
1017
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1018 static void image_osd_free(OverlayStateData *osd)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1019 {
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1020 if (!osd) return;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1021
1523
24a12aa0cb54 Fix up event source ids type: gint -> guint.
zas_
parents: 1498
diff changeset
1022 if (osd->idle_id) g_source_remove(osd->idle_id);
24a12aa0cb54 Fix up event source ids type: gint -> guint.
zas_
parents: 1498
diff changeset
1023 if (osd->timer_id) 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
1024
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
1025 file_data_unregister_notify_func(image_osd_notify_cb, osd);
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
1026
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1027 if (osd->imd)
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1028 {
615
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
1029 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
1030 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
1031
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1032 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
1033
887
e418c33a49c8 Move code from image_osd_update_cb() to separate functions.
zas_
parents: 886
diff changeset
1034 image_osd_info_hide(osd);
886
04c317fb7da0 Tidy up and code redundancy reduction.
zas_
parents: 866
diff changeset
1035 image_osd_icons_hide(osd);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1036 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1037
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1038 if (osd->histogram) histogram_free(osd->histogram);
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1039
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1040 g_free(osd);
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1041 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1042
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1043 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
1044 {
615
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
1045 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
1046
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1047 if (osd) image_osd_free(osd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1048 }
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 static void image_osd_destroy_cb(GtkWidget *widget, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1051 {
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1052 OverlayStateData *osd = data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1053
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1054 osd->imd = NULL;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1055 image_osd_free(osd);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1056 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1057
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
1058 static void image_osd_enable(ImageWindow *imd, OsdShowFlags show)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1059 {
615
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
1060 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
1061
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1062 if (!osd)
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1063 {
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1064 osd = g_new0(OverlayStateData, 1);
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1065 osd->imd = imd;
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1066 osd->show = OSD_SHOW_NOTHING;
1336
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1067 osd->x = options->image_overlay.x;
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1068 osd->y = options->image_overlay.y;
822
df541dc41707 Allow to set image overlay info position through options:
zas_
parents: 821
diff changeset
1069
1336
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1070 osd->histogram = histogram_new();
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1071
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1072 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
1073 G_CALLBACK(image_osd_destroy_cb), osd);
615
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
1074 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
1075
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1076 image_set_state_func(osd->imd, image_osd_state_cb, osd);
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1433
diff changeset
1077 file_data_register_notify_func(image_osd_notify_cb, osd, NOTIFY_PRIORITY_LOW);
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1078 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1079
616
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1080 if (show & OSD_SHOW_STATUS)
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1081 image_osd_icon(imd, IMAGE_OSD_ICON, -1);
d9c9d05c9d4d Move overlay histogram stuff from ImageWindow to OverlayStateData.
zas_
parents: 615
diff changeset
1082
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
1083 if (show != osd->show)
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
1084 image_osd_update_schedule(osd, TRUE);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1085
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
1086 osd->show = show;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1087 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1088
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
1089 void image_osd_set(ImageWindow *imd, OsdShowFlags show)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1090 {
117
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1091 if (!imd) return;
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1092
614
b2898f04c82e image_osd_get() and image_osd_set() now uses flags.
zas_
parents: 613
diff changeset
1093 image_osd_enable(imd, show);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1094 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1095
621
734b6b0a3356 image_osd_get() now returns OsdShowFlags.
zas_
parents: 620
diff changeset
1096 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
1097 {
615
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
1098 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
1099
621
734b6b0a3356 image_osd_get() now returns OsdShowFlags.
zas_
parents: 620
diff changeset
1100 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
1101 }
0c2e1f0a001b Wed Nov 29 14:28:30 2006 John Ellis <johne@verizon.net>
gqview
parents: 23
diff changeset
1102
1336
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1103 Histogram *image_osd_get_histogram(ImageWindow *imd)
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1104 {
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1105 OverlayStateData *osd = image_get_osd_data(imd);
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1106
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1107 return osd ? osd->histogram : NULL;
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1108 }
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1109
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1110 void image_osd_copy_status(ImageWindow *src, ImageWindow *dest)
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1111 {
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1112 Histogram *h_src, *h_dest;
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1113 image_osd_set(dest, image_osd_get(src));
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1114
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1115 h_src = image_osd_get_histogram(src);
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1116 h_dest = image_osd_get_histogram(dest);
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1117
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1118 h_dest->histogram_mode = h_src->histogram_mode;
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1119 h_dest->histogram_channel = h_src->histogram_channel;
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1120
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1121 }
4179d41d1149 fixed overlay configuration
nadvornik
parents: 1329
diff changeset
1122
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1123 /* duration:
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1124 0 = hide
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1125 1 = show
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1126 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
1127 -1 = use default duration
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1128 */
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1129 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
1130 {
615
cddccc89d93b Introduce image_get_osd_data() and image_set_osd_data().
zas_
parents: 614
diff changeset
1131 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
1132
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1133 if (!osd) return;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1134
1177
5a20c47e7a14 Fix up unsigned expression always true/false warnings.
zas_
parents: 1055
diff changeset
1135 if (flag >= IMAGE_OSD_COUNT) return;
118
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1136 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
1137 if (duration > 1) duration += 1;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1138
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1139 osd->icon_time[flag] = duration;
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1140
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1141 image_osd_update_schedule(osd, FALSE);
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1142 image_osd_timer_schedule(osd);
ac0f7f942c4d Wed Nov 29 22:53:03 2006 John Ellis <johne@verizon.net>
gqview
parents: 117
diff changeset
1143 }
1055
1646720364cf Adding a vim modeline to all files - patch by Klaus Ethgen
nadvornik
parents: 1011
diff changeset
1144 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */