/*
- * Geeqie
- * (C) 2006 John Ellis
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2006 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
* Author: John Ellis
*
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "main.h"
#include "image-overlay.h"
#include "collect.h"
-#include "debug.h"
#include "exif.h"
#include "filedata.h"
+#include "histogram.h"
#include "image.h"
#include "img-view.h"
#include "layout.h"
+#include "metadata.h"
#include "pixbuf-renderer.h"
#include "pixbuf_util.h"
-#include "histogram.h"
-
+#include "ui_fileops.h"
+#include "image-load.h"
+#include "glua.h"
/*
*----------------------------------------------------------------------------
struct _OverlayStateData {
ImageWindow *imd;
ImageState changed_states;
+ NotifyType notify;
Histogram *histogram;
gint ovl_info;
+ gint x;
+ gint y;
+
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 */
#define OSD_DATA "overlay-data"
-#define OSD_INFO_X 10
-#define OSD_INFO_Y -10
-
#define IMAGE_OSD_DEFAULT_DURATION 30
#define HISTOGRAM_HEIGHT 140
+#define HISTOGRAM_WIDTH 256
static void image_osd_timer_schedule(OverlayStateData *osd);
+void set_image_overlay_template_string(gchar **template_string, const gchar *value)
+{
+ g_assert(template_string);
-void set_default_image_overlay_template_string(ConfOptions *options)
+ g_free(*template_string);
+ *template_string = g_strdup(value);
+}
+
+
+void set_default_image_overlay_template_string(gchar **template_string)
{
- if (options->image_overlay.common.template_string) g_free(options->image_overlay.common.template_string);
- options->image_overlay.common.template_string = g_strdup(DEFAULT_OVERLAY_INFO);
+ set_image_overlay_template_string(template_string, DEFAULT_OVERLAY_INFO);
+}
+
+void set_image_overlay_font_string(gchar **font_string, const gchar *value)
+{
+ g_assert(font_string);
+
+ g_free(*font_string);
+ *font_string = g_strdup(value);
}
static OverlayStateData *image_get_osd_data(ImageWindow *imd)
*/
-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);
+ }
+ }
+}
+
+static gchar *keywords_to_string(FileData *fd)
+{
+ GList *keywords;
+ GString *kwstr = NULL;
+ gchar *ret = NULL;
+
+ g_assert(fd);
+
+ keywords = metadata_read_list(fd, KEYWORD_KEY, METADATA_PLAIN);
+
+ if (keywords)
+ {
+ GList *work = keywords;
+
+ while (work)
+ {
+ gchar *kw = work->data;
+ work = work->next;
+
+ if (!kw) continue;
+ if (!kwstr)
+ kwstr = g_string_new("");
+ else
+ g_string_append(kwstr, ", ");
+
+ g_string_append(kwstr, kw);
}
+ string_list_free(keywords);
}
+
+ if (kwstr)
+ {
+ ret = kwstr->str;
+ g_string_free(kwstr, FALSE);
+ }
+
+ return ret;
}
static gchar *image_osd_mkinfo(const gchar *str, ImageWindow *imd, GHashTable *vars)
{
gchar delim = '%', imp = '|', sep[] = " - ";
gchar *start, *end;
- gint pos, prev;
- gint last;
+ guint pos, prev;
+ 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;
+ prev = -1;
while (TRUE)
{
- gint was_digit = 0;
- gint limit = 0;
+ guint limit = 0;
gchar *trunc = NULL;
+ gchar *limpos = NULL;
+ gchar *extra = NULL;
+ gchar *extrapos = NULL;
gchar *p;
- start = strchr(new->str, delim);
+ start = strchr(new->str + (prev + 1), delim);
if (!start)
break;
end = strchr(start+1, delim);
if (!end)
break;
- for (p = end; p > start; p--)
+ /* Search for optionnal modifiers
+ * %name:99:extra% -> name = "name", limit=99, extra = "extra"
+ */
+ for (p = start + 1; p < end; p++)
{
- if (*p == ':' && was_digit)
+ if (p[0] == ':')
{
- trunc = p;
- break;
+ if (g_ascii_isdigit(p[1]) && !limpos)
+ {
+ limpos = p + 1;
+ if (!trunc) trunc = p;
+ }
+ else
+ {
+ extrapos = p + 1;
+ if (!trunc) trunc = p;
+ break;
+ }
}
- was_digit = g_ascii_isdigit(*p);
}
- if (trunc) limit = atoi(trunc+1);
+ if (limpos)
+ limit = (guint) atoi(limpos);
+
+ if (extrapos)
+ extra = g_strndup(extrapos, end - extrapos);
- name = g_strndup(start+1, ((limit > 0) ? trunc : end)-start-1);
+ name = g_strndup(start+1, (trunc ? trunc : end)-start-1);
+ pos = start - new->str;
+ data = NULL;
+
+ if (strcmp(name, "keywords") == 0)
+ {
+ data = keywords_to_string(imd->image_fd);
+ }
+ else if (strcmp(name, "comment") == 0)
+ {
+ data = metadata_read_string(imd->image_fd, COMMENT_KEY, METADATA_PLAIN);
+ }
+ else if (strcmp(name, "imagecomment") == 0)
+ {
+ data = exif_get_image_comment(imd->image_fd);
+ }
+#ifdef HAVE_LUA
+ else if (strncmp(name, "lua/", 4) == 0)
+ {
+ gchar *tmp;
+ tmp = strchr(name+4, '/');
+ if (!tmp)
+ break;
+ *tmp = '\0';
+ data = lua_callvalue(imd->image_fd, name+4, tmp+1);
+ }
+#endif
+ else
+ {
+ data = g_strdup(g_hash_table_lookup(vars, name));
+ if (!data)
+ data = metadata_read_string(imd->image_fd, name, METADATA_FORMATTED);
+ }
- pos = start-new->str;
- 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 && limit > 0 && strlen(data) > limit + 3)
{
gchar *new_data = g_strdup_printf("%-*.*s...", limit, limit, data);
g_free(data);
data = new_data;
}
+
if (data)
{
/* Since we use pango markup to display, we need to escape here */
g_free(data);
data = escaped;
}
+
+ if (extra)
+ {
+ if (data && *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
+ * 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.
+ * Any \n is replaced by a newline
+ * Examples:
+ * "<i>*</i>\n" -> data is displayed in italics ended with a newline
+ * "\n" -> ended with newline
+ * "ISO *" -> prefix data with "ISO " (ie. "ISO 100")
+ * "\**\*" -> prefix data with a star, and append a star (ie. "*100*")
+ * "\\*" -> prefix data with an anti slash (ie "\100")
+ * "Collection <b>*</b>\n" -> display data in bold prefixed by "Collection " and a newline is appended
+ *
+ * FIXME: using background / foreground colors lead to weird results.
+ */
+ gchar *new_data;
+ gchar *left = NULL;
+ gchar *right = extra;
+ gchar *p;
+ guint len = strlen(extra);
+
+ /* Search for left and right parts and unescape characters */
+ for (p = extra; *p; p++, len--)
+ if (p[0] == '\\')
+ {
+ if (p[1] == 'n')
+ {
+ memmove(p+1, p+2, --len);
+ p[0] = '\n';
+ }
+ else if (p[1] != '\0')
+ memmove(p, p+1, len--); // includes \0
+ }
+ else if (p[0] == '*' && !left)
+ {
+ right = p + 1;
+ left = extra;
+ }
+
+ if (left) right[-1] = '\0';
+
+ new_data = g_strdup_printf("%s%s%s", left ? left : "", data, right);
+ g_free(data);
+ 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)
+ 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(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;
gint width, height;
PangoLayout *layout;
const gchar *name;
- gchar *name_escaped;
gchar *text;
- gchar *size;
- gint n, t;
- CollectionData *cd;
- CollectInfo *info;
- GdkPixbuf *imgpixbuf = NULL;
- LayoutWindow *lw = NULL;
- gint with_hist = 0;
- gchar *ct;
- gint w, h;
- GHashTable *vars;
+ gboolean with_hist;
+ const HistMap *histmap = NULL;
ImageWindow *imd = osd->imd;
FileData *fd = image_get_fd(imd);
+ PangoFontDescription *font_desc;
if (!fd) return NULL;
- vars = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free);
-
name = image_get_name(imd);
if (name)
{
- name_escaped = g_markup_escape_text(name, -1);
- }
- else
- {
- name_escaped = NULL;
- }
+ gint n, t;
+ CollectionData *cd;
+ CollectInfo *info;
+ GHashTable *vars;
- cd = image_get_collection(imd, &info);
- if (cd)
- {
- gchar *buf;
+ vars = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free);
- t = g_list_length(cd->list);
- n = g_list_index(cd->list, info) + 1;
- buf = g_markup_escape_text((cd->name) ? cd->name : _("Untitled"), -1);
- ct = g_strdup_printf("<i>%s</i>\n", buf);
- g_free(buf);
- }
- else
- {
- lw = layout_find_by_image(imd);
- if (lw)
+ cd = image_get_collection(imd, &info);
+ if (cd)
{
- if (lw->slideshow)
+ t = g_list_length(cd->list);
+ n = g_list_index(cd->list, info) + 1;
+ if (cd->name)
{
- n = g_list_length(lw->slideshow->list_done);
- t = n + g_list_length(lw->slideshow->list);
- if (n == 0) n = t;
+ if (file_extension_match(cd->name, GQ_COLLECTION_EXT))
+ osd_template_insert(vars, "collection", remove_extension_from_path(cd->name), OSDT_FREE);
+ else
+ osd_template_insert(vars, "collection", cd->name, OSDT_NONE);
}
else
{
- t = layout_list_count(lw, NULL);
- n = layout_list_get_index(lw, image_get_path(lw->image)) + 1;
+ osd_template_insert(vars, "collection", _("Untitled"), OSDT_NONE);
}
}
- else if (view_window_find_image(imd, &n, &t))
+ else
{
- n++;
+ LayoutWindow *lw = layout_find_by_image(imd);
+ if (lw)
+ {
+ if (lw->slideshow)
+ {
+ n = g_list_length(lw->slideshow->list_done);
+ t = n + g_list_length(lw->slideshow->list);
+ if (n == 0) n = t;
+ }
+ else
+ {
+ t = layout_list_count(lw, NULL);
+ n = layout_list_get_index(lw, image_get_fd(lw->image)) + 1;
+ }
+ }
+ else if (view_window_find_image(imd, &n, &t))
+ {
+ n++;
+ }
+ else
+ {
+ t = 1;
+ n = 1;
+ }
+
+ if (n < 1) n = 1;
+ if (t < 1) t = 1;
+
+ osd_template_insert(vars, "collection", NULL, OSDT_NONE);
}
+
+ 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 && load_pixbuf &&
+ image_get_pixbuf(imd) != load_pixbuf)
+ {
+ w = gdk_pixbuf_get_width(load_pixbuf);
+ h = gdk_pixbuf_get_height(load_pixbuf);
+ }
+ else
+ {
+ image_get_image_size(imd, &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);
+ }
else
{
- t = 1;
- n = 1;
+ osd_template_insert(vars, "width", NULL, OSDT_NONE);
+ osd_template_insert(vars, "height", NULL, OSDT_NONE);
+ osd_template_insert(vars, "res", NULL, OSDT_NONE);
}
- if (n < 1) n = 1;
- if (t < 1) t = 1;
+ text = image_osd_mkinfo(options->image_overlay.template_string, imd, vars);
+ g_hash_table_destroy(vars);
- ct = g_strdup("");
- }
+ } else {
+ /* When does this occur ?? */
+ text = g_markup_escape_text(_("Untitled"), -1);
+ }
- size = text_from_size_abrev(imd->size);
- if (!imd->unknown)
+ with_hist = ((osd->show & OSD_SHOW_HISTOGRAM) && osd->histogram);
+ if (with_hist)
{
- if (imd->delay_flip &&
- imd->il && imd->il->pixbuf &&
- image_get_pixbuf(imd) != imd->il->pixbuf)
+ histmap = histmap_get(imd->image_fd);
+ if (!histmap)
{
- w = gdk_pixbuf_get_width(imd->il->pixbuf);
- h = gdk_pixbuf_get_height(imd->il->pixbuf);
- imgpixbuf = imd->il->pixbuf;
+ histmap_start_idle(imd->image_fd);
+ with_hist = FALSE;
}
- else
- {
- image_get_image_size(imd, &w, &h);
- imgpixbuf = (PIXBUF_RENDERER(imd->pr))->pixbuf;
- }
-
- if (imgpixbuf && (osd->show & OSD_SHOW_HISTOGRAM) && osd->histogram
- && (!imd->il || imd->il->done))
- with_hist=1;
-
- 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));
- }
-
- g_hash_table_insert(vars, "collection", g_strdup(ct));
- 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_strdup(name_escaped));
- g_hash_table_insert(vars, "date", g_strdup(text_from_time(imd->mtime)));
- g_hash_table_insert(vars, "size", g_strdup(size));
- g_hash_table_insert(vars, "zoom", image_zoom_get_as_text(imd));
-
- if (!name_escaped)
- {
- text = g_strdup_printf(_("Untitled"));
- }
- else
- {
- text = image_osd_mkinfo(options->image_overlay.common.template_string, imd, vars);
}
- g_free(size);
- g_free(ct);
- g_free(name_escaped);
- g_hash_table_destroy(vars);
{
gint active_marks = 0;
for (mark = 0; mark < FILEDATA_MARKS_SIZE; mark++)
{
- active_marks += fd->marks[mark];
+ active_marks += file_data_get_mark(fd, mark);
}
if (active_marks > 0)
for (mark = 0; mark < FILEDATA_MARKS_SIZE; mark++)
{
- g_string_append_printf(buf, fd->marks[mark] ? " <span background='#FF00FF'>%c</span>" : " %c", '1' + 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)
}
}
+ font_desc = pango_font_description_from_string(options->image_overlay.font);
layout = gtk_widget_create_pango_layout(imd->pr, NULL);
+ pango_layout_set_font_description(layout, font_desc);
+
pango_layout_set_markup(layout, text, -1);
g_free(text);
if (with_hist)
{
- histogram_read(osd->histogram, imgpixbuf);
- if (width < 266) width = 266;
+ if (width < HISTOGRAM_WIDTH + 10) width = HISTOGRAM_WIDTH + 10;
height += HISTOGRAM_HEIGHT + 5;
}
if (width > 0 && height > 0)
{
- /* TODO: make osd color configurable --Zas */
pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, width, height);
- pixbuf_set_rect_fill(pixbuf, 3, 3, width-6, height-6, 240, 240, 240, 210);
+ pixbuf_set_rect_fill(pixbuf, 3, 3, width-6, height-6, options->image_overlay.background_red, options->image_overlay.background_green,
+ options->image_overlay.background_blue, options->image_overlay.background_alpha);
pixbuf_set_rect(pixbuf, 0, 0, width, height, 240, 240, 240, 80, 1, 1, 1, 1);
pixbuf_set_rect(pixbuf, 1, 1, width-2, height-2, 240, 240, 240, 130, 1, 1, 1, 1);
pixbuf_set_rect(pixbuf, 2, 2, width-4, height-4, 240, 240, 240, 180, 1, 1, 1, 1);
pixbuf_pixel_set(pixbuf, width - 1, height - 1, 0, 0, 0, 0);
if (with_hist)
- histogram_draw(osd->histogram, pixbuf, 5, height - HISTOGRAM_HEIGHT - 5 , width - 10, HISTOGRAM_HEIGHT);
+ {
+ gint x = 5;
+ gint y = height - HISTOGRAM_HEIGHT - 5;
+ gint w = width - 10;
- pixbuf_draw_layout(pixbuf, layout, imd->pr, 5, 5, 0, 0, 0, 255);
+ 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, options->image_overlay.text_red, options->image_overlay.text_green,
+ options->image_overlay.text_blue, options->image_overlay.text_alpha);
}
g_object_unref(G_OBJECT(layout));
return icon;
}
+static gint image_overlay_add(ImageWindow *imd, GdkPixbuf *pixbuf, gint x, gint y,
+ OverlayRendererFlags flags)
+{
+ return pixbuf_renderer_overlay_add((PixbufRenderer *)imd->pr, pixbuf, x, y, flags);
+}
+
+static void image_overlay_set(ImageWindow *imd, gint id, GdkPixbuf *pixbuf, gint x, gint y)
+{
+ pixbuf_renderer_overlay_set((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
+}
+
+static void image_overlay_remove(ImageWindow *imd, gint id)
+{
+ pixbuf_renderer_overlay_remove((PixbufRenderer *)imd->pr, id);
+}
+
static void image_osd_icon_show(OverlayStateData *osd, ImageOSDFlag flag)
{
GdkPixbuf *pixbuf;
osd->icon_id[flag] = image_overlay_add(osd->imd, pixbuf,
osd_icons[flag].x, osd_icons[flag].y,
- TRUE, FALSE);
+ OVL_RELATIVE);
}
static void image_osd_icon_hide(OverlayStateData *osd, ImageOSDFlag flag)
}
}
-static gint image_osd_update_cb(gpointer data)
+static void image_osd_icons_reset_time(OverlayStateData *osd)
{
- OverlayStateData *osd = data;
+ gint i;
- osd->imd->overlay_show_zoom = FALSE;
+ for (i = 0; i < IMAGE_OSD_COUNT; i++)
+ {
+ if (osd_icons[i].reset)
+ {
+ osd->icon_time[i] = 0;
+ }
+ }
+}
+
+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_INFO_X, OSD_INFO_Y, TRUE, FALSE);
- }
- else
- {
- image_overlay_set(osd->imd, osd->ovl_info, pixbuf, OSD_INFO_X, OSD_INFO_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)
{
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.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);
}
-gint image_osd_get(ImageWindow *imd, OsdShowFlags *show)
+OsdShowFlags image_osd_get(ImageWindow *imd)
{
OverlayStateData *osd = image_get_osd_data(imd);
- if (!osd)
- {
- if (show) *show = OSD_SHOW_NOTHING;
- return FALSE;
- }
+ return osd ? osd->show : OSD_SHOW_NOTHING;
+}
- if (show) *show = osd->show;
+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;
- return TRUE;
}
/* duration:
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