summaryrefslogtreecommitdiff
path: root/src/keyevents.c
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2011-08-09 14:08:12 +0200
committerDaniel Friesel <derf@finalrewind.org>2011-08-09 14:11:57 +0200
commit5a280fd5b65957720f9811d292086dd54c4015f8 (patch)
tree80e2293f99f7bf9a605ee76fed1b7ef2eb303b0d /src/keyevents.c
parent30735df15977b8b497de70af72cccd4ee726342a (diff)
parentc78cee50a4c33e2286ad7ffe9f28e0fc4ef3bd89 (diff)
Merge patch by livibetter: Add flip and mirror in-place edit actions (closes #53)
Diffstat (limited to 'src/keyevents.c')
-rw-r--r--src/keyevents.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/keyevents.c b/src/keyevents.c
index 526e0ac..7c14e14 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -290,6 +290,10 @@ void init_keyevents(void) {
cur_kb = &keys.orient_1;
else if (!strcmp(action, "orient_3"))
cur_kb = &keys.orient_3;
+ else if (!strcmp(action, "flip"))
+ cur_kb = &keys.flip;
+ else if (!strcmp(action, "mirror"))
+ cur_kb = &keys.mirror;
else if (!strcmp(action, "reload_minus"))
cur_kb = &keys.reload_minus;
else if (!strcmp(action, "reload_plus"))
@@ -645,10 +649,16 @@ void feh_event_handle_keypress(XEvent * ev)
winwidget_destroy(winwid);
}
else if (feh_is_kp(&keys.orient_1, keysym, state)) {
- feh_edit_inplace_orient(winwid, 1);
+ feh_edit_inplace(winwid, 1);
}
else if (feh_is_kp(&keys.orient_3, keysym, state)) {
- feh_edit_inplace_orient(winwid, 3);
+ feh_edit_inplace(winwid, 3);
+ }
+ else if (feh_is_kp(&keys.flip, keysym, state)) {
+ feh_edit_inplace(winwid, INPLACE_EDIT_FLIP);
+ }
+ else if (feh_is_kp(&keys.mirror, keysym, state)) {
+ feh_edit_inplace(winwid, INPLACE_EDIT_MIRROR);
}
else if (feh_is_kp(&keys.toggle_fullscreen, keysym, state)) {
#ifdef HAVE_LIBXINERAMA