godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wmfs: Add INAREA macro to replace ugly ifs

Browse Source
This commit is contained in:
Martin Duquesnoy
2011-08-04 09:53:58 +02:00
parent e5a804cee8
commit 8f040ed7a4
5 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/event.c
View File

@@ -114,8 +114,7 @@ buttonpress(XEvent *e)
if(conf.selbar.mouse[i].tag == seltag[conf.selbar.mouse[i].screen]
|| conf.selbar.mouse[i].tag < 0)
if(ev->button == conf.selbar.mouse[i].button)
if(ev->x >= ib->selbar_geo.x && ev->x <= ib->selbar_geo.x + ib->selbar_geo.width
&& ev->y >= ib->selbar_geo.y && ev->y <= ib->selbar_geo.y + ib->selbar_geo.height)
if(INAREA(ev->x, ev->y, ib->selbar_geo))
if(conf.selbar.mouse[i].func)
conf.selbar.mouse[i].func(conf.selbar.mouse[i].cmd);
@@ -167,8 +166,7 @@ buttonpress(XEvent *e)
/* Status mouse bindings */
SLIST_FOREACH(sm, &smhead, next)
if(sm->infobar->bar->win == ev->window && ev->button == sm->button)
if(ev->x >= sm->area.x && ev->x <= sm->area.x + sm->area.width
&& ev->y >= sm->area.y && ev->y <= sm->area.y + sm->area.height)
if(INAREA(ev->x, ev->y, sm->area))
if(sm->func)
sm->func(sm->cmd);