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

bring buttonpress and keypress event handlers slightly closer together

Browse Source
This commit is contained in:
okan
2013-07-10 14:15:58 +00:00
parent 9571038358
commit bd7b8163bb
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
xevents.c
View File

@@ -238,12 +238,8 @@ xev_handle_buttonpress(XEvent *ee)
{ {
XButtonEvent *e = &ee->xbutton; XButtonEvent *e = &ee->xbutton;
struct client_ctx *cc, fakecc; struct client_ctx *cc, fakecc;
struct screen_ctx *sc;
struct mousebinding *mb; struct mousebinding *mb;
sc = screen_fromroot(e->root);
cc = client_find(e->window);
e->state &= ~IGNOREMODMASK; e->state &= ~IGNOREMODMASK;
TAILQ_FOREACH(mb, &Conf.mousebindingq, entry) { TAILQ_FOREACH(mb, &Conf.mousebindingq, entry) {
@@ -253,13 +249,16 @@ xev_handle_buttonpress(XEvent *ee)
if (mb == NULL) if (mb == NULL)
return; return;
if (mb->flags == MOUSEBIND_CTX_ROOT) { if (mb->flags == MOUSEBIND_CTX_WIN) {
if (e->window != sc->rootwin) if (((cc = client_find(e->window)) == NULL) &&
(cc = client_current()) == NULL)
return;
} else { /* (mb->flags == MOUSEBIND_CTX_ROOT) */
if (e->window != e->root)
return; return;
cc = &fakecc; cc = &fakecc;
cc->sc = screen_fromroot(e->window); cc->sc = screen_fromroot(e->window);
} else if (cc == NULL) /* (mb->flags == MOUSEBIND_CTX_WIN */ }
return;
(*mb->callback)(cc, e); (*mb->callback)(cc, e);
} }