X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=c4a705d0419af7cfa20a116d1b646adfaa7553ef;hb=60adbab72636e50dbafe4456c892c1bf26cee690;hp=90ba67b20bde1ce7a6b86cbfb54702b2d28ca6b6;hpb=60444daa70591946f352446906e498c8ae3dafdf;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 90ba67b..c4a705d 100644
--- a/dwm.c
+++ b/dwm.c
@@ -27,14 +27,15 @@
  */
 #include <errno.h>
 #include <locale.h>
-#include <regex.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/select.h>
+#include <sys/types.h>
 #include <sys/wait.h>
+#include <regex.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
@@ -341,7 +342,7 @@ buttonpress(XEvent *e) {
 			movemouse(c);
 		}
 		else if(ev->button == Button2) {
-			if(isarrange(tile) && !c->isfixed && c->isfloating)
+			if(ISTILE && !c->isfixed && c->isfloating)
 				togglefloating(NULL);
 			else
 				zoom(NULL);
@@ -645,8 +646,11 @@ enternotify(XEvent *e) {
 
 	if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
 		return;
-	if((c = getclient(ev->window)))
+	if((c = getclient(ev->window))) {
 		focus(c);
+		if(ISTILE && !c->isfloating)
+			restack();
+	}
 	else if(ev->window == root) {
 		selscreen = True;
 		focus(NULL);
@@ -1398,7 +1402,7 @@ void
 setmwfact(const char *arg) {
 	double delta;
 
-	if(isarrange(floating))
+	if(!ISTILE)
 		return;
 	/* arg handling, manipulate mwfact */
 	if(arg == NULL)
@@ -1568,7 +1572,7 @@ textw(const char *text) {
 void
 tile(void) {
 	unsigned int i, n, nx, ny, nw, nh, mw, th;
-	Client *c;
+	Client *c, *mc;
 
 	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
 		n++;
@@ -1581,7 +1585,8 @@ tile(void) {
 
 	nx = wax;
 	ny = way;
-	for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++) {
+	nw = 0; /* gcc stupidity requires this */
+	for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next), i++) {
 		c->ismax = False;
 		if(i == 0) { /* master */
 			nw = mw - 2 * c->border;
@@ -1590,9 +1595,9 @@ tile(void) {
 		else {  /* tile window */
 			if(i == 1) {
 				ny = way;
-				nx += mw;
+				nx += mc->w + mc->border;
+				nw = waw - nx - 2 * c->border;
 			}
-			nw = waw - mw - 2 * c->border;
 			if(i + 1 == n) /* remainder */
 				nh = (way + wah) - ny - 2 * c->border;
 			else
@@ -1600,7 +1605,7 @@ tile(void) {
 		}
 		resize(c, nx, ny, nw, nh, RESIZEHINTS);
 		if(n > 1 && th != wah)
-			ny += nh + 2 * c->border;
+			ny = c->y + c->h + c->border;
 	}
 }
 
@@ -1850,7 +1855,7 @@ void
 zoom(const char *arg) {
 	Client *c;
 
-	if(!sel || isarrange(floating) || sel->isfloating)
+	if(!sel || !ISTILE || sel->isfloating)
 		return;
 	if((c = sel) == nexttiled(clients))
 		if(!(c = nexttiled(c->next)))