Commit 503048c6 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Add %o, %r and %z format specifiers (see #95)

parent a62c48c7

ChangeLog

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ git HEAD 
    * menu: simpler background, remove drop shadows

    * Remove --menu-style support (deprecated in 1.12)

    * Allow --slideshow-delay and --reload to be used together

    * New format specifiers:

    ** %o    x,y image offset relative to top-left window corner

    ** %r    image rotation

    ** %z    image zoom



Sun, 25 Mar 2012 13:13:26 +0200  Daniel Friesel <derf@finalrewind.org>

man/feh.pre

+12 −0
Original line number Diff line number Diff line
@@ -817,6 +817,10 @@ Image name 
.

Escaped image name

.

.It %o

.

x,y offset of top-left image corner to window corner in pixels

.

.It %p

.

Number of image pixels
@@ -826,6 +830,10 @@ Number of image pixels 
Numbor of image pixels

.Pq kilopixels / megapixels

.

.It %r

.

Image rotation. A half right turn equals pi.

.

.It %s

.

Image size in bytes
@@ -852,6 +860,10 @@ Image width 
.Nm

version

.

.It %z

.

current image zoom

.

.El

.

.

src/collage.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ void init_collage_mode(void) 
	if (!opt.title)

		s = estrdup(PACKAGE " [collage mode]");

	else

		s = estrdup(feh_printf(opt.title, NULL));

		s = estrdup(feh_printf(opt.title, NULL, NULL));



	if (opt.display) {

		winwid = winwidget_create_from_image(im_main, s, WIN_TYPE_SINGLE);

src/feh.h

+2 −2
Original line number Diff line number Diff line
@@ -132,13 +132,13 @@ int feh_load_image(Imlib_Image * im, feh_file * file); 
void show_mini_usage(void);

void slideshow_change_image(winwidget winwid, int change, int render);

void slideshow_pause_toggle(winwidget w);

char *slideshow_create_name(feh_file * file);

char *slideshow_create_name(feh_file * file, winwidget winwid);

void init_keyevents(void);

void init_buttonbindings(void);

void feh_event_handle_keypress(XEvent * ev);

void feh_action_run(feh_file * file, char *action);

char *format_size(int size);

char *feh_printf(char *str, feh_file * file);

char *feh_printf(char *str, feh_file * file, winwidget winwid);

void im_weprintf(winwidget w, char *fmt, ...);

void feh_draw_zoom(winwidget w);

void feh_draw_checks(winwidget win);

src/imlib.c

+1 −1
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ void feh_draw_info(winwidget w) 


	fn = feh_load_font(w);



	info_cmd = feh_printf(opt.info_cmd, FEH_FILE(w->file->data));

	info_cmd = feh_printf(opt.info_cmd, FEH_FILE(w->file->data), w);



	info_pipe = popen(info_cmd, "r");