em/dwm
1
0
Fork 0
Code Releases Activity

simplified buttonpress

Browse Source
This commit is contained in:
Anselm R. Garbe 2006-09-01 15:31:59 +02:00
parent 1836b6740d
commit 6d22782e8f
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
event.c
View File

@ -109,19 +109,17 @@ buttonpress(XEvent *e)
for(a.i = 0; a.i < ntags; a.i++) { for(a.i = 0; a.i < ntags; a.i++) {
x += textw(tags[a.i]); x += textw(tags[a.i]);
if(ev->x < x) { if(ev->x < x) {
switch(ev->button) { if(ev->button == Button1) {
case Button1:
if(ev->state & MODKEY) if(ev->state & MODKEY)
tag(&a); tag(&a);
else else
view(&a); view(&a);
break; }
case Button3: else if(ev->button == Button3) {
if(ev->state & MODKEY) if(ev->state & MODKEY)
toggletag(&a); toggletag(&a);
else else
toggleview(&a); toggleview(&a);
break;
} }
return; return;
} }
@ -133,27 +131,18 @@ buttonpress(XEvent *e)
} }
else if((c = getclient(ev->window))) { else if((c = getclient(ev->window))) {
focus(c); focus(c);
if(CLEANMASK(ev->state) != MODKEY) if(c->ismax || CLEANMASK(ev->state) != MODKEY)
return; return;
switch(ev->button) { if((ev->button == Button1) && ((arrange == dofloat) || c->isfloat)) {
default:
break;
case Button1:
if(!c->ismax && (arrange == dofloat || c->isfloat)) {
restack(c); restack(c);
movemouse(c); movemouse(c);
} }
break; else if(ev->button == Button2)
case Button2:
zoom(NULL); zoom(NULL);
break; else if(ev->button == Button3 && ((arrange == dofloat) || c->isfloat)) {
case Button3:
if(!c->ismax && (arrange == dofloat || c->isfloat)) {
restack(c); restack(c);
resizemouse(c); resizemouse(c);
} }
break;
}
} }
} }