diff options
| author | okan <okan> | 2014-01-29 21:13:52 +0000 |
|---|---|---|
| committer | okan <okan> | 2014-01-29 21:13:52 +0000 |
| commit | db0b2fde5cb55a8867d9781dd0acb7c0ef92bcd2 (patch) | |
| tree | b55ac41540cdec24b37c5d3c334aff4bbb31a9ce /xevents.c | |
| parent | 4438970b649d8c6b0d662576bc37fc577b8de1b6 (diff) | |
| download | cwm-db0b2fde5cb55a8867d9781dd0acb7c0ef92bcd2.tar.gz cwm-db0b2fde5cb55a8867d9781dd0acb7c0ef92bcd2.tar.xz cwm-db0b2fde5cb55a8867d9781dd0acb7c0ef92bcd2.zip | |
Merge keybinding and mousebinding queues into using the same merged
struct, binding; they were essentially the same accept for what was 'pressed', keysym or button.
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 b321acb..987d4fa 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; } |