X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=main.c;h=534402c02c5f105529ec0e375a9dd45d704caab8;hb=30561a0161629b15abe1beeb97eec3fc0768efaf;hp=9ea09bff66f6787ae91b06c24655bf472af4e06d;hpb=b35575574be53a1b3be42d7037d2f432a19a3890;p=dwm.git

diff --git a/main.c b/main.c
index 9ea09bf..534402c 100644
--- a/main.c
+++ b/main.c
@@ -102,9 +102,10 @@ getproto(Window w)
 	int protos = 0;
 	int i;
 	long res;
-	unsigned char *protocols;
+	Atom *protocols;
 
-	res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L, &protocols);
+	res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L,
+			((unsigned char **)&protocols));
 	if(res <= 0) {
 		return protos;
 	}
@@ -178,15 +179,14 @@ main(int argc, char *argv[])
 
 	dpy = XOpenDisplay(0);
 	if(!dpy)
-		eprint("dwm: cannot connect X server\n");
+		eprint("dwm: cannot open display\n");
 
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);
 
-	/* check if another WM is already running */
 	otherwm = False;
 	XSetErrorHandler(xerrorstart);
-	/* this causes an error if some other WM is running */
+	/* this causes an error if some other window manager is running */
 	XSelectInput(dpy, root, SubstructureRedirectMask);
 	XSync(dpy, False);
 
@@ -210,13 +210,13 @@ main(int argc, char *argv[])
 	cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
 	grabkeys();
+	initrregs();
 
 	for(ntags = 0; tags[ntags]; ntags++);
 
 	/* style */
 	dc.bg = getcolor(BGCOLOR);
 	dc.fg = getcolor(FGCOLOR);
-	dc.border = getcolor(BORDERCOLOR);
 	setfont(FONT);
 
 	sx = sy = 0;
@@ -239,6 +239,8 @@ main(int argc, char *argv[])
 
 	dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
 	dc.gc = XCreateGC(dpy, root, 0, 0);
+
+	strcpy(stext, "dwm-"VERSION);
 	drawstatus();
 
 	issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
@@ -247,10 +249,9 @@ main(int argc, char *argv[])
 	wa.cursor = cursor[CurNormal];
 	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
-	strcpy(stext, "dwm-"VERSION);
 	scan();
 
-	/* main event loop, reads status text from stdin as well */
+	/* main event loop, also reads status text from stdin */
 	while(running) {
 		FD_ZERO(&rd);
 		if(readin)