commit 5d831eaa94e1ef91e4227298bdd5eec7b2181caf
parent e0a6dee30df84e1f4d63a428a9804bf47d82ca43
Author: Anselm R. Garbe <garbeam@gmail.com>
Date: Sat, 15 Sep 2007 10:35:18 +0200
renamed config.default.h into config.h
Diffstat:
M | Makefile | | | 6 | +----- |
D | config.default.h | | | 105 | ------------------------------------------------------------------------------- |
A | config.h | | | 105 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
3 files changed, 106 insertions(+), 110 deletions(-)
diff --git a/Makefile b/Makefile
@@ -20,10 +20,6 @@ options:
${OBJ}: dwm.h config.h config.mk
-config.h:
- @echo creating $@ from config.default.h
- @cp config.default.h $@
-
dwm: ${OBJ}
@echo CC -o $@
@${CC} -o $@ ${OBJ} ${LDFLAGS}
@@ -35,7 +31,7 @@ clean:
dist: clean
@echo creating dist tarball
@mkdir -p dwm-${VERSION}
- @cp -R LICENSE Makefile README config.default.h config.mk \
+ @cp -R LICENSE Makefile README config.h config.mk \
dwm.1 dwm.h tile.h ${SRC} dwm-${VERSION}
@tar -cf dwm-${VERSION}.tar dwm-${VERSION}
@gzip dwm-${VERSION}.tar
diff --git a/config.default.h b/config.default.h
@@ -1,105 +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 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 };
-#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 '"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_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.h b/config.h
@@ -0,0 +1,105 @@
+/* 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 DARK /* LIGHT */
+#ifdef DARK
+#define NORMBORDERCOLOR "#222"
+#define NORMBGCOLOR "#000"
+#define NORMFGCOLOR "#ddd"
+#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 };
+#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 '"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_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 }, \
+};