/*
* Geeqie
* (C) 2006 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
#include "main.h"
#include "image-overlay.h"
-#include "bar_info.h"
#include "collect.h"
#include "exif.h"
#include "filedata.h"
#include "image.h"
#include "img-view.h"
#include "layout.h"
+#include "metadata.h"
#include "pixbuf-renderer.h"
#include "pixbuf_util.h"
#include "ui_fileops.h"
+#include "image-load.h"
/*
*----------------------------------------------------------------------------
struct _OverlayStateData {
ImageWindow *imd;
ImageState changed_states;
+ NotifyType notify;
Histogram *histogram;
gint icon_time[IMAGE_OSD_COUNT];
gint icon_id[IMAGE_OSD_COUNT];
- gint idle_id;
- gint timer_id;
+ guint idle_id; /* event source id */
+ guint timer_id; /* event source id */
gulong destroy_id;
};
typedef struct _OSDIcon OSDIcon;
struct _OSDIcon {
- gint reset; /* reset on new image */
+ gboolean reset; /* reset on new image */
gint x; /* x, y offset */
gint y;
gchar *key; /* inline pixbuf */
*/
-void image_osd_histogram_chan_toggle(ImageWindow *imd)
+void image_osd_histogram_toggle_channel(ImageWindow *imd)
{
OverlayStateData *osd = image_get_osd_data(imd);
if (!osd || !osd->histogram) return;
- histogram_set_channel(osd->histogram, (histogram_get_channel(osd->histogram) +1)%HCHAN_COUNT);
+ histogram_toggle_channel(osd->histogram);
image_osd_update(imd);
}
-void image_osd_histogram_log_toggle(ImageWindow *imd)
+void image_osd_histogram_toggle_mode(ImageWindow *imd)
{
OverlayStateData *osd = image_get_osd_data(imd);
if (!osd || !osd->histogram) return;
- histogram_set_mode(osd->histogram, !histogram_get_mode(osd->histogram));
+ histogram_toggle_mode(osd->histogram);
image_osd_update(imd);
}
+void image_osd_histogram_set_channel(ImageWindow *imd, gint chan)
+{
+ OverlayStateData *osd = image_get_osd_data(imd);
+
+ if (!osd || !osd->histogram) return;
+
+ histogram_set_channel(osd->histogram, chan);
+ image_osd_update(imd);
+}
+
+void image_osd_histogram_set_mode(ImageWindow *imd, gint mode)
+{
+ OverlayStateData *osd = image_get_osd_data(imd);
+
+ if (!osd || !osd->histogram) return;
+
+ histogram_set_mode(osd->histogram, mode);
+ image_osd_update(imd);
+}
+
+gint image_osd_histogram_get_channel(ImageWindow *imd)
+{
+ OverlayStateData *osd = image_get_osd_data(imd);
+
+ if (!osd || !osd->histogram) return HCHAN_DEFAULT;
+
+ return histogram_get_channel(osd->histogram);
+}
+
+gint image_osd_histogram_get_mode(ImageWindow *imd)
+{
+ OverlayStateData *osd = image_get_osd_data(imd);
+
+ if (!osd || !osd->histogram) return 0;
+
+ return histogram_get_mode(osd->histogram);
+}
+
void image_osd_toggle(ImageWindow *imd)
{
- OverlayStateData *osd;
+ OsdShowFlags show;
if (!imd) return;
- osd = image_get_osd_data(imd);
- if (!osd)
+ show = image_osd_get(imd);
+ if (show == OSD_SHOW_NOTHING)
{
image_osd_set(imd, OSD_SHOW_INFO | OSD_SHOW_STATUS);
return;
}
-
- if (osd->show != OSD_SHOW_NOTHING)
+ else
{
- if (osd->show & OSD_SHOW_HISTOGRAM)
+ if (show & OSD_SHOW_HISTOGRAM)
{
image_osd_set(imd, OSD_SHOW_NOTHING);
}
else
{
- image_osd_set(imd, osd->show | OSD_SHOW_HISTOGRAM);
+ image_osd_set(imd, show | OSD_SHOW_HISTOGRAM);
}
}
}
g_assert(fd);
- if (comment_read(fd, &keywords, NULL))
+ keywords = metadata_read_list(fd, KEYWORD_KEY, METADATA_PLAIN);
+
+ if (keywords)
{
GList *work = keywords;
{
gchar *kw = work->data;
work = work->next;
-
+
if (!kw) continue;
if (!kwstr)
kwstr = g_string_new("");
g_string_append(kwstr, kw);
}
+ string_list_free(keywords);
}
if (kwstr)
gchar delim = '%', imp = '|', sep[] = " - ";
gchar *start, *end;
guint pos, prev;
- guint last;
+ gboolean want_separator = FALSE;
gchar *name, *data;
GString *new;
gchar *ret;
- ExifData *exif;
if (!str || !*str) return g_strdup("");
new = g_string_new(str);
- exif = exif_read_fd(imd->image_fd);
prev = 0;
- last = FALSE;
while (TRUE)
{
}
else if (strcmp(name, "comment") == 0)
{
- comment_read(imd->image_fd, NULL, &data);
+ data = metadata_read_string(imd->image_fd, COMMENT_KEY, METADATA_PLAIN);
}
else
{
data = g_strdup(g_hash_table_lookup(vars, name));
- if (data && strcmp(name, "zoom") == 0) imd->overlay_show_zoom = TRUE;
- if (!data && exif)
- data = exif_get_data_as_text(exif, name);
+ if (!data)
+ data = metadata_read_string(imd->image_fd, name, METADATA_FORMATTED);
}
+
if (data && *data && limit > 0 && strlen(data) > limit + 3)
{
gchar *new_data = g_strdup_printf("%-*.*s...", limit, limit, data);
{
/* Display data between left and right parts of extra string
* the data is expressed by a '*' character. A '*' may be escaped
- * by a \. You should escape all '*' characters, do not rely on the
+ * by a \. You should escape all '*' characters, do not rely on the
* current implementation which only replaces the first unescaped '*'.
* If no "*" is present, the extra string is just appended to data string.
* Pango mark up is accepted in left and right parts.
data = new_data;
}
g_free(extra);
- }
+ }
g_string_erase(new, pos, end-start+1);
- if (data)
- g_string_insert(new, pos, data);
-
- if (pos-prev >= 2 && new->str[pos-1] == imp)
+ if (data && *data)
{
- g_string_erase(new, --pos, 1);
- if (last && data && *data)
+ if (want_separator)
{
+ /* insert separator */
g_string_insert(new, pos, sep);
pos += strlen(sep);
+ want_separator = FALSE;
}
+
+ g_string_insert(new, pos, data);
+ pos += strlen(data);
+ }
+
+ if (pos-prev >= 1 && new->str[pos] == imp)
+ {
+ /* pipe character is replaced by a separator, delete it
+ * and raise a flag if needed */
+ g_string_erase(new, pos--, 1);
+ want_separator |= (data && *data);
}
- prev = data ? pos+strlen(data)-1 : pos-1;
- last = data ? TRUE : last;
+ if (new->str[pos] == '\n') want_separator = FALSE;
+
+ prev = pos - 1;
+
g_free(name);
g_free(data);
}
- exif_free_fd(imd->image_fd, exif);
/* search and destroy empty lines */
end = new->str;
while ((start = strchr(end, '\n')))
return ret;
}
+typedef enum {
+ OSDT_NONE = 0,
+ OSDT_FREE = 1 << 0,
+ OSDT_NO_DUP = 1 << 1
+} OsdTemplateFlags;
+
+static void osd_template_insert(GHashTable *vars, gchar *keyword, gchar *value, OsdTemplateFlags flags)
+{
+ if (!value)
+ {
+ g_hash_table_insert(vars, keyword, g_strdup(""));
+ return;
+ }
+
+ if (flags & OSDT_NO_DUP)
+ {
+ g_hash_table_insert(vars, keyword, value);
+ return;
+ }
+ else
+ {
+ g_hash_table_insert(vars, keyword, g_strdup(value));
+ }
+
+ if (flags & OSDT_FREE) g_free((gpointer) value);
+}
+
static GdkPixbuf *image_osd_info_render(OverlayStateData *osd)
{
GdkPixbuf *pixbuf = NULL;
PangoLayout *layout;
const gchar *name;
gchar *text;
- GdkPixbuf *imgpixbuf = NULL;
gboolean with_hist;
- ImageWindow *imd = osd->imd;
+ const HistMap *histmap = NULL;
+ ImageWindow *imd = osd->imd;
FileData *fd = image_get_fd(imd);
if (!fd) return NULL;
CollectionData *cd;
CollectInfo *info;
GHashTable *vars;
-
+
vars = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free);
cd = image_get_collection(imd, &info);
if (cd)
{
- gchar *collection_name;
-
t = g_list_length(cd->list);
n = g_list_index(cd->list, info) + 1;
if (cd->name)
{
if (file_extension_match(cd->name, GQ_COLLECTION_EXT))
- collection_name = remove_extension_from_path(cd->name);
+ osd_template_insert(vars, "collection", remove_extension_from_path(cd->name), OSDT_FREE);
else
- collection_name = g_strdup(cd->name);
+ osd_template_insert(vars, "collection", cd->name, OSDT_NONE);
}
else
{
- collection_name = g_strdup(_("Untitled"));
+ osd_template_insert(vars, "collection", _("Untitled"), OSDT_NONE);
}
-
- g_hash_table_insert(vars, "collection", g_markup_escape_text(collection_name, -1));
- g_free(collection_name);
}
else
{
if (n < 1) n = 1;
if (t < 1) t = 1;
- g_hash_table_insert(vars, "collection", g_strdup(""));
+ osd_template_insert(vars, "collection", NULL, OSDT_NONE);
}
-
- g_hash_table_insert(vars, "number", g_strdup_printf("%d", n));
- g_hash_table_insert(vars, "total", g_strdup_printf("%d", t));
- g_hash_table_insert(vars, "name", g_markup_escape_text(name, -1));
- g_hash_table_insert(vars, "date", g_strdup(text_from_time(imd->mtime)));
- g_hash_table_insert(vars, "size", text_from_size_abrev(imd->size));
- g_hash_table_insert(vars, "zoom", image_zoom_get_as_text(imd));
-
+
+ osd_template_insert(vars, "number", g_strdup_printf("%d", n), OSDT_NO_DUP);
+ osd_template_insert(vars, "total", g_strdup_printf("%d", t), OSDT_NO_DUP);
+ osd_template_insert(vars, "name", (gchar *) name, OSDT_NONE);
+ osd_template_insert(vars, "date", imd->image_fd ? ((gchar *) text_from_time(imd->image_fd->date)) : "", OSDT_NONE);
+ osd_template_insert(vars, "size", imd->image_fd ? (text_from_size_abrev(imd->image_fd->size)) : g_strdup(""), OSDT_FREE);
+ osd_template_insert(vars, "zoom", image_zoom_get_as_text(imd), OSDT_FREE);
+
if (!imd->unknown)
{
gint w, h;
+ GdkPixbuf *load_pixbuf = image_loader_get_pixbuf(imd->il);
if (imd->delay_flip &&
- imd->il && imd->il->pixbuf &&
- image_get_pixbuf(imd) != imd->il->pixbuf)
+ imd->il && load_pixbuf &&
+ image_get_pixbuf(imd) != load_pixbuf)
{
- w = gdk_pixbuf_get_width(imd->il->pixbuf);
- h = gdk_pixbuf_get_height(imd->il->pixbuf);
- imgpixbuf = imd->il->pixbuf;
+ w = gdk_pixbuf_get_width(load_pixbuf);
+ h = gdk_pixbuf_get_height(load_pixbuf);
}
else
{
image_get_image_size(imd, &w, &h);
- imgpixbuf = (PIXBUF_RENDERER(imd->pr))->pixbuf;
}
- g_hash_table_insert(vars, "width", g_strdup_printf("%d", w));
- g_hash_table_insert(vars, "height", g_strdup_printf("%d", h));
- g_hash_table_insert(vars, "res", g_strdup_printf("%d × %d", w, h));
+
+ osd_template_insert(vars, "width", g_strdup_printf("%d", w), OSDT_NO_DUP);
+ osd_template_insert(vars, "height", g_strdup_printf("%d", h), OSDT_NO_DUP);
+ osd_template_insert(vars, "res", g_strdup_printf("%d × %d", w, h), OSDT_FREE);
}
-
- text = image_osd_mkinfo(options->image_overlay.common.template_string, imd, vars);
+ else
+ {
+ osd_template_insert(vars, "width", NULL, OSDT_NONE);
+ osd_template_insert(vars, "height", NULL, OSDT_NONE);
+ osd_template_insert(vars, "res", NULL, OSDT_NONE);
+ }
+
+ text = image_osd_mkinfo(options->image_overlay.template_string, imd, vars);
g_hash_table_destroy(vars);
} else {
/* When does this occur ?? */
- text = g_strdup(_("Untitled"));
+ text = g_markup_escape_text(_("Untitled"), -1);
}
- with_hist = (imgpixbuf && (osd->show & OSD_SHOW_HISTOGRAM) && osd->histogram && (!imd->il || imd->il->done));
+ with_hist = ((osd->show & OSD_SHOW_HISTOGRAM) && osd->histogram);
+ if (with_hist)
+ {
+ histmap = histmap_get(imd->image_fd);
+ if (!histmap)
+ {
+ histmap_start_idle(imd->image_fd);
+ with_hist = FALSE;
+ }
+ }
+
{
gint active_marks = 0;
for (mark = 0; mark < FILEDATA_MARKS_SIZE; mark++)
{
g_string_append_printf(buf, file_data_get_mark(fd, mark) ? " <span background='#FF00FF'>%c</span>" : " %c", '1' + mark);
- }
+ }
if (*text)
text2 = g_strdup_printf("%s\n%s", text, buf->str);
text = text2;
}
- if (with_hist)
+ if (with_hist)
{
gchar *escaped_histogram_label = g_markup_escape_text(histogram_label(osd->histogram), -1);
if (*text)
if (with_hist)
{
- histogram_read(osd->histogram, imgpixbuf);
if (width < HISTOGRAM_WIDTH + 10) width = HISTOGRAM_WIDTH + 10;
height += HISTOGRAM_HEIGHT + 5;
}
gint x = 5;
gint y = height - HISTOGRAM_HEIGHT - 5;
gint w = width - 10;
- float xoffset = 0;
- gint subdiv = 5;
- gint c = 160;
- gint alpha = 250;
- gint i;
- float add = w / (float)subdiv;
-
- for (i = 0; i < subdiv; i++)
- {
- gint d = (i > 0 ? 0 : 1);
- pixbuf_set_rect(pixbuf, x + xoffset + 0.5, y, add + d + 0.5, HISTOGRAM_HEIGHT, c, c, c, alpha, d, 1, 1, 1);
- xoffset += add+d;
- }
-
- histogram_draw(osd->histogram, pixbuf, x, y, w, HISTOGRAM_HEIGHT);
+ pixbuf_set_rect_fill(pixbuf, x, y, w, HISTOGRAM_HEIGHT, 220, 220, 220, 210);
+ histogram_draw(osd->histogram, histmap, pixbuf, x, y, w, HISTOGRAM_HEIGHT);
}
pixbuf_draw_layout(pixbuf, layout, imd->pr, 5, 5, 0, 0, 0, 255);
}
pixbuf_renderer_overlay_set((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
}
-#if 0 /* unused for now */
-static gint image_overlay_get(ImageWindow *imd, gint id, GdkPixbuf **pixbuf, gint *x, gint *y)
-{
- return pixbuf_renderer_overlay_get((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
-}
-#endif
-
static void image_overlay_remove(ImageWindow *imd, gint id)
{
pixbuf_renderer_overlay_remove((PixbufRenderer *)imd->pr, id);
}
}
-static gint image_osd_update_cb(gpointer data)
+static void image_osd_icons_reset_time(OverlayStateData *osd)
{
- OverlayStateData *osd = data;
+ gint i;
+
+ for (i = 0; i < IMAGE_OSD_COUNT; i++)
+ {
+ if (osd_icons[i].reset)
+ {
+ osd->icon_time[i] = 0;
+ }
+ }
+}
- osd->imd->overlay_show_zoom = FALSE;
+static void image_osd_icons_update(OverlayStateData *osd)
+{
+ gint i;
+
+ for (i = 0; i < IMAGE_OSD_COUNT; i++)
+ {
+ if (osd->icon_time[i] > 0)
+ {
+ image_osd_icon_show(osd, i);
+ }
+ else
+ {
+ image_osd_icon_hide(osd, i);
+ }
+ }
+}
+
+static void image_osd_icons_hide(OverlayStateData *osd)
+{
+ gint i;
+
+ for (i = 0; i < IMAGE_OSD_COUNT; i++)
+ {
+ image_osd_icon_hide(osd, i);
+ }
+}
+
+static void image_osd_info_show(OverlayStateData *osd, GdkPixbuf *pixbuf)
+{
+ if (osd->ovl_info == 0)
+ {
+ osd->ovl_info = image_overlay_add(osd->imd, pixbuf, osd->x, osd->y, OVL_RELATIVE);
+ }
+ else
+ {
+ image_overlay_set(osd->imd, osd->ovl_info, pixbuf, osd->x, osd->y);
+ }
+}
+
+static void image_osd_info_hide(OverlayStateData *osd)
+{
+ if (osd->ovl_info == 0) return;
+
+ image_overlay_remove(osd->imd, osd->ovl_info);
+ osd->ovl_info = 0;
+}
+
+static gboolean image_osd_update_cb(gpointer data)
+{
+ OverlayStateData *osd = data;
if (osd->show & OSD_SHOW_INFO)
{
- if (osd->changed_states & IMAGE_STATE_IMAGE)
+ /* redraw when the image was changed,
+ with histogram we have to redraw also when loading is finished */
+ if (osd->changed_states & IMAGE_STATE_IMAGE ||
+ (osd->changed_states & IMAGE_STATE_LOADING && osd->show & OSD_SHOW_HISTOGRAM) ||
+ osd->notify & NOTIFY_HISTMAP)
{
GdkPixbuf *pixbuf;
pixbuf = image_osd_info_render(osd);
if (pixbuf)
{
- if (osd->ovl_info == 0)
- {
- osd->ovl_info = image_overlay_add(osd->imd, pixbuf,
- osd->x, osd->y, OVL_RELATIVE);
- }
- else
- {
- image_overlay_set(osd->imd, osd->ovl_info, pixbuf, osd->x, osd->y);
- }
+ image_osd_info_show(osd, pixbuf);
g_object_unref(pixbuf);
}
- else if (osd->ovl_info)
+ else
{
- image_overlay_remove(osd->imd, osd->ovl_info);
- osd->ovl_info = 0;
+ image_osd_info_hide(osd);
}
}
}
else
{
- if (osd->ovl_info)
- {
- image_overlay_remove(osd->imd, osd->ovl_info);
- osd->ovl_info = 0;
- }
+ image_osd_info_hide(osd);
}
if (osd->show & OSD_SHOW_STATUS)
{
- gint i;
-
if (osd->changed_states & IMAGE_STATE_IMAGE)
- {
- for (i = 0; i < IMAGE_OSD_COUNT; i++)
- {
- if (osd_icons[i].reset) osd->icon_time[i] = 0;
- }
- }
-
+ image_osd_icons_reset_time(osd);
+
if (osd->changed_states & IMAGE_STATE_COLOR_ADJ)
{
osd->icon_time[IMAGE_OSD_COLOR] = IMAGE_OSD_DEFAULT_DURATION + 1;
image_osd_timer_schedule(osd);
}
- for (i = 0; i < IMAGE_OSD_COUNT; i++)
- {
- if (osd->icon_time[i] > 0)
- {
- image_osd_icon_show(osd, i);
- }
- else
- {
- image_osd_icon_hide(osd, i);
- }
- }
+ image_osd_icons_update(osd);
}
else
{
- gint i;
-
- for (i = 0; i < IMAGE_OSD_COUNT; i++)
- {
- image_osd_icon_hide(osd, i);
- }
+ image_osd_icons_hide(osd);
}
- if (osd->imd->il && osd->imd->il->done)
- osd->changed_states = IMAGE_STATE_NONE;
- osd->idle_id = -1;
+ osd->changed_states = IMAGE_STATE_NONE;
+ osd->notify = 0;
+ osd->idle_id = 0;
return FALSE;
}
-static void image_osd_update_schedule(OverlayStateData *osd, gint force)
+static void image_osd_update_schedule(OverlayStateData *osd, gboolean force)
{
if (force) osd->changed_states |= IMAGE_STATE_IMAGE;
- if (osd->idle_id == -1)
+ if (!osd->idle_id)
{
osd->idle_id = g_idle_add_full(G_PRIORITY_HIGH, image_osd_update_cb, osd, NULL);
}
image_osd_update_schedule(osd, TRUE);
}
-static gint image_osd_timer_cb(gpointer data)
+static gboolean image_osd_timer_cb(gpointer data)
{
OverlayStateData *osd = data;
- gint done = TRUE;
- gint changed = FALSE;
+ gboolean done = TRUE;
+ gboolean changed = FALSE;
gint i;
for (i = 0; i < IMAGE_OSD_COUNT; i++)
if (done)
{
- osd->timer_id = -1;
+ osd->timer_id = 0;
return FALSE;
}
static void image_osd_timer_schedule(OverlayStateData *osd)
{
- if (osd->timer_id == -1)
+ if (!osd->timer_id)
{
osd->timer_id = g_timeout_add(100, image_osd_timer_cb, osd);
}
image_osd_update_schedule(osd, FALSE);
}
+static void image_osd_notify_cb(FileData *fd, NotifyType type, gpointer data)
+{
+ OverlayStateData *osd = data;
+
+ if ((type & (NOTIFY_HISTMAP)) && osd->imd && fd == osd->imd->image_fd)
+ {
+ DEBUG_1("Notify osd: %s %04x", fd->path, type);
+ osd->notify |= type;
+ image_osd_update_schedule(osd, FALSE);
+ }
+}
+
+
static void image_osd_free(OverlayStateData *osd)
{
if (!osd) return;
- if (osd->idle_id != -1) g_source_remove(osd->idle_id);
- if (osd->timer_id != -1) g_source_remove(osd->timer_id);
+ if (osd->idle_id) g_source_remove(osd->idle_id);
+ if (osd->timer_id) g_source_remove(osd->timer_id);
+
+ file_data_unregister_notify_func(image_osd_notify_cb, osd);
if (osd->imd)
{
- gint i;
-
image_set_osd_data(osd->imd, NULL);
g_signal_handler_disconnect(osd->imd->pr, osd->destroy_id);
image_set_state_func(osd->imd, NULL, NULL);
- image_overlay_remove(osd->imd, osd->ovl_info);
- for (i = 0; i < IMAGE_OSD_COUNT; i++)
- {
- image_osd_icon_hide(osd, i);
- }
+ image_osd_info_hide(osd);
+ image_osd_icons_hide(osd);
}
if (osd->histogram) histogram_free(osd->histogram);
g_free(osd);
}
-static void image_osd_remove(ImageWindow *imd)
-{
- OverlayStateData *osd = image_get_osd_data(imd);
-
- if (osd) image_osd_free(osd);
-}
-
static void image_osd_destroy_cb(GtkWidget *widget, gpointer data)
{
OverlayStateData *osd = data;
{
osd = g_new0(OverlayStateData, 1);
osd->imd = imd;
- osd->idle_id = -1;
- osd->timer_id = -1;
osd->show = OSD_SHOW_NOTHING;
- osd->histogram = NULL;
- osd->x = options->image_overlay.common.x;
- osd->y = options->image_overlay.common.y;
+ osd->x = options->image_overlay.x;
+ osd->y = options->image_overlay.y;
+ osd->histogram = histogram_new();
+
osd->destroy_id = g_signal_connect(G_OBJECT(imd->pr), "destroy",
G_CALLBACK(image_osd_destroy_cb), osd);
image_set_osd_data(imd, osd);
image_set_state_func(osd->imd, image_osd_state_cb, osd);
- }
-
- if (show & OSD_SHOW_HISTOGRAM)
- osd->histogram = histogram_new();
- else if (osd->histogram)
- {
- histogram_free(osd->histogram);
- osd->histogram = NULL;
+ file_data_register_notify_func(image_osd_notify_cb, osd, NOTIFY_PRIORITY_LOW);
}
if (show & OSD_SHOW_STATUS)
{
if (!imd) return;
- if (show == OSD_SHOW_NOTHING)
- {
- image_osd_remove(imd);
- return;
- }
-
image_osd_enable(imd, show);
}
return osd ? osd->show : OSD_SHOW_NOTHING;
}
+Histogram *image_osd_get_histogram(ImageWindow *imd)
+{
+ OverlayStateData *osd = image_get_osd_data(imd);
+
+ return osd ? osd->histogram : NULL;
+}
+
+void image_osd_copy_status(ImageWindow *src, ImageWindow *dest)
+{
+ Histogram *h_src, *h_dest;
+ image_osd_set(dest, image_osd_get(src));
+
+ h_src = image_osd_get_histogram(src);
+ h_dest = image_osd_get_histogram(dest);
+
+ h_dest->histogram_mode = h_src->histogram_mode;
+ h_dest->histogram_channel = h_src->histogram_channel;
+
+}
+
/* duration:
0 = hide
1 = show
if (!osd) return;
- if (flag < IMAGE_OSD_NONE || flag >= IMAGE_OSD_COUNT) return;
+ if (flag >= IMAGE_OSD_COUNT) return;
if (duration < 0) duration = IMAGE_OSD_DEFAULT_DURATION;
if (duration > 1) duration += 1;
image_osd_update_schedule(osd, FALSE);
image_osd_timer_schedule(osd);
}
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
projects / geeqie.git / blobdiff