GopherProxy

	tkeep master ratio on resizecol -> arrange - dwm - [fork] customized build of d…
	git clone git://src.adamsgaard.dk/dwm
	Log
	Files
	Refs
	README
	LICENSE
	---
	commit 6fc8a6304163fb63551e54acc62e6e9b7e96c820
	parent 2583a7c0d18749c391a7149f2f1ffb3efd91ba8d
	Author: Anselm R. Garbe <[email protected]>
	Date: Thu, 5 Oct 2006 12:59:35 +0200

	keep master ratio on resizecol -> arrange
	Diffstat:
	M config.arg.h \| 4 ++--
	M config.default.h \| 4 ++--
	M dwm.h \| 6 +++---
	M main.c \| 6 +++---
	M view.c \| 24 ++++++++++--------------

	5 files changed, 20 insertions(+), 24 deletions(-)
	---
	diff --git a/config.arg.h b/config.arg.h
	t@@ -37,8 +37,8 @@ static Key key[] = { \
	{ MODKEY, XK_k, focusprev, …
	{ MODKEY, XK_Return, zoom, …
	{ MODKEY, XK_b, togglestackpos, …
	- { MODKEY, XK_g, resizecol, …
	- { MODKEY, XK_s, resizecol, …
	+ { MODKEY, XK_g, resizecol, …
	+ { MODKEY, XK_s, resizecol, …
	{ MODKEY\|ShiftMask, XK_1, tag, …
	{ MODKEY\|ShiftMask, XK_2, tag, …
	{ MODKEY\|ShiftMask, XK_3, tag, …
	diff --git a/config.default.h b/config.default.h
	t@@ -31,8 +31,8 @@ static Key key[] = { \
	{ MODKEY\|ShiftMask, XK_Tab, focusprev, …
	{ MODKEY, XK_Return, zoom, …
	{ MODKEY, XK_b, togglestackpos, …
	- { MODKEY, XK_g, resizecol, …
	- { MODKEY, XK_s, resizecol, …
	+ { MODKEY, XK_g, resizecol, …
	+ { MODKEY, XK_s, resizecol, …
	{ MODKEY\|ShiftMask, XK_1, tag, …
	{ MODKEY\|ShiftMask, XK_2, tag, …
	{ MODKEY\|ShiftMask, XK_3, tag, …
	diff --git a/dwm.h b/dwm.h
	t@@ -101,8 +101,8 @@ struct Client {
	extern const char tags[]; / all tags */
	extern char stext[1024]; /* status text */
	extern int bx, by, bw, bh, bmw; /* bar geometry, bar mo…
	-extern int master, screen, sx, sy, sw, sh; /* screen geometry, master d…
	-extern unsigned int ntags, numlockmask; /* number of tags, dyna…
	+extern int screen, sx, sy, sw, sh; /* screen geometry */
	+extern unsigned int master, ntags, numlockmask; /* master percent, numb…
	extern void (handler[LASTEvent])(XEvent ); /* event handler */
	extern void (arrange)(Arg ); /* arrange function, ind…
	extern Atom wmatom[WMLast], netatom[NetLast];
	t@@ -168,7 +168,7 @@ extern void dotile(Arg arg); / ar…
	extern void focusnext(Arg arg); / focuses next visible client…
	extern void focusprev(Arg arg); / focuses previous visible cl…
	extern Bool isvisible(Client c); / returns True if client is …
	-extern void resizecol(Arg arg); / resizes the master dimensio…
	+extern void resizecol(Arg arg); / resizes the master percent …
	extern void restack(void); /* restores z layers of all …
	extern void togglestackpos(Arg arg); / toggles stack position…
	extern void togglemode(Arg arg); / toggles global arrange fun…
	diff --git a/main.c b/main.c
	t@@ -19,8 +19,8 @@

	char stext[1024];
	Bool *seltag;
	-int bx, by, bw, bh, bmw, master, screen, sx, sy, sw, sh;
	-unsigned int ntags, numlockmask;
	+int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh;
	+unsigned int master, ntags, numlockmask;
	Atom wmatom[WMLast], netatom[NetLast];
	Bool running = True;
	Bool issel = True;
	t@@ -136,7 +136,7 @@ setup(void) {
	sx = sy = 0;
	sw = DisplayWidth(dpy, screen);
	sh = DisplayHeight(dpy, screen);
	- master = ((stackpos == StackBottom ? sh - bh : sw) * MASTER) / 100;
	+ master = MASTER;

	bx = by = 0;
	bw = sw;
	diff --git a/view.c b/view.c
	t@@ -4,8 +4,6 @@
	*/
	#include "dwm.h"

	-#define MINDIM 100
	-
	/* static */

	static Client *
	t@@ -106,6 +104,7 @@ dofloat(Arg *arg) {
	void
	dotile(Arg *arg) {
	int i, n, stackw, stackh, tw, th;
	+ unsigned int md = ((stackpos == StackBottom ? sh - bh : sw) * master) …
	Client *c;

	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
	t@@ -113,10 +112,10 @@ dotile(Arg *arg) {

	if(stackpos == StackBottom) {
	stackw = sw;
	- stackh = sh - bh - master;
	+ stackh = sh - bh - md;
	}
	else {
	- stackw = sw - master;
	+ stackw = sw - md;
	stackh = sh - bh;
	}

	t@@ -145,18 +144,18 @@ dotile(Arg *arg) {
	switch(stackpos) {
	case StackLeft:
	case StackRight:
	- c->w = master - 2 * BORDERPX;
	+ c->w = md - 2 * BORDERPX;
	c->h = sh - bh - 2 * BORDERPX;
	break;
	case StackBottom:
	c->w = sw - 2 * BORDERPX;
	- c->h = master - 2 * BORDERPX;
	+ c->h = md - 2 * BORDERPX;
	break;
	}
	}
	else { /* tile window */
	if(stackpos == StackRight)
	- c->x += master;
	+ c->x += md;
	if(th > bh) {
	switch(stackpos) {
	case StackLeft:
	t@@ -166,7 +165,7 @@ dotile(Arg *arg) {
	c->h = sh - c->y - 2 *…
	break;
	case StackBottom:
	- c->y = sy + master + (i - 1) *…
	+ c->y = sy + md + (i - 1) * th …
	if(i + 1 == n)
	c->h = sh - c->y - 2 *…
	break;
	t@@ -176,7 +175,7 @@ dotile(Arg *arg) {
	}
	else { /* fallback if th < bh */
	if(stackpos == StackBottom)
	- c->y += master;
	+ c->y += md;
	c->w = stackw - 2 * BORDERPX;
	c->h = stackh - 2 * BORDERPX;
	}
	t@@ -238,7 +237,6 @@ isvisible(Client *c) {

	void
	resizecol(Arg *arg) {
	- int s;
	unsigned int n;
	Client *c;

	t@@ -248,14 +246,13 @@ resizecol(Arg *arg) {
	if(!sel \|\| sel->isfloat \|\| n < 2 \|\| (arrange == dofloat))
	return;

	- s = stackpos == StackBottom ? sh - bh : sw;
	if(sel == getnext(clients)) {
	- if(master + arg->i > s - MINDIM \|\| master + arg->i < MINDIM)
	+ if(master + arg->i > 95 \|\| master + arg->i < 5)
	return;
	master += arg->i;
	}
	else {
	- if(master - arg->i > s - MINDIM \|\| master - arg->i < MINDIM)
	+ if(master - arg->i > 95 \|\| master - arg->i < 5)
	return;
	master -= arg->i;
	}
	t@@ -321,7 +318,6 @@ togglestackpos(Arg *arg) {
	stackpos = STACKPOS;
	else
	stackpos = StackBottom;
	- master = ((stackpos == StackBottom ? sh - bh : sw) * MASTER) / 100;
	arrange(NULL);
	}