Unverified Commit 978fabad authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

--draw-exif, --draw-info: do not overwrite each other's output

parent 5c617922

src/imlib.c

+10 −1
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ static char *feh_http_load_image(char *url); 
static char *feh_dcraw_load_image(char *filename);

static char *feh_magick_load_image(char *filename);



int info_height = 0;



#ifdef HAVE_LIBXINERAMA

void init_xinerama(void)

{
@@ -1270,7 +1272,12 @@ void feh_draw_exif(winwidget w) 


	}



	gib_imlib_render_image_on_drawable(w->bg_pmap, im, 0, w->h - height, 1, 1, 0);

	int h_offset = 0;

	if (opt.draw_info) {

		h_offset = info_height;

	}



	gib_imlib_render_image_on_drawable(w->bg_pmap, im, 0, w->h - h_offset - height, 1, 1, 0);



	gib_imlib_free_image_and_decache(im);

	return;
@@ -1349,6 +1356,8 @@ void feh_draw_info(winwidget w) 
	gib_imlib_render_image_on_drawable(w->bg_pmap, im, 0,

			w->h - height, 1, 1, 0);



	info_height = height;



	gib_imlib_free_image_and_decache(im);

	return;

}

src/winwidget.c

+5 −4
Original line number Diff line number Diff line
@@ -592,14 +592,15 @@ void winwidget_render_image(winwidget winwid, int resize, int force_alias) 
			winwidget_update_caption(winwid);

		if (opt.draw_filename)

			feh_draw_filename(winwid);

#ifdef HAVE_LIBEXIF

		if (opt.draw_exif)

			feh_draw_exif(winwid);

#endif

		if (opt.draw_actions)

			feh_draw_actions(winwid);

		/* feh_draw_info must be called before feh_draw_exif */

		if (opt.draw_info && opt.info_cmd)

			feh_draw_info(winwid);

#ifdef HAVE_LIBEXIF

		if (opt.draw_exif)

			feh_draw_exif(winwid);

#endif

		if (winwid->errstr)

			feh_draw_errstr(winwid);

		if (winwid->file != NULL) {