comparison src/image-overlay.c @ 650:02e2c135ee0c

Keywords and comment can now be displayed in OSD info using %keywords% and %comment%.

649:3097880d7d95

 */

#include "main.h"
#include "image-overlay.h"

#include "collect.h"
#include "debug.h"
#include "exif.h"
#include "filedata.h"
#include "histogram.h"

			image_osd_set(imd, osd->show | OSD_SHOW_HISTOGRAM);
			}
		}
}

static gchar *image_osd_mkinfo(const gchar *str, ImageWindow *imd, GHashTable *vars)
{
	gchar delim = '%', imp = '|', sep[] = " - ";
	gchar *start, *end;
	gint pos, prev;

		if (extrapos)
			extra = g_strndup(extrapos, end - extrapos);
					
		name = g_strndup(start+1, (trunc ? trunc : end)-start-1);
		
		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;

650:02e2c135ee0c

 */

#include "main.h"
#include "image-overlay.h"

#include "bar_info.h"
#include "collect.h"
#include "debug.h"
#include "exif.h"
#include "filedata.h"
#include "histogram.h"

			image_osd_set(imd, osd->show | OSD_SHOW_HISTOGRAM);
			}
		}
}

static gchar *keywords_to_string(FileData *fd)
{
	GList *keywords;
	GString *kwstr = NULL;
	gchar *ret = NULL;

	g_assert(fd);

	if (comment_read(fd, &keywords, NULL))
		{
		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);
			}
		}

	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;

		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)
			{
			comment_read(imd->image_fd, NULL, &data);
			}
		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 && limit > 0 && strlen(data) > limit + 3)
			{
			gchar *new_data = g_strdup_printf("%-*.*s...", limit, limit, data);
			g_free(data);
			data = new_data;