several changes, made togglemax extern and separated it from zoom() - moved zoom...

[dwm.git] / event.c

diff --git a/event.c b/event.c
index b8036fc..540aeb6 100644 (file)
--- a/event.c
+++ b/event.c
@@ -11,7 +11,7 @@
 typedef struct {
        unsigned long mod;
        KeySym keysym;
-       void (*func)(Arg *arg);
+       void (*func)(Arg arg);
        Arg arg;
 } Key;
 
@@ -124,15 +124,15 @@ buttonpress(XEvent *e) {
                        if(ev->x < x) {
                                if(ev->button == Button1) {
                                        if(ev->state & MODKEY)
-                                               tag(&a);
+                                               tag(a);
                                        else
-                                               view(&a);
+                                               view(a);
                                }
                                else if(ev->button == Button3) {
                                        if(ev->state & MODKEY)
-                                               toggletag(&a);
+                                               toggletag(a);
                                        else
-                                               toggleview(&a);
+                                               toggleview(a);
                                }
                                return;
                        }
@@ -140,15 +140,16 @@ buttonpress(XEvent *e) {
                if(ev->x < x + blw)
                        switch(ev->button) {
                        case Button1:
-                               togglelayout(NULL);
+                               a.i = -1;
+                               setlayout(a);
                                break;
                        case Button4:
                                a.i = 1;
-                               incnmaster(&a);
+                               incnmaster(a);
                                break;
                        case Button5:
                                a.i = -1;
-                               incnmaster(&a);
+                               incnmaster(a);
                                break;
                        }
        }
@@ -156,14 +157,14 @@ buttonpress(XEvent *e) {
                focus(c);
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
-               if(ev->button == Button1 && (lt->arrange == swim || c->swimming)) {
+               if(ev->button == Button1 && (lt->arrange == versatile || c->isversatile)) {
                        restack();
                        movemouse(c);
                }
                else if(ev->button == Button2)
-                       zoom(NULL);
+                       zoom(a);
                else if(ev->button == Button3
-               && (lt->arrange == swim || c->swimming) && !c->isfixed)
+               && (lt->arrange == versatile || c->isversatile) && !c->isfixed)
                {
                        restack();
                        resizemouse(c);
@@ -181,7 +182,7 @@ configurerequest(XEvent *e) {
                c->ismax = False;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
-               if(c->isfixed || c->swimming || (lt->arrange == swim)) {
+               if(c->isfixed || c->isversatile || (lt->arrange == versatile)) {
                        if(ev->value_mask & CWX)
                                c->x = ev->x;
                        if(ev->value_mask & CWY)
@@ -260,7 +261,7 @@ keypress(XEvent *e) {
                && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
                {
                        if(key[i].func)
-                               key[i].func(&key[i].arg);
+                               key[i].func(key[i].arg);
                }
 }
 
@@ -309,7 +310,7 @@ propertynotify(XEvent *e) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
-                               if(!c->swimming && (c->swimming = (getclient(trans) != NULL)))
+                               if(!c->isversatile && (c->isversatile = (getclient(trans) != NULL)))
                                        lt->arrange();
                                break;
                        case XA_WM_NORMAL_HINTS: