X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=25bc926aaf0937ba290daab5cb15914d5b5fce83;hb=42c4b310032ca6f54cdc861d74369b6373d0c33e;hp=37eb299067676c15743485bd590f9295b2662481;hpb=fa244aa7fbcb438193b17111724640be244543ad;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 37eb299..25bc926 100644
--- a/dwm.c
+++ b/dwm.c
@@ -60,7 +60,6 @@ typedef struct Client Client;
 struct Client {
 	char name[256];
 	int x, y, w, h;
-	int fx, fy, fw, fh;
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int minax, maxax, minay, maxay;
 	long flags;
@@ -98,7 +97,6 @@ typedef struct {
 typedef struct {
 	const char *symbol;
 	void (*arrange)(void);
-	Bool isfloating;
 } Layout;
 
 typedef struct {
@@ -121,7 +119,6 @@ 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);
@@ -158,27 +155,22 @@ void movemouse(Client *c);
 Client *nexttiled(Client *c);
 void propertynotify(XEvent *e);
 void quit(const char *arg);
-void reapply(const char *arg);
 void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
 void resizemouse(Client *c);
 void restack(void);
 void run(void);
 void scan(void);
 void setclientstate(Client *c, long state);
-void setlayout(const char *arg);
 void setmfact(const char *arg);
 void setup(void);
 void spawn(const char *arg);
 void tag(const char *arg);
 unsigned int textnw(const char *text, unsigned int len);
 unsigned int textw(const char *text);
-void tileh(void);
-void tilehstack(unsigned int n);
-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 tile(void);
 void togglefloating(const char *arg);
+void togglelayout(const char *arg);
 void toggletag(const char *arg);
 void toggleview(const char *arg);
 void unban(Client *c);
@@ -274,8 +266,8 @@ arrange(void) {
 	for(c = clients; c; c = c->next)
 		if(isvisible(c, NULL)) {
 			unban(c);
-			if(lt->isfloating || c->isfloating)
-				resize(c, c->fx, c->fy, c->fw, c->fh, True);
+			if(!lt->arrange || c->isfloating)
+				resize(c, c->x, c->y, c->w, c->h, True);
 		}
 		else
 			ban(c);
@@ -335,7 +327,7 @@ buttonpress(XEvent *e) {
 			}
 		}
 		if((ev->x < x + blw) && ev->button == Button1) 
-			setlayout(NULL);
+			togglelayout(NULL);
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
@@ -346,7 +338,7 @@ buttonpress(XEvent *e) {
 			movemouse(c);
 		}
 		else if(ev->button == Button2) {
-			if(!lt->isfloating && c->isfloating)
+			if(lt->arrange && c->isfloating)
 				togglefloating(NULL);
 			else
 				zoom(NULL);
@@ -436,7 +428,7 @@ configurerequest(XEvent *e) {
 	if((c = getclient(ev->window))) {
 		if(ev->value_mask & CWBorderWidth)
 			c->bw = ev->border_width;
-		if(c->isfixed || c->isfloating || lt->isfloating) {
+		if(c->isfixed || c->isfloating || !lt->arrange) {
 			if(ev->value_mask & CWX)
 				c->x = sx + ev->x;
 			if(ev->value_mask & CWY)
@@ -471,15 +463,6 @@ 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;
@@ -504,7 +487,7 @@ void
 detachstack(Client *c) {
 	Client **tc;
 
-	for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+	for(tc = &stack; *tc && *tc != c; tc = &(*tc)->snext);
 	*tc = c->snext;
 }
 
@@ -595,7 +578,7 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
 	x = dc.x + (h / 2);
 	/* shorten text if necessary */
 	for(; len && (w = textnw(buf, len)) > dc.w - h; len--);
-	if (!len)
+	if(!len)
 		return;
 	if(len < olen) {
 		if(len > 1)
@@ -782,21 +765,21 @@ grabbuttons(Client *c, Bool focused) {
 	int i, j;
 	unsigned int buttons[]   = { Button1, Button2, Button3 };
 	unsigned int modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
-	                             MODKEY|numlockmask|LockMask} ;
+				MODKEY|numlockmask|LockMask} ;
 
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	if(focused)
 		for(i = 0; i < LENGTH(buttons); i++)
 			for(j = 0; j < LENGTH(modifiers); j++)
 				XGrabButton(dpy, buttons[i], modifiers[j], c->win, False,
-				            BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+					BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
 	else
 		XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
-		            BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+			BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
 }
 
 void
-grabkeys(void)  {
+grabkeys(void) {
 	unsigned int i, j;
 	KeyCode code;
 	XModifierKeymap *modmap;
@@ -969,8 +952,8 @@ manage(Window w, XWindowAttributes *wa) {
 	/* geometry */
 	c->x = wa->x;
 	c->y = wa->y;
-	c->w = c->fw = wa->width;
-	c->h = c->fh = wa->height;
+	c->w = wa->width;
+	c->h = wa->height;
 	c->oldbw = wa->border_width;
 	if(c->w == sw && c->h == sh) {
 		c->x = sx;
@@ -986,8 +969,6 @@ manage(Window w, XWindowAttributes *wa) {
 		c->y = MAX(c->y, wy);
 		c->bw = BORDERPX;
 	}
-	c->fx = c->x;
-	c->fy = c->y;
 
 	wc.border_width = c->bw;
 	XConfigureWindow(dpy, w, CWBorderWidth, &wc);
@@ -1041,7 +1022,7 @@ monocle(void) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if((lt->isfloating || !c->isfloating) &&  isvisible(c, NULL))
+		if(!c->isfloating && isvisible(c, NULL))
 			resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, RESIZEHINTS);
 }
 
@@ -1055,7 +1036,7 @@ movemouse(Client *c) {
 	ocx = nx = c->x;
 	ocy = ny = c->y;
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-			None, cursor[CurMove], CurrentTime) != GrabSuccess)
+	None, cursor[CurMove], CurrentTime) != GrabSuccess)
 		return;
 	XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
 	for(;;) {
@@ -1081,13 +1062,10 @@ movemouse(Client *c) {
 				ny = wy;
 			else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < SNAP)
 				ny = wy + wh - c->h - 2 * c->bw;
-			if(!c->isfloating && !lt->isfloating && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+			if(!c->isfloating && lt->arrange && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
 				togglefloating(NULL);
-			if(lt->isfloating || c->isfloating) {
-				c->fx = nx;
-				c->fy = ny;
+			if(!lt->arrange || c->isfloating)
 				resize(c, nx, ny, c->w, c->h, False);
-			}
 			break;
 		}
 	}
@@ -1137,17 +1115,6 @@ quit(const char *arg) {
 }
 
 void
-reapply(const char *arg) {
-	Client *c;
-
-	for(c = clients; c; c = c->next) {
-		memset(c->tags, 0, TAGSZ);
-		applyrules(c);
-	}
-	arrange();
-}
-
-void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 	XWindowChanges wc;
 
@@ -1162,8 +1129,7 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 
 		/* adjust for aspect limits */
 		if(c->minax != c->maxax && c->minay != c->maxay 
-		&& c->minax > 0 && c->maxax > 0 && c->minay > 0 && c->maxay > 0)
-		{
+		&& c->minax > 0 && c->maxax > 0 && c->minay > 0 && c->maxay > 0) {
 			if(w * c->maxay > h * c->maxax)
 				w = h * c->maxax / c->maxay;
 			else if(w * c->minay < h * c->minax)
@@ -1221,7 +1187,7 @@ resizemouse(Client *c) {
 	ocx = c->x;
 	ocy = c->y;
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-			None, cursor[CurResize], CurrentTime) != GrabSuccess)
+	None, cursor[CurResize], CurrentTime) != GrabSuccess)
 		return;
 	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
 	for(;;) {
@@ -1242,16 +1208,11 @@ resizemouse(Client *c) {
 			XSync(dpy, False);
 			nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
 			nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
-			if(!c->isfloating && !lt->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP)) {
-				c->fx = c->x;
-				c->fy = c->y;
+			if(!c->isfloating && lt->arrange && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP)) {
 				togglefloating(NULL);
 			}
-			if((lt->isfloating) || c->isfloating) {
+			if(!lt->arrange || c->isfloating)
 				resize(c, c->x, c->y, nw, nh, True);
-				c->fw = nw;
-				c->fh = nh;
-			}
 			break;
 		}
 	}
@@ -1266,9 +1227,9 @@ restack(void) {
 	drawbar();
 	if(!sel)
 		return;
-	if(sel->isfloating || lt->isfloating)
+	if(sel->isfloating || !lt->arrange)
 		XRaiseWindow(dpy, sel->win);
-	if(!lt->isfloating) {
+	if(lt->arrange) {
 		wc.stack_mode = Below;
 		wc.sibling = barwin;
 		for(c = stack; c; c = c->snext)
@@ -1351,7 +1312,7 @@ scan(void) {
 	if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
 		for(i = 0; i < num; i++) {
 			if(!XGetWindowAttributes(dpy, wins[i], &wa)
-					|| wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
+			|| wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
 				continue;
 			if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
 				manage(wins[i], &wa);
@@ -1360,7 +1321,7 @@ scan(void) {
 			if(!XGetWindowAttributes(dpy, wins[i], &wa))
 				continue;
 			if(XGetTransientForHint(dpy, wins[i], &d1)
-					&& (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
+			&& (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
 				manage(wins[i], &wa);
 		}
 	}
@@ -1376,33 +1337,12 @@ setclientstate(Client *c, long state) {
 			PropModeReplace, (unsigned char *)data, 2);
 }
 
-void
-setlayout(const char *arg) {
-	unsigned int i;
-
-	if(!arg) {
-		if(++lt == &layouts[LENGTH(layouts)])
-			lt = &layouts[0];
-	}
-	else {
-		for(i = 0; i < LENGTH(layouts); i++)
-			if(!strcmp(arg, layouts[i].symbol))
-				break;
-		if(i == LENGTH(layouts))
-			return;
-		lt = &layouts[i];
-	}
-	if(sel)
-		arrange();
-	else
-		drawbar();
-}
-
+/* TODO: move this into tile.c */
 void
 setmfact(const char *arg) {
 	double d;
 
-	if(lt->isfloating)
+	if(!lt->arrange) /* TODO: check this against the actual tile() function */
 		return;
 	if(!arg)
 		mfact = MFACT;
@@ -1432,8 +1372,7 @@ setup(void) {
 	sw = DisplayWidth(dpy, screen);
 	sh = DisplayHeight(dpy, screen);
 	bh = dc.font.height + 2;
-
-	/* update geometry */
+	mfact = MFACT;
 	updategeom();
 
 	/* init atoms */
@@ -1480,8 +1419,8 @@ setup(void) {
 	wa.event_mask = ButtonPressMask|ExposureMask;
 
 	barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
-				CopyFromParent, DefaultVisual(dpy, screen),
-				CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
+			CopyFromParent, DefaultVisual(dpy, screen),
+			CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
 	XDefineCursor(dpy, barwin, cursor[CurNormal]);
 	XMapRaised(dpy, barwin);
 	strcpy(stext, "dwm-"VERSION);
@@ -1533,7 +1472,7 @@ tag(const char *arg) {
 	if(!sel)
 		return;
 	for(i = 0; i < LENGTH(tags); i++)
-		sel->tags[i] = (NULL == arg);
+		sel->tags[i] = (arg == NULL);
 	sel->tags[idxoftag(arg)] = True;
 	arrange();
 }
@@ -1555,44 +1494,6 @@ textw(const char *text) {
 }
 
 void
-tileh(void) {
-	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(c->next); c; c = nexttiled(c->next), i++) {
-		if(i + 1 == n) /* remainder */
-			tileresize(c, x, ty, (tx + tw) - x - 2 * c->bw, th - 2 * c->bw);
-		else
-			tileresize(c, x, ty, w - 2 * c->bw, th - 2 * c->bw);
-		if(w != tw)
-			x = c->x + c->w + 2 * c->bw;
-	}
-}
-
-Client *
-tilemaster(unsigned int n) {
-	Client *c = nexttiled(clients);
-
-	if(n == 1)
-		tileresize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
-	else
-		tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw);
-	return c;
-}
-
-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)))
@@ -1601,17 +1502,27 @@ tileresize(Client *c, int x, int y, int w, int h) {
 }
 
 void
-tilev(void) {
+tile(void) {
 	int y, h;
-	unsigned int i, n = counttiled();
+	unsigned int i, n;
 	Client *c;
 
+	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
 	if(n == 0)
 		return;
-	c = tilemaster(n);
+
+	/* master */
+	c = nexttiled(clients);
+
+	if(n == 1)
+		tileresize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
+	else
+		tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw);
+
 	if(--n == 0)
 		return;
 
+	/* tile stack */
 	y = ty;
 	h = th / n;
 	if(h < bh)
@@ -1638,6 +1549,28 @@ togglefloating(const char *arg) {
 }
 
 void
+togglelayout(const char *arg) {
+	unsigned int i;
+
+	if(!arg) {
+		if(++lt == &layouts[LENGTH(layouts)])
+			lt = &layouts[0];
+	}
+	else {
+		for(i = 0; i < LENGTH(layouts); i++)
+			if(!strcmp(arg, layouts[i].symbol))
+				break;
+		if(i == LENGTH(layouts))
+			return;
+		lt = &layouts[i];
+	}
+	if(sel)
+		arrange();
+	else
+		drawbar();
+}
+
+void
 toggletag(const char *arg) {
 	unsigned int i, j;
 
@@ -1705,7 +1638,6 @@ unmapnotify(XEvent *e) {
 
 void
 updatebar(void) {
-
 	if(dc.drawable != 0)
 		XFreePixmap(dpy, dc.drawable);
 	dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
@@ -1727,7 +1659,6 @@ updategeom(void) {
 	wh = sh - bh;
 
 	/* master area geometry */
-	mfact = MFACT;
 	mx = wx;
 	my = wy;
 	mw = mfact * ww;
@@ -1813,7 +1744,7 @@ updatewmhints(Client *c) {
 
 void
 view(const char *arg) {
-	seltags ^= 1;
+	seltags ^= 1; /* toggle sel tagset */
 	memset(tagset[seltags], (NULL == arg), TAGSZ);
 	tagset[seltags][idxoftag(arg)] = True;
 	arrange();
@@ -1841,7 +1772,7 @@ xerror(Display *dpy, XErrorEvent *ee) {
 	|| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
 		return 0;
 	fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
-		ee->request_code, ee->error_code);
+			ee->request_code, ee->error_code);
 	return xerrorxlib(dpy, ee); /* may call exit */
 }
 
@@ -1858,6 +1789,7 @@ xerrorstart(Display *dpy, XErrorEvent *ee) {
 	return -1;
 }
 
+/* TODO: move this into tile.c */
 void
 zoom(const char *arg) {
 	Client *c = sel;
@@ -1865,7 +1797,7 @@ zoom(const char *arg) {
 	if(c == nexttiled(clients))
 		if(!c || !(c = nexttiled(c->next)))
 			return;
-	if(!lt->isfloating && !sel->isfloating) {
+	if(lt->arrange && !sel->isfloating) { /* TODO: check this against tile() */
 		detach(c);
 		attach(c);
 		focus(c);