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

diff --git a/dwm.c b/dwm.c
index a1a34e2..66cbcbd 100644
--- a/dwm.c
+++ b/dwm.c
@@ -33,31 +33,12 @@
 #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>
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
-/*
- * TODO: Idea:
- * I intend to not provide real Xinerama support, but instead having a Column
- * tilecols[] array which is used by tile(), and a Column maxcols[] arrays which is used by
- * monocle(). Those arrays should be initialized in config.h. For simplicity
- * reasons mwfact should be replaced with a more advanced method which
- * implements the same, but using the boundary between tilecols[0] and
- * tilecols[1] instead. Besides this, get rid of BARPOS and use instead the
- * following mechanism:
- *
- * #define BX 0
- * #define BY 0
- * #define BW sw
- * bh is calculated automatically and should be used for the 
- */
-//#ifdef XINERAMA
-#include <X11/extensions/Xinerama.h>
-//#endif
 
 /* macros */
 #define BUTTONMASK		(ButtonPressMask|ButtonReleaseMask)
@@ -66,9 +47,7 @@
 #define MAXTAGLEN		16
 #define MOUSEMASK		(BUTTONMASK|PointerMotionMask)
 
-
 /* enums */
-enum { BarTop, BarBot, BarOff };			/* bar position */
 enum { CurNormal, CurResize, CurMove, CurLast };	/* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };		/* color */
 enum { NetSupported, NetWMName, NetLast };		/* EWMH atoms */
