cleaned up code

[dwm.git] / main.c

diff --git a/main.c b/main.c
index 5cf2738..d18cd0c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -14,31 +14,17 @@
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
 
-Display *dpy;
-Window root, barwin;
-Atom wmatom[WMLast], netatom[NetLast];
-Cursor cursor[CurLast];
-Bool running = True;
-Bool issel = True;
 
-int tsel = Tdev; /* default tag */
-int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
-char stext[1024];
+/* static */
 
-DC dc = {0};
-Client *clients = NULL;
-Client *sel = NULL;
-
-static Bool otherwm;
 static int (*xerrorxlib)(Display *, XErrorEvent *);
-
-/* static functions */
+static Bool otherwm;
 
 static void
 cleanup()
 {
        while(sel) {
-               resize(sel, True);
+               resize(sel, True, TopLeft);
                unmanage(sel);
        }
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
@@ -48,9 +34,8 @@ static void
 scan()
 {
        unsigned int i, num;
-       Window *wins;
+       Window *wins, d1, d2;
        XWindowAttributes wa;
-       Window d1, d2;
 
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
@@ -69,10 +54,9 @@ scan()
 static int
 win_property(Window w, Atom a, Atom t, long l, unsigned char **prop)
 {
-       Atom real;
-       int format;
+       int status, format;
        unsigned long res, extra;
-       int status;
+       Atom real;
 
        status = XGetWindowProperty(dpy, w, a, 0L, l, False, t, &real, &format,
                        &res, &extra, prop);
@@ -97,15 +81,28 @@ xerrorstart(Display *dsply, XErrorEvent *ee)
        return -1;
 }
 
-/* extern functions */
+/* extern */
+
+char stext[1024];
+int tsel = Tdev; /* default tag */
+int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
+Atom wmatom[WMLast], netatom[NetLast];
+Bool running = True;
+Bool issel = True;
+Client *clients = NULL;
+Client *sel = NULL;
+Cursor cursor[CurLast];
+Display *dpy;
+DC dc = {0};
+Window root, barwin;
 
 int
 getproto(Window w)
 {
-       unsigned char *protocols;
-       long res;
        int protos = 0;
        int i;
+       long res;
+       unsigned char *protocols;
 
        res = win_property(w, wmatom[WMProtocols], XA_ATOM, 20L, &protocols);
        if(res <= 0) {
@@ -131,7 +128,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
@@ -141,30 +138,23 @@ quit(Arg *arg)
 }
 
 /*
- * 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().
+ * There's no way to check accesses to destroyed windows, thus those cases are
+ * ignored (especially on UnmapNotify's).  Other types of errors call Xlibs
+ * default error handler, which calls exit().
  */
 int
 xerror(Display *dpy, XErrorEvent *ee)
 {
        if(ee->error_code == BadWindow
-                       || (ee->request_code == X_SetInputFocus
-                               && ee->error_code == BadMatch)
-                       || (ee->request_code == X_PolyText8
-                               && ee->error_code == BadDrawable)
-                       || (ee->request_code == X_PolyFillRectangle
-                               && ee->error_code == BadDrawable)
-                       || (ee->request_code == X_PolySegment
-                               && ee->error_code == BadDrawable)
-                       || (ee->request_code == X_ConfigureWindow
-                               && ee->error_code == BadMatch)
-                       || (ee->request_code == X_GrabKey
-                               && ee->error_code == BadAccess))
+       || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
+       || (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
+       || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
+       || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
+       || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
+       || (ee->request_code == X_GrabKey && ee->error_code == BadAccess))
                return 0;
        fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
-                       ee->request_code, ee->error_code);
+               ee->request_code, ee->error_code);
        return xerrorxlib(dpy, ee); /* may call exit() */
 }
 
@@ -172,23 +162,22 @@ int
 main(int argc, char *argv[])
 {
        int i, n;
-       fd_set rd;
-       XSetWindowAttributes wa;
        unsigned int mask;
+       fd_set rd;
        Bool readstdin = True;
        Window w;
        XEvent ev;
+       XSetWindowAttributes wa;
 
        for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
                switch (argv[i][1]) {
-               case 'v':
-                       fprintf(stdout, "%s",
-                                       "dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n");
-                       exit(0);
-                       break;
                default:
                        eprint("usage: dwm [-v]\n");
                        break;
+               case 'v':
+                       fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+                       exit(EXIT_SUCCESS);
+                       break;
                }
        }
 
@@ -257,10 +246,8 @@ main(int argc, char *argv[])
 
        issel = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
 
-       wa.event_mask = SubstructureRedirectMask | EnterWindowMask \
-                                       | LeaveWindowMask;
+       wa.event_mask = SubstructureRedirectMask | EnterWindowMask | LeaveWindowMask;
        wa.cursor = cursor[CurNormal];
-
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
        strcpy(stext, "dwm-"VERSION);