diff options
| author | Bernd Ahlers <bernd@cvs.openbsd.org> | 2007-04-27 18:10:40 +0000 |
|---|---|---|
| committer | Bernd Ahlers <bernd@cvs.openbsd.org> | 2007-04-27 18:10:40 +0000 |
| commit | 034bd7a0cf741c5fe7de1e780d03fe862c3a18cb (patch) | |
| tree | 757386c6ff64a08e0c8a356aa3068ca182df9e68 | |
| parent | af7f50913a0e2a0c9979b3f7c7858f27f6967dc6 (diff) | |
Apply cwm-3-input_shift.diff from http://aon.iki.fi/cwm/.
| -rw-r--r-- | app/cwm/grab.c | 4 | ||||
| -rw-r--r-- | app/cwm/input.c | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/app/cwm/grab.c b/app/cwm/grab.c index 90dd73a48..a3e936a2c 100644 --- a/app/cwm/grab.c +++ b/app/cwm/grab.c @@ -4,7 +4,7 @@ * Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org> * All rights reserved. * - * $Id: grab.c,v 1.2 2007/04/27 18:08:14 bernd Exp $ + * $Id: grab.c,v 1.3 2007/04/27 18:10:39 bernd Exp $ */ #include "headers.h" @@ -378,7 +378,7 @@ grab_label(struct client_ctx *cc) switch (e.type) { case KeyPress: if (input_keycodetrans(e.xkey.keycode, e.xkey.state, - &ctl, &chr, 1) < 0) + &ctl, &chr, 0) < 0) continue; switch (ctl) { diff --git a/app/cwm/input.c b/app/cwm/input.c index cb34defc7..28ce7f4bc 100644 --- a/app/cwm/input.c +++ b/app/cwm/input.c @@ -4,7 +4,7 @@ * Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org> * All rights reserved. * - * $Id: input.c,v 1.1 2007/04/27 17:58:48 bernd Exp $ + * $Id: input.c,v 1.2 2007/04/27 18:10:39 bernd Exp $ */ #include "headers.h" @@ -19,7 +19,10 @@ input_keycodetrans(KeyCode kc, u_int state, *ctl = CTL_NONE; *chr = '\0'; - ks = XKeycodeToKeysym(G_dpy, kc, 0); + if (state & ShiftMask) + ks = XKeycodeToKeysym(G_dpy, kc, 1); + else + ks = XKeycodeToKeysym(G_dpy, kc, 0); /* Look for control characters. */ switch (ks) { |