/*
- * Geeqie
- * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2012 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 "exif.h"
#include "filedata.h"
#include "histogram.h"
#include "image.h"
#include "img-view.h"
#include "layout.h"
-#include "metadata.h"
+#include "osd.h"
#include "pixbuf-renderer.h"
#include "pixbuf_util.h"
#include "ui_fileops.h"
#include "image-load.h"
-#include "glua.h"
/*
*----------------------------------------------------------------------------
Histogram *histogram;
OsdShowFlags show;
+ OverlayRendererFlags origin;
gint ovl_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)
{
OverlayStateData *osd;
void image_osd_toggle(ImageWindow *imd)
{
OsdShowFlags show;
-
if (!imd) return;
show = image_osd_get(imd);
}
}
-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;
- guint pos, prev;
- gboolean want_separator = FALSE;
- gchar *name, *data;
- GString *new;
- gchar *ret;
-
- if (!str || !*str) return g_strdup("");
-
- new = g_string_new(str);
-
- prev = 0;
-
- while (TRUE)
- {
- guint limit = 0;
- gchar *trunc = NULL;
- gchar *limpos = NULL;
- gchar *extra = NULL;
- gchar *extrapos = NULL;
- gchar *p;
-
- start = strchr(new->str, delim);
- if (!start)
- break;
- end = strchr(start+1, delim);
- if (!end)
- break;
-
- /* Search for optionnal modifiers
- * %name:99:extra% -> name = "name", limit=99, extra = "extra"
- */
- for (p = start + 1; p < end; p++)
- {
- if (p[0] == ':')
- {
- if (g_ascii_isdigit(p[1]) && !limpos)
- {
- limpos = p + 1;
- if (!trunc) trunc = p;
- }
- else
- {
- extrapos = p + 1;
- if (!trunc) trunc = p;
- break;
- }
- }
- }
-
- if (limpos)
- limit = (guint) atoi(limpos);
-
- if (extrapos)
- extra = g_strndup(extrapos, end - extrapos);
-
- 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);
- }
-#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);
- }
-
- 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 */
- gchar *escaped = g_markup_escape_text(data, -1);
- 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 && *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);
- }
-
- if (new->str[pos] == '\n') want_separator = FALSE;
-
- prev = pos - 1;
-
- g_free(name);
- g_free(data);
- }
-
- /* search and destroy empty lines */
- end = new->str;
- while ((start = strchr(end, '\n')))
- {
- end = start;
- while (*++(end) == '\n')
- ;
- g_string_erase(new, start-new->str, end-start-1);
- }
-
- g_strchomp(new->str);
-
- ret = new->str;
- g_string_free(new, FALSE);
-
- 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;
const HistMap *histmap = NULL;
ImageWindow *imd = osd->imd;
FileData *fd = image_get_fd(imd);
+ PangoFontDescription *font_desc;
if (!fd) return NULL;
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, "path", (gchar *) image_get_path(imd), 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);
osd_template_insert(vars, "res", NULL, OSDT_NONE);
}
- text = image_osd_mkinfo(options->image_overlay.template_string, imd, vars);
+ text = image_osd_mkinfo(options->image_overlay.template_string, imd->image_fd, vars);
g_hash_table_destroy(vars);
} else {
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);
+ g_string_append_printf(buf, file_data_get_mark(fd, mark) ? " <span background='#FF00FF'>%c</span>" : " %c", '1' + (mark < 9 ? mark : -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 (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_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_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));
{
if (osd->ovl_info == 0)
{
- osd->ovl_info = image_overlay_add(osd->imd, pixbuf, osd->x, osd->y, OVL_RELATIVE);
+ osd->ovl_info = image_overlay_add(osd->imd, pixbuf, osd->x, osd->y, osd->origin);
}
else
{
osd->show = OSD_SHOW_NOTHING;
osd->x = options->image_overlay.x;
osd->y = options->image_overlay.y;
+ osd->origin = OVL_RELATIVE;
osd->histogram = histogram_new();
projects / geeqie.git / blobdiff