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

Merge pull request #66 from Ferada/master 

Perform actions on thumbnails.
parents f55de518 31288506

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ install-doc: 
	@echo installing docs to ${doc_dir}

	@mkdir -p ${doc_dir}

	@cp AUTHORS ChangeLog README TODO ${doc_dir}

	@chmod 644 ${doc_dir}/*

	@chmod 644 ${doc_dir}/AUTHORS ${doc_dir}/ChangeLog ${doc_dir}/README \

		${doc_dir}/TODO



install-bin:

	@echo installing executables to ${bin_dir}

src/keyevents.c

+15 −4
Original line number Diff line number Diff line
@@ -345,10 +345,21 @@ void feh_event_invoke_action(winwidget winwid, unsigned char 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"

					"For now, open the image to perform the action on it.\n",

					stdout);

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

			feh_file *thumbfile;

			/* also see events.c:306 */

			thumbfile = feh_thumbnail_get_selected_file();



			if (thumbfile) {

				feh_action_run(thumbfile, opt.actions[action]);



				/* so, reload/regenerate the thumbnail here? */

				if (!opt.hold_actions[action])

					winwidget_destroy(winwid);

			}

			else

				fputs("no thumbnail selected\n", stderr);

		}

	}

	return;

}

src/thumbnail.c

+7 −0
Original line number Diff line number Diff line
@@ -902,6 +902,13 @@ inline void feh_thumbnail_show_selected() 
		feh_thumbnail_show_fullsize(td.selected->file);

}



inline feh_file* feh_thumbnail_get_selected_file()

{

	if (td.selected)

		return td.selected->file;

	return NULL;

}



int feh_thumbnail_setup_thumbnail_dir(void)

{

	int status = 0;

src/thumbnail.h

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ void feh_thumbnail_select(winwidget winwid, feh_thumbnail *thumbnail); 
void feh_thumbnail_select_next(winwidget winwid, int jump);

void feh_thumbnail_select_prev(winwidget winwid, int jump);

void feh_thumbnail_show_selected();

feh_file *feh_thumbnail_get_selected_file();



int feh_thumbnail_setup_thumbnail_dir(void);