Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
implemented new color scheme accordingly to Sanders proposal
[dwm.git] / config.arg.h
diff --git a/config.arg.h b/config.arg.h
index 9a72b59..e65b989 100644 (file)
--- a/config.arg.h
+++ b/config.arg.h
@@ -3,19 +3,19 @@
  */
 
 #define TAGS \
  */
 
 #define TAGS \
-const char *tags[] = { "I", "II", "III", "IV", "V", "VI", "VII", NULL };
+const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
 
 #define DEFMODE                        dotile          /* dofloat */
 #define FLOATSYMBOL            "><>"
 #define TILESYMBOL             "[]="
 
 #define FONT                   "-*-terminus-medium-r-*-*-14-*-*-*-*-*-*-*"
 
 #define DEFMODE                        dotile          /* dofloat */
 #define FLOATSYMBOL            "><>"
 #define TILESYMBOL             "[]="
 
 #define FONT                   "-*-terminus-medium-r-*-*-14-*-*-*-*-*-*-*"
-#define NORMBGCOLOR            "#111111"
-#define NORMFGCOLOR            "#cccccc"
-#define SELBGCOLOR             "#336699"
-#define SELFGCOLOR             "#eeeeee"
-#define STATUSBGCOLOR          "#222222"
-#define STATUSFGCOLOR          "#99ccff"
+#define NORMBORDERCOLOR                "#333"
+#define NORMBGCOLOR            "#222"
+#define NORMFGCOLOR            "#ccc"
+#define SELBORDERCOLOR         "#9cf"
+#define SELBGCOLOR             "#444"
+#define SELFGCOLOR             "#fff"
 
 #define MASTER                 600             /* per thousand */
 #define MODKEY                 Mod1Mask
 
 #define MASTER                 600             /* per thousand */
 #define MODKEY                 Mod1Mask
