X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=2d132a5d84d50922843a6acdeea10afb7cda3259;hb=e6cbe9c11e88537d74eb094ba5844f71ee57f268;hp=b96157cf5e343e4536be0d27c8857ff4d5afb51f;hpb=adaa28a6e600f636f5e86244ccef69e98419ba1a;p=dwm.git

diff --git a/main.c b/main.c
index b96157c..2d132a5 100644
--- a/main.c
+++ b/main.c
@@ -16,10 +16,10 @@
 
 Display *dpy;
 Window root, barwin;
-Atom wm_atom[WMLast], net_atom[NetLast];
+Atom wmatom[WMLast], netatom[NetLast];
 Cursor cursor[CurLast];
 Bool running = True;
-Bool issel;
+Bool issel = True;
 
 int tsel = Tdev; /* default tag */
 int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
@@ -30,8 +30,6 @@ Client *clients = NULL;
 Client *sel = NULL;
 
 static Bool otherwm;
-static const char version[] =
-	"dwm-" VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 
 /* static functions */
@@ -109,12 +107,12 @@ getproto(Window w)
 	int protos = 0;
 	int i;
 
-	res = win_property(w, wm_atom[WMProtocols], XA_ATOM, 20L, &protocols);
+	res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L, &protocols);
 	if(res <= 0) {
 		return protos;
 	}
 	for(i = 0; i < res; i++) {
-		if(protocols[i] == wm_atom[WMDelete])
+		if(protocols[i] == wmatom[WMDelete])
 			protos |= WM_PROTOCOL_DELWIN;
 	}
 	free((char *) protocols);
@@ -133,7 +131,7 @@ sendevent(Window w, Atom a, long value)
 	e.xclient.data.l[0] = value;
 	e.xclient.data.l[1] = CurrentTime;
 	XSendEvent(dpy, w, False, NoEventMask, &e);
-	XFlush(dpy);
+	XSync(dpy, False);
 }
 
 void
@@ -184,7 +182,8 @@ main(int argc, char *argv[])
 	for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
 		switch (argv[i][1]) {
 		case 'v':
-			fprintf(stdout, "%s", version);
+			fprintf(stdout, "%s",
+					"dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n");
 			exit(0);
 			break;
 		default:
@@ -205,21 +204,21 @@ main(int argc, char *argv[])
 	XSetErrorHandler(xerrorstart);
 	/* this causes an error if some other WM is running */
 	XSelectInput(dpy, root, SubstructureRedirectMask);
-	XFlush(dpy);
+	XSync(dpy, False);
 
 	if(otherwm)
 		eprint("dwm: another window manager is already running\n");
 
-	XSetErrorHandler(0);
+	XSetErrorHandler(NULL);
 	xerrorxlib = XSetErrorHandler(xerror);
 
 	/* init atoms */
-	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);
-	XChangeProperty(dpy, root, net_atom[NetSupported], XA_ATOM, 32,
-			PropModeReplace, (unsigned char *) net_atom, NetLast);
+	wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
+	wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
+	netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
+	netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
+	XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
+			PropModeReplace, (unsigned char *) netatom, NetLast);
 
 	/* init cursors */
 	cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);