made arrange again like it was once

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 1c52d80..3c5e6df 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -53,25 +53,44 @@
 #define MOUSEMASK       (BUTTONMASK|PointerMotionMask)
 #define TAGMASK         ((int)((1LL << LENGTH(tags)) - 1))
 #define TEXTW(x)        (textnw(x, strlen(x)) + dc.font.height)
 #define MOUSEMASK       (BUTTONMASK|PointerMotionMask)
 #define TAGMASK         ((int)((1LL << LENGTH(tags)) - 1))
 #define TEXTW(x)        (textnw(x, strlen(x)) + dc.font.height)

+#define ISVISIBLE(x)    (x->tags & tagset[seltags])

 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
 enum { NetSupported, NetWMName, NetLast };              /* EWMH atoms */
 enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
 enum { NetSupported, NetWMName, NetLast };              /* EWMH atoms */
 enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */

+enum { ClkLtSymbol = 64, ClkStatusText, ClkWinTitle,
+       ClkClientWin, ClkRootWin, ClkLast };             /* clicks */

 
 /* typedefs */
 typedef unsigned int uint;
 typedef unsigned long ulong;
 
 /* typedefs */
 typedef unsigned int uint;
 typedef unsigned long ulong;

+
+typedef union {
+       int i;
+       uint ui;
+       float f;
+       void *v;
+} Arg;
+
+typedef struct {
+       uint click;
+       uint mask;
+       uint button;
+       void (*func)(const Arg *arg);
+       const Arg arg;
+} Button;
+

 typedef struct Client Client;
 struct Client {
        char name[256];
 typedef struct Client Client;
 struct Client {
        char name[256];

+       float mina, maxa;

        int x, y, w, h;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int x, y, w, h;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;

-       float mina, maxa;

        int bw, oldbw;
        int bw, oldbw;

-       Bool isbanned, isfixed, isfloating, ismoved, isurgent;

        uint tags;
        uint tags;

+       Bool isfixed, isfloating, isurgent;

        Client *next;
        Client *snext;
        Window win;
        Client *next;
        Client *snext;
        Window win;


@@ -92,13 +111,6 @@ typedef struct {
        } font;
 } DC; /* draw context */
 
        } font;
 } DC; /* draw context */
 

