about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--config.arg.h10
-rw-r--r--config.default.h10
-rw-r--r--dwm.h3
-rw-r--r--layout.c94
4 files changed, 73 insertions, 44 deletions
diff --git a/config.arg.h b/config.arg.h
index 8967285..2720ce3 100644
--- a/config.arg.h
+++ b/config.arg.h
@@ -30,9 +30,9 @@ static Layout layout[] = { \
 	{ "[]=",		tile }, /* first entry is default */ \
 	{ "><>",		floating }, \
 };
-#define MASTERWIDTH		600		/* master width per thousand */
-#define NMASTER			1		/* clients in master area */
-#define SNAP			32		/* snap pixel */
+#define NMASTER			1	/* clients in master area */
+#define RATIO			.8	/* ratio of tile */
+#define SNAP			32	/* snap pixel */
 
 /* key definitions */
 #define MODKEY			Mod1Mask
@@ -46,8 +46,8 @@ static Key key[] = { \
 		"exec urxvtcd -tr -bg '#222' -fg '#eee' -cr '#eee' +sb -fn '"FONT"'" }, \
 	{ MODKEY,			XK_space,	setlayout,	NULL }, \
 	{ MODKEY,			XK_b,		togglebar,	NULL }, \
-	{ MODKEY,			XK_h,		incmasterw,	"-32" }, \
-	{ MODKEY,			XK_l,		incmasterw,	"32" }, \
+	{ MODKEY,			XK_h,		incratio,	".1" }, \
+	{ MODKEY,			XK_l,		incratio,	"-.1" }, \
 	{ MODKEY|ShiftMask,		XK_j,		incnmaster,	"1" }, \
 	{ MODKEY|ShiftMask,		XK_k,		incnmaster,	"-1" }, \
 	{ MODKEY,			XK_j,		focusclient,	"1" }, \
diff --git a/config.default.h b/config.default.h
index e3de066..5a8d594 100644
--- a/config.default.h
+++ b/config.default.h
@@ -31,9 +31,9 @@ static Layout layout[] = { \
 	{ "[]=",		tile }, /* first entry is default */ \
 	{ "><>",		floating }, \
 };
-#define MASTERWIDTH		600		/* master width per thousand */
-#define NMASTER			1		/* clients in master area */
-#define SNAP			32		/* snap pixel */
+#define NMASTER			1	/* clients in master area */
+#define RATIO			.8	/* ratio of tile */
+#define SNAP			32	/* snap pixel */
 
 /* key definitions */
 #define MODKEY			Mod1Mask
