renamed resizecol into resizemaster

.hgtags

@@ -17,3 +17,5 @@ ad3fa2d185426c51fd5deceae809770363f8d33c 1.6
 4dbdb61c8b8ce21dee5c7050a6b103855964ed20 1.7
 d5ad819f2a66a40fa75dd2e44429f3bfc884d07b 1.7.1
 c71952fa3c7ca848ec38a6923b5c6d0e18fff431 1.8
+a5567a0d30112822db2627a04a2e7aa3b6c38148 1.9
+12deea36603da407e3f32640048846a3bd74a9ec 2.0

client.c

@@ -202,12 +202,12 @@ manage(Window w, XWindowAttributes *wa) {
 	c = emallocz(sizeof(Client));
 	c->tags = emallocz(ntags * sizeof(Bool));
 	c->win = w;
+	c->border = 0;
 	c->x = c->tx = wa->x;
 	c->y = c->ty = wa->y;
 	c->w = c->tw = wa->width;
 	c->h = wa->height;
 	c->th = bh;
-	c->border = 0;
 	updatesize(c);
 	if(c->x + c->w + 2 * BORDERPX > sw)
 		c->x = sw - c->w - 2 * BORDERPX;
@@ -232,9 +232,7 @@ manage(Window w, XWindowAttributes *wa) {
 	updatetitle(c);
 	settags(c, getclient(trans));
 	if(!c->isfloat)
-		c->isfloat = trans
-			|| (c->maxw && c->minw &&
-				c->maxw == c->minw && c->maxh == c->minh);
+		c->isfloat = trans || c->isfixed;
 	resizetitle(c);
 	if(clients)
 		clients->prev = c;
@@ -341,6 +339,8 @@ updatesize(Client *c) {
 	}
 	else
 		c->minw = c->minh = 0;
+	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh &&
+				c->maxw == c->minw && c->maxh == c->minh);
 	if(c->flags & PWinGravity)
 		c->grav = size.win_gravity;
 	else

config.arg.h

@@ -9,7 +9,7 @@ const char *tags[] = { "dev", "work", "net", "fnord", NULL };
 #define FLOATSYMBOL		"><>"
 #define TILESYMBOL		"[]="
 
-#define FONT			"-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"
+#define FONT			"-*-terminus-medium-*-*-*-14-*-*-*-*-*-*-*"
 #define NORMBGCOLOR		"#333333"
 #define NORMFGCOLOR		"#dddddd"
 #define SELBGCOLOR		"#333366"
@@ -19,22 +19,22 @@ const char *tags[] = { "dev", "work", "net", "fnord", NULL };
 
 #define MASTER			600 /* per thousand */
 #define MODKEY			Mod1Mask
+#define SNAP			40 /* pixel */
 
 #define KEYS \
 static Key key[] = { \
 	/* modifier			key		function	arguments */ \
 	{ MODKEY|ShiftMask,		XK_Return,	spawn, \
-		{ .cmd = "exec uxterm -bg '#111111' -fg '#eeeeee' -cr '#eeeeee' +sb -fn '"FONT"'" } }, \
+		{ .cmd = "exec urxvtc -tr -bg black -fg '#eeeeee' -cr '#eeeeee' +sb -fn '"FONT"'" } }, \
 	{ MODKEY,			XK_p,		spawn, \
-		{ .cmd = "exe=\"$(IFS=:; for dir in $PATH; do " \
-			 "for file in \"$dir\"/*; do [ -x \"$file\" ] && echo \"${file##*/}\"; done; done " \
-			 "| sort -u | dmenu -font '"FONT"' -normbg '"NORMBGCOLOR"' -normfg '"NORMFGCOLOR"' " \
-			 "-selbg '"SELBGCOLOR"' -selfg '"SELFGCOLOR"')\" && exec $exe" } }, \
+		{ .cmd = "exe=\"$(lsx `echo $PATH | sed 's/:/ /g'` | sort -u " \
+			" | dmenu -font '"FONT"' -normbg '"NORMBGCOLOR"' -normfg '"NORMFGCOLOR"' " \
+			"-selbg '"SELBGCOLOR"' -selfg '"SELFGCOLOR"')\" && exec $exe" } }, \
 	{ MODKEY,			XK_j,		focusnext,	{ 0 } }, \
 	{ MODKEY,			XK_k,		focusprev,	{ 0 } }, \
 	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
