X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=ed055c2a6fc92697a4b446e4340be1f89a53cb4f;hb=0045ad87dfb32f35fc17b5b8942049cfe84d623c;hp=4406b886a61c73e195cce5e38b2ec796a769c4c2;hpb=cb4aa5bc35cf16a06bb2b4e880648e390fa2cc55;p=dwm.git

diff --git a/main.c b/main.c
index 4406b88..ed055c2 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* (C)opyright MMVII Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 
@@ -17,10 +17,10 @@
 
 /* extern */
 
-char stext[1024];
+char stext[256];
 Bool *seltag;
 int bx, by, bw, bh, bmw, masterd, screen, sx, sy, sw, sh, wax, way, waw, wah;
-unsigned int master, ntags, numlockmask;
+unsigned int master, nmaster, ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool running = True;
 Bool issel = True;
@@ -40,9 +40,9 @@ static Bool otherwm, readin;
 static void
 cleanup(void) {
 	close(STDIN_FILENO);
-	while(clients) {
-		resize(clients, True, TopLeft);
-		unmanage(clients);
+	while(stack) {
+		resize(stack, True, TopLeft);
+		unmanage(stack);
 	}
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
@@ -101,6 +101,7 @@ setup(void) {
 	cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
 	cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 	/* init modifier map */
+	numlockmask = 0;
 	modmap = XGetModifierMapping(dpy);
 	for (i = 0; i < 8; i++) {
 		for (j = 0; j < modmap->max_keypermod; j++) {
@@ -120,19 +121,20 @@ setup(void) {
 	seltag = emallocz(sizeof(Bool) * ntags);
 	seltag[0] = True;
 	/* style */
+	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.status[ColBG] = getcolor(STATUSBGCOLOR);
-	dc.status[ColFG] = getcolor(STATUSFGCOLOR);
 	setfont(FONT);
 	/* geometry */
-	bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ?  textw(TILESYMBOL) : textw(FLOATSYMBOL);
 	sx = sy = 0;
 	sw = DisplayWidth(dpy, screen);
 	sh = DisplayHeight(dpy, screen);
 	master = MASTER;
+	nmaster = NMASTER;
+	bmw = textw(TILESYMBOL) > textw(FLOATSYMBOL) ? textw(TILESYMBOL) : textw(FLOATSYMBOL);
 	/* bar */
 	bx = sx;
 	by = sy;
@@ -236,7 +238,7 @@ main(int argc, char *argv[]) {
 	fd_set rd;
 
 	if(argc == 2 && !strncmp("-v", argv[1], 3)) {
-		fputs("dwm-"VERSION", (C)opyright MMVII Anselm R. Garbe\n", stdout);
+		fputs("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n", stdout);
 		exit(EXIT_SUCCESS);
 	}
 	else if(argc != 1)