X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=d9db7fd35e42d3423673c6104376e3bdca8a6d3d;hb=549726869bd88f70727ecae8a28161700395b20b;hp=3650ccdb8afc200f381c0256e571b6d47c51a639;hpb=a785a0d71213c2ab628778727c4354ad5bb517fb;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 3650ccd..d9db7fd 100644
--- a/dwm.c
+++ b/dwm.c
@@ -41,18 +41,19 @@
 #include <X11/Xutil.h>
 
 /* macros */
-#define MAX(a, b)	((a) > (b) ? (a) : (b))
-#define MIN(a, b)	((a) < (b) ? (a) : (b))
-#define BUTTONMASK	(ButtonPressMask|ButtonReleaseMask)
-#define CLEANMASK(mask)	(mask & ~(numlockmask|LockMask))
-#define LENGTH(x)	(sizeof x / sizeof x[0])
-#define MAXTAGLEN	16
-#define MOUSEMASK	(BUTTONMASK|PointerMotionMask)
+#define MAX(a, b)       ((a) > (b) ? (a) : (b))
+#define MIN(a, b)       ((a) < (b) ? (a) : (b))
+#define BUTTONMASK      (ButtonPressMask|ButtonReleaseMask)
+#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
+#define LENGTH(x)       (sizeof x / sizeof x[0])
+#define MAXTAGLEN       16
+#define MOUSEMASK       (BUTTONMASK|PointerMotionMask)
 
 /* enums */
-enum { CurNormal, CurResize, CurMove, CurLast };	/* cursor */
-enum { ColBorder, ColFG, ColBG, ColLast };		/* color */
-enum { NetSupported, NetWMName, NetLast };		/* EWMH atoms */
+enum { BarTop, BarBot, BarOff, BarLast };               /* bar appearance */
+enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
+enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
+enum { NetSupported, NetWMName, NetLast };              /* EWMH atoms */
 enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
 
 /* typedefs */
