X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=66cbcbd1dae563cc59988211dc1a15c0226a497d;hp=2985ceabc4fd600514b2b0b2741fca532371a665;hb=47b1974446cfec795e4e92c68cbf24174956619f;hpb=c9170189bf0d0234f8d97fd7b717f859b7242674

diff --git a/dwm.c b/dwm.c
index 2985cea..66cbcbd 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1,6 +1,3 @@
-/**
- * - allow for vstack
- */
 /* See LICENSE file for copyright and license details.
  *
  * dynamic window manager is designed like any other X client as well. It is
@@ -36,7 +33,6 @@
 #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>
@@ -170,8 +166,10 @@ 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 tile(void);
+void tileh(void);
+void tilehstack(unsigned int n);
 unsigned int tilemaster(void);
+void tilev(void);
 void tilevstack(unsigned int n);
 void togglefloating(const char *arg);
 void toggletag(const char *arg);
@@ -193,7 +191,7 @@ void zoom(const char *arg);
 char stext[256], buf[256];
 int screen, sx, sy, sw, sh;
 int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int bh, blw = 0;
+int bx, by, bw, bh, blw, mx, my, mw, mh, mox, moy, mow, moh, tx, ty, tw, th, wx, wy, ww, wh;
 unsigned int numlockmask = 0;
 void (*handler[LASTEvent]) (XEvent *) = {
 	[ButtonPress] = buttonpress,
@@ -409,8 +407,8 @@ configurenotify(XEvent *e) {
 		sw = ev->width;
 		sh = ev->height;
 		XFreePixmap(dpy, dc.drawable);
-		dc.drawable = XCreatePixmap(dpy, root, BW, bh, DefaultDepth(dpy, screen));
-		XMoveResizeWindow(dpy, barwin, BX, BY, BW, bh);
+		dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
+		XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
 		arrange();
 	}
 }
@@ -510,10 +508,10 @@ drawbar(void) {
 	drawtext(lt->symbol, dc.norm, False);
 	x = dc.x + dc.w;
 	dc.w = textw(stext);
-	dc.x = BW - dc.w;
+	dc.x = bw - dc.w;
 	if(dc.x < x) {
 		dc.x = x;
-		dc.w = BW - x;
+		dc.w = bw - x;
 	}
 	drawtext(stext, dc.norm, False);
 	if((dc.w = dc.x - x) > bh) {
@@ -525,7 +523,7 @@ drawbar(void) {
 		else
 			drawtext(NULL, dc.norm, False);
 	}
-	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, BW, bh, 0, 0);
+	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
 	XSync(dpy, False);
 }
 
@@ -983,14 +981,14 @@ manage(Window w, XWindowAttributes *wa) {
 		c->border = wa->border_width;
 	}
 	else {
-		if(c->x + c->w + 2 * c->border > WX + WW)
-			c->x = WX + WW - c->w - 2 * c->border;
-		if(c->y + c->h + 2 * c->border > WY + WH)
-			c->y = WY + WH - c->h - 2 * c->border;
-		if(c->x < WX)
-			c->x = WX;
-		if(c->y < WY)
-			c->y = WY;
+		if(c->x + c->w + 2 * c->border > wx + ww)
+			c->x = wx + ww - c->w - 2 * c->border;
+		if(c->y + c->h + 2 * c->border > wy + wh)
+			c->y = wy + wh - c->h - 2 * c->border;
+		if(c->x < wx)
+			c->x = wx;
+		if(c->y < wy)
+			c->y = wy;
 		c->border = BORDERPX;
 	}
 
@@ -1047,7 +1045,7 @@ monocle(void) {
 
 	for(c = clients; c; c = c->next)
 		if(isvisible(c))
-			resize(c, MOX, MOY, MOW, MOH, RESIZEHINTS);
+			resize(c, mox, moy, mow, moh, RESIZEHINTS);
 }
 
 void
@@ -1078,14 +1076,14 @@ movemouse(Client *c) {
 			XSync(dpy, False);
 			nx = ocx + (ev.xmotion.x - x1);
 			ny = ocy + (ev.xmotion.y - y1);
-			if(abs(WX - nx) < SNAP)
-				nx = WX;
-			else if(abs((WX + WW) - (nx + c->w + 2 * c->border)) < SNAP)
-				nx = WX + WW - c->w - 2 * c->border;
-			if(abs(WY - ny) < SNAP)
-				ny = WY;
-			else if(abs((WY + WH) - (ny + c->h + 2 * c->border)) < SNAP)
-				ny = WY + WH - c->h - 2 * c->border;
+			if(abs(wx - nx) < SNAP)
+				nx = wx;
+			else if(abs((wx + ww) - (nx + c->w + 2 * c->border)) < SNAP)
+				nx = wx + ww - c->w - 2 * c->border;
+			if(abs(wy - ny) < SNAP)
+				ny = wy;
+			else if(abs((wy + wh) - (ny + c->h + 2 * c->border)) < SNAP)
+				ny = wy + wh - c->h - 2 * c->border;
 			if(!c->isfloating && !lt->isfloating && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
 				togglefloating(NULL);
 			if((lt->isfloating) || c->isfloating)
@@ -1453,6 +1451,35 @@ setup(void) {
 	/* init layouts */
 	lt = &layouts[0];
 
