X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=0691029e00b03e23397dacc73176819337ddfc35;hb=2431ae7df7f654f6dbe5e923fadf703eaa4a7bf4;hp=f1d364127731e0c41d59d17da6fd1d711b37a464;hpb=12ea925076c4f1c013502651b0be90c05e0febac;p=dwm.git

diff --git a/dwm.c b/dwm.c
index f1d3641..0691029 100644
--- a/dwm.c
+++ b/dwm.c
@@ -53,13 +53,14 @@
 #define MOUSEMASK       (BUTTONMASK|PointerMotionMask)
 #define TAGMASK         ((int)((1LL << LENGTH(tags)) - 1))
 #define TEXTW(x)        (textnw(x, strlen(x)) + dc.font.height)
+#define ISVISIBLE(x)    (x->tags & tagset[seltags])
 
 /* enums */
 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 */
-enum { ClkLtSymbol = 64, ClkStatusText, ClkWinTitle,
+enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
        ClkClientWin, ClkRootWin, ClkLast };             /* clicks */
 
 /* typedefs */
@@ -89,7 +90,7 @@ struct Client {
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int bw, oldbw;
 	uint tags;
-	Bool isbanned, isfixed, isfloating, isurgent;
+	Bool isfixed, isfloating, isurgent;
 	Client *next;
 	Client *snext;
 	Window win;
@@ -207,7 +208,7 @@ static void zoom(const Arg *arg);
 static char stext[256];
 static int screen, sx, sy, sw, sh;
 static int by, bh, blw, wx, wy, ww, wh;
-static uint seltags = 0;
+static uint seltags = 0, sellt = 0;
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static uint numlockmask = 0;
 static void (*handler[LASTEvent]) (XEvent *) = {
@@ -234,7 +235,7 @@ static Client *stack = NULL;
 static Cursor cursor[CurLast];
 static Display *dpy;
 static DC dc = {0};
-static Layout *lt = NULL;
+static Layout *lt[] = { NULL, NULL };
 static Window root, barwin;
 /* configuration, allows nested code to access above variables */
 #include "config.h"
@@ -273,19 +274,18 @@ arrange(void) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(c->tags & tagset[seltags]) { /* is visible */
-			if(!lt->arrange || c->isfloating)
+		if(ISVISIBLE(c)) {
+			XMoveWindow(dpy, c->win, c->x, c->y);
+			if(!lt[sellt]->arrange || c->isfloating)
 				resize(c, c->x, c->y, c->w, c->h, True);
-			c->isbanned = False;
 		}
-		else if(!c->isbanned) {
+		else {
 			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-			c->isbanned = True;
 		}
 
 	focus(NULL);
-	if(lt->arrange)
-		lt->arrange();
+	if(lt[sellt]->arrange)
+		lt[sellt]->arrange();
 	restack();
 }
 
@@ -304,17 +304,18 @@ attachstack(Client *c) {
 void
 buttonpress(XEvent *e) {
 	uint i, x, click;
+	Arg arg = {0};
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 
 	click = ClkRootWin;
 	if(ev->window == barwin) {
 		i = x = 0;
-		do
-			x += TEXTW(tags[i]);
-		while(ev->x >= x && ++i < LENGTH(tags));
-		if(i < LENGTH(tags))
-			click = i;
+		do x += TEXTW(tags[i]); while(ev->x >= x && ++i < LENGTH(tags));
+		if(i < LENGTH(tags)) {
+			click = ClkTagBar;
+			arg.ui = 1 << i;
+		}
 		else if(ev->x < x + blw)
 			click = ClkLtSymbol;
 		else if(ev->x > wx + ww - TEXTW(stext))
@@ -330,7 +331,7 @@ buttonpress(XEvent *e) {
 	for(i = 0; i < LENGTH(buttons); i++)
 		if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
 		   && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
-			buttons[i].func(&buttons[i].arg);
+			buttons[i].func(click == ClkTagBar ? &arg : &buttons[i].arg);
 }
 
 void
@@ -355,7 +356,7 @@ cleanup(void) {
 
 	close(STDIN_FILENO);
 	view(&a);
-	lt = &foo;
+	lt[sellt] = &foo;
 	while(stack)
 		unmanage(stack);
 	if(dc.font.set)
@@ -413,7 +414,7 @@ configurerequest(XEvent *e) {
 	if((c = getclient(ev->window))) {
 		if(ev->value_mask & CWBorderWidth)
 			c->bw = ev->border_width;
-		else if(c->isfloating || !lt->arrange) {
+		else if(c->isfloating || !lt[sellt]->arrange) {
 			if(ev->value_mask & CWX)
 				c->x = sx + ev->x;
 			if(ev->value_mask & CWY)
@@ -426,10 +427,9 @@ configurerequest(XEvent *e) {
 				c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */
 			if((c->y - sy + c->h) > sh && c->isfloating)
 				c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
-			if((ev->value_mask & (CWX|CWY))
-			&& !(ev->value_mask & (CWWidth|CWHeight)))
+			if((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
 				configure(c);
-			if(!c->isbanned)
+			if(ISVISIBLE(c))
 				XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
 		}
 		else
@@ -482,25 +482,23 @@ detachstack(Client *c) {
 void
 drawbar(void) {
 	int i, x;
-	Client *c;
 
 	dc.x = 0;
-	for(c = stack; c && c->isbanned; c = c->snext);
 	for(i = 0; i < LENGTH(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);
+			drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.sel);
 		}
 		else {
 			drawtext(tags[i], dc.norm, isurgent(i));
-			drawsquare(c && c->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
+			drawsquare(sel && sel->tags & 1 << i, isoccupied(i), isurgent(i), dc.norm);
 		}
 		dc.x += dc.w;
 	}
 	if(blw > 0) {
 		dc.w = blw;
-		drawtext(lt->symbol, dc.norm, False);
+		drawtext(lt[sellt]->symbol, dc.norm, False);
 		x = dc.x + dc.w;
 	}
 	else
@@ -514,9 +512,9 @@ drawbar(void) {
 	drawtext(stext, dc.norm, False);
 	if((dc.w = dc.x - x) > bh) {
 		dc.x = x;
-		if(c) {
-			drawtext(c->name, dc.sel, False);
-			drawsquare(c->isfixed, c->isfloating, False, dc.sel);
+		if(sel) {
+			drawtext(sel->name, dc.sel, False);
+			drawsquare(sel->isfixed, sel->isfloating, False, dc.sel);
 		}
 		else
 			drawtext(NULL, dc.norm, False);
@@ -608,8 +606,8 @@ expose(XEvent *e) {
 
 void
 focus(Client *c) {
-	if(!c || c->isbanned)
-		for(c = stack; c && c->isbanned; c = c->snext);
+	if(!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]);
@@ -642,17 +640,17 @@ focusstack(const Arg *arg) {
 	if(!sel)
 		return;
 	if (arg->i > 0) {
-		for(c = sel->next; c && c->isbanned; c = c->next);
+		for(c = sel->next; c && !ISVISIBLE(c); c = c->next);
 		if(!c)
-			for(c = clients; c && c->isbanned; c = c->next);
+			for(c = clients; c && !ISVISIBLE(c); c = c->next);
 	}
 	else {
 		for(i = clients; i != sel; i = i->next)
-			if (!i->isbanned)
+			if(ISVISIBLE(i))
 				c = i;
 		if(!c)
 			for(; i; i = i->next)
-				if (!i->isbanned)
+				if(ISVISIBLE(i))
 					c = i;
 	}
 	if(c) {
@@ -931,7 +929,7 @@ manage(Window w, XWindowAttributes *wa) {
 		XRaiseWindow(dpy, c->win);
 	attach(c);
 	attachstack(c);
-	XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
+	XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
 	XMapWindow(dpy, c->win);
 	setclientstate(c, NormalState);
 	arrange();
@@ -964,7 +962,7 @@ monocle(void) {
 	Client *c;
 
 	for(c = nexttiled(clients); c; c = nexttiled(c->next))
-		resize(c, wx, wy, ww, wh, resizehints);
+		resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, resizehints);
 }
 
 void
@@ -1009,10 +1007,10 @@ movemouse(const Arg *arg) {
 					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->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+				if(!c->isfloating && lt[sellt]->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
 					togglefloating(NULL);
 			}
-			if(!lt->arrange || c->isfloating)
+			if(!lt[sellt]->arrange || c->isfloating)
 				resize(c, nx, ny, c->w, c->h, False);
 			break;
 		}
@@ -1021,7 +1019,7 @@ movemouse(const Arg *arg) {
 
 Client *
 nexttiled(Client *c) {
-	for(; c && (c->isfloating || c->isbanned); c = c->next);
+	for(; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
 	return c;
 }
 
@@ -1166,11 +1164,11 @@ resizemouse(const Arg *arg) {
 
 			if(snap && nw >= wx && nw <= wx + ww
 			        && nh >= wy && nh <= wy + wh) {
-				if(!c->isfloating && lt->arrange
+				if(!c->isfloating && lt[sellt]->arrange
 				   && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
 					togglefloating(NULL);
 			}
-			if(!lt->arrange || c->isfloating)
+			if(!lt[sellt]->arrange || c->isfloating)
 				resize(c, c->x, c->y, nw, nh, True);
 			break;
 		}
@@ -1186,13 +1184,13 @@ restack(void) {
 	drawbar();
 	if(!sel)
 		return;
-	if(sel->isfloating || !lt->arrange)
+	if(sel->isfloating || !lt[sellt]->arrange)
 		XRaiseWindow(dpy, sel->win);
-	if(lt->arrange) {
+	if(lt[sellt]->arrange) {
 		wc.stack_mode = Below;
 		wc.sibling = barwin;
 		for(c = stack; c; c = c->snext)
-			if(!c->isfloating && !c->isbanned) {
+			if(!c->isfloating && ISVISIBLE(c)) {
 				XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
 				wc.sibling = c->win;
 			}
@@ -1298,14 +1296,10 @@ setclientstate(Client *c, long state) {
 
 void
 setlayout(const Arg *arg) {
-	static Layout *prevlt = &layouts[1 % LENGTH(layouts)];
-
-	if(!arg || !arg->v || arg->v == lt)
-		lt = prevlt;
-	else {
-		prevlt = lt;
-		lt = (Layout *)arg->v;
-	}
+	if(!arg || !arg->v || arg->v != lt[sellt])
+		sellt ^= 1;
+	if(arg && arg->v)
+		lt[sellt] = (Layout *)arg->v;
 	if(sel)
 		arrange();
 	else
@@ -1317,7 +1311,7 @@ void
 setmfact(const Arg *arg) {
 	float f;
 
-	if(!arg || !lt->arrange)
+	if(!arg || !lt[sellt]->arrange)
 		return;
 	f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0;
 	if(f < 0.1 || f > 0.9)
@@ -1341,7 +1335,8 @@ setup(void) {
 	sw = DisplayWidth(dpy, screen);
 	sh = DisplayHeight(dpy, screen);
 	bh = dc.h = dc.font.height + 2;
-	lt = layouts;
+	lt[0] = &layouts[0];
+	lt[1] = &layouts[1 % LENGTH(layouts)];
 	updategeom();
 
 	/* init atoms */
@@ -1691,7 +1686,7 @@ void
 zoom(const Arg *arg) {
 	Client *c = sel;
 
-	if(!lt->arrange || lt->arrange == monocle || (sel && sel->isfloating))
+	if(!lt[sellt]->arrange || lt[sellt]->arrange == monocle || (sel && sel->isfloating))
 		return;
 	if(c == nexttiled(clients))
 		if(!c || !(c = nexttiled(c->next)))
@@ -1709,7 +1704,9 @@ main(int argc, char *argv[]) {
 	else if(argc != 1)
 		eprint("usage: dwm [-v]\n");
 
-	setlocale(LC_CTYPE, "");
+	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+		fprintf(stderr, "warning: no locale support\n");
+
 	if(!(dpy = XOpenDisplay(0)))
 		eprint("dwm: cannot open display\n");