diff options
| author | okan <okan> | 2014-01-29 22:30:00 +0000 |
|---|---|---|
| committer | okan <okan> | 2014-01-29 22:30:00 +0000 |
| commit | 1fd3fc49974bdc0c7703b53d9eaea29529e80643 (patch) | |
| tree | 8f675eaa3c96da03db2404ea9b28390af60a459e /xevents.c | |
| parent | 2b233f0548bb026eebb336bcdac57e48f0839e5c (diff) | |
| parent | 2be890489b8542b12f77133fbba404210c1b5f54 (diff) | |
| download | cwm-1fd3fc49974bdc0c7703b53d9eaea29529e80643.tar.gz cwm-1fd3fc49974bdc0c7703b53d9eaea29529e80643.tar.xz cwm-1fd3fc49974bdc0c7703b53d9eaea29529e80643.zip | |
cvsimport
Diffstat (limited to 'xevents.c')
| -rw-r--r-- | xevents.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xevents.c b/xevents.c index df5169c..1887395 100644 --- a/xevents.c +++ b/xevents.c @@ -224,12 +224,12 @@ xev_handle_buttonpress(XEvent *ee) { XButtonEvent *e = &ee->xbutton; struct client_ctx *cc, fakecc; - struct mousebinding *mb; + struct binding *mb; e->state &= ~IGNOREMODMASK; TAILQ_FOREACH(mb, &Conf.mousebindingq, entry) { - if (e->button == mb->button && e->state == mb->modmask) + if (e->button == mb->press.button && e->state == mb->modmask) break; } @@ -263,7 +263,7 @@ xev_handle_keypress(XEvent *ee) { XKeyEvent *e = &ee->xkey; struct client_ctx *cc = NULL, fakecc; - struct keybinding *kb; + struct binding *kb; KeySym keysym, skeysym; unsigned int modshift; @@ -273,7 +273,7 @@ xev_handle_keypress(XEvent *ee) e->state &= ~IGNOREMODMASK; TAILQ_FOREACH(kb, &Conf.keybindingq, entry) { - if (keysym != kb->keysym && skeysym == kb->keysym) + if (keysym != kb->press.keysym && skeysym == kb->press.keysym) modshift = ShiftMask; else modshift = 0; @@ -281,7 +281,7 @@ xev_handle_keypress(XEvent *ee) if ((kb->modmask | modshift) != e->state) continue; - if (kb->keysym == (modshift == 0 ? keysym : skeysym)) + if (kb->press.keysym == (modshift == 0 ? keysym : skeysym)) break; } |