aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnselm R Garbe2014-09-17 13:40:11 +0200
committerAnselm R Garbe2014-09-17 13:40:11 +0200
commit13a529ce63364544bdc851dfd5d3aa2ef8740914 (patch)
treeedd5ecbaca11e754b319fe861889efed2e0618a8
parentaa69426670bf0ae480db127ff8d4fc62d6da2593 (diff)
applied Hiltjo's patch as suggested on the ml to fix ControlMask for C-j and C-m
-rw-r--r--dmenu.13
-rw-r--r--dmenu.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/dmenu.1 b/dmenu.1
index bbee17d..2897ab1 100644
--- a/dmenu.1
+++ b/dmenu.1
@@ -136,6 +136,9 @@ Delete line right
C\-m
Return
.TP
+C\-M
+Shift-Return
+.TP
C\-n
Down
.TP
diff --git a/dmenu.c b/dmenu.c
index b56f3a8..94c70de 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -256,9 +256,9 @@ keypress(XKeyEvent *ev) {
case XK_h: ksym = XK_BackSpace; break;
case XK_i: ksym = XK_Tab; break;
case XK_j: /* fallthrough */
- case XK_J: ksym = XK_Return; break;
+ case XK_J: /* fallthrough */
case XK_m: /* fallthrough */
- case XK_M: ksym = XK_Return; break;
+ case XK_M: ksym = XK_Return; ev->state &= ~ControlMask; break;
case XK_n: ksym = XK_Down; break;
case XK_p: ksym = XK_Up; break;