removed config.arg.h, only 1 config.h necessary 73e2aba3
Anselm R. Garbe · 2007-09-15 10:30 2 file(s) · +22 −112
config.arg.h (deleted) +0 −100
1 -
/* See LICENSE file for copyright and license details. */
2 -
3 -
/* appearance */
4 -
#define BARPOS			BarTop /* BarBot, BarOff */
5 -
#define BORDERPX		1
6 -
#define FONT			"-*-terminus-medium-r-*-*-12-*-*-*-*-*-iso10646-*"
7 -
#define NORMBORDERCOLOR		"#244"
8 -
#define NORMFGCOLOR		"#ddd"
9 -
#define NORMBGCOLOR		"#133"
10 -
#define SELBORDERCOLOR		"#699"
11 -
#define SELFGCOLOR		"#eee"
12 -
#define SELBGCOLOR		"#366"
13 -
#define TERMBGCOLOR		"#122"
14 -
#define TERMFGCOLOR		"#ddd"
15 -
#define TERMCRCOLOR		"#ddd"
16 -
17 -
/* tagging */
18 -
#define TAGS \
19 -
const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
20 -
#define RULES \
21 -
static Rule rules[] = { \
22 -
	/* class:instance:title regex	tags regex	isfloating */ \
23 -
	{ "Firefox",			"3",		False }, \
24 -
	{ "Gimp",			NULL,		True }, \
25 -
	{ "MPlayer",			NULL,		True }, \
26 -
	{ "Acroread",			NULL,		True }, \
27 -
};
28 -
29 -
/* layout(s) */
30 -
#include "tile.h"
31 -
#define LAYOUTS \
32 -
static Layout layouts[] = { \
33 -
	/* symbol		function */ \
34 -
	{ "[]=",		tile }, /* first entry is default */ \
35 -
	{ "><>",		floating }, \
36 -
};
37 -
#define RESIZEHINTS		True	/* False - respect size hints in tiled resizals */
38 -
#define MWFACT			0.6	/* master width factor [0.1 .. 0.9] */
39 -
#define SNAP			32	/* snap pixel */
40 -
41 -
/* key definitions */
42 -
#define MODKEY			Mod1Mask
43 -
#define KEYS \
44 -
Key keys[] = { \
45 -
	/* modifier			key		function	argument */ \
46 -
	{ MODKEY,			XK_p,		spawn, \
47 -
		"exe=`dmenu_path | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"'" \
48 -
		" -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'` && exec $exe" }, \
49 -
	{ MODKEY|ShiftMask,		XK_Return,	spawn, \
50 -
		"exec xterm -bg '"TERMBGCOLOR"' -fg '"TERMFGCOLOR"' -cr '"TERMCRCOLOR"' +sb -fn '"FONT"'" }, \
51 -
	{ MODKEY,			XK_space,	setlayout,	NULL }, \
52 -
	{ MODKEY,			XK_b,		togglebar,	NULL }, \
53 -
	{ MODKEY,			XK_j,		focusnext,	NULL }, \
54 -
	{ MODKEY,			XK_k,		focusprev,	NULL }, \
55 -
	{ MODKEY,			XK_h,		setmwfact,	"-0.05" }, \
56 -
	{ MODKEY,			XK_l,		setmwfact,	"+0.05" }, \
57 -
	{ MODKEY,			XK_m,		togglemax,	NULL }, \
58 -
	{ MODKEY,			XK_Return,	zoom,		NULL }, \
59 -
	{ MODKEY|ShiftMask,		XK_space,	togglefloating,	NULL }, \
60 -
	{ MODKEY|ShiftMask,		XK_c,		killclient,	NULL }, \
61 -
	{ MODKEY,			XK_0,		view,		NULL }, \
62 -
	{ MODKEY,			XK_1,		view,		tags[0] }, \
63 -
	{ MODKEY,			XK_2,		view,		tags[1] }, \
64 -
	{ MODKEY,			XK_3,		view,		tags[2] }, \
65 -
	{ MODKEY,			XK_4,		view,		tags[3] }, \
66 -
	{ MODKEY,			XK_5,		view,		tags[4] }, \
67 -
	{ MODKEY,			XK_6,		view,		tags[5] }, \
68 -
	{ MODKEY,			XK_7,		view,		tags[6] }, \
69 -
	{ MODKEY,			XK_8,		view,		tags[7] }, \
70 -
	{ MODKEY,			XK_9,		view,		tags[8] }, \
71 -
	{ MODKEY|ControlMask,		XK_1,		toggleview,	tags[0] }, \
72 -
	{ MODKEY|ControlMask,		XK_2,		toggleview,	tags[1] }, \
73 -
	{ MODKEY|ControlMask,		XK_3,		toggleview,	tags[2] }, \
74 -
	{ MODKEY|ControlMask,		XK_4,		toggleview,	tags[3] }, \
75 -
	{ MODKEY|ControlMask,		XK_5,		toggleview,	tags[4] }, \
76 -
	{ MODKEY|ControlMask,		XK_6,		toggleview,	tags[5] }, \
77 -
	{ MODKEY|ControlMask,		XK_7,		toggleview,	tags[6] }, \
78 -
	{ MODKEY|ControlMask,		XK_8,		toggleview,	tags[7] }, \
79 -
	{ MODKEY|ControlMask,		XK_9,		toggleview,	tags[8] }, \
80 -
	{ MODKEY|ShiftMask,		XK_0,		tag,		NULL }, \
81 -
	{ MODKEY|ShiftMask,		XK_1,		tag,		tags[0] }, \
82 -
	{ MODKEY|ShiftMask,		XK_2,		tag,		tags[1] }, \
83 -
	{ MODKEY|ShiftMask,		XK_3,		tag,		tags[2] }, \
84 -
	{ MODKEY|ShiftMask,		XK_4,		tag,		tags[3] }, \
85 -
	{ MODKEY|ShiftMask,		XK_5,		tag,		tags[4] }, \
86 -
	{ MODKEY|ShiftMask,		XK_6,		tag,		tags[5] }, \
87 -
	{ MODKEY|ShiftMask,		XK_7,		tag,		tags[6] }, \
88 -
	{ MODKEY|ShiftMask,		XK_8,		tag,		tags[7] }, \
89 -
	{ MODKEY|ShiftMask,		XK_9,		tag,		tags[8] }, \
90 -
	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	tags[0] }, \
