applied Sanders tiny patches

diff --git a/Makefile b/Makefile
index 5fbf05c..9ef219a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ options:
        @echo CC $<
        @${CC} -c ${CFLAGS} $<
 
        @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
 
 config.h:
        @echo creating $@ from config.default.h

diff --git a/config.arg.h b/config.arg.h
index 25cf123..b254188 100644 (file)
--- 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, \
        { 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 } }, \
        { 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, \
        { 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 \
 };
 
 #define RULES \

diff --git a/dwm.html b/dwm.html
index 698f739..efabdac 100644 (file)
--- a/dwm.html
+++ b/dwm.html
@@ -21,7 +21,7 @@
                <p>
                dwm is a dynamic window manager for X11.
                </p>
                <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
                <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 (file)
--- 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);
 
        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);
        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);
 
        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 

-       strcpy(stext, "dwm-"VERSION);

        scan();
 
        /* main event loop, also reads status text from stdin */
        scan();
 
        /* main event loop, also reads status text from stdin */