git.stevedylan.dev

removed font and color definitions 1edf6a78

Anselm R Garbe · 2008-06-14 10:38 2 file(s) · +29 −28

config.def.h +21 −18

/* See LICENSE file for copyright and license details. */

/* appearance */
#define FONT            "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*"
#define NORMBORDERCOLOR "#cccccc"
#define NORMBGCOLOR     "#cccccc"
#define NORMFGCOLOR     "#000000"
#define SELBORDERCOLOR  "#0066ff"
#define SELBGCOLOR      "#0066ff"
#define SELFGCOLOR      "#ffffff"
static uint borderpx    = 1;        /* border pixel of windows */
static uint snap        = 32;       /* snap pixel */
static Bool showbar     = True;     /* False means no bar */
static Bool topbar      = True;     /* False means bottom bar */
static const char font[]            = "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*";
static const char normbordercolor[] = "#cccccc";
static const char normbgcolor[]     = "#cccccc";
static const char normfgcolor[]     = "#000000";
static const char selbordercolor[]  = "#0066ff";
static const char selbgcolor[]      = "#0066ff";
static const char selfgcolor[]      = "#ffffff";
static uint borderpx                = 1;        /* border pixel of windows */
static uint snap                    = 32;       /* snap pixel */
static Bool showbar                 = True;     /* False means no bar */
static Bool topbar                  = True;     /* False means bottom bar */

#ifdef XINERAMA
static uint xidx        = 0;        /* Xinerama screen index to use */
static uint xidx                    = 0;        /* Xinerama screen index to use */
#endif

/* tagging */

	{ MODKEY|ControlMask|ShiftMask, KEY,      toggletag,      {.ui = 1 << TAG} },

/* helper for spawning shell commands in the pre dwm-5.0 fashion */
#define SHCMD(cmd) { .v = (char*[]){ "/bin/sh", "-c", cmd, NULL } }
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }

/* commands */
static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
static const char *termcmd[]  = { "uxterm", NULL };

static Key keys[] = {
	/* modifier                     key        function        argument */
	{ MODKEY,                       XK_p,      spawn,          {.v = (char *[]){"dmenu_run", "-fn", FONT, "-nb", NORMBGCOLOR, "-nf", NORMFGCOLOR, "-sb", SELBGCOLOR, "-sf", SELFGCOLOR, NULL}} },
	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = (char *[]){"uxterm", NULL}} },
	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
	{ MODKEY,                       XK_b,      togglebar,      {0} },
	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },

	/* click                event mask      button          function        argument */
	{ ClkLtSymbol,          0,              Button1,        togglelayout,   {0} },
	{ ClkLtSymbol,          0,              Button3,        togglemax,      {0} },
	{ ClkWinTitle,          0,              Button1,        movemouse,      {0} },
	{ ClkWinTitle,          0,              Button2,        zoom,           {0} },
	{ ClkWinTitle,          0,              Button3,        resizemouse,    {0} },
	{ ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } },
	{ ClkWinTitle,          0,              Button4,        focusstack,     {.i = +1 } },
	{ ClkWinTitle,          0,              Button5,        focusstack,     {.i = -1 } },
	{ ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
	{ ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
	{ ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },
	{ ClkRootWin,           Button1Mask,    Button3,        spawn,          {.v = (char *[]){"uxterm", NULL}} },
	{ ClkRootWin,           Button1Mask,    Button3,        spawn,          {.v = termcmd } },
	TAGBUTTONS(0)
	TAGBUTTONS(1)
	TAGBUTTONS(2)

dwm.c +8 −10

	/* init screen */
	screen = DefaultScreen(dpy);
	root = RootWindow(dpy, screen);
	initfont(FONT);
	initfont(font);
	sx = 0;
	sy = 0;
	sw = DisplayWidth(dpy, screen);
	sh = DisplayHeight(dpy, screen);
	bh = dc.font.height + 2;
	bh = dc.h = dc.font.height + 2;
	lt = layouts;
	updategeom();


	cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);

	/* init appearance */
	dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
	dc.norm[ColFG] = getcolor(NORMFGCOLOR);
	dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
	dc.sel[ColBG] = getcolor(SELBGCOLOR);
	dc.sel[ColFG] = getcolor(SELFGCOLOR);
	initfont(FONT);
	dc.h = bh;
	dc.norm[ColBorder] = getcolor(normbordercolor);
	dc.norm[ColBG] = getcolor(normbgcolor);
	dc.norm[ColFG] = getcolor(normfgcolor);
	dc.sel[ColBorder] = getcolor(selbordercolor);
	dc.sel[ColBG] = getcolor(selbgcolor);
	dc.sel[ColFG] = getcolor(selfgcolor);
	dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
	dc.gc = XCreateGC(dpy, root, 0, 0);
	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);