-typedef union {
-       int i;
-       uint ui;
-       float f;
-       void *v;
-} Arg;
-

 typedef struct {
        uint mod;
        KeySym keysym;
 typedef struct {
        uint mod;
        KeySym keysym;


@@ -157,16 +169,18 @@ static void killclient(const Arg *arg);
 static void manage(Window w, XWindowAttributes *wa);
 static void mappingnotify(XEvent *e);
 static void maprequest(XEvent *e);
 static void manage(Window w, XWindowAttributes *wa);
 static void mappingnotify(XEvent *e);
 static void maprequest(XEvent *e);

-static void movemouse(Client *c);
+static void monocle(void);
+static void movemouse(const Arg *arg);

 static Client *nexttiled(Client *c);
 static void propertynotify(XEvent *e);
 static void quit(const Arg *arg);
 static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
 static Client *nexttiled(Client *c);
 static void propertynotify(XEvent *e);
 static void quit(const Arg *arg);
 static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);

-static void resizemouse(Client *c);
+static void resizemouse(const Arg *arg);

 static void restack(void);
 static void run(void);
 static void scan(void);
 static void setclientstate(Client *c, long state);
 static void restack(void);
 static void run(void);
 static void scan(void);
 static void setclientstate(Client *c, long state);

+static void setlayout(const Arg *arg);

 static void setmfact(const Arg *arg);
 static void setup(void);
 static void spawn(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);
 static void spawn(const Arg *arg);


@@ -175,8 +189,6 @@ static int textnw(const char *text, uint len);
 static void tile(void);
 static void togglebar(const Arg *arg);
 static void togglefloating(const Arg *arg);
 static void tile(void);
 static void togglebar(const Arg *arg);
 static void togglefloating(const Arg *arg);

-static void togglelayout(const Arg *arg);
-static void togglemax(const Arg *arg);

 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
 static void unmanage(Client *c);
 static void toggletag(const Arg *arg);
 static void toggleview(const Arg *arg);
 static void unmanage(Client *c);


@@ -196,7 +208,7 @@ static void zoom(const Arg *arg);
 static char stext[256];
 static int screen, sx, sy, sw, sh;
 static int by, bh, blw, wx, wy, ww, wh;
 static char stext[256];
 static int screen, sx, sy, sw, sh;
 static int by, bh, blw, wx, wy, ww, wh;

-static uint seltags = 0;
+static uint seltags = 0, sellt = 0;

 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static uint numlockmask = 0;
 static void (*handler[LASTEvent]) (XEvent *) = {
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static uint numlockmask = 0;
 static void (*handler[LASTEvent]) (XEvent *) = {


@@ -214,7 +226,6 @@ static void (*handler[LASTEvent]) (XEvent *) = {
        [UnmapNotify] = unmapnotify
 };
 static Atom wmatom[WMLast], netatom[NetLast];
        [UnmapNotify] = unmapnotify
 };
 static Atom wmatom[WMLast], netatom[NetLast];

-static Bool ismax = False;

 static Bool otherwm, readin;
 static Bool running = True;
 static uint tagset[] = {1, 1}; /* after start, first tag is selected */
 static Bool otherwm, readin;
 static Bool running = True;
 static uint tagset[] = {1, 1}; /* after start, first tag is selected */


@@ -224,13 +235,11 @@ static Client *stack = NULL;
 static Cursor cursor[CurLast];
 static Display *dpy;
 static DC dc = {0};
 static Cursor cursor[CurLast];
 static Display *dpy;
 static DC dc = {0};

+static Layout *lt[] = { NULL, NULL };

 static Window root, barwin;
 static Window root, barwin;

-

 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 

-static Layout *lt = layouts;
-

 /* compile-time check if all tags fit into an uint bit array. */
 struct NumTags { char limitexceeded[sizeof(uint) * 8 < LENGTH(tags) ? -1 : 1]; };
 
 /* compile-time check if all tags fit into an uint bit array. */
 struct NumTags { char limitexceeded[sizeof(uint) * 8 < LENGTH(tags) ? -1 : 1]; };
 


@@ -265,23 +274,18 @@ arrange(void) {
        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)

-               if(c->tags & tagset[seltags]) { /* is visible */
-                       if(ismax && !c->isfixed) {
-                               XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
-                               c->ismoved = True;
-                       }
-                       else if(!lt->arrange || c->isfloating)
+               if(ISVISIBLE(c)) {
+                       XMoveWindow(dpy, c->win, c->x, c->y);
+                       if(!lt[sellt]->arrange || c->isfloating)

                                resize(c, c->x, c->y, c->w, c->h, True);
                                resize(c, c->x, c->y, c->w, c->h, True);

-                       c->isbanned = False;

                }
                }

-               else if(!c->isbanned) {
+               else {

                        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
                        XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);

-                       c->isbanned = c->ismoved = True;

                }
 
        focus(NULL);
                }
 
        focus(NULL);

-       if(lt->arrange && !ismax)
-               lt->arrange();
+       if(lt[sellt]->arrange)
+               lt[sellt]->arrange();

        restack();
 }
 
        restack();
 }
 


