X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=6a21d3face00cf684b69aaaaca14f443ca832bc7;hb=7e25897f1108b1b24b3a1d4ebe69cfa6de1d08f0;hp=726e7975b7bd1dba93a31401af189631c64dac93;hpb=fe2775a15ba2d4900788c57194da2bad3d19cfaf;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 726e797..6a21d3f 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>
@@ -62,9 +63,9 @@ struct Client {
 	int rx, ry, rw, rh; /* revert geometry */
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int minax, maxax, minay, maxay;
-	long flags; 
+	long flags;
 	unsigned int border, oldborder;
-	Bool isbanned, isfixed, ismax, isfloating;
+	Bool isbanned, isfixed, ismax, isfloating, wasfloating;
 	Bool *tags;
 	Client *next;
 	Client *prev;
@@ -334,23 +335,23 @@ buttonpress(XEvent *e) {
 		if(CLEANMASK(ev->state) != MODKEY)
 			return;
 		if(ev->button == Button1) {
-			if(!isarrange(floating) && !c->isfloating)
-				togglefloating(NULL);
-			else
+			if(isarrange(floating) || c->isfloating)
 				restack();
+			else
+				togglefloating(NULL);
 			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);
 		}
 		else if(ev->button == Button3 && !c->isfixed) {
-			if(!isarrange(floating) && !c->isfloating)
-				togglefloating(NULL);
-			else
+			if(isarrange(floating) || c->isfloating)
 				restack();
+			else
+				togglefloating(NULL);
 			resizemouse(c);
 		}
 	}
@@ -444,7 +445,7 @@ void
 configurenotify(XEvent *e) {
 	XConfigureEvent *ev = &e->xconfigure;
 
-	if (ev->window == root && (ev->width != sw || ev->height != sh)) {
+	if(ev->window == root && (ev->width != sw || ev->height != sh)) {
 		sw = ev->width;
 		sh = ev->height;
 		XFreePixmap(dpy, dc.drawable);
@@ -883,7 +884,7 @@ initfont(const char *fontstr) {
 			XFreeFont(dpy, dc.font.xfont);
 		dc.font.xfont = NULL;
 		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
-		|| !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
+		&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
 			eprint("error, cannot load font: '%s'\n", fontstr);
 		dc.font.ascent = dc.font.xfont->ascent;
 		dc.font.descent = dc.font.xfont->descent;
@@ -1161,7 +1162,7 @@ quit(const char *arg) {
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 	double dx, dy, max, min, ratio;
-	XWindowChanges wc; 
+	XWindowChanges wc;
 
 	if(sizehints) {
 		if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) {
@@ -1398,16 +1399,16 @@ void
 setmwfact(const char *arg) {
 	double delta;
 
-	if(!isarrange(tile))
+	if(!ISTILE)
 		return;
 	/* arg handling, manipulate mwfact */
 	if(arg == NULL)
 		mwfact = MWFACT;
 	else if(1 == sscanf(arg, "%lf", &delta)) {
-		if(arg[0] != '+' && arg[0] != '-')
-			mwfact = delta;
-		else
+		if(arg[0] == '+' || arg[0] == '-')
 			mwfact += delta;
+		else
+			mwfact = delta;
 		if(mwfact < 0.1)
 			mwfact = 0.1;
 		else if(mwfact > 0.9)
@@ -1418,6 +1419,7 @@ setmwfact(const char *arg) {
 
 void
 setup(void) {
+	int d;
 	unsigned int i, j, mask;
 	Window w;
 	XModifierKeymap *modmap;
@@ -1507,7 +1509,7 @@ setup(void) {
 		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 
 	/* multihead support */
-	selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
+	selscreen = XQueryPointer(dpy, root, &w, &w, &d, &d, &d, &d, &mask);
 }
 
 void
@@ -1567,7 +1569,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++;
@@ -1580,7 +1582,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;
@@ -1589,9 +1592,9 @@ tile(void) {
 		else {  /* tile window */
 			if(i == 1) {
 				ny = way;
-				nx += mw;
+				nx += mc->w + 2 * 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
@@ -1599,7 +1602,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 + 2 * c->border;
 	}
 }
 
@@ -1627,17 +1630,26 @@ void
 togglemax(const char *arg) {
 	XEvent ev;
 
-	if(!sel || (!isarrange(floating) && !sel->isfloating) || sel->isfixed)
+	if(!sel || sel->isfixed)
 		return;
 	if((sel->ismax = !sel->ismax)) {
+		if(isarrange(floating) || sel->isfloating)
+			sel->wasfloating = True;
+		else {
+			togglefloating(NULL);
+			sel->wasfloating = False;
+		}
 		sel->rx = sel->x;
 		sel->ry = sel->y;
 		sel->rw = sel->w;
 		sel->rh = sel->h;
 		resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
 	}
-	else
+	else {
 		resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
+		if(!sel->wasfloating)
+			togglefloating(NULL);
+	}
 	drawbar();
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
@@ -1664,7 +1676,7 @@ toggleview(const char *arg) {
 	seltags[i] = !seltags[i];
 	for(j = 0; j < ntags && !seltags[j]; j++);
 	if(j == ntags)
-		seltags[i] = True; /* cannot toggle last view */
+		seltags[i] = True; /* at least one tag must be viewed */
 	arrange();
 }
 
@@ -1840,7 +1852,7 @@ void
 zoom(const char *arg) {
 	Client *c;
 
-	if(!sel || !isarrange(tile) || sel->isfloating)
+	if(!sel || !ISTILE || sel->isfloating)
 		return;
 	if((c = sel) == nexttiled(clients))
 		if(!(c = nexttiled(c->next)))