@@ -26,18 +26,18 @@ const char *tags[] = { "I", "II", "III", "IV", "V", "VI", "VII", NULL };
 static Key key[] = { \
        /* modifier                     key             function                argument */ \
        { MODKEY|ShiftMask,             XK_Return,      spawn, \
 static Key key[] = { \
        /* modifier                     key             function                argument */ \
        { MODKEY|ShiftMask,             XK_Return,      spawn, \
-               { .cmd = "exec uxterm -bg black -fg '#eeeeee' -cr '#eeeeee' +sb -fn '"FONT"'" } }, \
+               { .cmd = "exec uxterm -bg '#222' -fg '#eee' -cr '#eee' +sb -fn '"FONT"'" } }, \
        { MODKEY,                       XK_p,           spawn, \
                { .cmd = "exe=\"$(lsx `echo $PATH | sed 's/:/ /g'` | sort -u " \
                        " | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' " \
                        "-sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"')\" && exec $exe" } }, \
        { MODKEY,                       XK_j,           focusnext,      { 0 } }, \
        { MODKEY,                       XK_k,           focusprev,      { 0 } }, \
        { MODKEY,                       XK_p,           spawn, \
                { .cmd = "exe=\"$(lsx `echo $PATH | sed 's/:/ /g'` | sort -u " \
                        " | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' " \
                        "-sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"')\" && exec $exe" } }, \
        { MODKEY,                       XK_j,           focusnext,      { 0 } }, \
        { MODKEY,                       XK_k,           focusprev,      { 0 } }, \
+       { MODKEY,                       XK_i,           incnmaster,     { .i = 1 } }, \
+       { MODKEY,                       XK_d,           incnmaster,     { .i = -1 } }, \
        { MODKEY,                       XK_Return,      zoom,           { 0 } }, \
        { MODKEY,                       XK_g,           resizemaster,   { .i = 15 } }, \
        { MODKEY,                       XK_s,           resizemaster,   { .i = -15 } }, \
        { MODKEY,                       XK_Return,      zoom,           { 0 } }, \
        { MODKEY,                       XK_g,           resizemaster,   { .i = 15 } }, \
        { MODKEY,                       XK_s,           resizemaster,   { .i = -15 } }, \
-       { MODKEY,                       XK_i,           incnmaster,     { .i = 1 } }, \
-       { MODKEY,                       XK_d,           incnmaster,     { .i = -1 } }, \
        { MODKEY|ShiftMask,             XK_0,           tag,            { .i = -1 } }, \
        { MODKEY|ShiftMask,             XK_1,           tag,            { .i = 0 } }, \
        { MODKEY|ShiftMask,             XK_2,           tag,            { .i = 1 } }, \
        { MODKEY|ShiftMask,             XK_0,           tag,            { .i = -1 } }, \
        { MODKEY|ShiftMask,             XK_1,           tag,            { .i = 0 } }, \
        { MODKEY|ShiftMask,             XK_2,           tag,            { .i = 1 } }, \
@@ -46,6 +46,8 @@ static Key key[] = { \
        { MODKEY|ShiftMask,             XK_5,           tag,            { .i = 4 } }, \
        { MODKEY|ShiftMask,             XK_6,           tag,            { .i = 5 } }, \
        { MODKEY|ShiftMask,             XK_7,           tag,            { .i = 6 } }, \
        { MODKEY|ShiftMask,             XK_5,           tag,            { .i = 4 } }, \
        { MODKEY|ShiftMask,             XK_6,           tag,            { .i = 5 } }, \
        { MODKEY|ShiftMask,             XK_7,           tag,            { .i = 6 } }, \
+       { MODKEY|ShiftMask,             XK_8,           tag,            { .i = 7 } }, \
+       { MODKEY|ShiftMask,             XK_9,           tag,            { .i = 8 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_1,           toggletag,      { .i = 0 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_2,           toggletag,      { .i = 1 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_3,           toggletag,      { .i = 2 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_1,           toggletag,      { .i = 0 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_2,           toggletag,      { .i = 1 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_3,           toggletag,      { .i = 2 } }, \
@@ -53,6 +55,8 @@ static Key key[] = { \
        { MODKEY|ControlMask|ShiftMask, XK_5,           toggletag,      { .i = 4 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_6,           toggletag,      { .i = 5 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_7,           toggletag,      { .i = 6 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_5,           toggletag,      { .i = 4 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_6,           toggletag,      { .i = 5 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_7,           toggletag,      { .i = 6 } }, \
+       { MODKEY|ControlMask|ShiftMask, XK_8,           toggletag,      { .i = 7 } }, \
+       { MODKEY|ControlMask|ShiftMask, XK_9,           toggletag,      { .i = 8 } }, \
        { MODKEY|ShiftMask,             XK_c,           killclient,     { 0 } }, \
        { MODKEY,                       XK_space,       togglemode,     { 0 } }, \
        { MODKEY|ShiftMask,             XK_space,       togglefloat,    { 0 } }, \
        { MODKEY|ShiftMask,             XK_c,           killclient,     { 0 } }, \
        { MODKEY,                       XK_space,       togglemode,     { 0 } }, \
        { MODKEY|ShiftMask,             XK_space,       togglefloat,    { 0 } }, \
@@ -64,6 +68,8 @@ static Key key[] = { \
        { MODKEY,                       XK_5,           view,           { .i = 4 } }, \
        { MODKEY,                       XK_6,           view,           { .i = 5 } }, \
        { MODKEY,                       XK_7,           view,           { .i = 6 } }, \
        { MODKEY,                       XK_5,           view,           { .i = 4 } }, \
        { MODKEY,                       XK_6,           view,           { .i = 5 } }, \
        { MODKEY,                       XK_7,           view,           { .i = 6 } }, \
+       { MODKEY,                       XK_8,           view,           { .i = 7 } }, \
+       { MODKEY,                       XK_9,           view,           { .i = 8 } }, \
        { MODKEY|ControlMask,           XK_1,           toggleview,     { .i = 0 } }, \
        { MODKEY|ControlMask,           XK_2,           toggleview,     { .i = 1 } }, \
        { MODKEY|ControlMask,           XK_3,           toggleview,     { .i = 2 } }, \
        { MODKEY|ControlMask,           XK_1,           toggleview,     { .i = 0 } }, \
        { MODKEY|ControlMask,           XK_2,           toggleview,     { .i = 1 } }, \
        { MODKEY|ControlMask,           XK_3,           toggleview,     { .i = 2 } }, \
@@ -71,13 +77,15 @@ static Key key[] = { \
        { MODKEY|ControlMask,           XK_5,           toggleview,     { .i = 4 } }, \
        { MODKEY|ControlMask,           XK_6,           toggleview,     { .i = 5 } }, \
        { MODKEY|ControlMask,           XK_7,           toggleview,     { .i = 6 } }, \
        { MODKEY|ControlMask,           XK_5,           toggleview,     { .i = 4 } }, \
        { MODKEY|ControlMask,           XK_6,           toggleview,     { .i = 5 } }, \
        { MODKEY|ControlMask,           XK_7,           toggleview,     { .i = 6 } }, \
+       { MODKEY|ControlMask,           XK_8,           toggleview,     { .i = 7 } }, \
+       { MODKEY|ControlMask,           XK_9,           toggleview,     { .i = 8 } }, \
        { MODKEY|ShiftMask,             XK_q,           quit,           { 0 } }, \
 };
 
 #define RULES \
 static Rule rule[] = { \
        /* class:instance:title regex   tags regex      isfloat */ \
        { MODKEY|ShiftMask,             XK_q,           quit,           { 0 } }, \
 };
 
 #define RULES \
 static Rule rule[] = { \
        /* class:instance:title regex   tags regex      isfloat */ \
-       { "Firefox.*",                  "net",          False }, \
+       { "Firefox.*",                  "3",            False }, \
        { "Gimp.*",                     NULL,           True }, \
        { "MPlayer.*",                  NULL,           True }, \
        { "Acroread.*",                 NULL,           True }, \
        { "Gimp.*",                     NULL,           True }, \
        { "MPlayer.*",                  NULL,           True }, \
        { "Acroread.*",                 NULL,           True }, \