# HG changeset patch
# User arg@mig29
# Date 1164116953 -3600
# Node ID f05cfa7d512819bff4eec2ae4cd02cc47188ada1
# Parent  cdd763e9ac2667309f089f87ed3f7931926e8c2f
applied Gottox patches

diff -r cdd763e9ac26 -r f05cfa7d5128 config.mk
--- a/config.mk	Tue Nov 21 12:17:47 2006 +0100
+++ b/config.mk	Tue Nov 21 14:49:13 2006 +0100
@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 2.2
+VERSION = 2.3
 
 # Customize below to fit your system
 
diff -r cdd763e9ac26 -r f05cfa7d5128 draw.c
--- a/draw.c	Tue Nov 21 12:17:47 2006 +0100
+++ b/draw.c	Tue Nov 21 14:49:13 2006 +0100
@@ -99,7 +99,7 @@
 	drawtext(arrange == dofloat ?  FLOATSYMBOL : TILESYMBOL, dc.status, False);
 	x = dc.x + dc.w;
 	dc.w = textw(stext);
-	dc.x = bx + bw - dc.w;
+	dc.x = bw - dc.w;
 	if(dc.x < x) {
 		dc.x = x;
 		dc.w = bw - x;
@@ -107,10 +107,7 @@
 	drawtext(stext, dc.status, False);
 	if((dc.w = dc.x - x) > bh) {
 		dc.x = x;
-		if(sel)
-			drawtext(sel->name, dc.sel, False);
-		else
-			drawtext(NULL, dc.norm, False);
+		drawtext(sel ? sel->name : NULL, dc.sel, False);
 	}
 	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
 	XSync(dpy, False);
diff -r cdd763e9ac26 -r f05cfa7d5128 main.c
--- a/main.c	Tue Nov 21 12:17:47 2006 +0100
+++ b/main.c	Tue Nov 21 14:49:13 2006 +0100
@@ -130,7 +130,8 @@
 	sh = DisplayHeight(dpy, screen);
 	master = MASTER;
 	/* bar */
-	bx = by = 0;
+	bx = sx;
+	by = sy;
 	bw = sw;
 	dc.h = bh = dc.font.height + 2;
 	wa.override_redirect = 1;
@@ -144,7 +145,7 @@
 	strcpy(stext, "dwm-"VERSION);
 	/* windowarea */
 	wax = sx;
-	way = bh;
+	way = sy + bh;
 	wah = sh - bh;
 	waw = sw;
 	/* pixmap for everything */