X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/74cbbe5f3549cc3f95f9bf14a356ecfbb9a8f481..a967d7f66447b1b3023cdb4b5a10fca2cfb23b05:/main.c?ds=inline

diff --git a/main.c b/main.c
index d39c913..af1f1a6 100644
--- a/main.c
+++ b/main.c
@@ -1,7 +1,6 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * See LICENSE file for license details. */
 #include "dwm.h"
 #include <errno.h>
 #include <locale.h>
@@ -19,7 +18,7 @@
 
 char stext[256];
 int screen, sx, sy, sw, sh, wax, way, waw, wah;
-unsigned int bh, ntags, numlockmask;
+unsigned int bh, bpos, ntags, numlockmask;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool *seltag;
 Bool selscreen = True;
@@ -82,7 +81,7 @@ initfont(const char *fontstr) {
 	dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
 	if(missing) {
 		while(n--)
-			fprintf(stderr, "missing fontset: %s\n", missing[n]);
+			fprintf(stderr, "dwm: missing fontset: %s\n", missing[n]);
 		XFreeStringList(missing);
 	}
 	if(dc.font.set) {
@@ -164,9 +163,10 @@ setup(void) {
 	XFreeModifiermap(modmap);
 	/* select for events */
 	wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
-		| EnterWindowMask | LeaveWindowMask;
+		| EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
 	wa.cursor = cursor[CurNormal];
 	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
+	XSelectInput(dpy, root, wa.event_mask);
 	grabkeys();
 	compileregs();
 	for(ntags = 0; tags[ntags]; ntags++);
@@ -190,21 +190,20 @@ setup(void) {
 	wa.override_redirect = 1;
 	wa.background_pixmap = ParentRelative;
 	wa.event_mask = ButtonPressMask | ExposureMask;
-	barwin = XCreateWindow(dpy, root, sx, sy + (TOPBAR ? 0 : sh - bh), sw, bh, 0,
+	barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0,
 			DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 	XDefineCursor(dpy, barwin, cursor[CurNormal]);
+	bpos = BARPOS;
+	updatebarpos();
 	XMapRaised(dpy, barwin);
 	strcpy(stext, "dwm-"VERSION);
-	/* windowarea */
-	wax = sx;
-	way = sy + (TOPBAR ? bh : 0);
-	wah = sh - bh;
-	waw = sw;
 	/* pixmap for everything */
 	dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
 	dc.gc = XCreateGC(dpy, root, 0, 0);
 	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+	if(!dc.font.set)
+		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 	/* multihead support */
 	selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 }
@@ -222,22 +221,34 @@ xerrorstart(Display *dsply, XErrorEvent *ee) {
 /* extern */
 
 void
-sendevent(Window w, Atom a, long value) {
-	XEvent e;
-
-	e.type = ClientMessage;
-	e.xclient.window = w;
-	e.xclient.message_type = a;
-	e.xclient.format = 32;
-	e.xclient.data.l[0] = value;
-	e.xclient.data.l[1] = CurrentTime;
-	XSendEvent(dpy, w, False, NoEventMask, &e);
-	XSync(dpy, False);
+quit(const char *arg) {
+	readin = running = False;
 }
 
 void
-quit(Arg *arg) {
-	readin = running = False;
+updatebarpos(void) {
+	XEvent ev;
+
+	wax = sx;
+	way = sy;
+	wah = sh;
+	waw = sw;
+	switch(bpos) {
+	default:
+		wah -= bh;
+		way += bh;
+		XMoveWindow(dpy, barwin, sx, sy);
+		break;
+	case BarBot:
+		wah -= bh;
+		XMoveWindow(dpy, barwin, sx, sy + wah);
+		break;
+	case BarOff:
+		XMoveWindow(dpy, barwin, sx, sy - bh);
+		break;
+	}
+	XSync(dpy, False);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 /* There's no way to check accesses to destroyed windows, thus those cases are
@@ -268,7 +279,7 @@ main(int argc, char *argv[]) {
 	XEvent ev;
 
 	if(argc == 2 && !strncmp("-v", argv[1], 3))
-		eprint("dwm-"VERSION", (C)opyright MMVI-MMVII Anselm R. Garbe\n");
+		eprint("dwm-"VERSION", © 2004-2007 Anselm R. Garbe, Sander van Dijk\n");
 	else if(argc != 1)
 		eprint("usage: dwm [-v]\n");
 	setlocale(LC_CTYPE, "");
@@ -325,12 +336,11 @@ main(int argc, char *argv[]) {
 			}
 			drawstatus();
 		}
-		if(FD_ISSET(xfd, &rd))
-			while(XPending(dpy)) {
-				XNextEvent(dpy, &ev);
-				if(handler[ev.type])
-					(handler[ev.type])(&ev); /* call handler */
-			}
+		while(XPending(dpy)) {
+			XNextEvent(dpy, &ev);
+			if(handler[ev.type])
+				(handler[ev.type])(&ev); /* call handler */
+		}
 	}
 	cleanup();
 	XCloseDisplay(dpy);