aewl
changeset 166:e0535db04dfe
removed the CONFIG variable from config.mk, renamed config.h into config.default.h, after first clone/extract one needs to copy config.default.h to config.h, that is easier than always heavy typing make CONFIG=blafasel
author | arg@10ksloc.org |
---|---|
date | Wed, 02 Aug 2006 16:46:59 +0200 |
parents | 4d828b431b72 |
children | c11f86db4550 |
files | README config.default.h config.mk dwm.h |
diffstat | 4 files changed, 66 insertions(+), 11 deletions(-) [+] |
line diff
1.1 --- a/README Wed Aug 02 16:38:21 2006 +0200 1.2 +++ b/README Wed Aug 02 16:46:59 2006 +0200 1.3 @@ -16,13 +16,9 @@ 1.4 Afterwards enter the following command to build and install dwm (if 1.5 necessary as root): 1.6 1.7 + cp config.default.h config.h 1.8 make clean install 1.9 1.10 -If you want to use a customized config.h, you can use the following 1.11 -command for installing dwm: 1.12 - 1.13 - make CONFIG=<your-config>.h clean install 1.14 - 1.15 1.16 Running dwm 1.17 -----------
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/config.default.h Wed Aug 02 16:46:59 2006 +0200 2.3 @@ -0,0 +1,62 @@ 2.4 +/* 2.5 + * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com> 2.6 + * See LICENSE file for license details. 2.7 + */ 2.8 + 2.9 +enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast }; 2.10 +#define TAGS \ 2.11 +char *tags[TLast] = { \ 2.12 + [Tfnord] = "fnord", \ 2.13 + [Tdev] = "dev", \ 2.14 + [Tnet] = "net", \ 2.15 + [Twork] = "work", \ 2.16 + [Tmisc] = "misc", \ 2.17 +}; 2.18 + 2.19 +#define DEFMODE dotile /* dofloat */ 2.20 +#define DEFTAG Tdev 2.21 +#define FONT "fixed" 2.22 +#define BGCOLOR "#666699" 2.23 +#define FGCOLOR "#eeeeee" 2.24 +#define BORDERCOLOR "#9999CC" 2.25 +#define MODKEY Mod1Mask 2.26 +#define NUMLOCKMASK Mod2Mask 2.27 +#define MASTERW 52 /* percent */ 2.28 + 2.29 +#define KEYS \ 2.30 + const char *term[] = { "xterm", NULL }; \ 2.31 +static Key key[] = { \ 2.32 + /* modifier key function arguments */ \ 2.33 + { MODKEY, XK_0, view, { .i = Tfnord } }, \ 2.34 + { MODKEY, XK_1, view, { .i = Tdev } }, \ 2.35 + { MODKEY, XK_2, view, { .i = Tnet } }, \ 2.36 + { MODKEY, XK_3, view, { .i = Twork } }, \ 2.37 + { MODKEY, XK_4, view, { .i = Tmisc} }, \ 2.38 + { MODKEY, XK_h, viewprev, { 0 } }, \ 2.39 + { MODKEY, XK_j, focusnext, { 0 } }, \ 2.40 + { MODKEY, XK_k, focusprev, { 0 } }, \ 2.41 + { MODKEY, XK_l, viewnext, { 0 } }, \ 2.42 + { MODKEY, XK_m, togglemax, { 0 } }, \ 2.43 + { MODKEY, XK_space, togglemode, { 0 } }, \ 2.44 + { MODKEY, XK_Return, zoom, { 0 } }, \ 2.45 + { MODKEY|ControlMask, XK_0, appendtag, { .i = Tfnord } }, \ 2.46 + { MODKEY|ControlMask, XK_1, appendtag, { .i = Tdev } }, \ 2.47 + { MODKEY|ControlMask, XK_2, appendtag, { .i = Tnet } }, \ 2.48 + { MODKEY|ControlMask, XK_3, appendtag, { .i = Twork } }, \ 2.49 + { MODKEY|ControlMask, XK_4, appendtag, { .i = Tmisc } }, \ 2.50 + { MODKEY|ShiftMask, XK_0, replacetag, { .i = Tfnord } }, \ 2.51 + { MODKEY|ShiftMask, XK_1, replacetag, { .i = Tdev } }, \ 2.52 + { MODKEY|ShiftMask, XK_2, replacetag, { .i = Tnet } }, \ 2.53 + { MODKEY|ShiftMask, XK_3, replacetag, { .i = Twork } }, \ 2.54 + { MODKEY|ShiftMask, XK_4, replacetag, { .i = Tmisc } }, \ 2.55 + { MODKEY|ShiftMask, XK_c, killclient, { 0 } }, \ 2.56 + { MODKEY|ShiftMask, XK_q, quit, { 0 } }, \ 2.57 + { MODKEY|ShiftMask, XK_Return, spawn, { .argv = term } }, \ 2.58 +}; 2.59 + 2.60 +#define RULES \ 2.61 +static Rule rule[] = { \ 2.62 + /* class:instance tags isfloat */ \ 2.63 + { "Firefox.*", { [Tnet] = "net" }, False }, \ 2.64 + { "Gimp.*", { 0 }, True}, \ 2.65 +};
3.1 --- a/config.mk Wed Aug 02 16:38:21 2006 +0200 3.2 +++ b/config.mk Wed Aug 02 16:46:59 2006 +0200 3.3 @@ -3,9 +3,6 @@ 3.4 3.5 # Customize below to fit your system 3.6 3.7 -# configheader 3.8 -CONFIG = config.h 3.9 - 3.10 # paths 3.11 PREFIX = /usr/local 3.12 MANPREFIX = ${PREFIX}/share/man 3.13 @@ -18,9 +15,9 @@ 3.14 LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 3.15 3.16 # flags 3.17 -CFLAGS = -O3 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIG}\" 3.18 +CFLAGS = -O3 ${INCS} -DVERSION=\"${VERSION}\" 3.19 LDFLAGS = ${LIBS} 3.20 -#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DCONFIG=\"${CONFIG}\" 3.21 +#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" 3.22 #LDFLAGS = -g ${LIBS} 3.23 3.24 # compiler
4.1 --- a/dwm.h Wed Aug 02 16:38:21 2006 +0200 4.2 +++ b/dwm.h Wed Aug 02 16:46:59 2006 +0200 4.3 @@ -3,7 +3,7 @@ 4.4 * See LICENSE file for license details. 4.5 */ 4.6 4.7 -#include CONFIG 4.8 +#include "config.h" 4.9 #include <X11/Xlib.h> 4.10 4.11 /* mask shorthands, used in event.c and client.c */