X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=a54329a7f23117ada470594c1b2a71eef818d3ed;hb=1380569133c986a5ddfab2c280f2e993f7803c48;hp=6d3cf80bc77cc47949a5a7fd85b4f0d25453c1b8;hpb=f2e98f48fb3cb7558d705ba581767caccb4ea7be;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 6d3cf80..a54329a 100644
--- a/dwm.c
+++ b/dwm.c
@@ -96,8 +96,7 @@ typedef struct {
 	const char *symbol;
 	void (*arrange)(void);
 	Bool isfloating;
-} Layout; /* TODO: layout should keep an auxilliary pointer to its Geometry,
-	     instead of having all those layout specific vars globally */
+} Layout; 
 
 typedef struct {
 	const char *prop;
@@ -117,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);
@@ -170,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);
@@ -458,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;
@@ -1407,7 +1417,7 @@ setdefaultgeoms(void) {
 	mh = wh;
 
 	/* tile area */
-	tx = wx;
+	tx = mx + mw;
 	ty = wy;
 	tw = ww - mw;
 	th = wh;
@@ -1579,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