-	{ MODKEY,			XK_g,		resizecol,	{ .i = 15 } }, \
-	{ MODKEY,			XK_s,		resizecol,	{ .i = -15 } }, \
+	{ MODKEY,			XK_g,		resizemaster,	{ .i = 15 } }, \
+	{ MODKEY,			XK_s,		resizemaster,	{ .i = -15 } }, \
 	{ MODKEY|ShiftMask,		XK_1,		tag,		{ .i = 0 } }, \
 	{ MODKEY|ShiftMask,		XK_2,		tag,		{ .i = 1 } }, \
 	{ MODKEY|ShiftMask,		XK_3,		tag,		{ .i = 2 } }, \
@@ -60,8 +60,8 @@ static Key key[] = { \
 #define RULES \
 static Rule rule[] = { \
 	/* class:instance:title regex	tags regex	isfloat */ \
-	{ "Firefox.*",			"net",		False}, \
-	{ "Gimp.*",			NULL,		True}, \
-	{ "MPlayer.*",			NULL,		True}, \
-	{ "Acroread.*",			NULL,		True}, \
+	{ "Firefox.*",			"net",		False }, \
+	{ "Gimp.*",			NULL,		True }, \
+	{ "MPlayer.*",			NULL,		True }, \
+	{ "Acroread.*",			NULL,		True }, \
 };

config.default.h

@@ -19,6 +19,7 @@ const char *tags[] = { "1", "2", "3", "4", "5", NULL };
 
 #define MASTER			600 /* per thousand */
 #define MODKEY			Mod1Mask
+#define SNAP			20 /* pixel */
 
 #define KEYS \
 static Key key[] = { \
@@ -27,8 +28,8 @@ static Key key[] = { \
 	{ MODKEY,			XK_Tab,		focusnext,	{ 0 } }, \
 	{ MODKEY|ShiftMask,		XK_Tab,		focusprev,	{ 0 } }, \
 	{ MODKEY,			XK_Return,	zoom,		{ 0 } }, \
-	{ MODKEY,			XK_g,		resizecol,	{ .i = 15 } }, \
-	{ MODKEY,			XK_s,		resizecol,	{ .i = -15 } }, \
+	{ MODKEY,			XK_g,		resizemaster,	{ .i = 15 } }, \
+	{ MODKEY,			XK_s,		resizemaster,	{ .i = -15 } }, \
 	{ MODKEY|ShiftMask,		XK_1,		tag,		{ .i = 0 } }, \
 	{ MODKEY|ShiftMask,		XK_2,		tag,		{ .i = 1 } }, \
 	{ MODKEY|ShiftMask,		XK_3,		tag,		{ .i = 2 } }, \
@@ -61,5 +62,5 @@ static Key key[] = { \
 static Rule rule[] = { \
 	/* class:instance:title regex	tags regex	isfloat */ \
 	{ "Firefox.*",			"2",		False }, \
-	{ "Gimp.*",			NULL,		True}, \
+	{ "Gimp.*",			NULL,		True }, \
 };

config.mk

@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 1.9
+VERSION = 2.1
 
 # Customize below to fit your system
 

dwm.1

@@ -63,10 +63,10 @@ Focus previous window.
 Zooms/cycles current window to/from master area (tiling mode), toggles maximization current window (floating mode).
 .TP
 .B Mod1-g
-Grow current area (tiling mode only).
+Grow master area (tiling mode only).
 .TP
 .B Mod1-s
-Shrink current area (tiling mode only).
+Shrink master area (tiling mode only).
 .TP
 .B Mod1-Shift-[1..n]
 Apply

dwm.h

@@ -36,7 +36,6 @@
 
 /* mask shorthands, used in event.c and client.c */
 #define BUTTONMASK		(ButtonPressMask | ButtonReleaseMask)
-#define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
 /* other stuff used in different places */
 #define BORDERPX		1
 #define PROTODELWIN		1
@@ -84,7 +83,7 @@ struct Client {
 	int grav;
 	long flags; 
 	unsigned int border, weight;
-	Bool isfloat, ismax;
+	Bool isfloat, isfixed, ismax;
 	Bool *tags;
 	Client *next;
 	Client *prev;
@@ -162,7 +161,7 @@ extern void dotile(void);			/* arranges all windows tiled */
 extern void focusnext(Arg *arg);		/* focuses next visible client, arg is ignored  */
 extern void focusprev(Arg *arg);		/* focuses previous visible client, arg is ignored */
 extern Bool isvisible(Client *c);		/* returns True if client is visible */
-extern void resizecol(Arg *arg);		/* resizes the master percent with arg's index value */
+extern void resizemaster(Arg *arg);		/* resizes the master percent with arg's index value */
 extern void restack(void);			/* restores z layers of all clients */
 extern void togglemode(Arg *arg);		/* toggles global arrange function (dotile/dofloat) */
 extern void toggleview(Arg *arg);		/* toggles the tag with arg's index (in)visible */

event.c

@@ -18,6 +18,7 @@ typedef struct {
 KEYS
 
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define MOUSEMASK		(BUTTONMASK | PointerMotionMask)
 
 static void
 movemouse(Client *c) {
@@ -47,6 +48,14 @@ movemouse(Client *c) {
 			XSync(dpy, False);
 			c->x = ocx + (ev.xmotion.x - x1);
 			c->y = ocy + (ev.xmotion.y - y1);
+			if(abs(sx + c->x) < SNAP)
+				c->x = sx;
+			else if(abs((sx + sw) - (c->x + c->w)) < SNAP)
+				c->x = sw - c->w - 2 * BORDERPX;
+			if(abs((sy + bh) - c->y) < SNAP)
+				c->y = sy + bh;
+			else if(abs((sy + sh) - (c->y + c->h)) < SNAP)
+				c->y = sh - c->h - 2 * BORDERPX;
 			resize(c, False, TopLeft);
 			break;
 		}
@@ -135,7 +144,8 @@ buttonpress(XEvent *e) {
 		}
 		else if(ev->button == Button2)
 			zoom(NULL);
-		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
+		else if(ev->button == Button3 && (arrange == dofloat || c->isfloat) &&
+				!c->isfixed) {
 			restack();
 			resizemouse(c);
 		}

view.c

@@ -44,6 +44,9 @@ reorder(void) {
 static void
 togglemax(Client *c) {
 	XEvent ev;
+		
+	if(c->isfixed)
+		return;
 
 	if((c->ismax = !c->ismax)) {
 		c->rx = c->x; c->x = sx;
@@ -108,7 +111,7 @@ dotile(void) {
 	if(n > 1)
 		th /= (n - 1);
 
-	for(i = 0, c = clients; c; c = c->next, i++)
+	for(i = 0, c = clients; c; c = c->next)
 		if(isvisible(c)) {
 			if(c->isfloat) {
 				resize(c, True, TopLeft);
@@ -139,6 +142,7 @@ dotile(void) {
 					c->h = stackh - 2 * BORDERPX;
 			}
 			resize(c, False, TopLeft);
+			i++;
 		}
 		else
 			ban(c);
@@ -191,25 +195,10 @@ isvisible(Client *c) {
 }
 
 void
-resizecol(Arg *arg) {
-	unsigned int n;
-	Client *c;
-
-	for(n = 0, c = clients; c; c = c->next)
-		if(isvisible(c) && !c->isfloat)
-			n++;
-	if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
+resizemaster(Arg *arg) {
+	if(master + arg->i > 950 || master + arg->i < 50)
 		return;
-	if(sel == getnext(clients)) {
-		if(master + arg->i > 950 || master + arg->i < 50)
-			return;
-		master += arg->i;
-	}
-	else {
-		if(master - arg->i > 950 || master - arg->i < 50)
-			return;
-		master -= arg->i;
-	}
+	master += arg->i;
 	arrange();
 }