simplification

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 88391af..5095b62 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -39,20 +39,23 @@
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>

+#ifdef XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif

 
 /* macros */
 
 /* macros */

-#define MAX(a, b)      ((a) > (b) ? (a) : (b))
-#define MIN(a, b)      ((a) < (b) ? (a) : (b))
-#define BUTTONMASK     (ButtonPressMask|ButtonReleaseMask)
-#define CLEANMASK(mask)        (mask & ~(numlockmask|LockMask))
-#define LENGTH(x)      (sizeof x / sizeof x[0])
-#define MAXTAGLEN      16
-#define MOUSEMASK      (BUTTONMASK|PointerMotionMask)
+#define MAX(a, b)       ((a) > (b) ? (a) : (b))
+#define MIN(a, b)       ((a) < (b) ? (a) : (b))
+#define BUTTONMASK      (ButtonPressMask|ButtonReleaseMask)
+#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
+#define LENGTH(x)       (sizeof x / sizeof x[0])
+#define MAXTAGLEN       16
+#define MOUSEMASK       (BUTTONMASK|PointerMotionMask)

 
 /* enums */
 
 /* enums */

-enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
-enum { ColBorder, ColFG, ColBG, ColLast };             /* color */
-enum { NetSupported, NetWMName, NetLast };             /* EWMH atoms */
+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 */
 
 /* typedefs */
 enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
 
 /* typedefs */


