Mercurial > geeqie
annotate src/bar_histogram.c @ 1331:a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
| author | nadvornik |
|---|---|
| date | Fri, 27 Feb 2009 21:30:28 +0000 |
| parents | 8b6e2a47adc7 |
| children | 45bcfcb69f56 |
| rev | line source |
|---|---|
| 1298 | 1 /* |
| 2 * Geeqie | |
| 3 * (C) 2004 John Ellis | |
| 4 * Copyright (C) 2008 - 2009 The Geeqie Team | |
| 5 * | |
| 6 * Author: Vladimir Nadvornik | |
| 7 * | |
| 8 * This software is released under the GNU General Public License (GNU GPL). | |
| 9 * Please read the included file COPYING for more information. | |
| 10 * This software comes with no warranty of any kind, use at your own risk! | |
| 11 */ | |
| 12 | |
| 13 | |
| 14 #include "main.h" | |
| 15 #include "bar_comment.h" | |
| 16 | |
| 17 #include "bar.h" | |
| 18 #include "metadata.h" | |
| 19 #include "filedata.h" | |
|
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
20 #include "menu.h" |
| 1298 | 21 #include "ui_menu.h" |
| 22 #include "ui_misc.h" | |
| 23 #include "histogram.h" | |
| 1309 | 24 #include "rcfile.h" |
| 1298 | 25 |
| 26 /* | |
| 27 *------------------------------------------------------------------- | |
| 28 * keyword / comment utils | |
| 29 *------------------------------------------------------------------- | |
| 30 */ | |
| 31 | |
| 32 | |
| 33 | |
| 34 typedef struct _PaneHistogramData PaneHistogramData; | |
| 35 struct _PaneHistogramData | |
| 36 { | |
| 37 PaneData pane; | |
| 38 GtkWidget *widget; | |
| 39 GtkWidget *drawing_area; | |
| 40 Histogram *histogram; | |
| 41 gint histogram_width; | |
| 42 gint histogram_height; | |
| 43 GdkPixbuf *pixbuf; | |
| 44 FileData *fd; | |
|
1331
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
45 gboolean need_update; |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
46 gint idle_id; |
| 1298 | 47 }; |
| 48 | |
|
1331
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
49 static gboolean bar_pane_histogram_update_cb(gpointer data); |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
50 |
| 1298 | 51 |
| 52 static void bar_pane_histogram_update(PaneHistogramData *phd) | |
| 53 { | |
| 54 if (phd->pixbuf) g_object_unref(phd->pixbuf); | |
| 55 phd->pixbuf = NULL; | |
| 56 | |
| 57 if (!phd->histogram_width || !phd->histogram_height || !phd->fd) return; | |
| 58 | |
|
1331
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
59 /* histmap_get is relatively expensive, run it only when we really need it |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
60 and with lower priority than pixbuf_renderer |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
61 FIXME: this does not work for fullscreen*/ |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
62 if (GTK_WIDGET_DRAWABLE(phd->drawing_area)) |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
63 { |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
64 if (phd->idle_id == -1) phd->idle_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, bar_pane_histogram_update_cb, phd, NULL); |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
65 } |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
66 else |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
67 { |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
68 phd->need_update = TRUE; |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
69 } |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
70 } |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
71 |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
72 static gboolean bar_pane_histogram_update_cb(gpointer data) |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
73 { |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
74 const HistMap *histmap; |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
75 PaneHistogramData *phd = data; |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
76 |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
77 phd->idle_id = -1; |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
78 phd->need_update = FALSE; |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
79 |
| 1298 | 80 gtk_widget_queue_draw_area(GTK_WIDGET(phd->drawing_area), 0, 0, phd->histogram_width, phd->histogram_height); |
| 81 | |
| 82 histmap = histmap_get(phd->fd); | |
| 83 | |
|
1331
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
84 if (!histmap) return FALSE; |
| 1298 | 85 |
| 86 phd->pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, phd->histogram_width, phd->histogram_height); | |
| 87 gdk_pixbuf_fill(phd->pixbuf, 0xffffffff); | |
| 88 histogram_draw(phd->histogram, histmap, phd->pixbuf, 0, 0, phd->histogram_width, phd->histogram_height); | |
|
1330
8b6e2a47adc7
Add a tooltip showing current histogram state on bar histogram.
zas_
parents:
1329
diff
changeset
|
89 |
|
8b6e2a47adc7
Add a tooltip showing current histogram state on bar histogram.
zas_
parents:
1329
diff
changeset
|
90 #if GTK_CHECK_VERSION(2,12,0) |
|
8b6e2a47adc7
Add a tooltip showing current histogram state on bar histogram.
zas_
parents:
1329
diff
changeset
|
91 gtk_widget_set_tooltip_text(phd->drawing_area, histogram_label(phd->histogram)); |
|
8b6e2a47adc7
Add a tooltip showing current histogram state on bar histogram.
zas_
parents:
1329
diff
changeset
|
92 #endif |
|
1331
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
93 return FALSE; |
| 1298 | 94 } |
| 95 | |
| 96 | |
| 97 static void bar_pane_histogram_set_fd(GtkWidget *pane, FileData *fd) | |
| 98 { | |
| 99 PaneHistogramData *phd; | |
| 100 | |
| 101 phd = g_object_get_data(G_OBJECT(pane), "pane_data"); | |
| 102 if (!phd) return; | |
| 103 | |
| 104 file_data_unref(phd->fd); | |
| 105 phd->fd = file_data_ref(fd); | |
| 106 | |
| 107 bar_pane_histogram_update(phd); | |
| 108 } | |
| 109 | |
| 1309 | 110 static void bar_pane_histogram_write_config(GtkWidget *pane, GString *outstr, gint indent) |
| 111 { | |
| 112 PaneHistogramData *phd; | |
| 113 | |
| 114 phd = g_object_get_data(G_OBJECT(pane), "pane_data"); | |
| 115 if (!phd) return; | |
| 116 | |
| 1314 | 117 WRITE_STRING("<pane_histogram\n"); |
| 1309 | 118 indent++; |
| 119 WRITE_CHAR(*phd, pane.title); | |
| 120 WRITE_BOOL(*phd, pane.expanded); | |
|
1329
1fc356f629fe
Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents:
1324
diff
changeset
|
121 WRITE_INT(*phd->histogram, histogram_channel); |
|
1fc356f629fe
Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents:
1324
diff
changeset
|
122 WRITE_INT(*phd->histogram, histogram_mode); |
| 1309 | 123 indent--; |
| 1314 | 124 WRITE_STRING("/>\n"); |
| 1309 | 125 } |
| 126 | |
| 127 | |
| 1298 | 128 static void bar_pane_histogram_notify_cb(FileData *fd, NotifyType type, gpointer data) |
| 129 { | |
| 130 PaneHistogramData *phd = data; | |
| 131 if (fd == phd->fd) bar_pane_histogram_update(phd); | |
| 132 } | |
| 133 | |
| 134 static gboolean bar_pane_histogram_expose_event_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data) | |
| 135 { | |
| 136 PaneHistogramData *phd = data; | |
|
1331
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
137 if (!phd) return TRUE; |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
138 |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
139 if (phd->need_update) |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
140 { |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
141 bar_pane_histogram_update(phd); |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
142 } |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
143 |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
144 if (!phd->pixbuf) return TRUE; |
| 1298 | 145 |
| 146 gdk_draw_pixbuf(widget->window, | |
| 147 widget->style->fg_gc[GTK_WIDGET_STATE (widget)], | |
| 148 phd->pixbuf, | |
| 149 0, 0, | |
| 150 0, 0, | |
| 151 -1, -1, | |
| 152 GDK_RGB_DITHER_NORMAL, 0, 0); | |
| 153 return TRUE; | |
| 154 } | |
| 155 | |
| 156 static void bar_pane_histogram_size_cb(GtkWidget *widget, GtkAllocation *allocation, gpointer data) | |
| 157 { | |
| 158 PaneHistogramData *phd = data; | |
| 159 | |
| 160 phd->histogram_width = allocation->width; | |
| 161 phd->histogram_height = allocation->height; | |
| 162 bar_pane_histogram_update(phd); | |
| 163 } | |
| 164 | |
| 165 static void bar_pane_histogram_close(GtkWidget *pane) | |
| 166 { | |
| 167 PaneHistogramData *phd; | |
| 168 | |
| 169 phd = g_object_get_data(G_OBJECT(pane), "pane_data"); | |
| 170 if (!phd) return; | |
| 171 | |
| 172 gtk_widget_destroy(phd->widget); | |
| 173 } | |
| 174 | |
| 175 static void bar_pane_histogram_destroy(GtkWidget *widget, gpointer data) | |
| 176 { | |
| 177 PaneHistogramData *phd = data; | |
|
1331
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
178 |
|
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
179 g_source_remove(phd->idle_id); |
| 1298 | 180 file_data_unregister_notify_func(bar_pane_histogram_notify_cb, phd); |
| 181 | |
| 182 file_data_unref(phd->fd); | |
| 183 g_free(phd->pane.title); | |
| 184 histogram_free(phd->histogram); | |
| 185 if (phd->pixbuf) g_object_unref(phd->pixbuf); | |
| 186 | |
| 187 g_free(phd); | |
| 188 } | |
| 189 | |
|
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
190 static void bar_pane_histogram_popup_channels_cb(GtkWidget *widget, gpointer data) |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
191 { |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
192 PaneHistogramData *phd; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
193 gint channel; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
194 |
|
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
195 if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return; |
|
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
196 |
|
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
197 phd = submenu_item_get_data(widget); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
198 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
199 if (!phd) return; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
200 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
201 channel = GPOINTER_TO_INT(data); |
|
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
202 if (channel == histogram_get_channel(phd->histogram)) return; |
|
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
203 |
|
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
204 histogram_set_channel(phd->histogram, channel); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
205 bar_pane_histogram_update(phd); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
206 } |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
207 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
208 static void bar_pane_histogram_popup_logmode_cb(GtkWidget *widget, gpointer data) |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
209 { |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
210 PaneHistogramData *phd; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
211 gint logmode; |
|
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
212 |
|
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
213 if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return; |
|
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
214 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
215 phd = submenu_item_get_data(widget); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
216 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
217 if (!phd) return; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
218 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
219 logmode = GPOINTER_TO_INT(data); |
|
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
220 if (logmode == histogram_get_mode(phd->histogram)) return; |
|
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
221 |
|
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
222 histogram_set_mode(phd->histogram, logmode); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
223 bar_pane_histogram_update(phd); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
224 } |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
225 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
226 static GtkWidget *bar_pane_histogram_add_radio(GtkWidget *menu, GtkWidget *parent, |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
227 const gchar *label, |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
228 GCallback func, gint value, |
|
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
229 gboolean show_current, gint current_value) |
|
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
230 { |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
231 GtkWidget *item; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
232 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
233 if (show_current) |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
234 { |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
235 item = menu_item_add_radio(menu, parent, |
|
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
236 label, (value == current_value), |
|
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
237 func, GINT_TO_POINTER((gint)value)); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
238 } |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
239 else |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
240 { |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
241 item = menu_item_add(menu, label, |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
242 func, GINT_TO_POINTER((gint)value)); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
243 } |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
244 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
245 return item; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
246 } |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
247 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
248 GtkWidget *bar_pane_histogram_add_channels(GtkWidget *menu, GCallback func, gpointer data, |
|
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
249 gboolean show_current, gint current_value) |
|
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
250 { |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
251 GtkWidget *submenu; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
252 GtkWidget *parent; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
253 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
254 submenu = gtk_menu_new(); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
255 g_object_set_data(G_OBJECT(submenu), "submenu_data", data); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
256 |
|
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
257 parent = bar_pane_histogram_add_radio(submenu, NULL, _("_Red"), func, HCHAN_R, show_current, current_value); |
|
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
258 bar_pane_histogram_add_radio(submenu, parent, _("_Green"), func, HCHAN_G, show_current, current_value); |
|
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
259 bar_pane_histogram_add_radio(submenu, parent, _("_Blue"),func, HCHAN_B, show_current, current_value); |
|
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
260 bar_pane_histogram_add_radio(submenu, parent, _("_RGB"),func, HCHAN_RGB, show_current, current_value); |
|
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
261 bar_pane_histogram_add_radio(submenu, parent, _("_Value"),func, HCHAN_MAX, show_current, current_value); |
|
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
262 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
263 if (menu) |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
264 { |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
265 GtkWidget *item; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
266 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
267 item = menu_item_add(menu, _("Channels"), NULL, NULL); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
268 gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
269 return item; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
270 } |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
271 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
272 return submenu; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
273 } |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
274 GtkWidget *bar_pane_histogram_add_logmode(GtkWidget *menu, GCallback func, gpointer data, |
|
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
275 gboolean show_current, gint current_value) |
|
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
276 { |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
277 GtkWidget *submenu; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
278 GtkWidget *parent; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
279 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
280 submenu = gtk_menu_new(); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
281 g_object_set_data(G_OBJECT(submenu), "submenu_data", data); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
282 |
|
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
283 parent = bar_pane_histogram_add_radio(submenu, NULL, _("_Linear"), func, 0, show_current, current_value); |
|
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
284 bar_pane_histogram_add_radio(submenu, parent, _("Lo_garithmical"), func, 1, show_current, current_value); |
|
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
285 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
286 if (menu) |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
287 { |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
288 GtkWidget *item; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
289 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
290 item = menu_item_add(menu, _("Mode"), NULL, NULL); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
291 gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
292 return item; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
293 } |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
294 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
295 return submenu; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
296 } |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
297 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
298 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
299 static GtkWidget *bar_pane_histogram_menu(PaneHistogramData *phd) |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
300 { |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
301 GtkWidget *menu; |
|
1323
50ab4016ae0b
Fix up bar pane histogram contextual menu: show current state for channel and log mode.
zas_
parents:
1319
diff
changeset
|
302 static gboolean show_current = TRUE; |
|
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
303 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
304 menu = popup_menu_short_lived(); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
305 bar_pane_histogram_add_channels(menu, G_CALLBACK(bar_pane_histogram_popup_channels_cb), phd, |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
306 show_current, histogram_get_channel(phd->histogram)); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
307 bar_pane_histogram_add_logmode(menu, G_CALLBACK(bar_pane_histogram_popup_logmode_cb), phd, |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
308 show_current, histogram_get_mode(phd->histogram)); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
309 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
310 return menu; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
311 } |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
312 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
313 static gboolean bar_pane_histogram_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data) |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
314 { |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
315 PaneHistogramData *phd = data; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
316 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
317 if (bevent->button == MOUSE_BUTTON_RIGHT) |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
318 { |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
319 GtkWidget *menu; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
320 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
321 menu = bar_pane_histogram_menu(phd); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
322 gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, bevent->button, bevent->time); |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
323 return TRUE; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
324 } |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
325 |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
326 return FALSE; |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
327 } |
|
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
328 |
| 1298 | 329 |
|
1329
1fc356f629fe
Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents:
1324
diff
changeset
|
330 GtkWidget *bar_pane_histogram_new(const gchar *title, gint height, gint expanded, gint histogram_channel, gint histogram_mode) |
| 1298 | 331 { |
| 332 PaneHistogramData *phd; | |
| 333 | |
| 334 phd = g_new0(PaneHistogramData, 1); | |
| 335 | |
| 336 phd->pane.pane_set_fd = bar_pane_histogram_set_fd; | |
| 1309 | 337 phd->pane.pane_write_config = bar_pane_histogram_write_config; |
| 1298 | 338 phd->pane.title = g_strdup(title); |
| 1309 | 339 phd->pane.expanded = expanded; |
|
1331
a5c15bf32cdb
compute histmap in idle callback and only if the histogram is expanded
nadvornik
parents:
1330
diff
changeset
|
340 phd->idle_id = -1; |
| 1298 | 341 |
| 342 phd->histogram = histogram_new(); | |
|
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
343 |
| 1324 | 344 histogram_set_channel(phd->histogram, histogram_channel); |
|
1329
1fc356f629fe
Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents:
1324
diff
changeset
|
345 histogram_set_mode(phd->histogram, histogram_mode); |
|
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
346 |
| 1298 | 347 phd->widget = gtk_vbox_new(FALSE, PREF_PAD_GAP); |
| 348 | |
| 349 g_object_set_data(G_OBJECT(phd->widget), "pane_data", phd); | |
| 350 g_signal_connect(G_OBJECT(phd->widget), "destroy", | |
| 351 G_CALLBACK(bar_pane_histogram_destroy), phd); | |
| 352 | |
| 353 | |
| 354 gtk_widget_set_size_request(GTK_WIDGET(phd->widget), -1, height); | |
| 355 | |
| 356 phd->drawing_area = gtk_drawing_area_new(); | |
| 357 g_signal_connect_after(G_OBJECT(phd->drawing_area), "size_allocate", | |
| 358 G_CALLBACK(bar_pane_histogram_size_cb), phd); | |
| 359 | |
| 360 g_signal_connect(G_OBJECT(phd->drawing_area), "expose_event", | |
| 361 G_CALLBACK(bar_pane_histogram_expose_event_cb), phd); | |
| 362 | |
| 363 gtk_box_pack_start(GTK_BOX(phd->widget), phd->drawing_area, TRUE, TRUE, 0); | |
| 364 gtk_widget_show(phd->drawing_area); | |
|
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
365 gtk_widget_add_events(phd->drawing_area, GDK_BUTTON_PRESS_MASK); |
| 1298 | 366 |
|
1319
358685fb9dc9
Add a contextual menu on bar pane histogram allowing to change channels and mode. More work needed.
zas_
parents:
1315
diff
changeset
|
367 g_signal_connect(G_OBJECT(phd->drawing_area), "button_press_event", G_CALLBACK(bar_pane_histogram_press_cb), phd); |
| 1298 | 368 |
|
1330
8b6e2a47adc7
Add a tooltip showing current histogram state on bar histogram.
zas_
parents:
1329
diff
changeset
|
369 #if GTK_CHECK_VERSION(2,12,0) |
|
8b6e2a47adc7
Add a tooltip showing current histogram state on bar histogram.
zas_
parents:
1329
diff
changeset
|
370 gtk_widget_set_tooltip_text(phd->drawing_area, histogram_label(phd->histogram)); |
|
8b6e2a47adc7
Add a tooltip showing current histogram state on bar histogram.
zas_
parents:
1329
diff
changeset
|
371 #endif |
| 1298 | 372 gtk_widget_show(phd->widget); |
| 373 | |
| 374 file_data_register_notify_func(bar_pane_histogram_notify_cb, phd, NOTIFY_PRIORITY_LOW); | |
| 375 | |
| 376 return phd->widget; | |
| 377 } | |
| 378 | |
| 1309 | 379 GtkWidget *bar_pane_histogram_new_from_config(const gchar **attribute_names, const gchar **attribute_values) |
| 380 { | |
| 381 gchar *title = g_strdup(_("NoName")); | |
| 382 gboolean expanded = TRUE; | |
| 383 gint height = 80; | |
| 1324 | 384 gint histogram_channel = HCHAN_RGB; |
|
1329
1fc356f629fe
Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents:
1324
diff
changeset
|
385 gint histogram_mode = 0; |
| 1309 | 386 |
| 387 while (*attribute_names) | |
| 388 { | |
| 389 const gchar *option = *attribute_names++; | |
| 390 const gchar *value = *attribute_values++; | |
| 391 | |
| 1315 | 392 if (READ_CHAR_FULL("pane.title", title)) continue; |
| 393 if (READ_BOOL_FULL("pane.expanded", expanded)) continue; | |
| 1324 | 394 if (READ_INT_FULL("histogram_channel", histogram_channel)) continue; |
|
1329
1fc356f629fe
Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents:
1324
diff
changeset
|
395 if (READ_INT_FULL("histogram_mode", histogram_mode)) continue; |
| 1324 | 396 |
| 1309 | 397 |
| 398 DEBUG_1("unknown attribute %s = %s", option, value); | |
| 399 } | |
| 400 | |
|
1329
1fc356f629fe
Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents:
1324
diff
changeset
|
401 return bar_pane_histogram_new(title, height, expanded, histogram_channel, histogram_mode); |
| 1309 | 402 } |
| 403 | |
| 404 | |
| 1298 | 405 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ |
