X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=b61bbf593786af72774021d4f9db578a52e86669;hb=5d2385b636d496645be4c703f04a365c637379c5;hp=0c9acbe0fc265a60f6a74ca13e832f406a5f061c;hpb=825d6cb93a37f8c67a7c8b1a027e5eebc3f4dda7;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 0c9acbe..b61bbf5 100644
--- a/dwm.c
+++ b/dwm.c
@@ -52,6 +52,8 @@
 #define MAXTAGLEN       16
 #define MOUSEMASK       (BUTTONMASK|PointerMotionMask)
 #define TAGMASK         ((int)((1LL << LENGTH(tags)) - 1))
+#define TEXTW(x)        (textnw(x, strlen(x)) + dc.font.height)
+#define VISIBLE(x)      ((x)->tags & tagset[seltags])
 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
@@ -69,8 +71,8 @@ struct Client {
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int minax, maxax, minay, maxay;
 	long flags;
-	uint bw, oldbw;
-	Bool isbanned, isfixed, isfloating, isurgent;
+	int bw, oldbw;
+	Bool isbanned, isfixed, isfloating, ismax, isurgent;
 	uint tags;
 	Client *next;
 	Client *prev;
@@ -94,7 +96,7 @@ typedef struct {
 } DC; /* draw context */
 
 typedef struct {
-	ulong mod;
+	uint mod;
 	KeySym keysym;
 	void (*func)(const void *arg);
 	const void *arg;
@@ -119,7 +121,6 @@ void applyrules(Client *c);
 void arrange(void);
 void attach(Client *c);
 void attachstack(Client *c);
-void ban(Client *c);
 void buttonpress(XEvent *e);
 void checkotherwm(void);
 void cleanup(void);
@@ -132,7 +133,6 @@ void detachstack(Client *c);
 void drawbar(void);
 void drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]);
 void drawtext(const char *text, ulong col[ColLast], Bool invert);
-void *emallocz(uint size);
 void enternotify(XEvent *e);
 void eprint(const char *errstr, ...);
 void expose(XEvent *e);
@@ -150,7 +150,6 @@ void initfont(const char *fontstr);
 Bool isoccupied(uint t);
 Bool isprotodel(Client *c);
 Bool isurgent(uint t);
-Bool isvisible(Client *c);
 void keypress(XEvent *e);
 void killclient(const void *arg);
 void manage(Window w, XWindowAttributes *wa);
@@ -171,15 +170,14 @@ void setup(void);
 void spawn(const void *arg);
 void tag(const void *arg);
 uint textnw(const char *text, uint len);
-uint textw(const char *text);
 void tile(void);
 void tileresize(Client *c, int x, int y, int w, int h);
 void togglebar(const void *arg);
 void togglefloating(const void *arg);
 void togglelayout(const void *arg);
+void togglemax(const void *arg);
 void toggletag(const void *arg);
 void toggleview(const void *arg);
-void unban(Client *c);
 void unmanage(Client *c);
 void unmapnotify(XEvent *e);
 void updatebar(void);
@@ -218,6 +216,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
 	[UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];
+Bool domax = False;
 Bool otherwm, readin;
 Bool running = True;
 uint tagset[] = {1, 1}; /* after start, first tag is selected */
@@ -234,11 +233,10 @@ Window root, barwin;
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
-/* check if all tags will fit into a uint bitarray. */
-static char tags_is_a_sign_that_your_IQ[sizeof(int) * 8 < LENGTH(tags) ? -1 : 1];
+/* compile-time check if all tags fit into an uint bit array. */
+struct NumTags { char limitexceeded[sizeof(uint) * 8 < LENGTH(tags) ? -1 : 1]; };
 
 /* function implementations */