+	/* bar position */
+	bx = BX;
+	by = BY;
+	bw = BW;
+
+	/* window area */
+	wx = WX;
+	wy = WY;
+	ww = WW;
+	wh = WH;
+
+	/* master area */
+	mx = MX;
+	my = MY;
+	mw = MW;
+	mh = MH;
+
+	/* tile area */
+	tx = TX;
+	ty = TY;
+	tw = TW;
+	th = TH;
+
+	/* monocle area */
+	mox = MOX;
+	moy = MOY;
+	mow = MOW;
+	moh = MOH;
+
 	/* init bar */
 	for(blw = i = 0; i < LENGTH(layouts); i++) {
 		i = textw(layouts[i].symbol);
@@ -1464,7 +1491,9 @@ setup(void) {
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ButtonPressMask|ExposureMask;
 
-	barwin = XCreateWindow(dpy, root, BX, BY, BW, bh, 0, DefaultDepth(dpy, screen),
+
+
+	barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
 				CopyFromParent, DefaultVisual(dpy, screen),
 				CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
 	XDefineCursor(dpy, barwin, cursor[CurNormal]);
@@ -1547,6 +1576,37 @@ tileresize(Client *c, int x, int y, int w, int h) {
 		resize(c, x, y, w, h, False);
 }
 
+void
+tileh(void) {
+	tilehstack(tilemaster());
+}
+
+void
+tilehstack(unsigned int n) {
+	int i, x, w;
+	Client *c;
+
+	if(n == 0)
+		return;
+
+	x = tx;
+	w = tw / n;
+	if(w < bh)
+		w = tw;
+
+	for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++)
+		if(i > 0) {
+			if(i > 1 && i == n) /* remainder */
+				tileresize(c, x, ty, (tx + tw) - x - 2 * c->border,
+				              th - 2 * c->border);
+			else
+				tileresize(c, x, ty, w - 2 * c->border,
+				              th - 2 * c->border);
+			if(w != tw)
+				x = c->x + c->w + 2 * c->border;
+		}
+}
+
 unsigned int
 tilemaster(void) {
 	unsigned int n;
@@ -1557,13 +1617,18 @@ tilemaster(void) {
 	if(n == 0)
 		return 0;
 	if(n == 1)
-		tileresize(mc, MOX, MOY, (MOW) - 2 * mc->border, (MOH) - 2 * mc->border);
+		tileresize(mc, mox, moy, mow - 2 * mc->border, moh - 2 * mc->border);
 	else
-		tileresize(mc, MX, MY, (MW) - 2 * mc->border, (MH) - 2 * mc->border);
+		tileresize(mc, mx, my, mw - 2 * mc->border, mh - 2 * mc->border);
 	return n - 1;
 }
 
 void
+tilev(void) {
+	tilevstack(tilemaster());
+}
+
+void
 tilevstack(unsigned int n) {
 	int i, y, h;
 	Client *c;
@@ -1571,30 +1636,25 @@ tilevstack(unsigned int n) {
 	if(n == 0)
 		return;
 
-	y = TY;
-	h = (TH) / n;
+	y = ty;
+	h = th / n;
 	if(h < bh)
-		h = TH;
+		h = th;
 
 	for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++)
 		if(i > 0) {
 			if(i > 1 && i == n) /* remainder */
-				tileresize(c, TX, y, (TW) - 2 * c->border,
-				              ((TY) + (TH)) - y - 2 * c->border);
+				tileresize(c, tx, y, tw - 2 * c->border,
+				              (ty + th) - y - 2 * c->border);
 			else
-				tileresize(c, TX, y, (TW) - 2 * c->border,
+				tileresize(c, tx, y, tw - 2 * c->border,
 				              h - 2 * c->border);
-			if(h != TH)
+			if(h != th)
 				y = c->y + c->h + 2 * c->border;
 		}
 }
 
 void
-tile(void) {
-	tilevstack(tilemaster());
-}
-
-void
 togglefloating(const char *arg) {
 	if(!sel)
 		return;