@@ -97,6 +98,7 @@ typedef struct {
 typedef struct {
 	const char *symbol;
 	void (*arrange)(void);
+	void (*updategeom)(void);
 } Layout;
 
 typedef struct {
@@ -119,7 +121,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);
@@ -145,15 +146,14 @@ void initfont(const char *fontstr);
 Bool isoccupied(unsigned int t);
 Bool isprotodel(Client *c);
 Bool isurgent(unsigned int t);
-Bool isvisible(Client *c, Bool *cmp);
+Bool isvisible(Client *c);
 void keypress(XEvent *e);
 void killclient(const char *arg);
 void manage(Window w, XWindowAttributes *wa);
 void mappingnotify(XEvent *e);
 void maprequest(XEvent *e);
-void monocle(void);
 void movemouse(Client *c);
-Client *nexttiled(Client *c);
+Client *nextunfloating(Client *c);
 void propertynotify(XEvent *e);
 void quit(const char *arg);
 void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
@@ -162,18 +162,12 @@ void restack(void);
 void run(void);
 void scan(void);
 void setclientstate(Client *c, long state);
-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 togglebar(const char *arg);
 void togglefloating(const char *arg);
 void togglelayout(const char *arg);
 void toggletag(const char *arg);
@@ -187,7 +181,7 @@ void updatesizehints(Client *c);
 void updatetitle(Client *c);
 void updatewmhints(Client *c);
 void view(const char *arg);
-void viewprevtag(const char *arg);	/* views previous selected tags */
+void viewprevtag(const char *arg);
 int xerror(Display *dpy, XErrorEvent *ee);
 int xerrordummy(Display *dpy, XErrorEvent *ee);
 int xerrorstart(Display *dpy, XErrorEvent *ee);
@@ -196,10 +190,9 @@ void zoom(const char *arg);
 /* variables */
 char stext[256];
 int screen, sx, sy, sw, sh;
-int (*xerrorxlib)(Display *, XErrorEvent *);
-int bx, by, bw, bh, blw, mx, my, mw, mh, tx, ty, tw, th, wx, wy, ww, wh;
+int bx, by, bw, bh, blw, wx, wy, ww, wh;
 int seltags = 0;
-double mfact;
+int (*xerrorxlib)(Display *, XErrorEvent *);
 unsigned int numlockmask = 0;
 void (*handler[LASTEvent]) (XEvent *) = {
 	[ButtonPress] = buttonpress,
@@ -269,7 +262,7 @@ arrange(void) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(isvisible(c, NULL)) {
+		if(isvisible(c)) {
 			unban(c);
 			if(!lt->arrange || c->isfloating)
 				resize(c, c->x, c->y, c->w, c->h, True);
@@ -345,8 +338,6 @@ buttonpress(XEvent *e) {
 		else if(ev->button == Button2) {
 			if(lt->arrange && c->isfloating)
 				togglefloating(NULL);
-			else
-				zoom(NULL);
 		}
 		else if(ev->button == Button3 && !c->isfixed) {
 			restack();
@@ -449,7 +440,7 @@ configurerequest(XEvent *e) {
 			if((ev->value_mask & (CWX|CWY))
 			&& !(ev->value_mask & (CWWidth|CWHeight)))
 				configure(c);
-			if(isvisible(c, NULL))
+			if(isvisible(c))
 				XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
 		}
 		else
@@ -468,15 +459,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;
@@ -511,7 +493,7 @@ drawbar(void) {
 	Client *c;
 
 	dc.x = 0;
-	for(c = stack; c && !isvisible(c, NULL); c = c->snext);
+	for(c = stack; c && !isvisible(c); c = c->snext);
 	for(i = 0; i < LENGTH(tags); i++) {
 		dc.w = textw(tags[i]);
 		if(tagset[seltags][i]) {
@@ -651,8 +633,8 @@ expose(XEvent *e) {
 
 void
 focus(Client *c) {
-	if(!c || (c && !isvisible(c, NULL)))
-		for(c = stack; c && !isvisible(c, NULL); c = c->snext);
+	if(!c || (c && !isvisible(c)))
+		for(c = stack; c && !isvisible(c); c = c->snext);
 	if(sel && sel != c) {
 		grabbuttons(sel, False);
 		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
@@ -686,9 +668,9 @@ focusnext(const char *arg) {
 
 	if(!sel)
 		return;
-	for(c = sel->next; c && !isvisible(c, arg ? sel->tags : NULL); c = c->next);
+	for(c = sel->next; c && !isvisible(c); c = c->next);
 	if(!c)
-		for(c = clients; c && !isvisible(c, arg ? sel->tags : NULL); c = c->next);
+		for(c = clients; c && !isvisible(c); c = c->next);
 	if(c) {
 		focus(c);
 		restack();
@@ -701,10 +683,10 @@ focusprev(const char *arg) {
 
 	if(!sel)
 		return;
-	for(c = sel->prev; c && !isvisible(c, arg ? sel->tags : NULL); c = c->prev);
+	for(c = sel->prev; c && !isvisible(c); c = c->prev);
 	if(!c) {
 		for(c = clients; c && c->next; c = c->next);
-		for(; c && !isvisible(c, arg ? sel->tags : NULL); c = c->prev);
+		for(; c && !isvisible(c); c = c->prev);
 	}
 	if(c) {
 		focus(c);
@@ -905,13 +887,11 @@ isurgent(unsigned int t) {
 }
 
 Bool
-isvisible(Client *c, Bool *cmp) {
+isvisible(Client *c) {
 	unsigned int i;
 
-	if(!cmp)
-		cmp = tagset[seltags];
 	for(i = 0; i < LENGTH(tags); i++)
-		if(c->tags[i] && cmp[i])
+		if(c->tags[i] && tagset[seltags][i])
 			return True;
 	return False;
 }
@@ -981,7 +961,7 @@ manage(Window w, XWindowAttributes *wa) {
 			c->y = wy + wh - c->h - 2 * c->bw;
 		c->x = MAX(c->x, wx);
 		c->y = MAX(c->y, wy);
-		c->bw = BORDERPX;
+		c->bw = borderpx;
 	}
 
 	wc.border_width = c->bw;
@@ -1032,15 +1012,6 @@ maprequest(XEvent *e) {
 }
 
 void
-monocle(void) {
-	Client *c;
-
-	for(c = clients; c; c = c->next)
-		if(!c->isfloating && isvisible(c, NULL))
-			resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, RESIZEHINTS);
-}
-
-void
 movemouse(Client *c) {
 	int x1, y1, ocx, ocy, di, nx, ny;
 	unsigned int dui;
@@ -1068,15 +1039,15 @@ movemouse(Client *c) {
 			XSync(dpy, False);
 			nx = ocx + (ev.xmotion.x - x1);
 			ny = ocy + (ev.xmotion.y - y1);
-			if(abs(wx - nx) < SNAP)
+			if(abs(wx - nx) < snap)
 				nx = wx;
-			else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < SNAP)
+			else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < snap)
 				nx = wx + ww - c->w - 2 * c->bw;
-			if(abs(wy - ny) < SNAP)
+			if(abs(wy - ny) < snap)
 				ny = wy;
-			else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < SNAP)
+			else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap)
 				ny = wy + wh - c->h - 2 * c->bw;
-			if(!c->isfloating && lt->arrange && (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->arrange || c->isfloating)
 				resize(c, nx, ny, c->w, c->h, False);
@@ -1086,8 +1057,8 @@ movemouse(Client *c) {
 }
 
 Client *
-nexttiled(Client *c) {
-	for(; c && (c->isfloating || !isvisible(c, NULL)); c = c->next);
+nextunfloating(Client *c) {
+	for(; c && (c->isfloating || !isvisible(c)); c = c->next);
 	return c;
 }
 
@@ -1222,7 +1193,7 @@ 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->arrange && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP)) {
+			if(!c->isfloating && lt->arrange && (abs(nw - c->w) > snap || abs(nh - c->h) > snap)) {
 				togglefloating(NULL);
 			}
 			if(!lt->arrange || c->isfloating)
@@ -1247,7 +1218,7 @@ restack(void) {
 		wc.stack_mode = Below;
 		wc.sibling = barwin;
 		for(c = stack; c; c = c->snext)
-			if(!c->isfloating && isvisible(c, NULL)) {
+			if(!c->isfloating && isvisible(c)) {
 				XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
 				wc.sibling = c->win;
 			}
@@ -1351,27 +1322,6 @@ setclientstate(Client *c, long state) {
 			PropModeReplace, (unsigned char *)data, 2);
 }
 
-/* TODO: move this into tile.c */
-void
-setmfact(const char *arg) {
-	double d;
-
-	if(!lt->arrange) /* TODO: check this against the actual tile() function */
-		return;
-	if(!arg)
-		mfact = MFACT;
-	else {
-		d = strtod(arg, NULL);
-		if(arg[0] == '-' || arg[0] == '+')
-			d += mfact;
-		if(d < 0.1 || d > 0.9)
-			return;
-		mfact = d;
-	}
-	updategeom();
-	arrange();
-}
-
 void
 setup(void) {
 	unsigned int i, w;
@@ -1386,7 +1336,6 @@ setup(void) {
 	sw = DisplayWidth(dpy, screen);
 	sh = DisplayHeight(dpy, screen);
 	bh = dc.font.height + 2;
-	mfact = MFACT;
 	updategeom();
 
 	/* init atoms */
@@ -1508,76 +1457,11 @@ 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)))
-		/* client doesn't accept size constraints */
-		resize(c, x, y, w, h, False);
-}
-
-void
-tilev(void) {
-	int y, h;
-	unsigned int i, n = counttiled();
-	Client *c;
-
-	if(n == 0)
-		return;
-	c = tilemaster(n);
-	if(--n == 0)
-		return;
-
-	y = ty;
-	h = th / n;
-	if(h < bh)
-		h = th;
-
-	for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
-		if(i + 1 == n) /* remainder */
-			tileresize(c, tx, y, tw - 2 * c->bw, (ty + th) - y - 2 * c->bw);
-		else
-			tileresize(c, tx, y, tw - 2 * c->bw, h - 2 * c->bw);
-		if(h != th)
-			y = c->y + c->h + 2 * c->bw;
-	}
+togglebar(const char *arg) {
+	showbar = !showbar;
+	updategeom();
+	updatebar();
+	arrange();
 }
 
 void
@@ -1688,29 +1572,27 @@ updatebar(void) {
 
 void
 updategeom(void) {
+	unsigned int i;
 
-	/* bar geometry */
+#ifdef DEFGEOM /* define your own if you are Xinerama user */
+	DEFGEOM
+#else
+	/* bar geometry*/
 	bx = 0;
-	by = 0;
+	by = showbar ? (topbar ? 0 : sh - bh) : -bh;
 	bw = sw;
 
 	/* window area geometry */
 	wx = sx;
-	wy = sy + bh;
+	wy = showbar && topbar ? sy + bh : sy;
 	ww = sw;
-	wh = sh - bh;
-
-	/* master area geometry */
-	mx = wx;
-	my = wy;
-	mw = mfact * ww;
-	mh = wh;
+	wh = showbar ? sh - bh : sh;
+#endif
 
-	/* tile area geometry */
-	tx = mx + mw;
-	ty = wy;
-	tw = ww - mw;
-	th = wh;
+	/* update layout geometries */
+	for(i = 0; i < LENGTH(layouts); i++)
+		if(layouts[i].updategeom)
+			layouts[i].updategeom();
 }
 
 void
@@ -1831,22 +1713,6 @@ xerrorstart(Display *dpy, XErrorEvent *ee) {
 	return -1;
 }
 
-/* TODO: move this into tile.c */
-void
-zoom(const char *arg) {
-	Client *c = sel;
-
-	if(c == nexttiled(clients))
-		if(!c || !(c = nexttiled(c->next)))
-			return;
-	if(lt->arrange && !sel->isfloating) { /* TODO: check this against tile() */
-		detach(c);
-		attach(c);
-		focus(c);
-	}
-	arrange();
-}
-
 int
 main(int argc, char *argv[]) {
 	if(argc == 2 && !strcmp("-v", argv[1]))