-
 void
 applyrules(Client *c) {
 	uint i;
@@ -269,16 +267,17 @@ arrange(void) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(isvisible(c)) {
-			unban(c);
+		if(VISIBLE(c)) {
 			if(!lt->arrange || c->isfloating)
 				resize(c, c->x, c->y, c->w, c->h, True);
 		}
-		else
-			ban(c);
+		else if(!c->isbanned) {
+			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+			c->isbanned = True;
+		}
 
 	focus(NULL);
-	if(lt->arrange)
+	if(lt->arrange && !domax)
 		lt->arrange();
 	restack();
 }
@@ -298,14 +297,6 @@ attachstack(Client *c) {
 }
 
 void
-ban(Client *c) {
-	if(c->isbanned)
-		return;
-	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-	c->isbanned = True;
-}
-
-void
 buttonpress(XEvent *e) {
 	uint i, x, mask;
 	Client *c;
@@ -314,7 +305,7 @@ buttonpress(XEvent *e) {
 	if(ev->window == barwin) {
 		x = 0;
 		for(i = 0; i < LENGTH(tags); i++) {
-			x += textw(tags[i]);
+			x += TEXTW(tags[i]);
 			if(ev->x < x) {
 				mask = 1 << i;
 				if(ev->button == Button1) {
@@ -332,23 +323,23 @@ buttonpress(XEvent *e) {
 				return;
 			}
 		}
-		if((ev->x < x + blw) && ev->button == Button1) 
-			togglelayout(NULL);
+		if(ev->x < x + blw) {
+			if(ev->button == Button1) 
+				togglelayout(NULL);
+			else if(ev->button == Button3) 
+				togglemax(NULL);
+		}
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
-		if(CLEANMASK(ev->state) != MODKEY)
+		if(CLEANMASK(ev->state) != MODKEY || domax)
 			return;
-		if(ev->button == Button1) {
-			restack();
+		if(ev->button == Button1)
 			movemouse(c);
-		}
 		else if(ev->button == Button2)
 			togglefloating(NULL);
-		else if(ev->button == Button3 && !c->isfixed) {
-			restack();
+		else if(ev->button == Button3 && !c->isfixed)
 			resizemouse(c);
-		}
 	}
 }
 
@@ -371,10 +362,9 @@ checkotherwm(void) {
 void
 cleanup(void) {
 	close(STDIN_FILENO);
-	while(stack) {
-		unban(stack);
+	view(NULL);
+	while(stack)
 		unmanage(stack);
-	}
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
 	else
@@ -446,7 +436,7 @@ configurerequest(XEvent *e) {
 			if((ev->value_mask & (CWX|CWY))
 			&& !(ev->value_mask & (CWWidth|CWHeight)))
 				configure(c);
-			if(isvisible(c))
+			if(VISIBLE(c))
 				XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
 		}
 		else
@@ -499,9 +489,9 @@ drawbar(void) {
 	Client *c;
 
 	dc.x = 0;
-	for(c = stack; c && !isvisible(c); c = c->snext);
+	for(c = stack; c && !VISIBLE(c); c = c->snext);
 	for(i = 0; i < LENGTH(tags); i++) {
-		dc.w = textw(tags[i]);
+		dc.w = TEXTW(tags[i]);
 		if(tagset[seltags] & 1 << i) {
 			drawtext(tags[i], dc.sel, isurgent(i));
 			drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
@@ -514,12 +504,12 @@ drawbar(void) {
 	}
 	if(blw > 0) {
 		dc.w = blw;
-		drawtext(lt->symbol, dc.norm, False);
+		drawtext(lt->symbol, dc.norm, domax);
 		x = dc.x + dc.w;
 	}
 	else
 		x = dc.x;
-	dc.w = textw(stext);
+	dc.w = TEXTW(stext);
 	dc.x = bw - dc.w;
 	if(dc.x < x) {
 		dc.x = x;
@@ -597,15 +587,6 @@ drawtext(const char *text, ulong col[ColLast], Bool invert) {
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 }
 
-void *
-emallocz(uint size) {
-	void *res = calloc(1, size);
-
-	if(!res)
-		eprint("fatal: could not malloc() %u bytes\n", size);
-	return res;
-}
-
 void
 enternotify(XEvent *e) {
 	Client *c;
@@ -639,8 +620,8 @@ expose(XEvent *e) {
 
 void
 focus(Client *c) {
-	if(!c || (c && !isvisible(c)))
-		for(c = stack; c && !isvisible(c); c = c->snext);
+	if(!c || (c && !VISIBLE(c)))
+		for(c = stack; c && !VISIBLE(c); c = c->snext);
 	if(sel && sel != c) {
 		grabbuttons(sel, False);
 		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
@@ -652,6 +633,10 @@ focus(Client *c) {
 	}
 	sel = c;
 	if(c) {
+		if(domax) {
+			XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
+			c->ismax = True;
+		}
 		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	}
@@ -674,9 +659,9 @@ focusnext(const void *arg) {
 
 	if(!sel)
 		return;
-	for(c = sel->next; c && !isvisible(c); c = c->next);
+	for(c = sel->next; c && !VISIBLE(c); c = c->next);
 	if(!c)
-		for(c = clients; c && !isvisible(c); c = c->next);
+		for(c = clients; c && !VISIBLE(c); c = c->next);
 	if(c) {
 		focus(c);
 		restack();
@@ -689,10 +674,10 @@ focusprev(const void *arg) {
 
 	if(!sel)
 		return;
-	for(c = sel->prev; c && !isvisible(c); c = c->prev);
+	for(c = sel->prev; c && !VISIBLE(c); c = c->prev);
 	if(!c) {
 		for(c = clients; c && c->next; c = c->next);
-		for(; c && !isvisible(c); c = c->prev);
+		for(; c && !VISIBLE(c); c = c->prev);
 	}
 	if(c) {
 		focus(c);
@@ -884,11 +869,6 @@ isurgent(uint t) {
 	return False;
 }
 
-Bool
-isvisible(Client *c) {
-	return c->tags & tagset[seltags];
-}
-
 void
 keypress(XEvent *e) {
 	uint i;
@@ -932,7 +912,8 @@ manage(Window w, XWindowAttributes *wa) {
 	Window trans;
 	XWindowChanges wc;
 
-	c = emallocz(sizeof(Client));
+	if(!(c = calloc(1, sizeof(Client))))
+		eprint("fatal: could not calloc() %u bytes\n", sizeof(Client));
 	c->win = w;
 
 	/* geometry */
@@ -975,7 +956,6 @@ manage(Window w, XWindowAttributes *wa) {
 	attach(c);
 	attachstack(c);
 	XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
-	ban(c);
 	XMapWindow(dpy, c->win);
 	setclientstate(c, NormalState);
 	arrange();
@@ -1010,6 +990,7 @@ movemouse(Client *c) {
 	Window dummy;
 	XEvent ev;
 
+	restack();
 	ocx = nx = c->x;
 	ocy = ny = c->y;
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
@@ -1053,7 +1034,7 @@ movemouse(Client *c) {
 
 Client *
 nexttiled(Client *c) {
-	for(; c && (c->isfloating || !isvisible(c)); c = c->next);
+	for(; c && (c->isfloating || !VISIBLE(c)); c = c->next);
 	return c;
 }
 
@@ -1145,7 +1126,8 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 		x = sx;
 	if(y + h + 2 * c->bw < sy)
 		y = sy;
-	if(c->x != x || c->y != y || c->w != w || c->h != h) {
+	if(c->x != x || c->y != y || c->w != w || c->h != h || c->isbanned || c->ismax) {
+		c->isbanned = c->ismax = False;
 		c->x = wc.x = x;
 		c->y = wc.y = y;
 		c->w = wc.width = w;
@@ -1164,6 +1146,7 @@ resizemouse(Client *c) {
 	int nw, nh;
 	XEvent ev;
 
+	restack();
 	ocx = c->x;
 	ocy = c->y;
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
@@ -1211,13 +1194,13 @@ restack(void) {
 	drawbar();
 	if(!sel)
 		return;
-	if(sel->isfloating || !lt->arrange)
+	if(domax || sel->isfloating || !lt->arrange)
 		XRaiseWindow(dpy, sel->win);
-	if(lt->arrange) {
+	if(!domax && lt->arrange) {
 		wc.stack_mode = Below;
 		wc.sibling = barwin;
 		for(c = stack; c; c = c->snext)
-			if(!c->isfloating && isvisible(c)) {
+			if(!c->isfloating && VISIBLE(c)) {
 				XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
 				wc.sibling = c->win;
 			}
@@ -1382,7 +1365,7 @@ setup(void) {
 
 	/* init bar */
 	for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
-		w = textw(layouts[i].symbol);
+		w = TEXTW(layouts[i].symbol);
 		blw = MAX(blw, w);
 	}
 
@@ -1454,11 +1437,6 @@ textnw(const char *text, uint len) {
 	return XTextWidth(dc.font.xfont, text, len);
 }
 
-uint
-textw(const char *text) {
-	return textnw(text, strlen(text)) + dc.font.height;
-}
-
 void
 tile(void) {
 	int x, y, h, w;
@@ -1547,15 +1525,13 @@ togglelayout(const void *arg) {
 }
 
 void
-toggletag(const void *arg) {
-	int i, m = *(int *)arg;
-	for(i = 0; i < sizeof(int) * 8; i++)
-		fputc(m & 1 << i ? '1' : '0', stdout);
-	puts("");
-	for(i = 0; i < sizeof(int) * 8; i++)
-		fputc(TAGMASK & 1 << i ? '1' : '0', stdout);
-	puts("aaa");
+togglemax(const void *arg) {
+	domax = !domax;
+	arrange();
+}
 
+void
+toggletag(const void *arg) {
 	if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) {
 		sel->tags ^= (*(int *)arg) & TAGMASK;
 		arrange();
@@ -1571,14 +1547,6 @@ toggleview(const void *arg) {
 }
 
 void
-unban(Client *c) {
-	if(!c->isbanned)
-		return;
-	XMoveWindow(dpy, c->win, c->x, c->y);
-	c->isbanned = False;
-}
-
-void
 unmanage(Client *c) {
 	XWindowChanges wc;