X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=wm.c;h=ed002f760731722a5cafa5391222a7ebde869a3a;hp=b156cba8badf43e26e354d8519d735292ee8ee54;hb=650a1fb4e1a798aca48a53739f5bb2649191bc1c;hpb=33996500763b04119a6867dfa4040a4236c21a41

diff --git a/wm.c b/wm.c
index b156cba..ed002f7 100644
--- a/wm.c
+++ b/wm.c
@@ -13,32 +13,41 @@
 
 #include "wm.h"
 
+/********** CUSTOMIZE **********/
+
+char *tags[TLast] = {
+	[Tscratch] = "scratch",
+	[Tdev] = "dev",
+	[Tirc] = "irc",
+	[Twww] = "www",
+	[Twork] = "work",
+};
+
+/********** CUSTOMIZE **********/
+
 /* X structs */
 Display *dpy;
 Window root, barwin;
 Atom wm_atom[WMLast], net_atom[NetLast];
 Cursor cursor[CurLast];
-XRectangle rect, barrect;
 Bool running = True;
-Bool sel_screen;
+Bool issel;
 
-char *bartext, tag[256];
-int screen;
+char stext[1024];
+int tsel = Tdev; /* default tag */
+int screen, sx, sy, sw, sh, th;
 
-Brush brush = {0};
+DC dc = {0};
 Client *clients = NULL;
 Client *stack = NULL;
 
 static Bool other_wm_running;
-static char version[] = "gridwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
+static const char version[] =
+	"dwm - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
 static int (*x_error_handler) (Display *, XErrorEvent *);
 
 static void
-usage()
-{
-	fputs("usage: gridwm [-v]\n", stderr);
-	exit(1);
-}
+usage() {	error("usage: dwm [-v]\n"); }
 
 static void
 scan_wins()
@@ -85,13 +94,12 @@ win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
 int
 win_proto(Window w)
 {
-	Atom *protocols;
+	unsigned char *protocols;
 	long res;
 	int protos = 0;
 	int i;
 
-	res = win_property(w, wm_atom[WMProtocols], XA_ATOM, 20L,
-			((unsigned char **) &protocols));
+	res = win_property(w, wm_atom[WMProtocols], XA_ATOM, 20L, &protocols);
 	if(res <= 0) {
 		return protos;
 	}
@@ -141,7 +149,7 @@ error_handler(Display *dpy, XErrorEvent *error)
 			|| (error->request_code == X_GrabKey
 				&& error->error_code == BadAccess))
 		return 0;
-	fprintf(stderr, "gridwm: fatal error: request code=%d, error code=%d\n",
+	fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
 			error->request_code, error->error_code);
 	return x_error_handler(dpy, error); /* may call exit() */
 }
@@ -160,12 +168,15 @@ startup_error_handler(Display *dpy, XErrorEvent *error)
 static void
 cleanup()
 {
-	/*
-	Client *c;
-	for(c=client; c; c=c->next)
-		reparent_client(c, root, c->sel->rect.x, c->sel->rect.y);
+	while(clients)
+		unmanage(clients);
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
-	*/
+}
+
+void
+quit(void *aux)
+{
+	running = False;
 }
 
 int
@@ -192,7 +203,7 @@ main(int argc, char *argv[])
 
 	dpy = XOpenDisplay(0);
 	if(!dpy)
-		error("gridwm: cannot connect X server\n");
+		error("dwm: cannot connect X server\n");
 
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);
@@ -205,12 +216,12 @@ main(int argc, char *argv[])
 	XFlush(dpy);
 
 	if(other_wm_running)
-		error("gridwm: another window manager is already running\n");
+		error("dwm: another window manager is already running\n");
 
-	rect.x = rect.y = 0;
-	rect.width = DisplayWidth(dpy, screen);
-	rect.height = DisplayHeight(dpy, screen);
-	sel_screen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
+	sx = sy = 0;
+	sw = DisplayWidth(dpy, screen);
+	sh = DisplayHeight(dpy, screen);
+	issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 
 	XSetErrorHandler(0);
 	x_error_handler = XSetErrorHandler(error_handler);
@@ -232,29 +243,14 @@ main(int argc, char *argv[])
 
 	update_keys();
 
-	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();
+	initcolors(BGCOLOR, FGCOLOR, BORDERCOLOR);
+	initfont(&dc.font, FONT);
+
+	th = texth(&dc.font);
+
+	dc.drawable = XCreatePixmap(dpy, root, sw, th, DefaultDepth(dpy, screen));
+	dc.gc = XCreateGC(dpy, root, 0, 0);
 
 	wa.event_mask = SubstructureRedirectMask | EnterWindowMask \
 					| LeaveWindowMask;
@@ -266,7 +262,7 @@ main(int argc, char *argv[])
 	while(running) {
 		XNextEvent(dpy, &ev);
 		if(handler[ev.type])
-			(handler[ev.type]) (&ev); /* call handler */
+			(handler[ev.type])(&ev); /* call handler */
 	}
 
 	cleanup();