Merge pull request #66 from Ferada/master

Perform actions on thumbnails.

3 files changed, 23 insertions, 4 deletions

diff --git a/src/keyevents.c b/src/keyevents.c
index 827ab24..64194da 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -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;
 }
diff --git a/src/thumbnail.c b/src/thumbnail.c
index 86d254b..42e2a82 100644
--- a/src/thumbnail.c
+++ b/src/thumbnail.c
@@ -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;
diff --git a/src/thumbnail.h b/src/thumbnail.h
index a70b603..9b95726 100644
--- a/src/thumbnail.h
+++ b/src/thumbnail.h
@@ -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);