@@ -60,7 +63,6 @@ typedef struct Client Client;
 struct Client {
        char name[256];
        int x, y, w, h;
 struct Client {
        char name[256];
        int x, y, w, h;

-       int fx, fy, fw, fh;

        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int minax, maxax, minay, maxay;
        long flags;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int minax, maxax, minay, maxay;
        long flags;


@@ -98,7 +100,7 @@ typedef struct {
 typedef struct {
        const char *symbol;
        void (*arrange)(void);
 typedef struct {
        const char *symbol;
        void (*arrange)(void);

-       Bool isfloating;
+       void (*updategeom)(void);

 } Layout;
 
 typedef struct {
 } Layout;
 
 typedef struct {


@@ -121,7 +123,6 @@ void cleanup(void);
 void configure(Client *c);
 void configurenotify(XEvent *e);
 void configurerequest(XEvent *e);
 void configure(Client *c);
 void configurenotify(XEvent *e);
 void configurerequest(XEvent *e);

-unsigned int counttiled(void);

 void destroynotify(XEvent *e);
 void detach(Client *c);
 void detachstack(Client *c);
 void destroynotify(XEvent *e);
 void detach(Client *c);
 void detachstack(Client *c);


@@ -147,18 +148,16 @@ void initfont(const char *fontstr);
 Bool isoccupied(unsigned int t);
 Bool isprotodel(Client *c);
 Bool isurgent(unsigned int t);
 Bool isoccupied(unsigned int t);
 Bool isprotodel(Client *c);
 Bool isurgent(unsigned int t);

-Bool isvisible(Client *c, Bool *cmp);
+Bool isvisible(Client *c);

 void keypress(XEvent *e);
 void killclient(const char *arg);
 void manage(Window w, XWindowAttributes *wa);
 void mappingnotify(XEvent *e);
 void maprequest(XEvent *e);
 void keypress(XEvent *e);
 void killclient(const char *arg);
 void manage(Window w, XWindowAttributes *wa);
 void mappingnotify(XEvent *e);
 void maprequest(XEvent *e);

-void monocle(void);

 void movemouse(Client *c);
 void movemouse(Client *c);

-Client *nexttiled(Client *c);
+Client *nextunfloating(Client *c);

 void propertynotify(XEvent *e);
 void quit(const char *arg);
 void propertynotify(XEvent *e);
 void quit(const char *arg);

-void reapply(const char *arg);

 void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
 void resizemouse(Client *c);
 void restack(void);
 void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
 void resizemouse(Client *c);
 void restack(void);


@@ -171,12 +170,9 @@ void spawn(const char *arg);
 void tag(const char *arg);
 unsigned int textnw(const char *text, unsigned int len);
 unsigned int textw(const char *text);
 void tag(const char *arg);
 unsigned int textnw(const char *text, unsigned int len);
 unsigned int textw(const char *text);

-void tileh(void);
-void tilehstack(unsigned int n);
-Client *tilemaster(unsigned int n);
+void tile(void);

 void tileresize(Client *c, int x, int y, int w, int h);
 void tileresize(Client *c, int x, int y, int w, int h);

-void tilev(void);
-void tilevstack(unsigned int n);
+void togglebar(const char *arg);

 void togglefloating(const char *arg);
 void togglelayout(const char *arg);
 void toggletag(const char *arg);
 void togglefloating(const char *arg);
 void togglelayout(const char *arg);
 void toggletag(const char *arg);


@@ -187,10 +183,11 @@ void unmapnotify(XEvent *e);
 void updatebar(void);
 void updategeom(void);
 void updatesizehints(Client *c);
 void updatebar(void);
 void updategeom(void);
 void updatesizehints(Client *c);

+void updatetilegeom(void);

 void updatetitle(Client *c);
 void updatewmhints(Client *c);
 void view(const char *arg);
 void updatetitle(Client *c);
 void updatewmhints(Client *c);
 void view(const char *arg);

-void viewprevtag(const char *arg);     /* views previous selected tags */
+void viewprevtag(const char *arg);

 int xerror(Display *dpy, XErrorEvent *ee);
 int xerrordummy(Display *dpy, XErrorEvent *ee);
 int xerrorstart(Display *dpy, XErrorEvent *ee);
 int xerror(Display *dpy, XErrorEvent *ee);
 int xerrordummy(Display *dpy, XErrorEvent *ee);
 int xerrorstart(Display *dpy, XErrorEvent *ee);


@@ -199,10 +196,10 @@ void zoom(const char *arg);
 /* variables */
 char stext[256];
 int screen, sx, sy, sw, sh;
 /* variables */
 char stext[256];
 int screen, sx, sy, sw, sh;

-int (*xerrorxlib)(Display *, XErrorEvent *);
-int bx, by, bw, bh, blw, mx, my, mw, mh, tx, ty, tw, th, wx, wy, ww, wh;
+int bx, by, bw, bh, blw, wx, wy, ww, wh;
+int mx, my, mw, mh, tx, ty, tw, th;

 int seltags = 0;
 int seltags = 0;

-double mfact;
+int (*xerrorxlib)(Display *, XErrorEvent *);

 unsigned int numlockmask = 0;
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
 unsigned int numlockmask = 0;
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,


@@ -272,10 +269,10 @@ arrange(void) {
        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)

-               if(isvisible(c, NULL)) {
+               if(isvisible(c)) {

                        unban(c);
                        unban(c);

-                       if(lt->isfloating || c->isfloating)
-                               resize(c, c->fx, c->fy, c->fw, c->fh, True);
+                       if(!lt->arrange || c->isfloating)
+                               resize(c, c->x, c->y, c->w, c->h, True);

                }
                else
                        ban(c);
                }
                else
                        ban(c);


@@ -345,12 +342,8 @@ buttonpress(XEvent *e) {
                        restack();
                        movemouse(c);
                }
                        restack();
                        movemouse(c);
                }

-               else if(ev->button == Button2) {
-                       if(!lt->isfloating && c->isfloating)
-                               togglefloating(NULL);
-                       else
-                               zoom(NULL);
-               }
+               else if(ev->button == Button2)
+                       togglefloating(NULL);

                else if(ev->button == Button3 && !c->isfixed) {
                        restack();
                        resizemouse(c);
                else if(ev->button == Button3 && !c->isfixed) {
                        restack();
                        resizemouse(c);


@@ -436,7 +429,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(c->isfixed || c->isfloating || lt->isfloating) {
+               if(c->isfixed || c->isfloating || !lt->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)


@@ -452,7 +445,7 @@ configurerequest(XEvent *e) {
                        if((ev->value_mask & (CWX|CWY))
                        && !(ev->value_mask & (CWWidth|CWHeight)))
                                configure(c);
                        if((ev->value_mask & (CWX|CWY))
                        && !(ev->value_mask & (CWWidth|CWHeight)))
                                configure(c);

-                       if(isvisible(c, NULL))
+                       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


@@ -471,15 +464,6 @@ configurerequest(XEvent *e) {
        XSync(dpy, False);
 }
 
        XSync(dpy, False);
 }
 

-unsigned int
-counttiled(void) {
-       unsigned int n;
-       Client *c;
-
-       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
-       return n;
-}
-

 void
 destroynotify(XEvent *e) {
        Client *c;
 void
 destroynotify(XEvent *e) {
        Client *c;


@@ -514,7 +498,7 @@ drawbar(void) {
        Client *c;
 
        dc.x = 0;
        Client *c;
 
        dc.x = 0;

-       for(c = stack; c && !isvisible(c, NULL); c = c->snext);
+       for(c = stack; c && !isvisible(c); c = c->snext);

        for(i = 0; i < LENGTH(tags); i++) {
                dc.w = textw(tags[i]);
                if(tagset[seltags][i]) {
        for(i = 0; i < LENGTH(tags); i++) {
                dc.w = textw(tags[i]);
                if(tagset[seltags][i]) {


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

-       if(!c || (c && !isvisible(c, NULL)))
-               for(c = stack; c && !isvisible(c, NULL); c = c->snext);
+       if(!c || (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]);


@@ -689,9 +673,9 @@ focusnext(const char *arg) {
 
        if(!sel)
                return;
 
        if(!sel)
                return;

-       for(c = sel->next; c && !isvisible(c, arg ? sel->tags : NULL); c = c->next);
+       for(c = sel->next; c && !isvisible(c); c = c->next);

        if(!c)
        if(!c)

-               for(c = clients; c && !isvisible(c, arg ? sel->tags : NULL); c = c->next);
+               for(c = clients; c && !isvisible(c); c = c->next);

        if(c) {
                focus(c);
                restack();
        if(c) {
                focus(c);
                restack();


@@ -704,10 +688,10 @@ focusprev(const char *arg) {
 
        if(!sel)
                return;
 
        if(!sel)
                return;

-       for(c = sel->prev; c && !isvisible(c, arg ? sel->tags : NULL); c = c->prev);
+       for(c = sel->prev; c && !isvisible(c); c = c->prev);

        if(!c) {
                for(c = clients; c && c->next; c = c->next);
        if(!c) {
                for(c = clients; c && c->next; c = c->next);

-               for(; c && !isvisible(c, arg ? sel->tags : NULL); c = c->prev);
+               for(; c && !isvisible(c); c = c->prev);

        }
        if(c) {
                focus(c);
        }
        if(c) {
                focus(c);


@@ -908,13 +892,11 @@ isurgent(unsigned int t) {
 }
 
 Bool
 }
 
 Bool

-isvisible(Client *c, Bool *cmp) {
+isvisible(Client *c) {

        unsigned int i;
 
        unsigned int i;
 

-       if(!cmp)
-               cmp = tagset[seltags];

        for(i = 0; i < LENGTH(tags); i++)
        for(i = 0; i < LENGTH(tags); i++)

-               if(c->tags[i] && cmp[i])
+               if(c->tags[i] && tagset[seltags][i])

                        return True;
        return False;
 }
                        return True;
        return False;
 }


@@ -969,8 +951,8 @@ manage(Window w, XWindowAttributes *wa) {
        /* geometry */
        c->x = wa->x;
        c->y = wa->y;
        /* geometry */
        c->x = wa->x;
        c->y = wa->y;

-       c->w = c->fw = wa->width;
-       c->h = c->fh = wa->height;
+       c->w = wa->width;
+       c->h = wa->height;

        c->oldbw = wa->border_width;
        if(c->w == sw && c->h == sh) {
                c->x = sx;
        c->oldbw = wa->border_width;
        if(c->w == sw && c->h == sh) {
                c->x = sx;


@@ -978,16 +960,14 @@ manage(Window w, XWindowAttributes *wa) {
                c->bw = wa->border_width;
        }
        else {
                c->bw = wa->border_width;
        }
        else {

-               if(c->x + c->w + 2 * c->bw > wx + ww)
-                       c->x = wx + ww - c->w - 2 * c->bw;
-               if(c->y + c->h + 2 * c->bw > wy + wh)
-                       c->y = wy + wh - c->h - 2 * c->bw;
-               c->x = MAX(c->x, wx);
-               c->y = MAX(c->y, wy);
-               c->bw = BORDERPX;
+               if(c->x + c->w + 2 * c->bw > sx + sw)
+                       c->x = sx + sw - c->w - 2 * c->bw;
+               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);
+               c->bw = borderpx;

        }
        }

-       c->fx = c->x;
-       c->fy = c->y;

 
        wc.border_width = c->bw;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
 
        wc.border_width = c->bw;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);


@@ -1036,15 +1016,6 @@ maprequest(XEvent *e) {
                manage(ev->window, &wa);
 }
 
                manage(ev->window, &wa);
 }
 

-void
-monocle(void) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if((lt->isfloating || !c->isfloating) && isvisible(c, NULL))
-                       resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, RESIZEHINTS);
-}
-

 void
 movemouse(Client *c) {
        int x1, y1, ocx, ocy, di, nx, ny;
 void
 movemouse(Client *c) {
        int x1, y1, ocx, ocy, di, nx, ny;


@@ -1073,29 +1044,29 @@ movemouse(Client *c) {
                        XSync(dpy, False);
                        nx = ocx + (ev.xmotion.x - x1);
                        ny = ocy + (ev.xmotion.y - y1);
                        XSync(dpy, False);
                        nx = ocx + (ev.xmotion.x - x1);
                        ny = ocy + (ev.xmotion.y - y1);

-                       if(abs(wx - nx) < SNAP)
-                               nx = wx;
-                       else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < SNAP)
-                               nx = wx + ww - c->w - 2 * c->bw;
-                       if(abs(wy - ny) < SNAP)
-                               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->isfloating && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
-                               togglefloating(NULL);
-                       if(lt->isfloating || c->isfloating) {
-                               c->fx = nx;
-                               c->fy = ny;
-                               resize(c, nx, ny, c->w, c->h, False);
+                       if(snap && nx >= wx && nx <= wx + ww
+                               && ny >= wy && ny <= wy + wh) {
+                               if(abs(wx - nx) < snap)
+                                       nx = wx;
+                               else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < snap)
+                                       nx = wx + ww - c->w - 2 * c->bw;
+                               if(abs(wy - ny) < snap)
+                                       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))
+                                       togglefloating(NULL);

                        }
                        }

+                       if(!lt->arrange || c->isfloating)
+                               resize(c, nx, ny, c->w, c->h, False);

                        break;
                }
        }
 }
 
 Client *
                        break;
                }
        }
 }
 
 Client *

-nexttiled(Client *c) {
-       for(; c && (c->isfloating || !isvisible(c, NULL)); c = c->next);
+nextunfloating(Client *c) {
+       for(; c && (c->isfloating || !isvisible(c)); c = c->next);

        return c;
 }
 
        return c;
 }
 


@@ -1136,17 +1107,6 @@ quit(const char *arg) {
        readin = running = False;
 }
 
        readin = running = False;
 }
 

-void
-reapply(const char *arg) {
-       Client *c;
-
-       for(c = clients; c; c = c->next) {
-               memset(c->tags, 0, TAGSZ);
-               applyrules(c);
-       }
-       arrange();
-}
-

 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
        XWindowChanges wc;
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
        XWindowChanges wc;


@@ -1241,16 +1201,15 @@ resizemouse(Client *c) {
                        XSync(dpy, False);
                        nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
                        nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
                        XSync(dpy, False);
                        nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
                        nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);

-                       if(!c->isfloating && !lt->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP)) {
-                               c->fx = c->x;
-                               c->fy = c->y;
-                               togglefloating(NULL);
+
+                       if(snap && nw >= wx && nw <= wx + ww
+                               && nh >= wy && nh <= wy + wh) {
+                               if(!c->isfloating && lt->arrange
+                                  && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
+                                       togglefloating(NULL);

                        }
                        }

-                       if((lt->isfloating) || c->isfloating) {
+                       if(!lt->arrange || c->isfloating)

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

-                               c->fw = nw;
-                               c->fh = nh;
-                       }

                        break;
                }
        }
                        break;
                }
        }


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

-       if(sel->isfloating || lt->isfloating)
+       if(sel->isfloating || !lt->arrange)

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

-       if(!lt->isfloating) {
+       if(lt->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 && isvisible(c, NULL)) {
+                       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;
                        }


@@ -1379,10 +1338,8 @@ void
 setmfact(const char *arg) {
        double d;
 
 setmfact(const char *arg) {
        double d;
 

-       if(lt->isfloating)
+       if(!arg || lt->arrange != tile)

                return;
                return;

-       if(!arg)
-               mfact = MFACT;

        else {
                d = strtod(arg, NULL);
                if(arg[0] == '-' || arg[0] == '+')
        else {
                d = strtod(arg, NULL);
                if(arg[0] == '-' || arg[0] == '+')


@@ -1391,7 +1348,7 @@ setmfact(const char *arg) {
                        return;
                mfact = d;
        }
                        return;
                mfact = d;
        }

-       updategeom();
+       updatetilegeom();

        arrange();
 }
 
        arrange();
 }
 


@@ -1409,7 +1366,6 @@ setup(void) {
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        bh = dc.font.height + 2;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        bh = dc.font.height + 2;

-       mfact = MFACT;

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


@@ -1531,78 +1487,60 @@ textw(const char *text) {
 }
 
 void
 }
 
 void

-tileh(void) {
-       int x, w;
-       unsigned int i, n = counttiled();
+tile(void) {
+       int x, y, h, w;
+       unsigned int i, n;

        Client *c;
 
        Client *c;
 

+       for(n = 0, c = nextunfloating(clients); c; c = nextunfloating(c->next), n++);

        if(n == 0)
                return;
        if(n == 0)
                return;

-       c = tilemaster(n);
-       if(--n == 0)
-               return;
-
-       x = tx;
-       w = tw / n;
-       if(w < bh)
-               w = tw;
-
-       for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
-               if(i + 1 == n) /* remainder */
-                       tileresize(c, x, ty, (tx + tw) - x - 2 * c->bw, th - 2 * c->bw);
-               else
-                       tileresize(c, x, ty, w - 2 * c->bw, th - 2 * c->bw);
-               if(w != tw)
-                       x = c->x + c->w + 2 * c->bw;
-       }
-}

 
 

-Client *
-tilemaster(unsigned int n) {
-       Client *c = nexttiled(clients);
+       /* master */
+       c = nextunfloating(clients);

 
        if(n == 1)
                tileresize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
        else
                tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw);
 
        if(n == 1)
                tileresize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
        else
                tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw);

-       return c;
-}
-
-void
-tileresize(Client *c, int x, int y, int w, int h) {
-       resize(c, x, y, w, h, RESIZEHINTS);
-       if((RESIZEHINTS) && ((c->h < bh) || (c->h > h) || (c->w < bh) || (c->w > w)))
-               /* client doesn't accept size constraints */
-               resize(c, x, y, w, h, False);
-}
-
-void
-tilev(void) {
-       int y, h;
-       unsigned int i, n = counttiled();
-       Client *c;

 
 

-       if(n == 0)
-               return;
-       c = tilemaster(n);

        if(--n == 0)
                return;
 
        if(--n == 0)
                return;
 

+       /* tile stack */
+       x = (tx > c->x + c->w) ? c->x + c->w + 2 * c->bw : tw;

        y = ty;
        y = ty;

+       w = (tx > c->x + c->w) ? wx + ww - x : tw;

        h = th / n;
        if(h < bh)
                h = th;
 
        h = th / n;
        if(h < bh)
                h = th;
 

-       for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+       for(i = 0, c = nextunfloating(c->next); c; c = nextunfloating(c->next), i++) {

                if(i + 1 == n) /* remainder */
                if(i + 1 == n) /* remainder */

-                       tileresize(c, tx, y, tw - 2 * c->bw, (ty + th) - y - 2 * c->bw);
+                       tileresize(c, x, y, w - 2 * c->bw, (ty + th) - y - 2 * c->bw);

                else
                else

-                       tileresize(c, tx, y, tw - 2 * c->bw, h - 2 * c->bw);
+                       tileresize(c, x, y, w - 2 * c->bw, h - 2 * c->bw);

                if(h != th)
                        y = c->y + c->h + 2 * c->bw;
        }
 }
 
                if(h != th)
                        y = c->y + c->h + 2 * c->bw;
        }
 }
 

+void
+tileresize(Client *c, int x, int y, int w, int h) {
+       resize(c, x, y, w, h, resizehints);
+       if(resizehints && ((c->h < bh) || (c->h > h) || (c->w < bh) || (c->w > w)))
+               /* client doesn't accept size constraints */
+               resize(c, x, y, w, h, False);
+}
+
+void
+togglebar(const char *arg) {
+       showbar = !showbar;
+       updategeom();
+       updatebar();
+       arrange();
+}
+

 void
 togglefloating(const char *arg) {
        if(!sel)
 void
 togglefloating(const char *arg) {
        if(!sel)


@@ -1711,29 +1649,37 @@ updatebar(void) {
 
 void
 updategeom(void) {
 
 void
 updategeom(void) {

-
-       /* bar geometry */
-       bx = 0;
-       by = 0;
-       bw = sw;
+       int i;
+#ifdef XINERAMA
+       XineramaScreenInfo *info = NULL;

 
        /* window area geometry */
 
        /* window area geometry */

-       wx = sx;
-       wy = sy + bh;
-       ww = sw;
-       wh = sh - bh;
+       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;
+               XFree(info);
+       }
+       else
+#endif
+       {
+               wx = sx;
+               wy = showbar && topbar ? sy + bh : sy;
+               ww = sw;
+               wh = showbar ? sh - bh : sh;
+       }

 
 

-       /* master area geometry */
-       mx = wx;
-       my = wy;
-       mw = mfact * ww;
-       mh = wh;
+       /* bar geometry*/
+       bx = wx;
+       by = showbar ? (topbar ? 0 : wy + wh) : -bh;
+       bw = ww;

 
 

-       /* tile area geometry */
-       tx = mx + mw;
-       ty = wy;
-       tw = ww - mw;
-       th = wh;
+       /* update layout geometries */
+       for(i = 0; i < LENGTH(layouts); i++)
+               if(layouts[i].updategeom)
+                       layouts[i].updategeom();

 }
 
 void
 }
 
 void


@@ -1788,6 +1734,21 @@ updatesizehints(Client *c) {
                        && c->maxw == c->minw && c->maxh == c->minh);
 }
 
                        && c->maxw == c->minw && c->maxh == c->minh);
 }
 

+void
+updatetilegeom(void) {
+       /* master area geometry */
+       mx = wx;
+       my = wy;
+       mw = mfact * ww;
+       mh = wh;
+
+       /* tile area geometry */
+       tx = mx + mw;
+       ty = wy;
+       tw = ww - mw;
+       th = wh;
+}
+

 void
 updatetitle(Client *c) {
        if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
 void
 updatetitle(Client *c) {
        if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))


@@ -1858,10 +1819,10 @@ void
 zoom(const char *arg) {
        Client *c = sel;
 
 zoom(const char *arg) {
        Client *c = sel;
 

-       if(c == nexttiled(clients))
-               if(!c || !(c = nexttiled(c->next)))
+       if(c == nextunfloating(clients))
+               if(!c || !(c = nextunfloating(c->next)))

                        return;
                        return;

-       if(!lt->isfloating && !sel->isfloating) {
+       if(lt->arrange == tile && !sel->isfloating) {

                detach(c);
                attach(c);
                focus(c);
                detach(c);
                attach(c);
                focus(c);