X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;ds=sidebyside;f=wm.c;h=a4caf64c1f9dc335977c12e3584f5ce9ce4b2d1b;hb=8a8b7956b6de80decbfd3bff6d2ad6e5bb69b2bd;hp=de5324c0736a63f35fbd9caa7c18fb16ed103f78;hpb=1076f2b6b3d3751d5d5db6fcb9ac8c247e04e893;p=dwm.git

diff --git a/wm.c b/wm.c
index de5324c..a4caf64 100644
--- a/wm.c
+++ b/wm.c
@@ -13,15 +13,21 @@
 
 #include "wm.h"
 
+/* X structs */
 Display *dpy;
-Window root;
-XRectangle rect;
-int screen, sel_screen;
-Atom wm_atom[WMLast];
-Atom net_atom[NetLast];
+Window root, barwin;
+Atom wm_atom[WMLast], net_atom[NetLast];
 Cursor cursor[CurLast];
-unsigned int kmask, numlock_mask;
-Pixmap pmap;
+XRectangle rect, barrect;
+Bool running = True;
+Client *client = NULL;
+
+char *bartext, tag[256];
+int screen, sel_screen;
+unsigned int lock_mask, numlock_mask;
+
+/* draw structs */
+Brush brush = {0};
 
 enum { WM_PROTOCOL_DELWIN = 1 };
 
@@ -36,15 +42,6 @@ usage()
 	exit(1);
 }
 
-void
-error(char *errstr, ...) {
-	va_list ap;
-	va_start(ap, errstr);
-	vfprintf(stderr, errstr, ap);
-	va_end(ap);
-	exit(1);
-}
-
 static void
 scan_wins()
 {
@@ -60,7 +57,7 @@ scan_wins()
 			if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
 				continue;
 			if(wa.map_state == IsViewable)
-				/*manage*/;
+				manage(create_client(wins[i], &wa));
 		}
 	}
 	if(wins)
@@ -78,12 +75,11 @@ win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
 	status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
 			&res, &extra, prop);
 
-	if(status != Success || *prop == 0) {
+	if(status != Success || *prop == NULL) {
 		return 0;
 	}
-	if(res == 0) {
+	if(res == 0)
 		free((void *) *prop);
-	}
 	return res;
 }
 
@@ -170,7 +166,7 @@ init_lock_keys()
 	}
 	XFreeModifiermap(modmap);
 
-	kmask = 255 & ~(numlock_mask | LockMask);
+	lock_mask = 255 & ~(numlock_mask | LockMask);
 }
 
 static void
@@ -191,6 +187,7 @@ main(int argc, char *argv[])
 	XSetWindowAttributes wa;
 	unsigned int mask;
 	Window w;
+	XEvent ev;
 
 	/* command line args */
 	for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
@@ -217,7 +214,7 @@ main(int argc, char *argv[])
 	XSetErrorHandler(startup_error_handler);
 	/* this causes an error if some other WM is running */
 	XSelectInput(dpy, root, SubstructureRedirectMask);
-	XSync(dpy, False);
+	XFlush(dpy);
 
 	if(other_wm_running)
 		error("gridwm: another window manager is already running\n");
@@ -248,8 +245,29 @@ main(int argc, char *argv[])
 
 	init_lock_keys();
 
-	pmap = XCreatePixmap(dpy, root, rect.width, rect.height,
+	brush.drawable = XCreatePixmap(dpy, root, rect.width, rect.height,
 			DefaultDepth(dpy, screen));
+	brush.gc = XCreateGC(dpy, root, 0, 0);
+
+	/* style */
+	loadcolors(dpy, screen, &brush, BGCOLOR, FGCOLOR, BORDERCOLOR);
+	loadfont(dpy, &brush.font, FONT);
+
+	wa.override_redirect = 1;
+	wa.background_pixmap = ParentRelative;
+	wa.event_mask = ExposureMask;
+
+	barrect = rect;
+	barrect.height = labelheight(&brush.font);
+	barrect.y = rect.height - barrect.height;
+	barwin = XCreateWindow(dpy, root, barrect.x, barrect.y,
+			barrect.width, barrect.height, 0, DefaultDepth(dpy, screen),
+			CopyFromParent, DefaultVisual(dpy, screen),
+			CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
+	bartext = NULL;
+	XDefineCursor(dpy, barwin, cursor[CurNormal]);
+	XMapRaised(dpy, barwin);
+	draw_bar();
 
 	wa.event_mask = SubstructureRedirectMask | EnterWindowMask | LeaveWindowMask;
 	wa.cursor = cursor[CurNormal];
@@ -257,6 +275,12 @@ main(int argc, char *argv[])
 
 	scan_wins();
 
+	while(running) {
+		XNextEvent(dpy, &ev);
+		if(handler[ev.type])
+			(handler[ev.type]) (&ev); /* call handler */
+	}
+
 	cleanup();
 	XCloseDisplay(dpy);