X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/1076f2b6b3d3751d5d5db6fcb9ac8c247e04e893..26e134b8a7dae21a699822009674b3131de6e250:/wm.c?ds=inline

diff --git a/wm.c b/wm.c
index de5324c..ef4721d 100644
--- a/wm.c
+++ b/wm.c
@@ -13,21 +13,25 @@
 
 #include "wm.h"
 
+/* X structs */
 Display *dpy;
-Window root;
-XRectangle rect;
-int screen, sel_screen;
-Atom wm_atom[WMLast];
+Window root, barwin;
 Atom net_atom[NetLast];
 Cursor cursor[CurLast];
-unsigned int kmask, numlock_mask;
-Pixmap pmap;
+XRectangle rect, barrect;
+Bool running = True;
+
+char *bartext, tag[256];
+int screen, sel_screen;
+
+Brush brush = {0};
+Client *clients = NULL;
 
 enum { WM_PROTOCOL_DELWIN = 1 };
 
 static Bool other_wm_running;
-static int (*x_error_handler) (Display *, XErrorEvent *);
 static char version[] = "gridwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
+static int (*x_error_handler) (Display *, XErrorEvent *);
 
 static void
 usage()
@@ -36,15 +40,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,61 +55,20 @@ scan_wins()
 			if(wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
 				continue;
 			if(wa.map_state == IsViewable)
-				/*manage*/;
+				manage(wins[i], &wa);
 		}
 	}
 	if(wins)
 		XFree(wins);
 }
 
-static int
-win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
-{
-	Atom real;
-	int format;
-	unsigned long res, extra;
-	int status;
-
-	status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
-			&res, &extra, prop);
-
-	if(status != Success || *prop == 0) {
-		return 0;
-	}
-	if(res == 0) {
-		free((void *) *prop);
-	}
-	return res;
-}
-
-int
-win_proto(Window w)
-{
-	Atom *protocols;
-	long res;
-	int protos = 0;
-	int i;
-
-	res = win_property(w, wm_atom[WMProtocols], XA_ATOM, 20L,
-			((unsigned char **) &protocols));
-	if(res <= 0) {
-		return protos;
-	}
-	for(i = 0; i < res; i++) {
-		if(protocols[i] == wm_atom[WMDelete])
-			protos |= WM_PROTOCOL_DELWIN;
-	}
-	free((char *) protocols);
-	return protos;
-}
-
 /*
  * There's no way to check accesses to destroyed windows, thus
  * those cases are ignored (especially on UnmapNotify's).
  * Other types of errors call Xlib's default error handler, which
  * calls exit().
  */
-static int
+int
 error_handler(Display *dpy, XErrorEvent *error)
 {
 	if(error->error_code == BadWindow
@@ -147,32 +101,6 @@ startup_error_handler(Display *dpy, XErrorEvent *error)
 	return -1;
 }
 
-static void
-init_lock_keys()
-{
-	XModifierKeymap *modmap;
-	KeyCode numlock;
-	int i;
-	static int masks[] = {
-		ShiftMask, LockMask, ControlMask, Mod1Mask,
-		Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
-	};
-
-	numlock_mask = 0;
-	modmap = XGetModifierMapping(dpy);
-	numlock = XKeysymToKeycode(dpy, XStringToKeysym("Num_Lock"));
-
-	if(modmap && modmap->max_keypermod > 0) {
-		int max = (sizeof(masks) / sizeof(int)) * modmap->max_keypermod;
-		for(i = 0; i < max; i++)
-			if(numlock && (modmap->modifiermap[i] == numlock))
-				numlock_mask = masks[i / modmap->max_keypermod];
-	}
-	XFreeModifiermap(modmap);
-
-	kmask = 255 & ~(numlock_mask | LockMask);
-}
-
 static void
 cleanup()
 {
@@ -191,6 +119,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 +146,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");
@@ -231,9 +160,6 @@ main(int argc, char *argv[])
 	x_error_handler = XSetErrorHandler(error_handler);
 
 	/* init atoms */
-	wm_atom[WMState] = XInternAtom(dpy, "WM_STATE", False);
-	wm_atom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
-	wm_atom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
 	net_atom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
 	net_atom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
 
@@ -246,17 +172,45 @@ main(int argc, char *argv[])
 	cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
 	cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
-	init_lock_keys();
+	update_keys();
 
-	pmap = XCreatePixmap(dpy, root, rect.width, rect.height,
+	brush.drawable = XCreatePixmap(dpy, root, rect.width, rect.height,
 			DefaultDepth(dpy, screen));
-
-	wa.event_mask = SubstructureRedirectMask | EnterWindowMask | LeaveWindowMask;
+	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];
 	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
 	scan_wins();
 
+	while(running) {
+		XNextEvent(dpy, &ev);
+		if(handler[ev.type])
+			(handler[ev.type]) (&ev); /* call handler */
+	}
+
 	cleanup();
 	XCloseDisplay(dpy);