using light colorscheme, preparing merge of config.arg.h with config.default.h

[dwm.git] / config.arg.h

diff --git a/config.arg.h b/config.arg.h
index ca23b24..fbf01ba 100644 (file)
--- a/config.arg.h
+++ b/config.arg.h
@@ -3,19 +3,19 @@
 /* appearance */
 #define BARPOS                 BarTop /* BarBot, BarOff */
 #define BORDERPX               1
 /* appearance */
 #define BARPOS                 BarTop /* BarBot, BarOff */
 #define BORDERPX               1

-#define FONT                   "-*-terminus-medium-r-*-*-14-*-*-*-*-*-iso10646-*"
-#define NORMBORDERCOLOR                "#333"
-#define NORMBGCOLOR            "#222"
-#define NORMFGCOLOR            "#ccc"
-#define SELBORDERCOLOR         "#59a"
-#define SELBGCOLOR             "#555"
-#define SELFGCOLOR             "#fff"
+#define FONT                   "-*-terminus-medium-r-*-*-12-*-*-*-*-*-iso10646-*"
+#define NORMBORDERCOLOR                "#cccc99"
+#define NORMFGCOLOR            "#000000"
+#define NORMBGCOLOR            "#ffffea"
+#define SELBORDERCOLOR         "#669966"
+#define SELFGCOLOR             "#000000"
+#define SELBGCOLOR             "#99cc99"

 
 /* tagging */
 #define TAGS \
 const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
 #define RULES \
 
 /* tagging */
 #define TAGS \
 const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
 #define RULES \

-static Rule rule[] = { \
+static Rule rules[] = { \

        /* class:instance:title regex   tags regex      isfloating */ \
        { "Firefox",                    "3",            False }, \
        { "Gimp",                       NULL,           True }, \
        /* class:instance:title regex   tags regex      isfloating */ \
        { "Firefox",                    "3",            False }, \
        { "Gimp",                       NULL,           True }, \


@@ -26,30 +26,31 @@ static Rule rule[] = { \
 /* layout(s) */
 #include "tile.h"
 #define LAYOUTS \
 /* layout(s) */
 #include "tile.h"
 #define LAYOUTS \

-static Layout layout[] = { \
+static Layout layouts[] = { \

        /* symbol               function */ \
        { "[]=",                tile }, /* first entry is default */ \
        { "><>",                floating }, \
 };
        /* symbol               function */ \
        { "[]=",                tile }, /* first entry is default */ \
        { "><>",                floating }, \
 };

+#define RESIZEHINTS            True    /* False - respect size hints in tiled resizals */

 #define MWFACT                 0.6     /* master width factor [0.1 .. 0.9] */
 #define SNAP                   32      /* snap pixel */
 
 /* key definitions */
 #define MODKEY                 Mod1Mask
 #define KEYS \
 #define MWFACT                 0.6     /* master width factor [0.1 .. 0.9] */
 #define SNAP                   32      /* snap pixel */
 
 /* key definitions */
 #define MODKEY                 Mod1Mask
 #define KEYS \

-Key key[] = { \
+Key keys[] = { \

        /* modifier                     key             function        argument */ \
        { MODKEY,                       XK_p,           spawn, \
                "exe=`dmenu_path | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"'" \
                " -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'` && exec $exe" }, \
        { MODKEY|ShiftMask,             XK_Return,      spawn, \
        /* modifier                     key             function        argument */ \
        { MODKEY,                       XK_p,           spawn, \
                "exe=`dmenu_path | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"'" \
                " -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'` && exec $exe" }, \
        { MODKEY|ShiftMask,             XK_Return,      spawn, \

-               "exec urxvtcd -tr -bg '#111' -fg '#eee' -cr '#eee' +sb -fn '"FONT"'" }, \
+               "exec xterm -bg '"NORMBGCOLOR"' -fg '"NORMFGCOLOR"' -cr '"NORMFGCOLOR"' +sb -fn '"FONT"'" }, \

        { MODKEY,                       XK_space,       setlayout,      NULL }, \
        { MODKEY,                       XK_b,           togglebar,      NULL }, \
        { MODKEY,                       XK_j,           focusnext,      NULL }, \
        { MODKEY,                       XK_k,           focusprev,      NULL }, \
        { MODKEY,                       XK_space,       setlayout,      NULL }, \
        { MODKEY,                       XK_b,           togglebar,      NULL }, \
        { MODKEY,                       XK_j,           focusnext,      NULL }, \
        { MODKEY,                       XK_k,           focusprev,      NULL }, \

-       { MODKEY,                       XK_h,           addtomwfact,    "-0.05" }, \
-       { MODKEY,                       XK_l,           addtomwfact,    "0.05" }, \
+       { MODKEY,                       XK_h,           setmwfact,      "-0.05" }, \
+       { MODKEY,                       XK_l,           setmwfact,      "+0.05" }, \

        { MODKEY,                       XK_m,           togglemax,      NULL }, \
        { MODKEY,                       XK_Return,      zoom,           NULL }, \
        { MODKEY|ShiftMask,             XK_space,       togglefloating, NULL }, \
        { MODKEY,                       XK_m,           togglemax,      NULL }, \
        { MODKEY,                       XK_Return,      zoom,           NULL }, \
        { MODKEY|ShiftMask,             XK_space,       togglefloating, NULL }, \