1.1 --- a/main.c	Mon Jul 17 08:37:37 2006 +0200
     1.2 +++ b/main.c	Mon Jul 17 09:12:29 2006 +0200
     1.3 @@ -14,26 +14,12 @@
     1.4  #include <X11/Xatom.h>
     1.5  #include <X11/Xproto.h>
     1.6  
     1.7 -Display *dpy;
     1.8 -Window root, barwin;
     1.9 -Atom wmatom[WMLast], netatom[NetLast];
    1.10 -Cursor cursor[CurLast];
    1.11 -Bool running = True;
    1.12 -Bool issel = True;
    1.13  
    1.14 -int tsel = Tdev; /* default tag */
    1.15 -int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
    1.16 -char stext[1024];
    1.17 -
    1.18 -DC dc = {0};
    1.19 -Client *clients = NULL;
    1.20 -Client *sel = NULL;
    1.21 +/* static */
    1.22  
    1.23  static Bool otherwm;
    1.24  static int (*xerrorxlib)(Display *, XErrorEvent *);
    1.25  
    1.26 -/* static functions */
    1.27 -
    1.28  static void
    1.29  cleanup()
    1.30  {
    1.31 @@ -97,7 +83,20 @@
    1.32  	return -1;
    1.33  }
    1.34  
    1.35 -/* extern functions */
    1.36 +/* extern */
    1.37 +
    1.38 +char stext[1024];
    1.39 +int tsel = Tdev; /* default tag */
    1.40 +int screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
    1.41 +Atom wmatom[WMLast], netatom[NetLast];
    1.42 +Bool running = True;
    1.43 +Bool issel = True;
    1.44 +Client *clients = NULL;
    1.45 +Client *sel = NULL;
    1.46 +Cursor cursor[CurLast];
    1.47 +Display *dpy;
    1.48 +DC dc = {0};
    1.49 +Window root, barwin;
    1.50  
    1.51  int
    1.52  getproto(Window w)
    1.53 @@ -141,10 +140,9 @@
    1.54  }
    1.55  
    1.56  /*
    1.57 - * There's no way to check accesses to destroyed windows, thus
    1.58 - * those cases are ignored (especially on UnmapNotify's).
    1.59 - * Other types of errors call Xlib's default error handler, which
    1.60 - * calls exit().
    1.61 + * There's no way to check accesses to destroyed windows, thus those cases are
    1.62 + * ignored (especially on UnmapNotify's).  Other types of errors call Xlibs
    1.63 + * default error handler, which calls exit().
    1.64   */
    1.65  int
    1.66  xerror(Display *dpy, XErrorEvent *ee)