2wm

commit c3bfb42abc9c3e496f37ec96148de591c709eb69
parent 9ac0a667401a2c419385e6c62019f5773b69e4c3
Author: Anselm R. Garbe <arg@suckless.org>
Date:   Mon, 12 Feb 2007 15:19:45 +0100

prepared sbar-integration to 2wm
Diffstat:
config.default.h
 | 
8
++++----
main.c
 | 
7
++++---
view.c
 | 
1
+

3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/config.default.h b/config.default.h
@@ -7,11 +7,11 @@
 #define SELCOLOR		"#69c"
 
 #define SY			0
-#define SH			DisplayHeight(0		/* sy = YOFFSET */
-#define MASTER			600		/* per thousand */
+#define SH			DisplayHeight(dpy, screen)
+#define MASTER			600				/* per thousand */
 #define MODKEY			Mod1Mask
-#define NMASTER			1		/* clients in master area */
-#define SNAP			40		/* pixel */
+#define NMASTER			1				/* clients in master area */
+#define SNAP			40				/* pixel */
 
 #define KEYS \
 static Key key[] = { \
diff --git a/main.c b/main.c
@@ -143,7 +143,7 @@ main(int argc, char *argv[]) {
 	XSetWindowAttributes wa;
 
 	if(argc == 2 && !strncmp("-v", argv[1], 3))
-		eprint("2wm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
+		eprint("2wm-"VERSION", (C)opyright MMVII Anselm R. Garbe\n");
 	else if(argc != 1)
 		eprint("usage: 2wm [-v]\n");
 	setlocale(LC_CTYPE, "");
@@ -198,9 +198,10 @@ main(int argc, char *argv[]) {
 	normcol = getcolor(NORMCOLOR);
 	selcol = getcolor(SELCOLOR);
 	/* geometry */
-	sx = sy = 0;
+	sx = 0;
+	sy = SY;
 	sw = DisplayWidth(dpy, screen);
-	sh = DisplayHeight(dpy, screen);
+	sh = SH;
 	master = MASTER;
 	nmaster = NMASTER;
 	/* multihead support */
diff --git a/view.c b/view.c
@@ -128,6 +128,7 @@ attach(Arg *arg) {
 	if(!c)
 		return;
 	c->view = !c->view;
+	pop(c);
 	focus(c);
 	arrange();
 }