Added tag 4.8 for changeset 607015ddb091

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index a9edae3..a54329a 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -96,7 +96,7 @@ typedef struct {
        const char *symbol;
        void (*arrange)(void);
        Bool isfloating;
-} Layout;
+} Layout; 
 
 typedef struct {
        const char *prop;
@@ -116,6 +116,7 @@ void cleanup(void);
 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);
@@ -169,7 +170,8 @@ unsigned int textnw(const char *text, unsigned int len);
 unsigned int textw(const char *text);
 void tileh(void);
 void tilehstack(unsigned int n);
-unsigned int tilemaster(void);
+Client *tilemaster(unsigned int n);
+void tileresize(Client *c, int x, int y, int w, int h);
 void tilev(void);
 void tilevstack(unsigned int n);
 void togglefloating(const char *arg);
@@ -178,6 +180,7 @@ void toggleview(const char *arg);
 void unban(Client *c);
 void unmanage(Client *c);
 void unmapnotify(XEvent *e);
+void updatebarpos(void);
 void updatesizehints(Client *c);
 void updatetitle(Client *c);
 void updatewmhints(Client *c);
@@ -407,6 +410,7 @@ configurenotify(XEvent *e) {
 
        if(ev->window == root && (ev->width != sw || ev->height != sh)) {
                setgeoms();
+               updatebarpos();
                arrange();
        }
 }
@@ -455,6 +459,15 @@ configurerequest(XEvent *e) {
        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;
@@ -1404,7 +1417,7 @@ setdefaultgeoms(void) {
        mh = wh;
 
        /* tile area */
-       tx = wx;
+       tx = mx + mw;
        ty = wy;
        tw = ww - mw;
        th = wh;
@@ -1414,11 +1427,6 @@ setdefaultgeoms(void) {
        moy = wy;
        mow = ww;
        moh = wh;
-
-       if(dc.drawable != 0)
-               XFreePixmap(dpy, dc.drawable);
-       dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
-       XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
 }
 
 void
@@ -1581,89 +1589,76 @@ textw(const char *text) {
 }
 
 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
 tileh(void) {
-       tilehstack(tilemaster());
-}
-
-void
-tilehstack(unsigned int n) {
-       int i, x, w;
+       int x, w;
+       unsigned int i, n = counttiled();
        Client *c;
 
        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(clients); c; c = nexttiled(c->next), i++)
-               if(i > 0) {
-                       if(i > 1 && i == n) /* remainder */
-                               tileresize(c, x, ty, (tx + tw) - x - 2 * c->border,
-                                             th - 2 * c->border);
-                       else
-                               tileresize(c, x, ty, w - 2 * c->border,
-                                             th - 2 * c->border);
-                       if(w != tw)
-                               x = c->x + c->w + 2 * c->border;
-               }
+       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->border, th - 2 * c->border);
+               else
+                       tileresize(c, x, ty, w - 2 * c->border, th - 2 * c->border);
+               if(w != tw)
+                       x = c->x + c->w + 2 * c->border;
+       }
 }
 
-unsigned int
-tilemaster(void) {
-       unsigned int n;
-       Client *c, *mc;
+Client *
+tilemaster(unsigned int n) {
+       Client *c = nexttiled(clients);
 
-       for(n = 0, mc = c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
-       if(n == 0)
-               return 0;
        if(n == 1)
-               tileresize(mc, mox, moy, mow - 2 * mc->border, moh - 2 * mc->border);
+               tileresize(c, mox, moy, mow - 2 * c->border, moh - 2 * c->border);
        else
-               tileresize(mc, mx, my, mw - 2 * mc->border, mh - 2 * mc->border);
-       return n - 1;
+               tileresize(c, mx, my, mw - 2 * c->border, mh - 2 * c->border);
+       return c;
 }
 
 void
-tilev(void) {
-       tilevstack(tilemaster());
+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
-tilevstack(unsigned int n) {
-       int i, y, h;
+tilev(void) {
+       int y, h;
+       unsigned int i, n = counttiled();
        Client *c;
 
        if(n == 0)
                return;
+       c = tilemaster(n);
+       if(--n == 0)
+               return;
 
        y = ty;
        h = th / n;
        if(h < bh)
                h = th;
 
-       for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++)
-               if(i > 0) {
-                       if(i > 1 && i == n) /* remainder */
-                               tileresize(c, tx, y, tw - 2 * c->border,
-                                             (ty + th) - y - 2 * c->border);
-                       else
-                               tileresize(c, tx, y, tw - 2 * c->border,
-                                             h - 2 * c->border);
-                       if(h != th)
-                               y = c->y + c->h + 2 * c->border;
-               }
+       for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+               if(i + 1 == n) /* remainder */
+                       tileresize(c, tx, y, tw - 2 * c->border, (ty + th) - y - 2 * c->border);
+               else
+                       tileresize(c, tx, y, tw - 2 * c->border, h - 2 * c->border);
+               if(h != th)
+                       y = c->y + c->h + 2 * c->border;
+       }
 }
 
 void
@@ -1743,6 +1738,15 @@ unmapnotify(XEvent *e) {
 }
 
 void
+updatebarpos(void) {
+
+       if(dc.drawable != 0)
+               XFreePixmap(dpy, dc.drawable);
+       dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
+       XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
+}
+
+void
 updatesizehints(Client *c) {
        long msize;
        XSizeHints size;