@@ -93,10 +72,6 @@ struct Client {
 
 typedef struct {
 	int x, y, w, h;
-} Column;
-
-typedef struct {
-	int x, y, w, h;
 	unsigned long norm[ColLast];
 	unsigned long sel[ColLast];
 	Drawable drawable;
@@ -120,6 +95,7 @@ typedef struct {
 typedef struct {
 	const char *symbol;
 	void (*arrange)(void);
+	Bool isfloating;
 } Layout;
 
 typedef struct {
@@ -185,21 +161,22 @@ void run(void);
 void scan(void);
 void setclientstate(Client *c, long state);
 void setlayout(const char *arg);
-void setmwfact(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 tile(void);
-void togglebar(const char *arg);
+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);
 void toggleview(const char *arg);
 void unban(Client *c);
 void unmanage(Client *c);
 void unmapnotify(XEvent *e);
-void updatebarpos(void);
 void updatesizehints(Client *c);
 void updatetitle(Client *c);
 void updatewmhints(Client *c);
@@ -209,15 +186,12 @@ int xerror(Display *dpy, XErrorEvent *ee);
 int xerrordummy(Display *dpy, XErrorEvent *ee);
 int xerrorstart(Display *dpy, XErrorEvent *ee);
 void zoom(const char *arg);
-void selectview(const char *arg);
 
 /* variables */
 char stext[256], buf[256];
-double mwfact;
-int screen, sx, sy, sw, sh, wax, way, waw, wah, ncols;
+int screen, sx, sy, sw, sh;
 int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int bh, bpos;
-unsigned int 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,
@@ -234,8 +208,6 @@ void (*handler[LASTEvent]) (XEvent *) = {
 	[UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];
-Bool domwfact = True;
-Bool dozoom = True;
 Bool otherwm, readin;
 Bool running = True;
 Bool *prevtags;
@@ -243,11 +215,10 @@ Bool *seltags;
 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
-Column *cols = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
-Layout *lt;
+Layout *lt = NULL;
 Window root, barwin;
 
 /* configuration, allows nested code to access above variables */
@@ -320,7 +291,7 @@ void
 ban(Client *c) {
 	if(c->isbanned)
 		return;
-	XMoveWindow(dpy, c->win, c->x + 3 * sw, c->y);
+	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 	c->isbanned = True;
 }
 
@@ -350,8 +321,6 @@ buttonpress(XEvent *e) {
 				return;
 			}
 		}
-		if((ev->x < x + blw) && ev->button == Button1)
-			setlayout(NULL);
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
@@ -392,7 +361,6 @@ checkotherwm(void) {
 
 void
 cleanup(void) {
-
 	close(STDIN_FILENO);
 	while(stack) {
 		unban(stack);
@@ -402,7 +370,6 @@ cleanup(void) {
 		XFreeFontSet(dpy, dc.font.set);
 	else
 		XFreeFont(dpy, dc.font.xfont);
-
 	XUngrabKey(dpy, AnyKey, AnyModifier, root);
 	XFreePixmap(dpy, dc.drawable);
 	XFreeGC(dpy, dc.gc);
@@ -437,13 +404,11 @@ configurenotify(XEvent *e) {
 	XConfigureEvent *ev = &e->xconfigure;
 
 	if(ev->window == root && (ev->width != sw || ev->height != sh)) {
-		/* TODO -- use Xinerama dimensions here ? */
 		sw = ev->width;
 		sh = ev->height;
 		XFreePixmap(dpy, dc.drawable);
-		dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen));
-		XResizeWindow(dpy, barwin, sw, bh);
-		updatebarpos();
+		dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
+		XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
 		arrange();
 	}
 }
@@ -454,11 +419,10 @@ configurerequest(XEvent *e) {
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
 	XWindowChanges wc;
 
-	/* TODO -- consider Xinerama if necessary when centering */
 	if((c = getclient(ev->window))) {
 		if(ev->value_mask & CWBorderWidth)
 			c->border = ev->border_width;
-		if(c->isfixed || c->isfloating || (floating == lt->arrange)) {
+		if(c->isfixed || c->isfloating || lt->isfloating) {
 			if(ev->value_mask & CWX)
 				c->x = sx + ev->x;
 			if(ev->value_mask & CWY)
@@ -493,16 +457,6 @@ configurerequest(XEvent *e) {
 	XSync(dpy, False);
 }
 
-Bool
-conflicts(Client *c, unsigned int tidx) {
-	unsigned int i;
-
-	for(i = 0; i < LENGTH(tags); i++)
-		if(c->tags[i])
-			return True; /* conflict */
-	return False;
-}
-
 void
 destroynotify(XEvent *e) {
 	Client *c;
@@ -554,10 +508,10 @@ drawbar(void) {
 	drawtext(lt->symbol, dc.norm, False);
 	x = dc.x + dc.w;
 	dc.w = textw(stext);
-	dc.x = sw - dc.w;
+	dc.x = bw - dc.w;
 	if(dc.x < x) {
 		dc.x = x;
-		dc.w = sw - x;
+		dc.w = bw - x;
 	}
 	drawtext(stext, dc.norm, False);
 	if((dc.w = dc.x - x) > bh) {
@@ -569,7 +523,7 @@ drawbar(void) {
 		else
 			drawtext(NULL, dc.norm, False);
 	}
-	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
+	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
 	XSync(dpy, False);
 }
 
@@ -677,7 +631,6 @@ void
 floating(void) { /* default floating layout */
 	Client *c;
 
-	domwfact = dozoom = False;
 	for(c = clients; c; c = c->next)
 		if(isvisible(c))
 			resize(c, c->x, c->y, c->w, c->h, True);
@@ -1016,28 +969,29 @@ manage(Window w, XWindowAttributes *wa) {
 	c->tags = emallocz(TAGSZ);
 	c->win = w;
 
-	c->x = wa->x + sx;
-	c->y = wa->y + sy;
+	/* geometry */
+	c->x = wa->x;
+	c->y = wa->y;
 	c->w = wa->width;
 	c->h = wa->height;
 	c->oldborder = wa->border_width;
-
 	if(c->w == sw && c->h == sh) {
 		c->x = sx;
 		c->y = sy;
 		c->border = wa->border_width;
 	}
 	else {
-		if(c->x + c->w + 2 * c->border > wax + waw)
-			c->x = wax + waw - c->w - 2 * c->border;
-		if(c->y + c->h + 2 * c->border > way + wah)
-			c->y = way + wah - c->h - 2 * c->border;
-		if(c->x < wax)
-			c->x = wax;
-		if(c->y < way)
-			c->y = way;
+		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;
 	}
+
 	wc.border_width = c->border;
 	XConfigureWindow(dpy, w, CWBorderWidth, &wc);
 	XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
@@ -1086,12 +1040,12 @@ maprequest(XEvent *e) {
 }
 
 void
-monocle(void) {
+monocle(void) { 
 	Client *c;
 
-	domwfact = dozoom = False;
-	for(c = nexttiled(clients); c; c = nexttiled(c->next))
-		resize(c, wax, way, waw - 2 * c->border, wah - 2 * c->border, RESIZEHINTS);
+	for(c = clients; c; c = c->next)
+		if(isvisible(c))
+			resize(c, mox, moy, mow, moh, RESIZEHINTS);
 }
 
 void
@@ -1122,17 +1076,17 @@ movemouse(Client *c) {
 			XSync(dpy, False);
 			nx = ocx + (ev.xmotion.x - x1);
 			ny = ocy + (ev.xmotion.y - y1);
-			if(abs(wax - nx) < SNAP)
-				nx = wax;
-			else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP)
-				nx = wax + waw - c->w - 2 * c->border;
-			if(abs(way - ny) < SNAP)
-				ny = way;
-			else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP)
-				ny = way + wah - c->h - 2 * c->border;
-			if(!c->isfloating && (lt->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+			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->arrange == floating) || c->isfloating)
+			if((lt->isfloating) || c->isfloating)
 				resize(c, nx, ny, c->w, c->h, False);
 			break;
 		}
@@ -1291,9 +1245,9 @@ resizemouse(Client *c) {
 				nw = 1;
 			if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
 				nh = 1;
-			if(!c->isfloating && (lt->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+			if(!c->isfloating && !lt->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
 				togglefloating(NULL);
-			if((lt->arrange == floating) || c->isfloating)
+			if((lt->isfloating) || c->isfloating)
 				resize(c, c->x, c->y, nw, nh, True);
 			break;
 		}
@@ -1309,9 +1263,9 @@ restack(void) {
 	drawbar();
 	if(!sel)
 		return;
-	if(sel->isfloating || (lt->arrange == floating))
+	if(sel->isfloating || lt->isfloating)
 		XRaiseWindow(dpy, sel->win);
-	if(lt->arrange != floating) {
+	if(!lt->isfloating) {
 		wc.stack_mode = Below;
 		wc.sibling = barwin;
 		if(!sel->isfloating) {
@@ -1426,19 +1380,20 @@ setclientstate(Client *c, long state) {
 
 void
 setlayout(const char *arg) {
+	static Layout *revert = 0;
 	unsigned int i;
 
-	if(!arg) {
-		lt++;
-		if(lt == &layouts[LENGTH(layouts)])
-			lt = &layouts[0];
-	}
+	if(!arg)
+		return;
+	for(i = 0; i < LENGTH(layouts); i++)
+		if(!strcmp(arg, layouts[i].symbol))
+			break;
+	if(i == LENGTH(layouts))
+		return;
+	if(revert && &layouts[i] == lt)
+		lt = revert;
 	else {
-		for(i = 0; i < LENGTH(layouts); i++)
-			if(!strcmp(arg, layouts[i].symbol))
-				break;
-		if(i == LENGTH(layouts))
-			return;
+		revert = lt;
 		lt = &layouts[i];
 	}
 	if(sel)
@@ -1448,35 +1403,9 @@ setlayout(const char *arg) {
 }
 
 void
-setmwfact(const char *arg) {
-	double delta;
-
-	if(!domwfact)
-		return;
-	/* arg handling, manipulate mwfact */
-	if(arg == NULL)
-		mwfact = MWFACT;
-	else if(sscanf(arg, "%lf", &delta) == 1) {
-		if(arg[0] == '+' || arg[0] == '-')
-			mwfact += delta;
-		else
-			mwfact = delta;
-		if(mwfact < 0.1)
-			mwfact = 0.1;
-		else if(mwfact > 0.9)
-			mwfact = 0.9;
-	}
-	arrange();
-}
-
-void
 setup(void) {
-	int screens = 1;
 	unsigned int i;
 	XSetWindowAttributes wa;
-//#ifdef XINERAMA
-	XineramaScreenInfo *info;
-//#endif
 
 	/* init screen */
 	screen = DefaultScreen(dpy);
@@ -1485,14 +1414,6 @@ setup(void) {
 	sy = 0;
 	sw = DisplayWidth(dpy, screen);
 	sh = DisplayHeight(dpy, screen);
-	if(XineramaIsActive(dpy)) {
-		if((info = XineramaQueryScreens(dpy, &screens))) {
-			sx = info[0].x_org;
-			sy = info[0].y_org;
-			sw = info[0].width;
-			sh = info[0].height;
-		}
-	}
 
 	/* init atoms */
 	wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
@@ -1507,36 +1428,6 @@ setup(void) {
 	cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
 	cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
-	ncols = 2;
-#if 0
-	if(XineramaIsActive(dpy)) {
-		if((info = XineramaQueryScreens(dpy, &screens))) {
-			if(screens >= 1) {
-				sx = info[0].x_org;
-				sy = info[0].y_org;
-				sw = info[0].width;
-				sh = info[0].height;
-			}
-			else {
-				ncols = screens;
-				cols = emallocz(ncols * sizeof(Column));
-				for(i = 0; i < ncols; i++) {
-					cols[i].x = info[i].x_org;
-					cols[i].y = info[i].y_org;
-					cols[i].w = info[i].width;
-					cols[i].h = info[i].height;
-				}
-			}
-			XFree(info);
-		}
-	}
-	else
-	{
-		cols = emallocz(ncols * sizeof(Column));
-		cols[0].x = sx;
-		cols[0].y = sy;
-	}
-#endif
 	/* init appearance */
 	dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
 	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
@@ -1558,10 +1449,37 @@ setup(void) {
 	seltags[0] = prevtags[0] = True;
 
 	/* init layouts */
-	mwfact = MWFACT;
 	lt = &layouts[0];
 
-	/* TODO: Xinerama hints ? */
+	/* 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);
@@ -1569,16 +1487,16 @@ setup(void) {
 			blw = i;
 	}
 
-	bpos = BARPOS;
 	wa.override_redirect = 1;
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ButtonPressMask|ExposureMask;
 
-	barwin = XCreateWindow(dpy, root, sx, sy, sw, 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]);
-	updatebarpos();
 	XMapRaised(dpy, barwin);
 	strcpy(stext, "dwm-"VERSION);
 	drawbar();
@@ -1651,57 +1569,89 @@ textw(const char *text) {
 }
 
 void
-tile(void) {
-	unsigned int i, n, nx, ny, nw, nh, mw, th;
-	Client *c, *mc;
+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);
+}
 
-	domwfact = dozoom = True;
-	nx = wax;
-	ny = way;
-	nw = 0;
-	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-		n++;
+void
+tileh(void) {
+	tilehstack(tilemaster());
+}
 
-	/* window geoms */
-	mw = (n == 1) ? waw : mwfact * waw;
-	th = (n > 1) ? wah / (n - 1) : 0;
-	if(n > 1 && th < bh)
-		th = wah;
+void
+tilehstack(unsigned int n) {
+	int i, x, w;
+	Client *c;
 
-	for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next)) {
-		if(i == 0) { /* master */
-			nw = mw - 2 * c->border;
-			nh = wah - 2 * c->border;
-		}
-		else {  /* tile window */
-			if(i == 1) {
-				ny = way;
-				nx += mc->w + 2 * mc->border;
-				nw = waw - mw - 2 * c->border;
-			}
-			if(i + 1 == n) /* remainder */
-				nh = (way + wah) - ny - 2 * c->border;
+	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
-				nh = th - 2 * c->border;
+				tileresize(c, x, ty, w - 2 * c->border,
+				              th - 2 * c->border);
+			if(w != tw)
+				x = c->x + c->w + 2 * c->border;
 		}
-		resize(c, nx, ny, nw, nh, RESIZEHINTS);
-		if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)))
-			/* client doesn't accept size constraints */
-			resize(c, nx, ny, nw, nh, False);
-		if(n > 1 && th != wah)
-			ny = c->y + c->h + 2 * c->border;
-		i++;
-	}
 }
 
-void
-togglebar(const char *arg) {
-	if(bpos == BarOff)
-		bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
+unsigned int
+tilemaster(void) {
+	unsigned int n;
+	Client *c, *mc;
+
+	for(n = 0, mc = c = nexttiled(clients); c; c = nexttiled(c->next))
+		n++;
+	if(n == 0)
+		return 0;
+	if(n == 1)
+		tileresize(mc, mox, moy, mow - 2 * mc->border, moh - 2 * mc->border);
 	else
-		bpos = BarOff;
-	updatebarpos();
-	arrange();
+		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;
+
+	if(n == 0)
+		return;
+
+	y = ty;
+	h = th / n;
+	if(h < bh)
+		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);
+			else
+				tileresize(c, tx, y, tw - 2 * c->border,
+				              h - 2 * c->border);
+			if(h != th)
+				y = c->y + c->h + 2 * c->border;
+		}
 }
 
 void
@@ -1721,8 +1671,6 @@ toggletag(const char *arg) {
 	if(!sel)
 		return;
 	i = idxoftag(arg);
-	if(conflicts(sel, i))
-		return;
 	sel->tags[i] = !sel->tags[i];
 	for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
 	if(j == LENGTH(tags))
@@ -1783,32 +1731,6 @@ unmapnotify(XEvent *e) {
 }
 
 void
-updatebarpos(void) {
-	XEvent ev;
-
-	wax = sx;
-	way = sy;
-	wah = sh;
-	waw = sw;
-	switch(bpos) {
-	default:
-		wah -= bh;
-		way += bh;
-		XMoveWindow(dpy, barwin, sx, sy);
-		break;
-	case BarBot:
-		wah -= bh;
-		XMoveWindow(dpy, barwin, sx, sy + wah);
-		break;
-	case BarOff:
-		XMoveWindow(dpy, barwin, sx, sy - bh);
-		break;
-	}
-	XSync(dpy, False);
-	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-void
 updatesizehints(Client *c) {
 	long msize;
 	XSizeHints size;
@@ -1940,7 +1862,7 @@ void
 zoom(const char *arg) {
 	Client *c = sel;
 
-	if(!sel || !dozoom || sel->isfloating)
+	if(!sel || lt->isfloating || sel->isfloating)
 		return;
 	if(c == nexttiled(clients))
 		if(!(c = nexttiled(c->next)))