91 -
	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	tags[1] }, \
92 -
	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	tags[2] }, \
93 -
	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	tags[3] }, \
94 -
	{ MODKEY|ControlMask|ShiftMask,	XK_5,		toggletag,	tags[4] }, \
95 -
	{ MODKEY|ControlMask|ShiftMask,	XK_6,		toggletag,	tags[5] }, \
96 -
	{ MODKEY|ControlMask|ShiftMask,	XK_7,		toggletag,	tags[6] }, \
97 -
	{ MODKEY|ControlMask|ShiftMask,	XK_8,		toggletag,	tags[7] }, \
98 -
	{ MODKEY|ControlMask|ShiftMask,	XK_9,		toggletag,	tags[8] }, \
99 -
	{ MODKEY|ShiftMask,		XK_q,		quit,		NULL }, \
100 -
};
config.default.h +22 −12
3 3
/* appearance */
4 4
#define BARPOS			BarTop /* BarBot, BarOff */
5 5
#define BORDERPX		1
6 -
#define FONT			"-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
7 -
#define NORMBORDERCOLOR		"#dddddd"
8 -
#define NORMBGCOLOR		"#eeeeee"
9 -
#define NORMFGCOLOR		"#222222"
10 -
#define SELBORDERCOLOR		"#ff0000"
11 -
#define SELBGCOLOR		"#006699"
12 -
#define SELFGCOLOR		"#ffffff"
6 +
#define FONT			"-*-terminus-medium-r-*-*-12-*-*-*-*-*-iso10646-*"
7 +
#define DARK /* LIGHT */
8 +
#ifdef DARK
9 +
#define NORMBORDERCOLOR		"#222"
10 +
#define NORMBGCOLOR		"#000"
11 +
#define NORMFGCOLOR		"#eee"
12 +
#define SELBORDERCOLOR		"#09f"
13 +
#else
14 +
#define NORMBORDERCOLOR		"#666"
15 +
#define NORMBGCOLOR		"#eee"
16 +
#define NORMFGCOLOR		"#222"
17 +
#define SELBORDERCOLOR		"#f00"
18 +
#endif
19 +
#define SELBGCOLOR		"#369"
20 +
#define SELFGCOLOR		"#fff"
13 21
14 22
/* tagging */
15 23
#define TAGS \
16 24
const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
17 -
/* Query class:instance:title for regex matching info with following command:
18 -
 * xprop | awk -F '"' '/^WM_CLASS/ { printf("%s:%s:",$4,$2) }; /^WM_NAME/ { printf("%s\n",$2) }' */
19 25
#define RULES \
20 26
static Rule rules[] = { \
21 27
	/* class:instance:title regex	tags regex	isfloating */ \
28 +
	{ "Firefox",			"3",		False }, \
22 29
	{ "Gimp",			NULL,		True }, \
23 30
	{ "MPlayer",			NULL,		True }, \
24 31
	{ "Acroread",			NULL,		True }, \
32 39
	{ "[]=",		tile }, /* first entry is default */ \
33 40
	{ "><>",		floating }, \
34 41
};
35 -
#define RESIZEHINTS		False	/* True - respect size hints in tiled resizals */
42 +
#define RESIZEHINTS		True	/* False - respect size hints in tiled resizals */
36 43
#define MWFACT			0.6	/* master width factor [0.1 .. 0.9] */
37 44
#define SNAP			32	/* snap pixel */
38 45
41 48
#define KEYS \
42 49
Key keys[] = { \
43 50
	/* modifier			key		function	argument */ \
44 -
	{ MODKEY|ShiftMask,		XK_Return,	spawn,		"exec xterm" }, \
45 -
	{ MODKEY,			XK_p,		spawn, 		"exe=`dmenu_path | dmenu` && exec $exe" }, \
51 +
	{ MODKEY,			XK_p,		spawn, \
52 +
		"exe=`dmenu_path | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"'" \
53 +
		" -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'` && exec $exe" }, \
54 +
	{ MODKEY|ShiftMask,		XK_Return,	spawn, \
55 +
		"exec xterm -bg '"NORMBGCOLOR"' -fg '"NORMFGCOLOR"' -cr '"NORMFGCOLOR"' +sb -fn '"FONT"'" }, \
46 56
	{ MODKEY,			XK_space,	setlayout,	NULL }, \
47 57
	{ MODKEY,			XK_b,		togglebar,	NULL }, \
48 58
	{ MODKEY,			XK_j,		focusnext,	NULL }, \