Commit fee966ab authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

--action: Reload image if hold_action flag (;) is set (closes #59) 

An action may be used to alter the image or specific parts of it displayed by
--info, so if a user invokes an action with hold_action set, the image and all
relevant information must be reloaded.
parent fdf6add1

ChangeLog

+5 −0
Original line number Diff line number Diff line 
git HEAD



    * Reload image after executing an action with the hold-action flag set

      <https://github.com/derf/feh/issues/59>



Tue, 16 Aug 2011 22:48:06 +0200  Daniel Friesel <derf@finalrewind.org>



* Release v1.15.1

man/feh.pre

+2 −1
Original line number Diff line number Diff line
@@ -123,7 +123,8 @@ If 
is

.Qq \&; ,

.Nm

will not switch to the next image after executing the action.

will reload the current image instead of switching to the next one after

executing the action.

.

.Pp

.

src/keyevents.c

+8 −3
Original line number Diff line number Diff line
@@ -331,14 +331,19 @@ void feh_event_invoke_action(winwidget winwid, unsigned char action) 
	if (opt.actions[action]) {

		if (opt.slideshow) {

			feh_action_run(FEH_FILE(winwid->file->data), opt.actions[action]);

			winwidget_update_caption(winwid);



			if (! opt.hold_actions[action])

			if (opt.hold_actions[action])

				feh_reload_image(winwid, 1, 1);

			else

				slideshow_change_image(winwid, SLIDE_NEXT, 1);



		} else if ((winwid->type == WIN_TYPE_SINGLE)

				|| (winwid->type == WIN_TYPE_THUMBNAIL_VIEWER)) {

			feh_action_run(FEH_FILE(winwid->file->data), opt.actions[action]);



			if (opt.hold_actions[action])

				feh_reload_image(winwid, 1, 1);

			else

				winwidget_destroy(winwid);

		} else if (winwid->type == WIN_TYPE_THUMBNAIL)

			fputs("actions from the main thumb window aren't currently supported!\n"