@@ -299,50 +303,34 @@ attachstack(Client *c) {
 
 void
 buttonpress(XEvent *e) {
 
 void
 buttonpress(XEvent *e) {

-       uint i, mask;
-       int x;
+       uint i, x, click;

        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 

+       click = ClkRootWin;

        if(ev->window == barwin) {
        if(ev->window == barwin) {

-               x = 0;
-               for(i = 0; i < LENGTH(tags); i++) {
+               i = x = 0;
+               do

                        x += TEXTW(tags[i]);
                        x += TEXTW(tags[i]);

-                       if(ev->x < x) {
-                               mask = 1 << i;
-                               if(ev->button == Button1) {
-                                       if(ev->state & MODKEY)
-                                               tag((Arg*)&mask);
-                                       else
-                                               view((Arg*)&mask);
-                               }
-                               else if(ev->button == Button3) {
-                                       if(ev->state & MODKEY)
-                                               toggletag((Arg*)&mask);
-                                       else
-                                               toggleview((Arg*)&mask);
-                               }
-                               return;
-                       }
-               }
-               if(ev->x < x + blw) {
-                       if(ev->button == Button1) 
-                               togglelayout(NULL);
-                       else if(ev->button == Button3) 
-                               togglemax(NULL);
-               }
+               while(ev->x >= x && ++i < LENGTH(tags));
+               if(i < LENGTH(tags))
+                       click = i;
+               else if(ev->x < x + blw)
+                       click = ClkLtSymbol;
+               else if(ev->x > wx + ww - TEXTW(stext))
+                       click = ClkStatusText;
+               else
+                       click = ClkWinTitle;

        }
        else if((c = getclient(ev->window))) {
                focus(c);
        }
        else if((c = getclient(ev->window))) {
                focus(c);

-               if(CLEANMASK(ev->state) != MODKEY || (ismax && !c->isfixed))
-                       return;
-               if(ev->button == Button1)
-                       movemouse(c);
-               else if(ev->button == Button2)
-                       togglefloating(NULL);
-               else if(ev->button == Button3 && !c->isfixed)
-                       resizemouse(c);
+               click = ClkClientWin;

        }
        }

+
+       for(i = 0; i < LENGTH(buttons); i++)
+               if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
+                  && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
+                       buttons[i].func(&buttons[i].arg);

 }
 
 void
 }
 
 void


@@ -363,8 +351,11 @@ checkotherwm(void) {
 void
 cleanup(void) {
        Arg a = {.i = ~0};
 void
 cleanup(void) {
        Arg a = {.i = ~0};

+       Layout foo = { "", NULL };
+

        close(STDIN_FILENO);
        view(&a);
        close(STDIN_FILENO);
        view(&a);

+       lt[sellt] = &foo;

        while(stack)
                unmanage(stack);
        if(dc.font.set)
        while(stack)
                unmanage(stack);
        if(dc.font.set)


@@ -422,9 +413,7 @@ configurerequest(XEvent *e) {
        if((c = getclient(ev->window))) {
                if(ev->value_mask & CWBorderWidth)
                        c->bw = ev->border_width;
        if((c = getclient(ev->window))) {
                if(ev->value_mask & CWBorderWidth)
                        c->bw = ev->border_width;

-               if(ismax && !c->isbanned && !c->isfixed)
-                       XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh + 2 * c->bw);
-               else if(c->isfloating || !lt->arrange) {
+               else if(c->isfloating || !lt[sellt]->arrange) {

                        if(ev->value_mask & CWX)
                                c->x = sx + ev->x;
                        if(ev->value_mask & CWY)
                        if(ev->value_mask & CWX)
                                c->x = sx + ev->x;
                        if(ev->value_mask & CWY)


@@ -437,10 +426,9 @@ configurerequest(XEvent *e) {
                                c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */
                        if((c->y - sy + c->h) > sh && c->isfloating)
                                c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
                                c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */
                        if((c->y - sy + c->h) > sh && c->isfloating)
                                c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */

-                       if((ev->value_mask & (CWX|CWY))
-                       && !(ev->value_mask & (CWWidth|CWHeight)))
+                       if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))

                                configure(c);
                                configure(c);

-                       if(!c->isbanned)
+                       if(ISVISIBLE(c))

                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                }
                else
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                }
                else


@@ -493,25 +481,23 @@ detachstack(Client *c) {
 void
 drawbar(void) {
        int i, x;
 void
 drawbar(void) {
        int i, x;

-       Client *c;

 
        dc.x = 0;
 
        dc.x = 0;

-       for(c = stack; c && c->isbanned; c = c->snext);

        for(i = 0; i < LENGTH(tags); i++) {
                dc.w = TEXTW(tags[i]);
                if(tagset[seltags] & 1 << i) {
                        drawtext(tags[i], dc.sel, isurgent(i));
        for(i = 0; i < LENGTH(tags); i++) {
                dc.w = TEXTW(tags[i]);
                if(tagset[seltags] & 1 << i) {
                        drawtext(tags[i], dc.sel, isurgent(i));

-                       drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
+                       drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);

                }
                else {
                        drawtext(tags[i], dc.norm, isurgent(i));
                }
                else {
                        drawtext(tags[i], dc.norm, isurgent(i));

-                       drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
+                       drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);

                }
                dc.x += dc.w;
        }
        if(blw > 0) {
                dc.w = blw;
                }
                dc.x += dc.w;
        }
        if(blw > 0) {
                dc.w = blw;

-               drawtext(lt->symbol, dc.norm, ismax);
+               drawtext(lt[sellt]->symbol, dc.norm, False);

                x = dc.x + dc.w;
        }
        else
                x = dc.x + dc.w;
        }
        else


@@ -525,9 +511,9 @@ drawbar(void) {
        drawtext(stext, dc.norm, False);
        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
        drawtext(stext, dc.norm, False);
        if((dc.w = dc.x - x) > bh) {
                dc.x = x;

-               if(c) {
-                       drawtext(c->name, dc.sel, False);
-                       drawsquare(c->isfixed, c->isfloating, False, dc.sel);
+               if(sel) {
+                       drawtext(sel->name, dc.sel, False);
+                       drawsquare(sel->isfixed, sel->isfloating, False, dc.sel);

                }
                else
                        drawtext(NULL, dc.norm, False);
                }
                else
                        drawtext(NULL, dc.norm, False);


@@ -619,8 +605,8 @@ expose(XEvent *e) {
 
 void
 focus(Client *c) {
 
 void
 focus(Client *c) {

-       if(!c || c->isbanned)
-               for(c = stack; c && c->isbanned; c = c->snext);
+       if(!c || !ISVISIBLE(c))
+               for(c = stack; c && !ISVISIBLE(c); c = c->snext);

        if(sel && sel != c) {
                grabbuttons(sel, False);
                XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
        if(sel && sel != c) {
                grabbuttons(sel, False);
                XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);


@@ -653,17 +639,17 @@ focusstack(const Arg *arg) {
        if(!sel)
                return;
        if (arg->i > 0) {
        if(!sel)
                return;
        if (arg->i > 0) {

-               for(c = sel->next; c && c->isbanned; c = c->next);
+               for(c = sel->next; c && !ISVISIBLE(c); c = c->next);

                if(!c)
                if(!c)

-                       for(c = clients; c && c->isbanned; c = c->next);
+                       for(c = clients; c && !ISVISIBLE(c); c = c->next);

        }
        else {
                for(i = clients; i != sel; i = i->next)
        }
        else {
                for(i = clients; i != sel; i = i->next)

-                       if (!i->isbanned)
+                       if(ISVISIBLE(i))

                                c = i;
                                c = i;

-               if(!c) 
+               if(!c)

                        for(; i; i = i->next)
                        for(; i; i = i->next)

-                               if (!i->isbanned)
+                               if(ISVISIBLE(i))

                                        c = i;
        }
        if(c) {
                                        c = i;
        }
        if(c) {


@@ -917,7 +903,8 @@ manage(Window w, XWindowAttributes *wa) {
                if(c->y + c->h + 2 * c->bw > sy + sh)
                        c->y = sy + sh - c->h - 2 * c->bw;
                c->x = MAX(c->x, sx);
                if(c->y + c->h + 2 * c->bw > sy + sh)
                        c->y = sy + sh - c->h - 2 * c->bw;
                c->x = MAX(c->x, sx);

-               c->y = MAX(c->y, by == 0 ? bh : sy);
+               /* only fix client y-offset, if the client center might cover the bar */
+               c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy);

                c->bw = borderpx;
        }
 
                c->bw = borderpx;
        }
 


@@ -970,12 +957,23 @@ maprequest(XEvent *e) {
 }
 
 void
 }
 
 void

-movemouse(Client *c) {
+monocle(void) {
+       Client *c;
+
+       for(c = nexttiled(clients); c; c = nexttiled(c->next))
+               resize(c, wx, wy, ww, wh, resizehints);
+}
+
+void
+movemouse(const Arg *arg) {

        int x1, y1, ocx, ocy, di, nx, ny;
        uint dui;
        int x1, y1, ocx, ocy, di, nx, ny;
        uint dui;

+       Client *c;

        Window dummy;
        XEvent ev;
 
        Window dummy;
        XEvent ev;
 

+       if(!(c = sel))
+               return;

        restack();
        ocx = nx = c->x;
        ocy = ny = c->y;
        restack();
        ocx = nx = c->x;
        ocy = ny = c->y;


@@ -1008,10 +1006,10 @@ movemouse(Client *c) {
                                        ny = wy;
                                else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap)
                                        ny = wy + wh - c->h - 2 * c->bw;
                                        ny = wy;
                                else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap)
                                        ny = wy + wh - c->h - 2 * c->bw;

-                               if(!c->isfloating && lt->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+                               if(!c->isfloating && lt[sellt]->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))

                                        togglefloating(NULL);
                        }
                                        togglefloating(NULL);
                        }

-                       if(!lt->arrange || c->isfloating)
+                       if(!lt[sellt]->arrange || c->isfloating)

                                resize(c, nx, ny, c->w, c->h, False);
                        break;
                }
                                resize(c, nx, ny, c->w, c->h, False);
                        break;
                }


@@ -1020,7 +1018,7 @@ movemouse(Client *c) {
 
 Client *
 nexttiled(Client *c) {
 
 Client *
 nexttiled(Client *c) {

-       for(; c && (c->isfloating || c->isbanned); c = c->next);
+       for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);

        return c;
 }
 
        return c;
 }
 


@@ -1094,11 +1092,11 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 
                w = MAX(w, c->minw);
                h = MAX(h, c->minh);
 
                w = MAX(w, c->minw);
                h = MAX(h, c->minh);

-               
-               if (c->maxw)
+
+               if(c->maxw)

                        w = MIN(w, c->maxw);
 
                        w = MIN(w, c->maxw);
 

-               if (c->maxh)
+               if(c->maxh)

                        h = MIN(h, c->maxh);
        }
        if(w <= 0 || h <= 0)
                        h = MIN(h, c->maxh);
        }
        if(w <= 0 || h <= 0)


@@ -1115,8 +1113,7 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
                h = bh;
        if(w < bh)
                w = bh;
                h = bh;
        if(w < bh)
                w = bh;

-       if(c->x != x || c->y != y || c->w != w || c->h != h || c->ismoved) {
-               c->ismoved = False;
+       if(c->x != x || c->y != y || c->w != w || c->h != h) {

                c->x = wc.x = x;
                c->y = wc.y = y;
                c->w = wc.width = w;
                c->x = wc.x = x;
                c->y = wc.y = y;
                c->w = wc.width = w;


@@ -1130,11 +1127,14 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 }
 
 void
 }
 
 void

-resizemouse(Client *c) {
+resizemouse(const Arg *arg) {

        int ocx, ocy;
        int nw, nh;
        int ocx, ocy;
        int nw, nh;

+       Client *c;

        XEvent ev;
 
        XEvent ev;
 

+       if(!(c = sel))
+               return;

        restack();
        ocx = c->x;
        ocy = c->y;
        restack();
        ocx = c->x;
        ocy = c->y;


@@ -1163,11 +1163,11 @@ resizemouse(Client *c) {
 
                        if(snap && nw >= wx && nw <= wx + ww
                                && nh >= wy && nh <= wy + wh) {
 
                        if(snap && nw >= wx && nw <= wx + ww
                                && nh >= wy && nh <= wy + wh) {

-                               if(!c->isfloating && lt->arrange
+                               if(!c->isfloating && lt[sellt]->arrange

                                   && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
                                        togglefloating(NULL);
                        }
                                   && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
                                        togglefloating(NULL);
                        }

-                       if(!lt->arrange || c->isfloating)
+                       if(!lt[sellt]->arrange || c->isfloating)

                                resize(c, c->x, c->y, nw, nh, True);
                        break;
                }
                                resize(c, c->x, c->y, nw, nh, True);
                        break;
                }


@@ -1183,13 +1183,13 @@ restack(void) {
        drawbar();
        if(!sel)
                return;
        drawbar();
        if(!sel)
                return;

-       if(ismax || sel->isfloating || !lt->arrange)
+       if(sel->isfloating || !lt[sellt]->arrange)

                XRaiseWindow(dpy, sel->win);
                XRaiseWindow(dpy, sel->win);

-       if(!ismax && lt->arrange) {
+       if(lt[sellt]->arrange) {

                wc.stack_mode = Below;
                wc.sibling = barwin;
                for(c = stack; c; c = c->snext)
                wc.stack_mode = Below;
                wc.sibling = barwin;
                for(c = stack; c; c = c->snext)

-                       if(!c->isfloating && !c->isbanned) {
+                       if(!c->isfloating && ISVISIBLE(c)) {

                                XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
                                wc.sibling = c->win;
                        }
                                XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
                                wc.sibling = c->win;
                        }


@@ -1293,12 +1293,23 @@ setclientstate(Client *c, long state) {
                        PropModeReplace, (unsigned char *)data, 2);
 }
 
                        PropModeReplace, (unsigned char *)data, 2);
 }
 

+void
+setlayout(const Arg *arg) {
+       sellt ^= 1;
+       if(arg && arg->v && arg->v != lt[sellt])
+               lt[sellt] = (Layout *)arg->v;
+       if(sel)
+               arrange();
+       else
+               drawbar();
+}
+

 /* arg > 1.0 will set mfact absolutly */
 void
 setmfact(const Arg *arg) {
        float f;
 
 /* arg > 1.0 will set mfact absolutly */
 void
 setmfact(const Arg *arg) {
        float f;
 

-       if(!arg || !lt->arrange)
+       if(!arg || !lt[sellt]->arrange)

                return;
        f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0;
        if(f < 0.1 || f > 0.9)
                return;
        f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0;
        if(f < 0.1 || f > 0.9)


@@ -1316,12 +1327,14 @@ setup(void) {
        /* init screen */
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
        /* init screen */
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);

-       initfont(FONT);
+       initfont(font);

        sx = 0;
        sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        sx = 0;
        sy = 0;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);

-       bh = dc.font.height + 2;
+       bh = dc.h = dc.font.height + 2;
+       lt[0] = &layouts[0];
+       lt[1] = &layouts[1 % LENGTH(layouts)];

        updategeom();
 
        /* init atoms */
        updategeom();
 
        /* init atoms */


@@ -1338,14 +1351,12 @@ setup(void) {
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
        /* init appearance */
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
        /* init appearance */

-       dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
-       dc.norm[ColBG] = getcolor(NORMBGCOLOR);
-       dc.norm[ColFG] = getcolor(NORMFGCOLOR);
-       dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
-       dc.sel[ColBG] = getcolor(SELBGCOLOR);
-       dc.sel[ColFG] = getcolor(SELFGCOLOR);
-       initfont(FONT);
-       dc.h = bh;
+       dc.norm[ColBorder] = getcolor(normbordercolor);
+       dc.norm[ColBG] = getcolor(normbgcolor);
+       dc.norm[ColFG] = getcolor(normfgcolor);
+       dc.sel[ColBorder] = getcolor(selbordercolor);
+       dc.sel[ColBG] = getcolor(selbgcolor);
+       dc.sel[ColFG] = getcolor(selfgcolor);

        dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);
        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
        dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
        dc.gc = XCreateGC(dpy, root, 0, 0);
        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);


@@ -1375,7 +1386,7 @@ setup(void) {
                        PropModeReplace, (unsigned char *) netatom, NetLast);
 
        /* select for events */
                        PropModeReplace, (unsigned char *) netatom, NetLast);
 
        /* select for events */

-       wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
+       wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask

                        |EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
        XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
        XSelectInput(dpy, root, wa.event_mask);
                        |EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
        XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
        XSelectInput(dpy, root, wa.event_mask);


@@ -1474,32 +1485,24 @@ togglefloating(const Arg *arg) {
        arrange();
 }
 
        arrange();
 }
 

-void
-togglelayout(const Arg *arg) {
-       if(++lt == &layouts[LENGTH(layouts)])
-               lt = &layouts[0];
-       if(sel)
-               arrange();
-       else
-               drawbar();
-}
-
-void
-togglemax(const Arg *arg) {
-       ismax = !ismax;
-       arrange();
-}
-

 void
 toggletag(const Arg *arg) {
 void
 toggletag(const Arg *arg) {

-       if(sel && (sel->tags ^= (arg->ui & TAGMASK)))
+       uint mask = sel->tags ^ (arg->ui & TAGMASK);
+
+       if(sel && mask) {
+               sel->tags = mask;

                arrange();
                arrange();

+       }

 }
 
 void
 toggleview(const Arg *arg) {
 }
 
 void
 toggleview(const Arg *arg) {

-       if((tagset[seltags] ^= (arg->ui & TAGMASK)))
+       uint mask = tagset[seltags] ^ (arg->ui & TAGMASK);
+
+       if(mask) {
+               tagset[seltags] = mask;

                arrange();
                arrange();

+       }

 }
 
 void
 }
 
 void


@@ -1550,10 +1553,10 @@ updategeom(void) {
        /* window area geometry */
        if(XineramaIsActive(dpy)) {
                info = XineramaQueryScreens(dpy, &i);
        /* window area geometry */
        if(XineramaIsActive(dpy)) {
                info = XineramaQueryScreens(dpy, &i);

-               wx = info[0].x_org;
-               wy = showbar && topbar ? info[0].y_org + bh : info[0].y_org;
-               ww = info[0].width;
-               wh = showbar ? info[0].height - bh : info[0].height;
+               wx = info[xidx].x_org;
+               wy = showbar && topbar ?  info[xidx].y_org + bh : info[xidx].y_org;
+               ww = info[xidx].width;
+               wh = showbar ? info[xidx].height - bh : info[xidx].height;

                XFree(info);
        }
        else
                XFree(info);
        }
        else


@@ -1681,7 +1684,7 @@ void
 zoom(const Arg *arg) {
        Client *c = sel;
 
 zoom(const Arg *arg) {
        Client *c = sel;
 

-       if(ismax || !lt->arrange || (sel && sel->isfloating))
+       if(!lt[sellt]->arrange || lt[sellt]->arrange == monocle || (sel && sel->isfloating))

                return;
        if(c == nexttiled(clients))
                if(!c || !(c = nexttiled(c->next)))
                return;
        if(c == nexttiled(clients))
                if(!c || !(c = nexttiled(c->next)))