applied Sanders patch

.hgtags

@@ -25,3 +25,4 @@ a2c465098a3b972bbed00feda9804b6aae1e9531 2.1
 32b246925086910d63147483160281a91a47479f 2.4
 dcbbfabc8ecc5f33a6cc950584de87da1a368045 2.5
 c7f84f23ec5aef29988dcdc4ec22a7352ee8f58e 2.5.1
+5308dd22b6ee8e3218c81d9e7e4125f235bb5778 2.6

client.c

@@ -131,58 +131,6 @@ getctitle(Window w) {
 	return NULL;
 }
 
-void
-gravitate(Client *c, Bool invert) {
-	int dx = 0, dy = 0;
-
-	switch(c->grav) {
-	default:
-		break;
-	case StaticGravity:
-	case NorthWestGravity:
-	case NorthGravity:
-	case NorthEastGravity:
-		dy = c->border;
-		break;
-	case EastGravity:
-	case CenterGravity:
-	case WestGravity:
-		dy = -(c->h / 2) + c->border;
-		break;
-	case SouthEastGravity:
-	case SouthGravity:
-	case SouthWestGravity:
-		dy = -(c->h);
-		break;
-	}
-	switch (c->grav) {
-	default:
-		break;
-	case StaticGravity:
-	case NorthWestGravity:
-	case WestGravity:
-	case SouthWestGravity:
-		dx = c->border;
-		break;
-	case NorthGravity:
-	case CenterGravity:
-	case SouthGravity:
-		dx = -(c->w / 2) + c->border;
-		break;
-	case NorthEastGravity:
-	case EastGravity:
-	case SouthEastGravity:
-		dx = -(c->w + c->border);
-		break;
-	}
-	if(invert) {
-		dx = -dx;
-		dy = -dy;
-	}
-	c->x += dx;
-	c->y += dy;
-}
-
 void
 killclient(Arg *arg) {
 	if(!sel)
@@ -341,10 +289,6 @@ updatesize(Client *c) {
 		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
-		c->grav = NorthWestGravity;
 }
 
 void

config.mk

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

draw.c

@@ -197,11 +197,8 @@ setfont(const char *fontstr) {
 		if(dc.font.xfont)
 			XFreeFont(dpy, dc.font.xfont);
 		dc.font.xfont = NULL;
-		dc.font.xfont = XLoadQueryFont(dpy, fontstr);
-		if (!dc.font.xfont)
-			dc.font.xfont = XLoadQueryFont(dpy, "fixed");
-		if (!dc.font.xfont)
-			eprint("error, cannot init 'fixed' font\n");
+		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)))
+			eprint("error, cannot load font: '%s'\n", fontstr);
 		dc.font.ascent = dc.font.xfont->ascent;
 		dc.font.descent = dc.font.xfont->descent;
 	}

dwm.1

@@ -22,7 +22,7 @@ dwm contains a small status bar which displays all available tags, the mode,
 the title of the focused window, and the text read from standard input. The
 selected tags are indicated with a different color. The tags of the focused
 window are indicated with a filled square in the top left corner.  The tags
-which are applied to one or more clients are indicated with an empty square in
+which are applied to one or more windows are indicated with an empty square in
 the top left corner.
 .P
 dwm draws a 1-pixel border around windows to indicate the focus state.
@@ -122,9 +122,17 @@ dwm is customized by creating a custom config.h and (re)compiling the source
 code. This keeps it fast, secure and simple.
 .SH CAVEATS
 The status bar may display
-.BR "broken pipe"
-when dwm has been started by
+.BR "EOF"
+when dwm has been started by an X session manager like
 .BR xdm (1),
-because it closes standard output before executing dwm.
+because those close standard output before executing dwm.
+.P
+Java applications which use the XToolkit/XAWT backend may draw grey windows
+only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 and early
+JDK 1.6 versions, because it assumes a reparenting window manager. As a workaround
+you can use JDK 1.4 (which doesn't contain the XToolkit/XAWT backend) or you
+can set the following environment variable (to use the older Motif
+backend instead):
+.BR AWT_TOOLKIT=MToolkit .
 .SH SEE ALSO
 .BR dmenu (1)

dwm.h

@@ -80,7 +80,6 @@ struct Client {
 	int rx, ry, rw, rh; /* revert geometry */
 	int tx, ty, tw, th; /* title window geometry */
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
-	int grav;
 	long flags; 
 	unsigned int border;
 	Bool isfloat, isfixed, ismax;
@@ -114,7 +113,6 @@ extern void configure(Client *c);		/* send synthetic configure event */
 extern void focus(Client *c);			/* focus c, c may be NULL */
 extern Client *getclient(Window w);		/* return client of w */
 extern Client *getctitle(Window w);		/* return client of title window */
-extern void gravitate(Client *c, Bool invert);	/* gravitate c */
 extern void killclient(Arg *arg);		/* kill c nicely */
 extern void manage(Window w, XWindowAttributes *wa);	/* manage new client */
 extern void resize(Client *c, Bool sizehints, Corner sticky); /* resize c*/

event.c

@@ -161,7 +161,6 @@ configurerequest(XEvent *e) {
 
 	if((c = getclient(ev->window))) {
 		c->ismax = False;
-		gravitate(c, True);
 		if(ev->value_mask & CWX)
 			c->x = ev->x;
 		if(ev->value_mask & CWY)
@@ -172,7 +171,6 @@ configurerequest(XEvent *e) {
 			c->h = ev->height;
 		if(ev->value_mask & CWBorderWidth)
 			c->border = ev->border_width;
-		gravitate(c, False);
 		wc.x = c->x;
 		wc.y = c->y;
 		wc.width = c->w;