# HG changeset patch
# User paulo@thepaulopc
# Date 1308205652 25200
# Node ID bc03b37b37ba858383e4924e7940e940da3dbecb
# Parent  e749c30135e9f76c25ea5a43ae5c63f8a1bce650
move command mode text to the left, next to the layout icon

diff -r e749c30135e9 -r bc03b37b37ba draw.c
--- a/draw.c	Tue Jun 14 00:33:07 2011 -0700
+++ b/draw.c	Wed Jun 15 23:27:32 2011 -0700
@@ -72,19 +72,21 @@
 	drawtext(lt->symbol, dc.norm);
 	x = dc.x + dc.w;
 
-	char *_stext = stext;
 	if (getkeymode() == COMMANDMODE) {
-		strcpy(cmtext, "-- CMD -- ");
-		strncat(cmtext, stext, sizeof cmtext - 1 - strlen(cmtext));
-		_stext = cmtext;
+		const char *_cmtext = "-- CMD --";
+		dc.w = textw(_cmtext);
+		dc.x = x;
+		drawtext(_cmtext, dc.norm);
+		x = dc.x + dc.w;
 	}
-	dc.w = textw(_stext);
+
+	dc.w = textw(stext);
 	dc.x = sw - dc.w;
 	if(dc.x < x) {
 		dc.x = x;
 		dc.w = sw - x;
 	}
-	drawtext(_stext, dc.norm);
+	drawtext(stext, dc.norm);
 
 	if((dc.w = dc.x - x) > bh) {
 		dc.x = x;
diff -r e749c30135e9 -r bc03b37b37ba dwm.h
--- a/dwm.h	Tue Jun 14 00:33:07 2011 -0700
+++ b/dwm.h	Wed Jun 15 23:27:32 2011 -0700
@@ -89,7 +89,6 @@
 
 extern const char *tags[];			/* all tags */
 extern char stext[256];				/* status text */
-extern char cmtext[256];				/* command mode text */
 extern int screen, sx, sy, sw, sh;		/* screen geometry */
 extern int wax, way, wah, waw;			/* windowarea geometry */
 extern unsigned int bh, blw;			/* bar height, bar layout label width */
diff -r e749c30135e9 -r bc03b37b37ba main.c
--- a/main.c	Tue Jun 14 00:33:07 2011 -0700
+++ b/main.c	Wed Jun 15 23:27:32 2011 -0700
@@ -18,7 +18,6 @@
 /* extern */
 
 char stext[256];
-char cmtext[256];
 int screen, sx, sy, sw, sh, wax, way, waw, wah;
 unsigned int bh, ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];