X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=view.c;h=b3b412d8ea421b0fb6099caaba4dcdf63c60d0ec;hp=21e7bbd4a037b6dac11e5dfe28b0e37927d7186e;hb=cb4aa5bc35cf16a06bb2b4e880648e390fa2cc55;hpb=46d5f9d1bfd8caaabaabfb7c7e5eac269aff4987

diff --git a/view.c b/view.c
index 21e7bbd..b3b412d 100644
--- a/view.c
+++ b/view.c
@@ -1,4 +1,4 @@
-/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -69,13 +69,12 @@ dofloat(void) {
 
 void
 dotile(void) {
-	unsigned int i, n, mpx, stackw, th;
+	unsigned int i, n, mpw, th;
 	Client *c;
 
 	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
 		n++;
-	mpx = (waw * master) / 1000;
-	stackw = waw - mpx;
+	mpw = (waw * master) / 1000;
 
 	for(i = 0, c = clients; c; c = c->next)
 		if(isvisible(c)) {
@@ -91,15 +90,15 @@ dotile(void) {
 				c->h = wah - 2 * BORDERPX;
 			}
 			else if(i == 0) { /* master window */
-				c->w = waw - stackw - 2 * BORDERPX;
+				c->w = mpw - 2 * BORDERPX;
 				c->h = wah - 2 * BORDERPX;
 				th = wah / (n - 1);
 			}
 			else {  /* tile window */
-				c->x += mpx;
-				c->w = stackw - 2 * BORDERPX;
+				c->x += mpw;
+				c->w = (waw - mpw) - 2 * BORDERPX;
 				if(th > bh) {
-					c->y = way + (i - 1) * th;
+					c->y += (i - 1) * th;
 					c->h = th - 2 * BORDERPX;
 				}
 				else /* fallback if th < bh */
@@ -202,7 +201,7 @@ restack(void) {
 
 void
 togglefloat(Arg *arg) {
-	if (!sel)
+	if (!sel || arrange == dofloat)
 		return;
 	sel->isfloat = !sel->isfloat;
 	arrange();
@@ -233,17 +232,9 @@ view(Arg *arg) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
-		seltag[i] = False;
-	seltag[arg->i] = True;
-	arrange();
-}
-
-void
-viewall(Arg *arg) {
-	unsigned int i;
-
-	for(i = 0; i < ntags; i++)
-		seltag[i] = True;
+		seltag[i] = (arg->i == -1) ? True : False;
+	if(arg->i >= 0 && arg->i < ntags)
+		seltag[arg->i] = True;
 	arrange();
 }