about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAnselm R.Garbe <arg@10ksloc.org>2006-08-08 09:30:45 +0200
committerAnselm R.Garbe <arg@10ksloc.org>2006-08-08 09:30:45 +0200
commit42277b111018c5e83cc867b04156511aa0914bf1 (patch)
tree85efed8021248711812d41e19309e47647c7b81c
parent095f9e143eb1379631f6a0ffc6b923a6f7a687e2 (diff)
downloaddwm-42277b111018c5e83cc867b04156511aa0914bf1.tar.gz
applied Sanders tiny patches
-rw-r--r--Makefile2
-rw-r--r--config.arg.h8
-rw-r--r--dwm.html2
-rw-r--r--main.c3
4 files changed, 8 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 5fbf05c..9ef219a 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ options:
 	@echo CC $<
 	@${CC} -c ${CFLAGS} $<
 
-${OBJ}: dwm.h config.h
+${OBJ}: dwm.h config.h config.mk
 
 config.h:
 	@echo creating $@ from config.default.h
diff --git a/config.arg.h b/config.arg.h
index 25cf123..b254188 100644
--- a/config.arg.h
+++ b/config.arg.h
@@ -28,8 +28,8 @@ static Key key[] = { \
 	{ MODKEY,		XK_l,		viewnext,	{ 0 } }, \
 	{ MODKEY,		XK_m,		togglemax,	{ 0 } }, \
 	{ MODKEY,		XK_p,		spawn, \
-		{ .cmd = "exec `ls -lL /usr/bin /usr/local/bin 2>/dev/null | \
-			awk 'NF>2 && $1 ~ /^[^d].*x/ {print $NF}' | sort | uniq | dmenu`" } }, \
+		{ .cmd = "exec `ls -lL /usr/bin /usr/local/bin 2>/dev/null | " \
+			"awk 'NF>2 && $1 ~ /^[^d].*x/ {print $NF}' | sort | uniq | dmenu`" } }, \
 	{ MODKEY,		XK_space,	togglemode,	{ 0 } }, \
 	{ MODKEY,		XK_Return,	zoom,		{ 0 } }, \
 	{ MODKEY|ControlMask,	XK_1,		appendtag,	{ .i = 0 } }, \
@@ -41,8 +41,8 @@ static Key key[] = { \
 	{ MODKEY|ShiftMask,	XK_c,		killclient,	{ 0 } }, \
 	{ MODKEY|ShiftMask,	XK_q,		quit,		{ 0 } }, \
 	{ MODKEY|ShiftMask,	XK_Return,	spawn, \
-		{ .cmd = "exec urxvt -bg '#ffffea' +sb \
-			-fn '-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*'" } }, \
+		{ .cmd = "exec urxvt -bg '#ffffea' +sb " \
+			"-fn '-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*'" } }, \
 };
 
 #define RULES \
diff --git a/dwm.html b/dwm.html
index 698f739..efabdac 100644
--- a/dwm.html
+++ b/dwm.html
@@ -21,7 +21,7 @@
 		<p>
 		dwm is a dynamic window manager for X11.
 		</p>
-		<h4>Philosophy</h4>
+		<h4>Background</h4>
 		<p>
 		As founder and main developer of wmii I came to the conclusion that
 		wmii is too clunky for my needs. I don't need so many funky features
diff --git a/main.c b/main.c
index db03958..5efe599 100644
--- a/main.c
+++ b/main.c
@@ -240,6 +240,8 @@ main(int argc, char *argv[])
 
 	dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
 	dc.gc = XCreateGC(dpy, root, 0, 0);
+
+	strcpy(stext, "dwm-"VERSION);
 	drawstatus();
 
 	issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
@@ -248,7 +250,6 @@ main(int argc, char *argv[])
 	wa.cursor = cursor[CurNormal];
 	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
-	strcpy(stext, "dwm-"VERSION);
 	scan();
 
 	/* main event loop, also reads status text from stdin */