@@ -44,8 +44,8 @@ static Key key[] = { \
 	{ MODKEY,			XK_p,		spawn, 		"exe=`dmenu_path | dmenu` && exec $exe" }, \
 	{ MODKEY,			XK_space,	setlayout,	NULL }, \
 	{ MODKEY,			XK_b,		togglebar,	NULL }, \
-	{ MODKEY,			XK_h,		incmasterw,	"-32" }, \
-	{ MODKEY,			XK_l,		incmasterw,	"32" }, \
+	{ MODKEY,			XK_h,		incratio,	".1" }, \
+	{ MODKEY,			XK_l,		incratio,	"-.1" }, \
 	{ MODKEY|ShiftMask,		XK_j,		incnmaster,	"1" }, \
 	{ MODKEY|ShiftMask,		XK_k,		incnmaster,	"-1" }, \
 	{ MODKEY,			XK_j,		focusclient,	"1" }, \
diff --git a/dwm.h b/dwm.h
index 692c469..b5653b1 100644
--- a/dwm.h
+++ b/dwm.h
@@ -44,6 +44,7 @@ enum { WMProtocols, WMDelete, WMState, WMLast };	/* default atoms */
 typedef struct Client Client;
 struct Client {
 	char name[256];
+	float scale;
 	int x, y, w, h;
 	int rx, ry, rw, rh; /* revert geometry */
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
@@ -122,7 +123,7 @@ void grabkeys(void);			/* grab all keys defined in config.h */
 /* layout.c */
 void floating(void);			/* arranges all windows floating */
 void focusclient(const char *arg);	/* focuses next(1)/previous(-1) visible client */
-void incmasterw(const char *arg);	/* increments the master width with arg's index value */
+void incratio(const char *arg);		/* increments the tile ratio with arg's value */
 void incnmaster(const char *arg);	/* increments nmaster with arg's index value */
 void initlayouts(void);			/* initialize layout array */
 Client *nexttiled(Client *c);		/* returns tiled successor of c */
diff --git a/layout.c b/layout.c
index f8c92ee..eeeb628 100644
--- a/layout.c
+++ b/layout.c
@@ -1,5 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include "dwm.h"
+#include <stdio.h>
 #include <stdlib.h>
 
 unsigned int blw = 0;
@@ -7,53 +8,79 @@ Layout *lt = NULL;
 
 /* static */
 
+static double ratio = RATIO;
 static unsigned int nlayouts = 0;
-static unsigned int masterw = MASTERWIDTH;
 static unsigned int nmaster = NMASTER;
 
+static double // simple pow()
+spow(double x, double y)
+{
+	if(y == 0)
+		return 1;
+	while(--y)
+		x *= x;
+	return x;
+}
+
 static void
 tile(void) {
-	unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th;
+	double mscale = 0, tscale = 0, sum = 0;
+	unsigned int i, n, nx, ny, nw, nh, mw, tw;
 	Client *c;
 
 	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
 		n++;
-	/* window geoms */
-	mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
-	mw = (n > nmaster) ? (waw * masterw) / 1000 : waw;
-	th = (n > nmaster) ? wah / (n - nmaster) : 0;
+
+	mw = (n <= nmaster) ? waw :  waw / (1 + ratio);
 	tw = waw - mw;
 
+	if(n > 0) {
+		if(n < nmaster) {
+			for(i = 0; i < n; i++)
+				sum += spow(ratio, i);
+			mscale = wah / sum;
+		}
+		else {
+			for(i = 0; i < nmaster; i++)
+				sum += spow(ratio, i);
+			mscale = wah / sum;
+			for(sum = 0, i = 0; i < (n - nmaster); i++)
+				sum += spow(ratio, i);
+			tscale = wah / sum;
+		}
+	}
+	nx = wax;
+	ny = way;
 	for(i = 0, c = clients; c; c = c->next)
 		if(isvisible(c)) {
 			unban(c);
 			if(c->isfloating)
 				continue;
 			c->ismax = False;
-			nx = wax;
-			ny = way;
-			if(i < nmaster) {
-				ny += i * mh;
+			if(i < nmaster) { /* master window */
 				nw = mw - 2 * c->border;
-				nh = mh;
-				if(i + 1 == (n < nmaster ? n : nmaster)) /* remainder */
-					nh = wah - mh * i;
-				nh -= 2 * c->border;
+				if(i + 1 == n || i + 1 == nmaster)
+					nh = (way + wah) - ny - (2 * c->border);
+				else
+					nh = (mscale * spow(ratio, i)) - (2 * c->border);
 			}
-			else {  /* tile window */
-				nx += mw;
-				nw = tw - 2 * c->border;
-				if(th > 2 * c->border) {
-					ny += (i - nmaster) * th;
-					nh = th;
-					if(i + 1 == n) /* remainder */
-						nh = wah - th * (i - nmaster);
-					nh -= 2 * c->border;
+			else { /* tile window */
+				if(i == nmaster) {
+					ny = way;
+					nx = wax + mw;
 				}
-				else /* fallback if th <= 2 * c->border */
-					nh = wah - 2 * c->border;
+				nw = tw - 2 * c->border;
+				if(i + 1 == n)
+					nh = (way + wah) - ny - (2 * c->border);
+				else
+					nh = (tscale * spow(ratio, i - nmaster)) - (2 * c->border);
+			}
+			if(nh < bh) {
+				nh = bh;
+				ny = way + wah - nh;
 			}
 			resize(c, nx, ny, nw, nh, False);
+			ny += nh;
 			i++;
 		}
 		else
@@ -106,18 +133,19 @@ focusclient(const char *arg) {
 }
 
 void
-incmasterw(const char *arg) {
-	int i;
+incratio(const char *arg) {
+	double delta;
+
 	if(lt->arrange != tile)
 		return;
 	if(!arg)
-		masterw = MASTERWIDTH;
+		ratio = RATIO;
 	else {
-		i = atoi(arg);
-		if(waw * (masterw + i) / 1000 >= waw - 2 * BORDERPX 
-		|| waw * (masterw + i) / 1000 <= 2 * BORDERPX)
-			return;
-		masterw += i;
+		if(1 == sscanf(arg, "%lf", &delta)) {
+			if(delta + ratio < .1 || delta + ratio > 1.9)
+				return;
+			ratio += delta;
+		}
 	}
 	lt->arrange();
 }
no.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include <sys/select.h> #include <X11/cursorfont.h> #include <X11/keysym.h> #include <X11/Xatom.h> #include <X11/Xproto.h> /* extern */ char stext[1024]; Bool *seltag; int bx, by, bw, bh, bmw, mw, screen, sx, sy, sw, sh; unsigned int ntags, numlockmask; Atom wmatom[WMLast], netatom[NetLast]; Bool running = True; Bool issel = True; Bool maximized = False; Client *clients = NULL; Client *sel = NULL; Cursor cursor[CurLast]; Display *dpy; DC dc = {0}; Window root, barwin; /* static */ static int (*xerrorxlib)(Display *, XErrorEvent *); static Bool otherwm, readin; static void cleanup() { close(STDIN_FILENO); while(sel) { resize(sel, True, TopLeft); unmanage(sel); } if(dc.font.set) XFreeFontSet(dpy, dc.font.set); else XFreeFont(dpy, dc.font.xfont); XUngrabKey(dpy, AnyKey, AnyModifier, root); XFreePixmap(dpy, dc.drawable); XFreeGC(dpy, dc.gc); XDestroyWindow(dpy, barwin); XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); XSync(dpy, False); free(seltag); } static void scan() { unsigned int i, num; Window *wins, d1, d2; XWindowAttributes wa; wins = NULL; if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) { for(i = 0; i < num; i++) { if(!XGetWindowAttributes(dpy, wins[i], &wa)) continue; if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1)) continue; if(wa.map_state == IsViewable) manage(wins[i], &wa); } } if(wins) XFree(wins); } static void setup() { int i, j; unsigned int mask; Window w; XModifierKeymap *modmap; XSetWindowAttributes wa; /* init atoms */ wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False); wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False); netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False); netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False); XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32, PropModeReplace, (unsigned char *) netatom, NetLast); /* init cursors */ cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr); cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing); cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur); modmap = XGetModifierMapping(dpy); for (i = 0; i < 8; i++) { for (j = 0; j < modmap->max_keypermod; j++) { if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock)) numlockmask = (1 << i); } } XFree(modmap); wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask | EnterWindowMask | LeaveWindowMask; wa.cursor = cursor[CurNormal]; XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa); grabkeys(); initrregs(); for(ntags = 0; tags[ntags]; ntags++); seltag = emallocz(sizeof(Bool) * ntags); seltag[0] = True; /* style */ dc.norm[ColBG] = getcolor(NORMBGCOLOR); dc.norm[ColFG] = getcolor(NORMFGCOLOR); dc.sel[ColBG] = getcolor(SELBGCOLOR); dc.sel[ColFG] = getcolor(SELFGCOLOR); dc.status[ColBG] = getcolor(STATUSBGCOLOR); dc.status[ColFG] = getcolor(STATUSFGCOLOR); setfont(FONT); bmw = textw(FLOATSYMBOL) > textw(TILESYMBOL) ? textw(FLOATSYMBOL) : textw(TILESYMBOL); sx = sy = 0; sw = DisplayWidth(dpy, screen); sh = DisplayHeight(dpy, screen); mw = (sw * MASTERW) / 100; bx = by = 0; bw = sw; dc.h = bh = dc.font.height + 2; wa.override_redirect = 1; wa.background_pixmap = ParentRelative; 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); XDefineCursor(dpy, barwin, cursor[CurNormal]); XMapRaised(dpy, barwin); dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen)); dc.gc = XCreateGC(dpy, root, 0, 0); XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter); issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask); strcpy(stext, "dwm-"VERSION); } /* * Startup Error handler to check if another window manager * is already running. */ static int xerrorstart(Display *dsply, XErrorEvent *ee) { otherwm = True; return -1; } /* extern */ int getproto(Window w) { int i, format, protos, status; unsigned long extra, res; Atom *protocols, real; protos = 0; status = XGetWindowProperty(dpy, w, wmatom[WMProtocols], 0L, 20L, False, XA_ATOM, &real, &format, &res, &extra, (unsigned char **)&protocols); if(status != Success || protocols == 0) return protos; for(i = 0; i < res; i++) if(protocols[i] == wmatom[WMDelete]) protos |= PROTODELWIN; free(protocols); return protos; } void sendevent(Window w, Atom a, long value) { XEvent e; e.type = ClientMessage; e.xclient.window = w; e.xclient.message_type = a; e.xclient.format = 32; e.xclient.data.l[0] = value; e.xclient.data.l[1] = CurrentTime; XSendEvent(dpy, w, False, NoEventMask, &e); XSync(dpy, False); } void quit(Arg *arg) { readin = running = False; } /* * There's no way to check accesses to destroyed windows, thus those cases are * ignored (especially on UnmapNotify's). Other types of errors call Xlibs * default error handler, which calls exit(). */ int xerror(Display *dpy, XErrorEvent *ee) { if(ee->error_code == BadWindow || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch) || (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable) || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable) || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable) || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch) || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)) return 0; fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n", ee->request_code, ee->error_code); return xerrorxlib(dpy, ee); /* may call exit() */ } int main(int argc, char *argv[]) { int r, xfd; fd_set rd; if(argc == 2 && !strncmp("-v", argv[1], 3)) { fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout); exit(EXIT_SUCCESS); } else if(argc != 1) eprint("usage: dwm [-v]\n"); dpy = XOpenDisplay(0); if(!dpy) eprint("dwm: cannot open display\n"); xfd = ConnectionNumber(dpy); screen = DefaultScreen(dpy); root = RootWindow(dpy, screen); otherwm = False; XSetErrorHandler(xerrorstart); /* this causes an error if some other window manager is running */ XSelectInput(dpy, root, SubstructureRedirectMask); XSync(dpy, False); if(otherwm) eprint("dwm: another window manager is already running\n"); XSync(dpy, False); XSetErrorHandler(NULL); xerrorxlib = XSetErrorHandler(xerror); XSync(dpy, False); setup(); drawstatus(); scan(); /* main event loop, also reads status text from stdin */ XSync(dpy, False); procevent(); readin = True; while(running) { FD_ZERO(&rd); if(readin) FD_SET(STDIN_FILENO, &rd); FD_SET(xfd, &rd); r = select(xfd + 1, &rd, NULL, NULL, NULL); if((r == -1) && (errno == EINTR)) continue; if(r > 0) { if(readin && FD_ISSET(STDIN_FILENO, &rd)) { readin = NULL != fgets(stext, sizeof(stext), stdin); if(readin) stext[strlen(stext) - 1] = 0; else strcpy(stext, "broken pipe"); drawstatus(); } } else if(r < 0) eprint("select failed\n"); procevent(); } cleanup(); XCloseDisplay(dpy); return 0; }