diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2012-09-12 15:09:34 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2012-09-12 15:09:34 +0000 |
| commit | c7459ac257f221e842261427492d2f0d16716c9a (patch) | |
| tree | 6f5bcd5a9dae1030ba28452f6f6d36bcb44a7519 | |
| parent | 8b3e5dcd161242db101f9a70f7c21592ba7f4f12 (diff) | |
revert previous for now until a way to test more than a few encodings is found
| -rw-r--r-- | app/cwm/xevents.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/cwm/xevents.c b/app/cwm/xevents.c index b20adbc5c..abade0c8c 100644 --- a/app/cwm/xevents.c +++ b/app/cwm/xevents.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: xevents.c,v 1.66 2012/09/10 13:28:04 okan Exp $ + * $OpenBSD: xevents.c,v 1.67 2012/09/12 15:09:33 okan Exp $ */ /* @@ -240,8 +240,8 @@ xev_handle_buttonpress(XEvent *ee) sc = screen_fromroot(e->root); cc = client_find(e->window); - /* only allow the ones we care about */ - e->state &= (ControlMask | Mod1Mask | Mod4Mask | ShiftMask); + /* Ignore caps lock and numlock */ + e->state &= ~(Mod2Mask | LockMask); TAILQ_FOREACH(mb, &Conf.mousebindingq, entry) { if (e->button == mb->button && e->state == mb->modmask) @@ -282,8 +282,8 @@ xev_handle_keypress(XEvent *ee) keysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 0); skeysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 1); - /* only allow the ones we care about */ - e->state &= (ControlMask | Mod1Mask | Mod4Mask | ShiftMask); + /* we don't care about caps lock and numlock here */ + e->state &= ~(LockMask | Mod2Mask); TAILQ_FOREACH(kb, &Conf.keybindingq, entry) { if (keysym != kb->keysym && skeysym == kb->keysym) |