mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge keybinding and mousebinding queues into using the same merged

Browse Source 
struct, binding; they were essentially the same accept for what was
'pressed', keysym or button.
This commit is contained in:
okan
2014-01-29 21:13:52 +00:00
parent 4438970b64
commit db0b2fde5c
3 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xevents.c
View File

@ -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;
}