summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJari Vetoniemi <mailRoxas@gmail.com>2016-12-06 20:34:19 +0200
committerGitHub <noreply@github.com>2016-12-06 20:34:19 +0200
commit01be868deff0b1574d6f214e095cf9b126170d5c (patch)
tree3f68ecfd054e9ec66caa042eb49b7b223380fa6a
parent10fcb9cbf836f6807087648bac6a38f70ee1d0df (diff)
parentcb6030f64b770d07108fb0d42d11f043aa3defaf (diff)
downloadbemenu-01be868deff0b1574d6f214e095cf9b126170d5c.tar.gz
bemenu-01be868deff0b1574d6f214e095cf9b126170d5c.tar.bz2
bemenu-01be868deff0b1574d6f214e095cf9b126170d5c.zip
Merge pull request #29 from upwhere/CtrlM
Add C-m -> Return bind
-rw-r--r--lib/renderers/curses/curses.c1
-rw-r--r--lib/renderers/wayland/wayland.c3
-rw-r--r--lib/renderers/x11/x11.c3
3 files changed, 7 insertions, 0 deletions
diff --git a/lib/renderers/curses/curses.c b/lib/renderers/curses/curses.c
index 253089b..3e75d6e 100644
--- a/lib/renderers/curses/curses.c
+++ b/lib/renderers/curses/curses.c
@@ -327,6 +327,7 @@ poll_key(const struct bm_menu *menu, uint32_t *unicode)
return BM_KEY_SHIFT_RETURN;
case 10: /* Return */
+ case 13: /* C-m */
terminate();
return BM_KEY_RETURN;
diff --git a/lib/renderers/wayland/wayland.c b/lib/renderers/wayland/wayland.c
index 3efda7f..6f6f322 100644
--- a/lib/renderers/wayland/wayland.c
+++ b/lib/renderers/wayland/wayland.c
@@ -151,6 +151,9 @@ poll_key(const struct bm_menu *menu, unsigned int *unicode)
case XKB_KEY_d:
return (mods & MOD_ALT ? BM_KEY_PAGE_DOWN : BM_KEY_UNICODE);
+ case XKB_KEY_m:
+ return (mods & MOD_CTRL ? BM_KEY_RETURN : BM_KEY_UNICODE);
+
default: break;
}
diff --git a/lib/renderers/x11/x11.c b/lib/renderers/x11/x11.c
index ce1dbc1..3fc6a50 100644
--- a/lib/renderers/x11/x11.c
+++ b/lib/renderers/x11/x11.c
@@ -140,6 +140,9 @@ poll_key(const struct bm_menu *menu, unsigned int *unicode)
case XK_d:
return (mods & MOD_ALT ? BM_KEY_PAGE_DOWN : BM_KEY_UNICODE);
+ case XK_m:
+ return (mods & MOD_CTRL ? BM_KEY_RETURN : BM_KEY_UNICODE);
+
default: break;
}