changed order of colordefs in config.h's, changed config.arg.h to fit to new dmenu

[dwm.git] / config.arg.h

diff --git a/config.arg.h b/config.arg.h
index 3862be4..f91c722 100644 (file)
--- a/config.arg.h
+++ b/config.arg.h
@@ -11,15 +11,15 @@ const char *tags[] = { "dev", "work", "net", "fnord", NULL };
 #define TILESYMBOL             "[]="
 
 #define FONT                   "-*-terminus-medium-*-*-*-12-*-*-*-*-*-iso10646-*"
-#define SELBGCOLOR             "#333366"
-#define SELFGCOLOR             "#eeeeee"
 #define NORMBGCOLOR            "#333333"
 #define NORMFGCOLOR            "#dddddd"
+#define SELBGCOLOR             "#333366"
+#define SELFGCOLOR             "#eeeeee"
 #define STATUSBGCOLOR          "#222222"
 #define STATUSFGCOLOR          "#9999cc"
 
-#define MODKEY                 Mod1Mask
 #define MASTERW                        60 /* percent */
+#define MODKEY                 Mod1Mask
 
 #define KEYS \
 static Key key[] = { \
@@ -29,11 +29,13 @@ static Key key[] = { \
        { MODKEY,                       XK_p,           spawn, \
                { .cmd = "exe=\"$(IFS=:; for dir in $PATH; do " \
                         "for file in \"$dir\"/*; do [ -x \"$file\" ] && echo \"${file##*/}\"; done; " \
-                        "done | sort -u | dmenu)\" && exec \"$exe\"" } }, \
+                        "done | sort -u | dmenu -font '"FONT"' -normbg '"NORMBGCOLOR"' -normfg '"NORMFGCOLOR"'" \
+                        "-selbg '"SELBGCOLOR"' -selfg '"SELFGCOLOR"')\" && exec $exe" } }, \
        { MODKEY,                       XK_j,           focusnext,      { 0 } }, \
        { MODKEY,                       XK_k,           focusprev,      { 0 } }, \
        { MODKEY,                       XK_Return,      zoom,           { 0 } }, \
-       { MODKEY,                       XK_m,           togglemax,      { 0 } }, \
+       { MODKEY,                       XK_g,           resizecol,      { .i = 20 } }, \
+       { MODKEY,                       XK_s,           resizecol,      { .i = -20 } }, \
        { MODKEY|ShiftMask,             XK_1,           tag,            { .i = 0 } }, \
        { MODKEY|ShiftMask,             XK_2,           tag,            { .i = 1 } }, \
        { MODKEY|ShiftMask,             XK_3,           tag,            { .i = 2 } }, \
@@ -44,11 +46,11 @@ static Key key[] = { \
        { MODKEY|ControlMask|ShiftMask, XK_4,           toggletag,      { .i = 3 } }, \
        { MODKEY|ShiftMask,             XK_c,           killclient,     { 0 } }, \
        { MODKEY,                       XK_space,       togglemode,     { 0 } }, \
+       { MODKEY,                       XK_0,           viewall,        { 0 } }, \
        { MODKEY,                       XK_1,           view,           { .i = 0 } }, \
        { MODKEY,                       XK_2,           view,           { .i = 1 } }, \
        { MODKEY,                       XK_3,           view,           { .i = 2 } }, \
        { MODKEY,                       XK_4,           view,           { .i = 3 } }, \
-       { MODKEY,                       XK_a,           viewall,        { 0 } }, \
        { MODKEY|ControlMask,           XK_1,           toggleview,     { .i = 0 } }, \
        { MODKEY|ControlMask,           XK_2,           toggleview,     { .i = 1 } }, \
        { MODKEY|ControlMask,           XK_3,           toggleview,     { .i = 2 } }, \
@@ -59,7 +61,7 @@ static Key key[] = { \
 #define RULES \
 static Rule rule[] = { \
        /* class:instance:title regex   tags regex      isfloat */ \
-       { "Firefox.*",                  "net",          False }, \
+       { "Firefox.*",                  "net",          True}, \
        { "Gimp.*",                     NULL,           True}, \
        { "MPlayer.*",                  NULL,           True}, \
        { "Acroread.*",                 NULL,           True}, \