1	1		/* See LICENSE file for copyright and license details. */
2	2
3	3		/* appearance */
4		-	#define FONT "--terminus-medium-r-normal--14-------*"
5		-	#define NORMBORDERCOLOR "#cccccc"
6		-	#define NORMBGCOLOR "#cccccc"
7		-	#define NORMFGCOLOR "#000000"
8		-	#define SELBORDERCOLOR "#0066ff"
9		-	#define SELBGCOLOR "#0066ff"
10		-	#define SELFGCOLOR "#ffffff"
11		-	static uint borderpx = 1; /* border pixel of windows */
12		-	static uint snap = 32; /* snap pixel */
13		-	static Bool showbar = True; /* False means no bar */
14		-	static Bool topbar = True; /* False means bottom bar */
	4	+	static const char font[] = "--terminus-medium-r-normal--14-------*";
	5	+	static const char normbordercolor[] = "#cccccc";
	6	+	static const char normbgcolor[] = "#cccccc";
	7	+	static const char normfgcolor[] = "#000000";
	8	+	static const char selbordercolor[] = "#0066ff";
	9	+	static const char selbgcolor[] = "#0066ff";
	10	+	static const char selfgcolor[] = "#ffffff";
	11	+	static uint borderpx = 1; /* border pixel of windows */
	12	+	static uint snap = 32; /* snap pixel */
	13	+	static Bool showbar = True; /* False means no bar */
	14	+	static Bool topbar = True; /* False means bottom bar */
15	15
16	16		#ifdef XINERAMA
17		-	static uint xidx = 0; /* Xinerama screen index to use */
	17	+	static uint xidx = 0; /* Xinerama screen index to use */
18	18		#endif
19	19
20	20		/* tagging */

45	45		{ MODKEY\|ControlMask\|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
46	46
47	47		/* helper for spawning shell commands in the pre dwm-5.0 fashion */
48		-	#define SHCMD(cmd) { .v = (char*[]){ "/bin/sh", "-c", cmd, NULL } }
	48	+	#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
	49	+
	50	+	/* commands */
	51	+	static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
	52	+	static const char *termcmd[] = { "uxterm", NULL };
49	53
50	54		static Key keys[] = {
51	55		/* modifier key function argument */
52		-	{ MODKEY, XK_p, spawn, {.v = (char *[]){"dmenu_run", "-fn", FONT, "-nb", NORMBGCOLOR, "-nf", NORMFGCOLOR, "-sb", SELBGCOLOR, "-sf", SELFGCOLOR, NULL}} },
53		-	{ MODKEY\|ShiftMask, XK_Return, spawn, {.v = (char *[]){"uxterm", NULL}} },
	56	+	{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
	57	+	{ MODKEY\|ShiftMask, XK_Return, spawn, {.v = termcmd } },
54	58		{ MODKEY, XK_b, togglebar, {0} },
55	59		{ MODKEY, XK_j, focusstack, {.i = +1 } },
56	60		{ MODKEY, XK_k, focusstack, {.i = -1 } },

89	93		/* click event mask button function argument */
90	94		{ ClkLtSymbol, 0, Button1, togglelayout, {0} },
91	95		{ ClkLtSymbol, 0, Button3, togglemax, {0} },
92		-	{ ClkWinTitle, 0, Button1, movemouse, {0} },
93	96		{ ClkWinTitle, 0, Button2, zoom, {0} },
94		-	{ ClkWinTitle, 0, Button3, resizemouse, {0} },
	97	+	{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
95	98		{ ClkWinTitle, 0, Button4, focusstack, {.i = +1 } },
96	99		{ ClkWinTitle, 0, Button5, focusstack, {.i = -1 } },
97	100		{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
98	101		{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
99	102		{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
100		-	{ ClkRootWin, Button1Mask, Button3, spawn, {.v = (char *[]){"uxterm", NULL}} },
	103	+	{ ClkRootWin, Button1Mask, Button3, spawn, {.v = termcmd } },
101	104		TAGBUTTONS(0)
102	105		TAGBUTTONS(1)
103	106		TAGBUTTONS(2)

1321	1321		/* init screen */
1322	1322		screen = DefaultScreen(dpy);
1323	1323		root = RootWindow(dpy, screen);
1324		-	initfont(FONT);
	1324	+	initfont(font);
1325	1325		sx = 0;
1326	1326		sy = 0;
1327	1327		sw = DisplayWidth(dpy, screen);
1328	1328		sh = DisplayHeight(dpy, screen);
1329		-	bh = dc.font.height + 2;
	1329	+	bh = dc.h = dc.font.height + 2;
1330	1330		lt = layouts;
1331	1331		updategeom();
1332	1332

1344	1344		cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
1345	1345
1346	1346		/* init appearance */
1347		-	dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
1348		-	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
1349		-	dc.norm[ColFG] = getcolor(NORMFGCOLOR);
1350		-	dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
1351		-	dc.sel[ColBG] = getcolor(SELBGCOLOR);
1352		-	dc.sel[ColFG] = getcolor(SELFGCOLOR);
1353		-	initfont(FONT);
1354		-	dc.h = bh;
	1347	+	dc.norm[ColBorder] = getcolor(normbordercolor);
	1348	+	dc.norm[ColBG] = getcolor(normbgcolor);
	1349	+	dc.norm[ColFG] = getcolor(normfgcolor);
	1350	+	dc.sel[ColBorder] = getcolor(selbordercolor);
	1351	+	dc.sel[ColBG] = getcolor(selbgcolor);
	1352	+	dc.sel[ColFG] = getcolor(selfgcolor);
1355	1353		dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
1356	1354		dc.gc = XCreateGC(dpy, root, 0, 0);
1357	1355		XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);