commit 73e2aba341624fbfb4791d464bf0d0a16c50578c
parent 9f88fd093cf4f18dfd25b86344e5df73f5f1c2a1
Author: Anselm R. Garbe <garbeam@gmail.com>
Date: Sat, 15 Sep 2007 10:30:45 +0200
removed config.arg.h, only 1 config.h necessary
Diffstat:
| D | config.arg.h | | | 100 | ------------------------------------------------------------------------------- |
| M | config.default.h | | | 34 | ++++++++++++++++++++++------------ |
2 files changed, 22 insertions(+), 112 deletions(-)
diff --git a/config.arg.h b/config.arg.h
@@ -1,100 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-/* appearance */
-#define BARPOS BarTop /* BarBot, BarOff */
-#define BORDERPX 1
-#define FONT "-*-terminus-medium-r-*-*-12-*-*-*-*-*-iso10646-*"
-#define NORMBORDERCOLOR "#244"
-#define NORMFGCOLOR "#ddd"
-#define NORMBGCOLOR "#133"
-#define SELBORDERCOLOR "#699"
-#define SELFGCOLOR "#eee"
-#define SELBGCOLOR "#366"
-#define TERMBGCOLOR "#122"
-#define TERMFGCOLOR "#ddd"
-#define TERMCRCOLOR "#ddd"
-
-/* tagging */
-#define TAGS \
-const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
-#define RULES \
-static Rule rules[] = { \
- /* class:instance:title regex tags regex isfloating */ \
- { "Firefox", "3", False }, \
- { "Gimp", NULL, True }, \
- { "MPlayer", NULL, True }, \
- { "Acroread", NULL, True }, \
-};
-
-/* layout(s) */
-#include "tile.h"
-#define LAYOUTS \
-static Layout layouts[] = { \
- /* 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 \
-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, \
- "exec xterm -bg '"TERMBGCOLOR"' -fg '"TERMFGCOLOR"' -cr '"TERMCRCOLOR"' +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_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|ShiftMask, XK_c, killclient, NULL }, \
- { MODKEY, XK_0, view, NULL }, \
- { MODKEY, XK_1, view, tags[0] }, \
- { MODKEY, XK_2, view, tags[1] }, \
- { MODKEY, XK_3, view, tags[2] }, \
- { MODKEY, XK_4, view, tags[3] }, \
- { MODKEY, XK_5, view, tags[4] }, \
- { MODKEY, XK_6, view, tags[5] }, \
- { MODKEY, XK_7, view, tags[6] }, \
- { MODKEY, XK_8, view, tags[7] }, \
- { MODKEY, XK_9, view, tags[8] }, \
- { MODKEY|ControlMask, XK_1, toggleview, tags[0] }, \
- { MODKEY|ControlMask, XK_2, toggleview, tags[1] }, \
- { MODKEY|ControlMask, XK_3, toggleview, tags[2] }, \
- { MODKEY|ControlMask, XK_4, toggleview, tags[3] }, \
- { MODKEY|ControlMask, XK_5, toggleview, tags[4] }, \
- { MODKEY|ControlMask, XK_6, toggleview, tags[5] }, \
- { MODKEY|ControlMask, XK_7, toggleview, tags[6] }, \
- { MODKEY|ControlMask, XK_8, toggleview, tags[7] }, \
- { MODKEY|ControlMask, XK_9, toggleview, tags[8] }, \
- { MODKEY|ShiftMask, XK_0, tag, NULL }, \
- { MODKEY|ShiftMask, XK_1, tag, tags[0] }, \
- { MODKEY|ShiftMask, XK_2, tag, tags[1] }, \
- { MODKEY|ShiftMask, XK_3, tag, tags[2] }, \
- { MODKEY|ShiftMask, XK_4, tag, tags[3] }, \
- { MODKEY|ShiftMask, XK_5, tag, tags[4] }, \
- { MODKEY|ShiftMask, XK_6, tag, tags[5] }, \
- { MODKEY|ShiftMask, XK_7, tag, tags[6] }, \
- { MODKEY|ShiftMask, XK_8, tag, tags[7] }, \
- { MODKEY|ShiftMask, XK_9, tag, tags[8] }, \
- { MODKEY|ControlMask|ShiftMask, XK_1, toggletag, tags[0] }, \
- { MODKEY|ControlMask|ShiftMask, XK_2, toggletag, tags[1] }, \
- { MODKEY|ControlMask|ShiftMask, XK_3, toggletag, tags[2] }, \
- { MODKEY|ControlMask|ShiftMask, XK_4, toggletag, tags[3] }, \
- { MODKEY|ControlMask|ShiftMask, XK_5, toggletag, tags[4] }, \
- { MODKEY|ControlMask|ShiftMask, XK_6, toggletag, tags[5] }, \
- { MODKEY|ControlMask|ShiftMask, XK_7, toggletag, tags[6] }, \
- { MODKEY|ControlMask|ShiftMask, XK_8, toggletag, tags[7] }, \
- { MODKEY|ControlMask|ShiftMask, XK_9, toggletag, tags[8] }, \
- { MODKEY|ShiftMask, XK_q, quit, NULL }, \
-};
diff --git a/config.default.h b/config.default.h
@@ -3,22 +3,29 @@
/* appearance */
#define BARPOS BarTop /* BarBot, BarOff */
#define BORDERPX 1
-#define FONT "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
-#define NORMBORDERCOLOR "#dddddd"
-#define NORMBGCOLOR "#eeeeee"
-#define NORMFGCOLOR "#222222"
-#define SELBORDERCOLOR "#ff0000"
-#define SELBGCOLOR "#006699"
-#define SELFGCOLOR "#ffffff"
+#define FONT "-*-terminus-medium-r-*-*-12-*-*-*-*-*-iso10646-*"
+#define DARK /* LIGHT */
+#ifdef DARK
+#define NORMBORDERCOLOR "#222"
+#define NORMBGCOLOR "#000"
+#define NORMFGCOLOR "#eee"
+#define SELBORDERCOLOR "#09f"
+#else
+#define NORMBORDERCOLOR "#666"
+#define NORMBGCOLOR "#eee"
+#define NORMFGCOLOR "#222"
+#define SELBORDERCOLOR "#f00"
+#endif
+#define SELBGCOLOR "#369"
+#define SELFGCOLOR "#fff"
/* tagging */
#define TAGS \
const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
-/* Query class:instance:title for regex matching info with following command:
- * xprop | awk -F '"' '/^WM_CLASS/ { printf("%s:%s:",$4,$2) }; /^WM_NAME/ { printf("%s\n",$2) }' */
#define RULES \
static Rule rules[] = { \
/* class:instance:title regex tags regex isfloating */ \
+ { "Firefox", "3", False }, \
{ "Gimp", NULL, True }, \
{ "MPlayer", NULL, True }, \
{ "Acroread", NULL, True }, \
@@ -32,7 +39,7 @@ static Layout layouts[] = { \
{ "[]=", tile }, /* first entry is default */ \
{ "><>", floating }, \
};
-#define RESIZEHINTS False /* True - respect size hints in tiled resizals */
+#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 */
@@ -41,8 +48,11 @@ static Layout layouts[] = { \
#define KEYS \
Key keys[] = { \
/* modifier key function argument */ \
- { MODKEY|ShiftMask, XK_Return, spawn, "exec xterm" }, \
- { MODKEY, XK_p, spawn, "exe=`dmenu_path | dmenu` && exec $exe" }, \
+ { 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 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 }, \
