removed some global vars which should be static instead

[dwm.git] / event.c

diff --git a/event.c b/event.c
index b8036fc..3086284 100644 (file)
--- a/event.c
+++ b/event.c
@@ -140,7 +140,8 @@ buttonpress(XEvent *e) {
                if(ev->x < x + blw)
                        switch(ev->button) {
                        case Button1:
                if(ev->x < x + blw)
                        switch(ev->button) {
                        case Button1:

-                               togglelayout(NULL);
+                               a.i = -1;
+                               setlayout(&a);

                                break;
                        case Button4:
                                a.i = 1;
                                break;
                        case Button4:
                                a.i = 1;


@@ -156,14 +157,14 @@ buttonpress(XEvent *e) {
                focus(c);
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
                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);
                else if(ev->button == Button3
                        restack();
                        movemouse(c);
                }
                else if(ev->button == Button2)
                        zoom(NULL);
                else if(ev->button == Button3

-               && (lt->arrange == swim || c->swimming) && !c->isfixed)
+               && (lt->arrange == versatile || c->isversatile) && !c->isfixed)

                {
                        restack();
                        resizemouse(c);
                {
                        restack();
                        resizemouse(c);


@@ -181,7 +182,7 @@ configurerequest(XEvent *e) {
                c->ismax = False;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
                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)
                        if(ev->value_mask & CWX)
                                c->x = ev->x;
                        if(ev->value_mask & CWY)


@@ -309,7 +310,7 @@ propertynotify(XEvent *e) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
                        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:
                                        lt->arrange();
                                break;
                        case XA_WM_NORMAL_HINTS: