fixed XSync handling and finished man page

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 39172ee..2d132a5 100644 (file)
--- a/main.c
+++ b/main.c
@@ -3,37 +3,23 @@
  * See LICENSE file for license details.
  */
 
+#include "dwm.h"
+
 #include <errno.h>
-#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-
 #include <X11/cursorfont.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 
-#include "dwm.h"
-
-/********** CUSTOMIZE **********/
-
-char *tags[TLast] = {
-       [Tscratch] = "scratch",
-       [Tdev] = "dev",
-       [Twww] = "www",
-       [Twork] = "work",
-};
-
-/********** CUSTOMIZE **********/
-
-/* X structs */
 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;
@@ -44,12 +30,19 @@ 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 */
+
 static void
-usage() {      eprint("usage: dwm [-v]\n"); }
+cleanup()
+{
+       while(sel) {
+               resize(sel, True);
+               unmanage(sel);
+       }
+       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+}
 
 static void
 scan()
@@ -73,22 +66,6 @@ scan()
                XFree(wins);
 }
 
-static void
-cleanup()
-{
-       while(sel) {
-               resize(sel, True);
-               unmanage(sel);
-       }
-       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
-}
-
-void
-quit(Arg *arg)
-{
-       running = False;
-}
-
 static int
 win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
 {
@@ -109,6 +86,19 @@ win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
        return res;
 }
 
+/*
+ * Startup Error handler to check if another window manager
+ * is already running.
+ */
+static int
+xerrorstart(Display *dsply, XErrorEvent *ee)
+{
+       otherwm = True;
+       return -1;
+}
+
+/* extern functions */
+
 int
 getproto(Window w)
 {
@@ -117,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);
@@ -141,18 +131,13 @@ 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);
 }
 
-/*
- * Startup Error handler to check if another window manager
- * is already running.
- */
-static int
-xerrorstart(Display *dsply, XErrorEvent *ee)
+void
+quit(Arg *arg)
 {
-       otherwm = True;
-       return -1;
+       running = False;
 }
 
 /*
@@ -197,11 +182,12 @@ 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:
-                       usage();
+                       eprint("usage: dwm [-v]\n");
                        break;
                }
        }
@@ -218,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);