diff options
| author | Ivan Kanakarakis <ivan.kanak@gmail.com> | 2012-06-30 18:49:43 +0300 |
|---|---|---|
| committer | Ivan Kanakarakis <ivan.kanak@gmail.com> | 2012-07-10 04:26:12 +0300 |
| commit | d2709c0e2cb852a1e4efc25183843b54993eb951 (patch) | |
| tree | 866dbbb45f32a32801de2e0348efb403f49a4999 | |
| parent | 89cbe7ed5f863c206f9c877fa484dbdb45040aad (diff) | |
rework buttonpress and keypress functions - separate if statement for function
| -rw-r--r-- | monsterwm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/monsterwm.c b/monsterwm.c index a913392..519100c 100644 --- a/monsterwm.c +++ b/monsterwm.c @@ -198,10 +198,10 @@ void buttonpress(XEvent *e) { if (CLICK_TO_FOCUS && curr != c && e->xbutton.button == Button1) focus(c); for (unsigned int i = 0; i < LENGTH(buttons); i++) - if (buttons[i].func && buttons[i].button == e->xbutton.button && - CLEANMASK(buttons[i].mask) == CLEANMASK(e->xbutton.state)) { + if (CLEANMASK(buttons[i].mask) == CLEANMASK(e->xbutton.state) + && buttons[i].button == e->xbutton.button) { if (curr != c) focus(c); - buttons[i].func(&(buttons[i].arg)); + if (buttons[i].func) buttons[i].func(&(buttons[i].arg)); } } @@ -466,8 +466,8 @@ void grid(int hh, int cy) { void keypress(XEvent *e) { KeySym keysym = XkbKeycodeToKeysym(dis, e->xkey.keycode, 0, 0); for (unsigned int i = 0; i < LENGTH(keys); i++) - if (keysym == keys[i].keysym && CLEANMASK(keys[i].mod) == CLEANMASK(e->xkey.state) - && keys[i].func) keys[i].func(&keys[i].arg); + if (keysym == keys[i].keysym && CLEANMASK(keys[i].mod) == CLEANMASK(e->xkey.state)) + if (keys[i].func) keys[i].func(&keys[i].arg); } /* explicitly kill a client - close the highlighted window |