simplified Mod-m

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 7d2a0de..3699f99 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -17,38 +17,38 @@
  * set the override_redirect flag.  Clients are organized in a global
  * doubly-linked client list, the focus history is remembered through a global
  * stack list. Each client contains an array of Bools of the same size as the
  * set the override_redirect flag.  Clients are organized in a global
  * doubly-linked client list, the focus history is remembered through a global
  * stack list. Each client contains an array of Bools of the same size as the

- * global tags array to indicate the tags of a client.  For each client dwm
- * creates a small title window, which is resized whenever the (_NET_)WM_NAME
- * properties are updated or the client is moved/resized.
+ * global tags array to indicate the tags of a client.  

  *
  *

- * Keys and tagging rules are organized as arrays and defined in the config.h
- * file. These arrays are kept static in event.o and tag.o respectively,
- * because no other part of dwm needs access to them.  The current layout is
- * represented by the lt pointer.
+ * Keys and tagging rules are organized as arrays and defined in config.h.

  *
  * To understand everything else, start reading main().
  */
 #include <errno.h>
 #include <locale.h>
  *
  * To understand everything else, start reading main().
  */
 #include <errno.h>
 #include <locale.h>

-#include <regex.h>

 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/select.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/select.h>

+#include <sys/types.h>

 #include <sys/wait.h>
 #include <sys/wait.h>

+#include <regex.h>

 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>

+#include <X11/Xlib.h>

 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 
 /* macros */
 #define BUTTONMASK             (ButtonPressMask | ButtonReleaseMask)
 #define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 
 /* macros */
 #define BUTTONMASK             (ButtonPressMask | ButtonReleaseMask)
 #define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))

+#define LENGTH(x)              (sizeof x / sizeof x[0])
+#define MAXTAGLEN              16

 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
 #define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 

+

 /* enums */
 enum { BarTop, BarBot, BarOff };                       /* bar position */
 enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
 /* enums */
 enum { BarTop, BarBot, BarOff };                       /* bar position */
 enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */


@@ -61,12 +61,11 @@ typedef struct Client Client;
 struct Client {
        char name[256];
        int x, y, w, h;
 struct Client {
        char name[256];
        int x, y, w, h;

-       int rx, ry, rw, rh; /* revert geometry */

        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int minax, maxax, minay, maxay;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int minax, maxax, minay, maxay;

-       long flags; 
+       long flags;

        unsigned int border, oldborder;
        unsigned int border, oldborder;

-       Bool isbanned, isfixed, ismax, isfloating;
+       Bool isbanned, isfixed, isfloating;

        Bool *tags;
        Client *next;
        Client *prev;
        Bool *tags;
        Client *next;
        Client *prev;


@@ -112,313 +111,431 @@ typedef struct {
        regex_t *tagregex;
 } Regs;
 
        regex_t *tagregex;
 } Regs;
 

-/* functions */
-static void eprint(const char *errstr, ...);
-static void *emallocz(unsigned int size);
-static void spawn(const char *arg);
-static void drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]);
-static unsigned long initcolor(const char *colstr);
-static void initfont(const char *fontstr);
-static Bool isoccupied(unsigned int t);
-static unsigned int textnw(const char *text, unsigned int len);
-static void drawtext(const char *text, unsigned long col[ColLast]);
-static void drawbar(void);
-static void initstyle(void);
-static void initbar(void);
-static unsigned int textw(const char *text);
-static void togglebar(const char *arg);
-static void updatebarpos(void);
-static void attachstack(Client *c);
-static void detachstack(Client *c);
-static void grabbuttons(Client *c, Bool focused);
-static Bool isprotodel(Client *c);
-static void setclientstate(Client *c, long state);
-static int xerrordummy(Display *dsply, XErrorEvent *ee);
-static void ban(Client *c);
-static void configure(Client *c);
-static void killclient(const char *arg);
-static void manage(Window w, XWindowAttributes *wa);
-static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
-static void unban(Client *c);
-static void unmanage(Client *c);
-static void updatesizehints(Client *c);
-static void updatetitle(Client *c);
-static Client *getclient(Window w);
-static void movemouse(Client *c);
-static void resizemouse(Client *c);
-static void buttonpress(XEvent *e);
-static void configurerequest(XEvent *e);
-static void configurenotify(XEvent *e);
-static void destroynotify(XEvent *e);
-static void enternotify(XEvent *e);
-static void expose(XEvent *e);
-static void keypress(XEvent *e);
-static void leavenotify(XEvent *e);
-static void mappingnotify(XEvent *e);
-static void maprequest(XEvent *e);
-static void propertynotify(XEvent *e);
-static void unmapnotify(XEvent *e);
-static unsigned int idxoftag(const char *tag);
-static void floating(void); /* default floating layout */
-static void applyrules(Client *c);
-static void compileregs(void);
-static void focusnext(const char *arg);
-static void focusprev(const char *arg);
-static void initlayouts(void);
-static Bool isfloating(void);
-static Bool isvisible(Client *c);
-static void restack(void);
-static void setlayout(const char *arg);
-static void tag(const char *arg);
-static void togglefloating(const char *arg);
-static void togglemax(const char *arg);
-static void toggletag(const char *arg);
-static void toggleview(const char *arg);
-static void view(const char *arg);
-static void cleanup(void);
-static long getstate(Window w);
-static void scan(void);
-static void setup(void);
-static int xerrorstart(Display *dsply, XErrorEvent *ee);
-static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
-static void quit(const char *arg);
-static int xerror(Display *dpy, XErrorEvent *ee);
-static void arrange(void);
-static void attach(Client *c);
-static void detach(Client *c);
-static void focus(Client *c);
-static Bool isarrange(void (*func)());
-static Client *nexttiled(Client *c);
-static void setmwfact(const char *arg);
-static void tile(void);
-static void zoom(const char *arg);
-
-#include "config.h"
+/* function declarations */
+void applyrules(Client *c);
+void arrange(void);
+void attach(Client *c);
+void attachstack(Client *c);
+void ban(Client *c);
+void buttonpress(XEvent *e);
+void checkotherwm(void);
+void cleanup(void);
+void compileregs(void);
+void configure(Client *c);
+void configurenotify(XEvent *e);
+void configurerequest(XEvent *e);
+void destroynotify(XEvent *e);
+void detach(Client *c);
+void detachstack(Client *c);
+void drawbar(void);
+void drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]);
+void drawtext(const char *text, unsigned long col[ColLast]);
+void *emallocz(unsigned int size);
+void enternotify(XEvent *e);
+void eprint(const char *errstr, ...);
+void expose(XEvent *e);
+void floating(void); /* default floating layout */
+void focus(Client *c);
+void focusin(XEvent *e);
+void focusnext(const char *arg);
+void focusprev(const char *arg);
+Client *getclient(Window w);
+unsigned long getcolor(const char *colstr);
+long getstate(Window w);
+Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
+void grabbuttons(Client *c, Bool focused);
+void grabkeys(void);
+unsigned int idxoftag(const char *tag);
+void initfont(const char *fontstr);
+Bool isoccupied(unsigned int t);
+Bool isprotodel(Client *c);
+Bool isvisible(Client *c);
+void keypress(XEvent *e);
+void killclient(const char *arg);
+void leavenotify(XEvent *e);
+void manage(Window w, XWindowAttributes *wa);
+void mappingnotify(XEvent *e);
+void maprequest(XEvent *e);
+void maximize(const char *arg);
+void movemouse(Client *c);
+Client *nexttiled(Client *c);
+void propertynotify(XEvent *e);
+void quit(const char *arg);
+void reapply(const char *arg);
+void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
+void resizemouse(Client *c);
+void restack(void);
+void run(void);
+void scan(void);
+void setclientstate(Client *c, long state);
+void setlayout(const char *arg);
+void setmwfact(const char *arg);
+void setup(void);
+void spawn(const char *arg);
+void tag(const char *arg);
+unsigned int textnw(const char *text, unsigned int len);
+unsigned int textw(const char *text);
+void tile(void);
+void togglebar(const char *arg);
+void togglefloating(const char *arg);
+void toggletag(const char *arg);
+void toggleview(const char *arg);
+void unban(Client *c);
+void unmanage(Client *c);
+void unmapnotify(XEvent *e);
+void updatebarpos(void);
+void updatesizehints(Client *c);
+void updatetitle(Client *c);
+void view(const char *arg);
+void viewprevtag(const char *arg);     /* views previous selected tags */
+int xerror(Display *dpy, XErrorEvent *ee);
+int xerrordummy(Display *dsply, XErrorEvent *ee);
+int xerrorstart(Display *dsply, XErrorEvent *ee);
+void zoom(const char *arg);

 
 /* variables */
 
 /* variables */

-static char stext[256];
-static double mwfact = MWFACT;
-static int screen, sx, sy, sw, sh, wax, way, waw, wah;
-static int (*xerrorxlib)(Display *, XErrorEvent *);
-static unsigned int bh;
-static unsigned int blw = 0;
-static unsigned int bpos = BARPOS;
-static unsigned int ltidx = 0; /* default */
-static unsigned int nlayouts = 0;
-static unsigned int nrules = 0;
-static unsigned int ntags;
-static unsigned int numlockmask = 0;
-static void (*handler[LASTEvent]) (XEvent *) = {
+char stext[256];
+double mwfact;
+int screen, sx, sy, sw, sh, wax, way, waw, wah;
+int (*xerrorxlib)(Display *, XErrorEvent *);
+unsigned int bh, bpos;
+unsigned int blw = 0;
+unsigned int numlockmask = 0;
+void (*handler[LASTEvent]) (XEvent *) = {

        [ButtonPress] = buttonpress,
        [ConfigureRequest] = configurerequest,
        [ConfigureNotify] = configurenotify,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,
        [ButtonPress] = buttonpress,
        [ConfigureRequest] = configurerequest,
        [ConfigureNotify] = configurenotify,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,

-       [LeaveNotify] = leavenotify,

        [Expose] = expose,
        [Expose] = expose,

+       [FocusIn] = focusin,

        [KeyPress] = keypress,
        [KeyPress] = keypress,

+       [LeaveNotify] = leavenotify,

        [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,
        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify
 };
        [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,
        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify
 };

-static Atom wmatom[WMLast], netatom[NetLast];
-static Bool otherwm, readin;
-static Bool running = True;
-static Bool *seltags;
-static Bool selscreen = True;
-static Client *clients = NULL;
-static Client *sel = NULL;
-static Client *stack = NULL;
-static Cursor cursor[CurLast];
-static Display *dpy;
-static DC dc = {0};
-static Window barwin, root;
-static Regs *regs = NULL;
-
-static void
-eprint(const char *errstr, ...) {
-       va_list ap;
+Atom wmatom[WMLast], netatom[NetLast];
+Bool domwfact = True;
+Bool dozoom = True;
+Bool otherwm, readin;
+Bool running = True;
+Bool selscreen = True;
+Client *clients = NULL;
+Client *sel = NULL;
+Client *stack = NULL;
+Cursor cursor[CurLast];
+Display *dpy;
+DC dc = {0};
+Layout *layout = NULL;
+Window barwin, root;
+Regs *regs = NULL;
+
+/* configuration, allows nested code to access above variables */
+#include "config.h"

 
 

-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       exit(EXIT_FAILURE);
+Bool prevtags[LENGTH(tags)];
+
+/* function implementations */
+void
+applyrules(Client *c) {
+       static char buf[512];
+       unsigned int i, j;
+       regmatch_t tmp;
+       Bool matched = False;
+       XClassHint ch = { 0 };
+
+       /* rule matching */
+       XGetClassHint(dpy, c->win, &ch);
+       snprintf(buf, sizeof buf, "%s:%s:%s",
+                       ch.res_class ? ch.res_class : "",
+                       ch.res_name ? ch.res_name : "", c->name);
+       for(i = 0; i < LENGTH(rules); i++)
+               if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
+                       c->isfloating = rules[i].isfloating;
+                       for(j = 0; regs[i].tagregex && j < LENGTH(tags); j++) {
+                               if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
+                                       matched = True;
+                                       c->tags[j] = True;
+                               }
+                       }
+               }
+       if(ch.res_class)
+               XFree(ch.res_class);
+       if(ch.res_name)
+               XFree(ch.res_name);
+       if(!matched)
+               memcpy(c->tags, seltags, sizeof seltags);

 }
 
 }
 

-static void *
-emallocz(unsigned int size) {
-       void *res = calloc(1, size);
+void
+arrange(void) {
+       Client *c;

 
 

-       if(!res)
-               eprint("fatal: could not malloc() %u bytes\n", size);
-       return res;
+       for(c = clients; c; c = c->next)
+               if(isvisible(c))
+                       unban(c);
+               else
+                       ban(c);
+       layout->arrange();
+       focus(NULL);
+       restack();

 }
 
 }
 

-static void
-spawn(const char *arg) {
-       static char *shell = NULL;
+void
+attach(Client *c) {
+       if(clients)
+               clients->prev = c;
+       c->next = clients;
+       clients = c;
+}

 
 

-       if(!shell && !(shell = getenv("SHELL")))
-               shell = "/bin/sh";
-       if(!arg)
+void
+attachstack(Client *c) {
+       c->snext = stack;
+       stack = c;
+}
+
+void
+ban(Client *c) {
+       if(c->isbanned)

                return;
                return;

-       /* The double-fork construct avoids zombie processes and keeps the code
-        * clean from stupid signal handlers. */
-       if(fork() == 0) {
-               if(fork() == 0) {
-                       if(dpy)
-                               close(ConnectionNumber(dpy));
-                       setsid();
-                       execl(shell, shell, "-c", arg, (char *)NULL);
-                       fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg);
-                       perror(" failed");
-               }
-               exit(0);
-       }
-       wait(0);
+       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+       c->isbanned = True;

 }
 
 }
 

-static void
-drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
-       int x;
-       XGCValues gcv;
-       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+void
+buttonpress(XEvent *e) {
+       unsigned int i, x;
+       Client *c;
+       XButtonPressedEvent *ev = &e->xbutton;

 
 

-       gcv.foreground = col[ColFG];
-       XChangeGC(dpy, dc.gc, GCForeground, &gcv);
-       x = (dc.font.ascent + dc.font.descent + 2) / 4;
-       r.x = dc.x + 1;
-       r.y = dc.y + 1;
-       if(filled) {
-               r.width = r.height = x + 1;
-               XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+       if(ev->window == barwin) {
+               x = 0;
+               for(i = 0; i < LENGTH(tags); i++) {
+                       x += textw(tags[i]);
+                       if(ev->x < x) {
+                               if(ev->button == Button1) {
+                                       if(ev->state & MODKEY)
+                                               tag(tags[i]);
+                                       else
+                                               view(tags[i]);
+                               }
+                               else if(ev->button == Button3) {
+                                       if(ev->state & MODKEY)
+                                               toggletag(tags[i]);
+                                       else
+                                               toggleview(tags[i]);
+                               }
+                               return;
+                       }
+               }
+               if((ev->x < x + blw) && ev->button == Button1)
+                       setlayout(NULL);

        }
        }

-       else if(empty) {
-               r.width = r.height = x;
-               XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+       else if((c = getclient(ev->window))) {
+               focus(c);
+               if(CLEANMASK(ev->state) != MODKEY)
+                       return;
+               if(ev->button == Button1) {
+                       if((layout->arrange == floating) || c->isfloating)
+                               restack();
+                       else
+                               togglefloating(NULL);
+                       movemouse(c);
+               }
+               else if(ev->button == Button2) {
+                       if((floating != layout->arrange) && c->isfloating)
+                               togglefloating(NULL);
+                       else
+                               zoom(NULL);
+               }
+               else if(ev->button == Button3 && !c->isfixed) {
+                       if((floating == layout->arrange) || c->isfloating)
+                               restack();
+                       else
+                               togglefloating(NULL);
+                       resizemouse(c);
+               }

        }
 }
 
        }
 }
 

-static unsigned long
-initcolor(const char *colstr) {
-       Colormap cmap = DefaultColormap(dpy, screen);
-       XColor color;
+void
+checkotherwm(void) {
+       otherwm = False;
+       XSetErrorHandler(xerrorstart);

 
 

-       if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
-               eprint("error, cannot allocate color '%s'\n", colstr);
-       return color.pixel;
+       /* this causes an error if some other window manager is running */
+       XSelectInput(dpy, root, SubstructureRedirectMask);
+       XSync(dpy, False);
+       if(otherwm)
+               eprint("dwm: another window manager is already running\n");
+       XSync(dpy, False);
+       XSetErrorHandler(NULL);
+       xerrorxlib = XSetErrorHandler(xerror);
+       XSync(dpy, False);

 }
 
 }
 

-static void
-initfont(const char *fontstr) {
-       char *def, **missing;
-       int i, n;
-
-       missing = NULL;
+void
+cleanup(void) {
+       close(STDIN_FILENO);
+       while(stack) {
+               unban(stack);
+               unmanage(stack);
+       }

        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);
        if(dc.font.set)
                XFreeFontSet(dpy, dc.font.set);

-       dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
-       if(missing) {
-               while(n--)
-                       fprintf(stderr, "dwm: missing fontset: %s\n", missing[n]);
-               XFreeStringList(missing);
-       }
-       if(dc.font.set) {
-               XFontSetExtents *font_extents;
-               XFontStruct **xfonts;
-               char **font_names;
-               dc.font.ascent = dc.font.descent = 0;
-               font_extents = XExtentsOfFontSet(dc.font.set);
-               n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
-               for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
-                       if(dc.font.ascent < (*xfonts)->ascent)
-                               dc.font.ascent = (*xfonts)->ascent;
-                       if(dc.font.descent < (*xfonts)->descent)
-                               dc.font.descent = (*xfonts)->descent;
-                       xfonts++;
-               }
-       }
-       else {
-               if(dc.font.xfont)
-                       XFreeFont(dpy, dc.font.xfont);
-               dc.font.xfont = NULL;
-               if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
-               || !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
-                       eprint("error, cannot load font: '%s'\n", fontstr);
-               dc.font.ascent = dc.font.xfont->ascent;
-               dc.font.descent = dc.font.xfont->descent;
-       }
-       dc.font.height = dc.font.ascent + dc.font.descent;
+       else
+               XFreeFont(dpy, dc.font.xfont);
+       XUngrabKey(dpy, AnyKey, AnyModifier, root);
+       XFreePixmap(dpy, dc.drawable);
+       XFreeGC(dpy, dc.gc);
+       XDestroyWindow(dpy, barwin);
+       XFreeCursor(dpy, cursor[CurNormal]);
+       XFreeCursor(dpy, cursor[CurResize]);
+       XFreeCursor(dpy, cursor[CurMove]);
+       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+       XSync(dpy, False);

 }
 
 }
 

-static Bool
-isoccupied(unsigned int t) {
-       Client *c;
+void
+compileregs(void) {
+       unsigned int i;
+       regex_t *reg;

 
 

-       for(c = clients; c; c = c->next)
-               if(c->tags[t])
-                       return True;
-       return False;
+       if(regs)
+               return;
+       regs = emallocz(LENGTH(rules) * sizeof(Regs));
+       for(i = 0; i < LENGTH(rules); i++) {
+               if(rules[i].prop) {
+                       reg = emallocz(sizeof(regex_t));
+                       if(regcomp(reg, rules[i].prop, REG_EXTENDED))
+                               free(reg);
+                       else
+                               regs[i].propregex = reg;
+               }
+               if(rules[i].tags) {
+                       reg = emallocz(sizeof(regex_t));
+                       if(regcomp(reg, rules[i].tags, REG_EXTENDED))
+                               free(reg);
+                       else
+                               regs[i].tagregex = reg;
+               }
+       }

 }
 
 }
 

-static unsigned int
-textnw(const char *text, unsigned int len) {
-       XRectangle r;
+void
+configure(Client *c) {
+       XConfigureEvent ce;

 
 

-       if(dc.font.set) {
-               XmbTextExtents(dc.font.set, text, len, NULL, &r);
-               return r.width;
-       }
-       return XTextWidth(dc.font.xfont, text, len);
+       ce.type = ConfigureNotify;
+       ce.display = dpy;
+       ce.event = c->win;
+       ce.window = c->win;
+       ce.x = c->x;
+       ce.y = c->y;
+       ce.width = c->w;
+       ce.height = c->h;
+       ce.border_width = c->border;
+       ce.above = None;
+       ce.override_redirect = False;
+       XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);

 }
 
 }
 

-static void
-drawtext(const char *text, unsigned long col[ColLast]) {
-       int x, y, w, h;
-       static char buf[256];
-       unsigned int len, olen;
-       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+void
+configurenotify(XEvent *e) {
+       XConfigureEvent *ev = &e->xconfigure;

 
 

-       XSetForeground(dpy, dc.gc, col[ColBG]);
-       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
-       if(!text)
-               return;
-       w = 0;
-       olen = len = strlen(text);
-       if(len >= sizeof buf)
-               len = sizeof buf - 1;
-       memcpy(buf, text, len);
-       buf[len] = 0;
-       h = dc.font.ascent + dc.font.descent;
-       y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
-       x = dc.x + (h / 2);
-       /* shorten text if necessary */
-       while(len && (w = textnw(buf, len)) > dc.w - h)
-               buf[--len] = 0;
-       if(len < olen) {
-               if(len > 1)
-                       buf[len - 1] = '.';
-               if(len > 2)
-                       buf[len - 2] = '.';
-               if(len > 3)
-                       buf[len - 3] = '.';
+       if(ev->window == root && (ev->width != sw || ev->height != sh)) {
+               sw = ev->width;
+               sh = ev->height;
+               XFreePixmap(dpy, dc.drawable);
+               dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+               XResizeWindow(dpy, barwin, sw, bh);
+               updatebarpos();
+               arrange();

        }
        }

-       if(w > dc.w)
-               return; /* too long */
-       XSetForeground(dpy, dc.gc, col[ColFG]);
-       if(dc.font.set)
-               XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
-       else
-               XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);

 }
 
 }
 

-static void
+void
+configurerequest(XEvent *e) {
+       Client *c;
+       XConfigureRequestEvent *ev = &e->xconfigurerequest;
+       XWindowChanges wc;
+
+       if((c = getclient(ev->window))) {
+               if(ev->value_mask & CWBorderWidth)
+                       c->border = ev->border_width;
+               if(c->isfixed || c->isfloating || (floating == layout->arrange)) {
+                       if(ev->value_mask & CWX)
+                               c->x = ev->x;
+                       if(ev->value_mask & CWY)
+                               c->y = ev->y;
+                       if(ev->value_mask & CWWidth)
+                               c->w = ev->width;
+                       if(ev->value_mask & CWHeight)
+                               c->h = ev->height;
+                       if((c->x + c->w) > sw && c->isfloating)
+                               c->x = sw / 2 - c->w / 2; /* center in x direction */
+                       if((c->y + c->h) > sh && c->isfloating)
+                               c->y = sh / 2 - c->h / 2; /* center in y direction */
+                       if((ev->value_mask & (CWX | CWY))
+                       && !(ev->value_mask & (CWWidth | CWHeight)))
+                               configure(c);
+                       if(isvisible(c))
+                               XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
+               }
+               else
+                       configure(c);
+       }
+       else {
+               wc.x = ev->x;
+               wc.y = ev->y;
+               wc.width = ev->width;
+               wc.height = ev->height;
+               wc.border_width = ev->border_width;
+               wc.sibling = ev->above;
+               wc.stack_mode = ev->detail;
+               XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
+       }
+       XSync(dpy, False);
+}
+
+void
+destroynotify(XEvent *e) {
+       Client *c;
+       XDestroyWindowEvent *ev = &e->xdestroywindow;
+
+       if((c = getclient(ev->window)))
+               unmanage(c);
+}
+
+void
+detach(Client *c) {
+       if(c->prev)
+               c->prev->next = c->next;
+       if(c->next)
+               c->next->prev = c->prev;
+       if(c == clients)
+               clients = c->next;
+       c->next = c->prev = NULL;
+}
+
+void
+detachstack(Client *c) {
+       Client **tc;
+
+       for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+       *tc = c->snext;
+}
+
+void

 drawbar(void) {
        int i, x;
 
        dc.x = dc.y = 0;
 drawbar(void) {
        int i, x;
 
        dc.x = dc.y = 0;

-       for(i = 0; i < ntags; i++) {
+       for(i = 0; i < LENGTH(tags); i++) {

                dc.w = textw(tags[i]);
                if(seltags[i]) {
                        drawtext(tags[i], dc.sel);
                dc.w = textw(tags[i]);
                if(seltags[i]) {
                        drawtext(tags[i], dc.sel);


@@ -431,7 +548,7 @@ drawbar(void) {
                dc.x += dc.w;
        }
        dc.w = blw;
                dc.x += dc.w;
        }
        dc.w = blw;

-       drawtext(layouts[ltidx].symbol, dc.norm);
+       drawtext(layout->symbol, dc.norm);

        x = dc.x + dc.w;
        dc.w = textw(stext);
        dc.x = sw - dc.w;
        x = dc.x + dc.w;
        dc.w = textw(stext);
        dc.x = sw - dc.w;


@@ -444,7 +561,7 @@ drawbar(void) {
                dc.x = x;
                if(sel) {
                        drawtext(sel->name, dc.sel);
                dc.x = x;
                if(sel) {
                        drawtext(sel->name, dc.sel);

-                       drawsquare(sel->ismax, sel->isfloating, dc.sel);
+                       drawsquare(False, sel->isfloating, dc.sel);

                }
                else
                        drawtext(NULL, dc.norm);
                }
                else
                        drawtext(NULL, dc.norm);


@@ -453,103 +570,257 @@ drawbar(void) {
        XSync(dpy, False);
 }
 
        XSync(dpy, False);
 }
 

-static void
-initstyle(void) {
-       dc.norm[ColBorder] = initcolor(NORMBORDERCOLOR);
-       dc.norm[ColBG] = initcolor(NORMBGCOLOR);
-       dc.norm[ColFG] = initcolor(NORMFGCOLOR);
-       dc.sel[ColBorder] = initcolor(SELBORDERCOLOR);
-       dc.sel[ColBG] = initcolor(SELBGCOLOR);
-       dc.sel[ColFG] = initcolor(SELFGCOLOR);
-       initfont(FONT);
-       dc.h = bh = dc.font.height + 2;
+void
+drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
+       int x;
+       XGCValues gcv;
+       XRectangle r = { dc.x, dc.y, dc.w, dc.h };
+
+       gcv.foreground = col[ColFG];
+       XChangeGC(dpy, dc.gc, GCForeground, &gcv);
+       x = (dc.font.ascent + dc.font.descent + 2) / 4;
+       r.x = dc.x + 1;
+       r.y = dc.y + 1;
+       if(filled) {
+               r.width = r.height = x + 1;
+               XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+       }
+       else if(empty) {
+               r.width = r.height = x;
+               XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+       }

 }
 
 }
 

-static void
-initbar(void) {
-       XSetWindowAttributes wa;
+void
+drawtext(const char *text, unsigned long col[ColLast]) {
+       int x, y, w, h;
+       static char buf[256];
+       unsigned int len, olen;
+       XRectangle r = { dc.x, dc.y, dc.w, dc.h };

 
 

-       wa.override_redirect = 1;
-       wa.background_pixmap = ParentRelative;
-       wa.event_mask = ButtonPressMask | ExposureMask;
-       barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0,
-                       DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
-                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-       XDefineCursor(dpy, barwin, cursor[CurNormal]);
-       updatebarpos();
-       XMapRaised(dpy, barwin);
-       strcpy(stext, "dwm-"VERSION);
-       dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
-       dc.gc = XCreateGC(dpy, root, 0, 0);
-       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
-       if(!dc.font.set)
-               XSetFont(dpy, dc.gc, dc.font.xfont->fid);
+       XSetForeground(dpy, dc.gc, col[ColBG]);
+       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+       if(!text)
+               return;
+       w = 0;
+       olen = len = strlen(text);
+       if(len >= sizeof buf)
+               len = sizeof buf - 1;
+       memcpy(buf, text, len);
+       buf[len] = 0;
+       h = dc.font.ascent + dc.font.descent;
+       y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
+       x = dc.x + (h / 2);
+       /* shorten text if necessary */
+       while(len && (w = textnw(buf, len)) > dc.w - h)
+               buf[--len] = 0;
+       if(len < olen) {
+               if(len > 1)
+                       buf[len - 1] = '.';
+               if(len > 2)
+                       buf[len - 2] = '.';
+               if(len > 3)
+                       buf[len - 3] = '.';
+       }
+       if(w > dc.w)
+               return; /* too long */
+       XSetForeground(dpy, dc.gc, col[ColFG]);
+       if(dc.font.set)
+               XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
+       else
+               XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);

 }
 
 }
 

-static unsigned int
-textw(const char *text) {
-       return textnw(text, strlen(text)) + dc.font.height;
-}
+void *
+emallocz(unsigned int size) {
+       void *res = calloc(1, size);

 
 

-static void
-togglebar(const char *arg) {
-       if(bpos == BarOff)
-               bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
-       else
-               bpos = BarOff;
-       updatebarpos();
-       arrange();
+       if(!res)
+               eprint("fatal: could not malloc() %u bytes\n", size);
+       return res;

 }
 
 }
 

-static void
-updatebarpos(void) {
-       XEvent ev;
+void
+enternotify(XEvent *e) {
+       Client *c;
+       XCrossingEvent *ev = &e->xcrossing;

 
 

-       wax = sx;
-       way = sy;
-       wah = sh;
-       waw = sw;
-       switch(bpos) {
-       default:
-               wah -= bh;
-               way += bh;
-               XMoveWindow(dpy, barwin, sx, sy);
-               break;
-       case BarBot:
-               wah -= bh;
-               XMoveWindow(dpy, barwin, sx, sy + wah);
-               break;
-       case BarOff:
-               XMoveWindow(dpy, barwin, sx, sy - bh);
-               break;
+       if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
+               return;
+       if((c = getclient(ev->window)))
+               focus(c);
+       else if(ev->window == root) {
+               selscreen = True;
+               focus(NULL);

        }
        }

-       XSync(dpy, False);
-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));

 }
 
 }
 

-static void
-attachstack(Client *c) {
-       c->snext = stack;
-       stack = c;
+void
+eprint(const char *errstr, ...) {
+       va_list ap;
+
+       va_start(ap, errstr);
+       vfprintf(stderr, errstr, ap);
+       va_end(ap);
+       exit(EXIT_FAILURE);

 }
 
 }
 

-static void
-detachstack(Client *c) {
-       Client **tc;
+void
+expose(XEvent *e) {
+       XExposeEvent *ev = &e->xexpose;

 
 

-       for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
-       *tc = c->snext;
+       if(ev->count == 0) {
+               if(ev->window == barwin)
+                       drawbar();
+       }

 }
 
 }
 

-static void
-grabbuttons(Client *c, Bool focused) {
-       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+void
+floating(void) { /* default floating layout */
+       Client *c;

 
 

-       if(focused) {
-               XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
+       domwfact = dozoom = False;
+       for(c = clients; c; c = c->next)
+               if(isvisible(c))
+                       resize(c, c->x, c->y, c->w, c->h, True);
+}
+
+void
+focus(Client *c) {
+       if((!c && selscreen) || (c && !isvisible(c)))
+               for(c = stack; c && !isvisible(c); c = c->snext);
+       if(sel && sel != c) {
+               grabbuttons(sel, False);
+               XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
+       }
+       if(c) {
+               detachstack(c);
+               attachstack(c);
+               grabbuttons(c, True);
+       }
+       sel = c;
+       drawbar();
+       if(!selscreen)
+               return;
+       if(c) {
+               XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
+               XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+       }
+       else
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+}
+
+void
+focusin(XEvent *e) { /* there are some broken focus acquiring clients */
+       XFocusChangeEvent *ev = &e->xfocus;
+
+       if(sel && ev->window != sel->win)
+               XSetInputFocus(dpy, sel->win, RevertToPointerRoot, CurrentTime);
+}
+
+void
+focusnext(const char *arg) {
+       Client *c;
+
+       if(!sel)
+               return;
+       for(c = sel->next; c && !isvisible(c); c = c->next);
+       if(!c)
+               for(c = clients; c && !isvisible(c); c = c->next);
+       if(c) {
+               focus(c);
+               restack();
+       }
+}
+
+void
+focusprev(const char *arg) {
+       Client *c;
+
+       if(!sel)
+               return;
+       for(c = sel->prev; c && !isvisible(c); c = c->prev);
+       if(!c) {
+               for(c = clients; c && c->next; c = c->next);
+               for(; c && !isvisible(c); c = c->prev);
+       }
+       if(c) {
+               focus(c);
+               restack();
+       }
+}
+
+Client *
+getclient(Window w) {
+       Client *c;
+
+       for(c = clients; c && c->win != w; c = c->next);
+       return c;
+}
+
+unsigned long
+getcolor(const char *colstr) {
+       Colormap cmap = DefaultColormap(dpy, screen);
+       XColor color;
+
+       if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color))
+               eprint("error, cannot allocate color '%s'\n", colstr);
+       return color.pixel;
+}
+
+long
+getstate(Window w) {
+       int format, status;
+       long result = -1;
+       unsigned char *p = NULL;
+       unsigned long n, extra;
+       Atom real;
+
+       status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
+                       &real, &format, &n, &extra, (unsigned char **)&p);
+       if(status != Success)
+               return -1;
+       if(n != 0)
+               result = *p;
+       XFree(p);
+       return result;
+}
+
+Bool
+gettextprop(Window w, Atom atom, char *text, unsigned int size) {
+       char **list = NULL;
+       int n;
+       XTextProperty name;
+
+       if(!text || size == 0)
+               return False;
+       text[0] = '\0';
+       XGetTextProperty(dpy, w, &name, atom);
+       if(!name.nitems)
+               return False;
+       if(name.encoding == XA_STRING)
+               strncpy(text, (char *)name.value, size - 1);
+       else {
+               if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
+               && n > 0 && *list) {
+                       strncpy(text, *list, size - 1);
+                       XFreeStringList(list);
+               }
+       }
+       text[size - 1] = '\0';
+       XFree(name.value);
+       return True;
+}
+
+void
+grabbuttons(Client *c, Bool focused) {
+       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+
+       if(focused) {
+               XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, Button1, MODKEY | LockMask, c->win, False, BUTTONMASK,
+                               GrabModeAsync, GrabModeSync, None, None);

                XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
                XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
                XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
                                GrabModeAsync, GrabModeSync, None, None);
                XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,


@@ -578,7 +849,86 @@ grabbuttons(Client *c, Bool focused) {
                                GrabModeAsync, GrabModeSync, None, None);
 }
 
                                GrabModeAsync, GrabModeSync, None, None);
 }
 

-static Bool
+void
+grabkeys(void)  {
+       unsigned int i;
+       KeyCode code;
+
+       XUngrabKey(dpy, AnyKey, AnyModifier, root);
+       for(i = 0; i < LENGTH(keys); i++) {
+               code = XKeysymToKeycode(dpy, keys[i].keysym);
+               XGrabKey(dpy, code, keys[i].mod, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
+                               GrabModeAsync, GrabModeAsync);
+       }
+}
+
+unsigned int
+idxoftag(const char *tag) {
+       unsigned int i;
+
+       for(i = 0; (i < LENGTH(tags)) && (tags[i] != tag); i++);
+       return (i < LENGTH(tags)) ? i : 0;
+}
+
+void
+initfont(const char *fontstr) {
+       char *def, **missing;
+       int i, n;
+
+       missing = NULL;
+       if(dc.font.set)
+               XFreeFontSet(dpy, dc.font.set);
+       dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+       if(missing) {
+               while(n--)
+                       fprintf(stderr, "dwm: missing fontset: %s\n", missing[n]);
+               XFreeStringList(missing);
+       }
+       if(dc.font.set) {
+               XFontSetExtents *font_extents;
+               XFontStruct **xfonts;
+               char **font_names;
+               dc.font.ascent = dc.font.descent = 0;
+               font_extents = XExtentsOfFontSet(dc.font.set);
+               n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
+               for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) {
+                       if(dc.font.ascent < (*xfonts)->ascent)
+                               dc.font.ascent = (*xfonts)->ascent;
+                       if(dc.font.descent < (*xfonts)->descent)
+                               dc.font.descent = (*xfonts)->descent;
+                       xfonts++;
+               }
+       }
+       else {
+               if(dc.font.xfont)
+                       XFreeFont(dpy, dc.font.xfont);
+               dc.font.xfont = NULL;
+               if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
+               && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
+                       eprint("error, cannot load font: '%s'\n", fontstr);
+               dc.font.ascent = dc.font.xfont->ascent;
+               dc.font.descent = dc.font.xfont->descent;
+       }
+       dc.font.height = dc.font.ascent + dc.font.descent;
+}
+
+Bool
+isoccupied(unsigned int t) {
+       Client *c;
+
+       for(c = clients; c; c = c->next)
+               if(c->tags[t])
+                       return True;
+       return False;
+}
+
+Bool

 isprotodel(Client *c) {
        int i, n;
        Atom *protocols;
 isprotodel(Client *c) {
        int i, n;
        Atom *protocols;


@@ -593,46 +943,34 @@ isprotodel(Client *c) {
        return ret;
 }
 
        return ret;
 }
 

-static void
-setclientstate(Client *c, long state) {
-       long data[] = {state, None};
-
-       XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
-                       PropModeReplace, (unsigned char *)data, 2);
-}
-
-static int
-xerrordummy(Display *dsply, XErrorEvent *ee) {
-       return 0;
-}
+Bool
+isvisible(Client *c) {
+       unsigned int i;

 
 

-static void
-ban(Client *c) {
-       if(c->isbanned)
-               return;
-       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-       c->isbanned = True;
+       for(i = 0; i < LENGTH(tags); i++)
+               if(c->tags[i] && seltags[i])
+                       return True;
+       return False;

 }
 
 }
 

-static void
-configure(Client *c) {
-       XConfigureEvent ce;
+void
+keypress(XEvent *e) {
+       unsigned int i;
+       KeySym keysym;
+       XKeyEvent *ev;

 
 

-       ce.type = ConfigureNotify;
-       ce.display = dpy;
-       ce.event = c->win;
-       ce.window = c->win;
-       ce.x = c->x;
-       ce.y = c->y;
-       ce.width = c->w;
-       ce.height = c->h;
-       ce.border_width = c->border;
-       ce.above = None;
-       ce.override_redirect = False;
-       XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
+       ev = &e->xkey;
+       keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
+       for(i = 0; i < LENGTH(keys); i++)
+               if(keysym == keys[i].keysym
+               && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
+               {
+                       if(keys[i].func)
+                               keys[i].func(keys[i].arg);
+               }

 }
 
 }
 

-static void
+void

 killclient(const char *arg) {
        XEvent ev;
 
 killclient(const char *arg) {
        XEvent ev;
 


@@ -651,16 +989,25 @@ killclient(const char *arg) {
                XKillClient(dpy, sel->win);
 }
 
                XKillClient(dpy, sel->win);
 }
 

-static void
+void
+leavenotify(XEvent *e) {
+       XCrossingEvent *ev = &e->xcrossing;
+
+       if((ev->window == root) && !ev->same_screen) {
+               selscreen = False;
+               focus(NULL);
+       }
+}
+
+void

 manage(Window w, XWindowAttributes *wa) {
 manage(Window w, XWindowAttributes *wa) {

-       unsigned int i;

        Client *c, *t = NULL;
        Window trans;
        Status rettrans;
        XWindowChanges wc;
 
        c = emallocz(sizeof(Client));
        Client *c, *t = NULL;
        Window trans;
        Status rettrans;
        XWindowChanges wc;
 
        c = emallocz(sizeof(Client));

-       c->tags = emallocz(ntags * sizeof(Bool));
+       c->tags = emallocz(sizeof seltags);

        c->win = w;
        c->x = wa->x;
        c->y = wa->y;
        c->win = w;
        c->x = wa->x;
        c->y = wa->y;


@@ -688,15 +1035,13 @@ manage(Window w, XWindowAttributes *wa) {
        XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
        configure(c); /* propagates border_width, if size doesn't change */
        updatesizehints(c);
        XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
        configure(c); /* propagates border_width, if size doesn't change */
        updatesizehints(c);

-       XSelectInput(dpy, w,
-               StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+       XSelectInput(dpy, w, EnterWindowMask | FocusChangeMask | PropertyChangeMask | StructureNotifyMask);

        grabbuttons(c, False);
        updatetitle(c);
        if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
                for(t = clients; t && t->win != trans; t = t->next);
        if(t)
        grabbuttons(c, False);
        updatetitle(c);
        if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
                for(t = clients; t && t->win != trans; t = t->next);
        if(t)

-               for(i = 0; i < ntags; i++)
-                       c->tags[i] = t->tags[i];
+               memcpy(c->tags, t->tags, sizeof seltags);

        applyrules(c);
        if(!c->isfloating)
                c->isfloating = (rettrans == Success) || c->isfixed;
        applyrules(c);
        if(!c->isfloating)
                c->isfloating = (rettrans == Success) || c->isfixed;


@@ -709,167 +1054,36 @@ manage(Window w, XWindowAttributes *wa) {
        arrange();
 }
 
        arrange();
 }
 

-static void
-resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
-       double dx, dy, max, min, ratio;
-       XWindowChanges wc; 
+void
+mappingnotify(XEvent *e) {
+       XMappingEvent *ev = &e->xmapping;

 
 

-       if(sizehints) {
-               if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) {
-                       dx = (double)(w - c->basew);
-                       dy = (double)(h - c->baseh);
-                       min = (double)(c->minax) / (double)(c->minay);
-                       max = (double)(c->maxax) / (double)(c->maxay);
-                       ratio = dx / dy;
-                       if(max > 0 && min > 0 && ratio > 0) {
-                               if(ratio < min) {
-                                       dy = (dx * min + dy) / (min * min + 1);
-                                       dx = dy * min;
-                                       w = (int)dx + c->basew;
-                                       h = (int)dy + c->baseh;
-                               }
-                               else if(ratio > max) {
-                                       dy = (dx * min + dy) / (max * max + 1);
-                                       dx = dy * min;
-                                       w = (int)dx + c->basew;
-                                       h = (int)dy + c->baseh;
-                               }
-                       }
-               }
-               if(c->minw && w < c->minw)
-                       w = c->minw;
-               if(c->minh && h < c->minh)
-                       h = c->minh;
-               if(c->maxw && w > c->maxw)
-                       w = c->maxw;
-               if(c->maxh && h > c->maxh)
-                       h = c->maxh;
-               if(c->incw)
-                       w -= (w - c->basew) % c->incw;
-               if(c->inch)
-                       h -= (h - c->baseh) % c->inch;
-       }
-       if(w <= 0 || h <= 0)
-               return;
-       /* offscreen appearance fixes */
-       if(x > sw)
-               x = sw - w - 2 * c->border;
-       if(y > sh)
-               y = sh - h - 2 * c->border;
-       if(x + w + 2 * c->border < sx)
-               x = sx;
-       if(y + h + 2 * c->border < sy)
-               y = sy;
-       if(c->x != x || c->y != y || c->w != w || c->h != h) {
-               c->x = wc.x = x;
-               c->y = wc.y = y;
-               c->w = wc.width = w;
-               c->h = wc.height = h;
-               wc.border_width = c->border;
-               XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
-               configure(c);
-               XSync(dpy, False);
-       }
-}
-
-static void
-unban(Client *c) {
-       if(!c->isbanned)
-               return;
-       XMoveWindow(dpy, c->win, c->x, c->y);
-       c->isbanned = False;
-}
-
-static void
-unmanage(Client *c) {
-       XWindowChanges wc;
-
-       wc.border_width = c->oldborder;
-       /* The server grab construct avoids race conditions. */
-       XGrabServer(dpy);
-       XSetErrorHandler(xerrordummy);
-       XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
-       detach(c);
-       detachstack(c);
-       if(sel == c)
-               focus(NULL);
-       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-       setclientstate(c, WithdrawnState);
-       free(c->tags);
-       free(c);
-       XSync(dpy, False);
-       XSetErrorHandler(xerror);
-       XUngrabServer(dpy);
-       arrange();
+       XRefreshKeyboardMapping(ev);
+       if(ev->request == MappingKeyboard)
+               grabkeys();

 }
 
 }
 

-static void
-updatesizehints(Client *c) {
-       long msize;
-       XSizeHints size;
-
-       if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
-               size.flags = PSize;
-       c->flags = size.flags;
-       if(c->flags & PBaseSize) {
-               c->basew = size.base_width;
-               c->baseh = size.base_height;
-       }
-       else if(c->flags & PMinSize) {
-               c->basew = size.min_width;
-               c->baseh = size.min_height;
-       }
-       else
-               c->basew = c->baseh = 0;
-       if(c->flags & PResizeInc) {
-               c->incw = size.width_inc;
-               c->inch = size.height_inc;
-       }
-       else
-               c->incw = c->inch = 0;
-       if(c->flags & PMaxSize) {
-               c->maxw = size.max_width;
-               c->maxh = size.max_height;
-       }
-       else
-               c->maxw = c->maxh = 0;
-       if(c->flags & PMinSize) {
-               c->minw = size.min_width;
-               c->minh = size.min_height;
-       }
-       else if(c->flags & PBaseSize) {
-               c->minw = size.base_width;
-               c->minh = size.base_height;
-       }
-       else
-               c->minw = c->minh = 0;
-       if(c->flags & PAspect) {
-               c->minax = size.min_aspect.x;
-               c->maxax = size.max_aspect.x;
-               c->minay = size.min_aspect.y;
-               c->maxay = size.max_aspect.y;
-       }
-       else
-               c->minax = c->maxax = c->minay = c->maxay = 0;
-       c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
-                       && c->maxw == c->minw && c->maxh == c->minh);
-}
+void
+maprequest(XEvent *e) {
+       static XWindowAttributes wa;
+       XMapRequestEvent *ev = &e->xmaprequest;

 
 

-static void
-updatetitle(Client *c) {
-       if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
-               gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
+       if(!XGetWindowAttributes(dpy, ev->window, &wa))
+               return;
+       if(wa.override_redirect)
+               return;
+       if(!getclient(ev->window))
+               manage(ev->window, &wa);

 }
 
 }
 

-static Client *
-getclient(Window w) {
-       Client *c;
-
-       for(c = clients; c && c->win != w; c = c->next);
-       return c;
+void
+maximize(const char *arg) {
+       if(!sel || (!sel->isfloating && layout->arrange != floating))
+               return;
+       resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);

 }
 
 }
 

-static void
+void

 movemouse(Client *c) {
        int x1, y1, ocx, ocy, di, nx, ny;
        unsigned int dui;
 movemouse(Client *c) {
        int x1, y1, ocx, ocy, di, nx, ny;
        unsigned int dui;


@@ -881,7 +1095,6 @@ movemouse(Client *c) {
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;

-       c->ismax = False;

        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {
                XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {
                XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);


@@ -912,7 +1125,123 @@ movemouse(Client *c) {
        }
 }
 
        }
 }
 

-static void
+Client *
+nexttiled(Client *c) {
+       for(; c && (c->isfloating || !isvisible(c)); c = c->next);
+       return c;
+}
+
+void
+propertynotify(XEvent *e) {
+       Client *c;
+       Window trans;
+       XPropertyEvent *ev = &e->xproperty;
+
+       if(ev->state == PropertyDelete)
+               return; /* ignore */
+       if((c = getclient(ev->window))) {
+               switch (ev->atom) {
+                       default: break;
+                       case XA_WM_TRANSIENT_FOR:
+                               XGetTransientForHint(dpy, c->win, &trans);
+                               if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
+                                       arrange();
+                               break;
+                       case XA_WM_NORMAL_HINTS:
+                               updatesizehints(c);
+                               break;
+               }
+               if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
+                       updatetitle(c);
+                       if(c == sel)
+                               drawbar();
+               }
+       }
+}
+
+void
+quit(const char *arg) {
+       readin = running = False;
+}
+
+void
+reapply(const char *arg) {
+       static Bool zerotags[LENGTH(tags)] = { 0 };
+       Client *c;
+
+       for(c = clients; c; c = c->next) {
+               memcpy(c->tags, zerotags, sizeof zerotags);
+               applyrules(c);
+       }
+       arrange();
+}
+
+void
+resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
+       XWindowChanges wc;
+
+       if(sizehints) {
+               /* set minimum possible */
+               if (w < 1)
+                       w = 1;
+               if (h < 1)
+                       h = 1;
+
+               /* temporarily remove base dimensions */
+               w -= c->basew;
+               h -= c->baseh;
+
+               /* adjust for aspect limits */
+               if (c->minay > 0 && c->maxay > 0 && c->minax > 0 && c->maxax > 0) {
+                       if (w * c->maxay > h * c->maxax)
+                               w = h * c->maxax / c->maxay;
+                       else if (w * c->minay < h * c->minax)
+                               h = w * c->minay / c->minax;
+               }
+
+               /* adjust for increment value */
+               if(c->incw)
+                       w -= w % c->incw;
+               if(c->inch)
+                       h -= h % c->inch;
+
+               /* restore base dimensions */
+               w += c->basew;
+               h += c->baseh;
+
+               if(c->minw > 0 && w < c->minw)
+                       w = c->minw;
+               if(c->minh > 0 && h < c->minh)
+                       h = c->minh;
+               if(c->maxw > 0 && w > c->maxw)
+                       w = c->maxw;
+               if(c->maxh > 0 && h > c->maxh)
+                       h = c->maxh;
+       }
+       if(w <= 0 || h <= 0)
+               return;
+       /* offscreen appearance fixes */
+       if(x > sw)
+               x = sw - w - 2 * c->border;
+       if(y > sh)
+               y = sh - h - 2 * c->border;
+       if(x + w + 2 * c->border < sx)
+               x = sx;
+       if(y + h + 2 * c->border < sy)
+               y = sy;
+       if(c->x != x || c->y != y || c->w != w || c->h != h) {
+               c->x = wc.x = x;
+               c->y = wc.y = y;
+               c->w = wc.width = w;
+               c->h = wc.height = h;
+               wc.border_width = c->border;
+               XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+               configure(c);
+               XSync(dpy, False);
+       }
+}
+
+void

 resizemouse(Client *c) {
        int ocx, ocy;
        int nw, nh;
 resizemouse(Client *c) {
        int ocx, ocy;
        int nw, nh;


@@ -923,7 +1252,6 @@ resizemouse(Client *c) {
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                        None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                        None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;

-       c->ismax = False;

        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
        for(;;) {
                XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
        for(;;) {
                XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);


@@ -951,563 +1279,96 @@ resizemouse(Client *c) {
        }
 }
 
        }
 }
 

-static void
-buttonpress(XEvent *e) {
-       unsigned int i, x;
+void
+restack(void) {

        Client *c;
        Client *c;

-       XButtonPressedEvent *ev = &e->xbutton;
+       XEvent ev;
+       XWindowChanges wc;

 
 

-       if(barwin == ev->window) {
-               x = 0;
-               for(i = 0; i < ntags; i++) {
-                       x += textw(tags[i]);
-                       if(ev->x < x) {
-                               if(ev->button == Button1) {
-                                       if(ev->state & MODKEY)
-                                               tag(tags[i]);
-                                       else
-                                               view(tags[i]);
-                               }
-                               else if(ev->button == Button3) {
-                                       if(ev->state & MODKEY)
-                                               toggletag(tags[i]);
-                                       else
-                                               toggleview(tags[i]);
-                               }
-                               return;
-                       }
-               }
-               if((ev->x < x + blw) && ev->button == Button1)
-                       setlayout(NULL);
-       }
-       else if((c = getclient(ev->window))) {
-               focus(c);
-               if(CLEANMASK(ev->state) != MODKEY)
-                       return;
-               if(ev->button == Button1 && (isfloating() || c->isfloating)) {
-                       restack();
-                       movemouse(c);
+       drawbar();
+       if(!sel)
+               return;
+       if(sel->isfloating || (layout->arrange == floating))
+               XRaiseWindow(dpy, sel->win);
+       if(layout->arrange != floating) {
+               wc.stack_mode = Below;
+               wc.sibling = barwin;
+               if(!sel->isfloating) {
+                       XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
+                       wc.sibling = sel->win;

                }
                }

-               else if(ev->button == Button2)
-                       zoom(NULL);
-               else if(ev->button == Button3
-               && (isfloating() || c->isfloating) && !c->isfixed)
-               {
-                       restack();
-                       resizemouse(c);
+               for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+                       if(c == sel)
+                               continue;
+                       XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
+                       wc.sibling = c->win;

                }
        }
                }
        }

+       XSync(dpy, False);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));

 }
 
 }
 

-static void
-configurerequest(XEvent *e) {
-       Client *c;
-       XConfigureRequestEvent *ev = &e->xconfigurerequest;
-       XWindowChanges wc;
-
-       if((c = getclient(ev->window))) {
-               c->ismax = False;
-               if(ev->value_mask & CWBorderWidth)
-                       c->border = ev->border_width;
-               if(c->isfixed || c->isfloating || isfloating()) {
-                       if(ev->value_mask & CWX)
-                               c->x = ev->x;
-                       if(ev->value_mask & CWY)
-                               c->y = ev->y;
-                       if(ev->value_mask & CWWidth)
-                               c->w = ev->width;
-                       if(ev->value_mask & CWHeight)
-                               c->h = ev->height;
-                       if((c->x + c->w) > sw && c->isfloating)
-                               c->x = sw / 2 - c->w / 2; /* center in x direction */
-                       if((c->y + c->h) > sh && c->isfloating)
-                               c->y = sh / 2 - c->h / 2; /* center in y direction */
-                       if((ev->value_mask & (CWX | CWY))
-                       && !(ev->value_mask & (CWWidth | CWHeight)))
-                               configure(c);
-                       if(isvisible(c))
-                               XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
-               }
-               else
-                       configure(c);
-       }
-       else {
-               wc.x = ev->x;
-               wc.y = ev->y;
-               wc.width = ev->width;
-               wc.height = ev->height;
-               wc.border_width = ev->border_width;
-               wc.sibling = ev->above;
-               wc.stack_mode = ev->detail;
-               XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-       }
-       XSync(dpy, False);
-}
-
-static void
-configurenotify(XEvent *e) {
-       XConfigureEvent *ev = &e->xconfigure;
-
-       if (ev->window == root && (ev->width != sw || ev->height != sh)) {
-               sw = ev->width;
-               sh = ev->height;
-               XFreePixmap(dpy, dc.drawable);
-               dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
-               XResizeWindow(dpy, barwin, sw, bh);
-               updatebarpos();
-               arrange();
-       }
-}
-
-static void
-destroynotify(XEvent *e) {
-       Client *c;
-       XDestroyWindowEvent *ev = &e->xdestroywindow;
-
-       if((c = getclient(ev->window)))
-               unmanage(c);
-}
-
-static void
-enternotify(XEvent *e) {
-       Client *c;
-       XCrossingEvent *ev = &e->xcrossing;
-
-       if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
-               return;
-       if((c = getclient(ev->window)))
-               focus(c);
-       else if(ev->window == root) {
-               selscreen = True;
-               focus(NULL);
-       }
-}
-
-static void
-expose(XEvent *e) {
-       XExposeEvent *ev = &e->xexpose;
-
-       if(ev->count == 0) {
-               if(barwin == ev->window)
-                       drawbar();
-       }
-}
-
-static void
-keypress(XEvent *e) {
-       KEYS
-       unsigned int len = sizeof keys / sizeof keys[0];
-       unsigned int i;
-       KeyCode code;
-       KeySym keysym;
-       XKeyEvent *ev;
-
-       if(!e) { /* grabkeys */
-               XUngrabKey(dpy, AnyKey, AnyModifier, root);
-               for(i = 0; i < len; i++) {
-                       code = XKeysymToKeycode(dpy, keys[i].keysym);
-                       XGrabKey(dpy, code, keys[i].mod, root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
-                                       GrabModeAsync, GrabModeAsync);
-               }
-               return;
-       }
-       ev = &e->xkey;
-       keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-       for(i = 0; i < len; i++)
-               if(keysym == keys[i].keysym
-               && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
-               {
-                       if(keys[i].func)
-                               keys[i].func(keys[i].arg);
-               }
-}
-
-static void
-leavenotify(XEvent *e) {
-       XCrossingEvent *ev = &e->xcrossing;
-
-       if((ev->window == root) && !ev->same_screen) {
-               selscreen = False;
-               focus(NULL);
-       }
-}
-
-static void
-mappingnotify(XEvent *e) {
-       XMappingEvent *ev = &e->xmapping;
-
-       XRefreshKeyboardMapping(ev);
-       if(ev->request == MappingKeyboard)
-               keypress(NULL);
-}
-
-static void
-maprequest(XEvent *e) {
-       static XWindowAttributes wa;
-       XMapRequestEvent *ev = &e->xmaprequest;
-
-       if(!XGetWindowAttributes(dpy, ev->window, &wa))
-               return;
-       if(wa.override_redirect)
-               return;
-       if(!getclient(ev->window))
-               manage(ev->window, &wa);
-}
-
-static void
-propertynotify(XEvent *e) {
-       Client *c;
-       Window trans;
-       XPropertyEvent *ev = &e->xproperty;
-
-       if(ev->state == PropertyDelete)
-               return; /* ignore */
-       if((c = getclient(ev->window))) {
-               switch (ev->atom) {
-                       default: break;
-                       case XA_WM_TRANSIENT_FOR:
-                               XGetTransientForHint(dpy, c->win, &trans);
-                               if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
-                                       arrange();
-                               break;
-                       case XA_WM_NORMAL_HINTS:
-                               updatesizehints(c);
-                               break;
-               }
-               if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
-                       updatetitle(c);
-                       if(c == sel)
-                               drawbar();
-               }
-       }
-}
-
-static void
-unmapnotify(XEvent *e) {
-       Client *c;
-       XUnmapEvent *ev = &e->xunmap;
-
-       if((c = getclient(ev->window)))
-               unmanage(c);
-}
-
-static unsigned int
-idxoftag(const char *tag) {
-       unsigned int i;
-
-       for(i = 0; i < ntags; i++)
-               if(tags[i] == tag)
-                       return i;
-       return 0;
-}
-
-static void
-floating(void) { /* default floating layout */
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(isvisible(c))
-                       resize(c, c->x, c->y, c->w, c->h, True);
-}
-
-static void
-applyrules(Client *c) {
-       static char buf[512];
-       unsigned int i, j;
-       regmatch_t tmp;
-       Bool matched = False;
-       XClassHint ch = { 0 };
-
-       /* rule matching */
-       XGetClassHint(dpy, c->win, &ch);
-       snprintf(buf, sizeof buf, "%s:%s:%s",
-                       ch.res_class ? ch.res_class : "",
-                       ch.res_name ? ch.res_name : "", c->name);
-       for(i = 0; i < nrules; i++)
-               if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
-                       c->isfloating = rules[i].isfloating;
-                       for(j = 0; regs[i].tagregex && j < ntags; j++) {
-                               if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
-                                       matched = True;
-                                       c->tags[j] = True;
-                               }
-                       }
-               }
-       if(ch.res_class)
-               XFree(ch.res_class);
-       if(ch.res_name)
-               XFree(ch.res_name);
-       if(!matched)
-               for(i = 0; i < ntags; i++)
-                       c->tags[i] = seltags[i];
-}
-
-static void
-compileregs(void) {
-       unsigned int i;
-       regex_t *reg;
-
-       if(regs)
-               return;
-       nrules = sizeof rules / sizeof rules[0];
-       regs = emallocz(nrules * sizeof(Regs));
-       for(i = 0; i < nrules; i++) {
-               if(rules[i].prop) {
-                       reg = emallocz(sizeof(regex_t));
-                       if(regcomp(reg, rules[i].prop, REG_EXTENDED))
-                               free(reg);
-                       else
-                               regs[i].propregex = reg;
-               }
-               if(rules[i].tags) {
-                       reg = emallocz(sizeof(regex_t));
-                       if(regcomp(reg, rules[i].tags, REG_EXTENDED))
-                               free(reg);
-                       else
-                               regs[i].tagregex = reg;
-               }
-       }
-}
-
-static void
-focusnext(const char *arg) {
-       Client *c;
-
-       if(!sel)
-               return;
-       for(c = sel->next; c && !isvisible(c); c = c->next);
-       if(!c)
-               for(c = clients; c && !isvisible(c); c = c->next);
-       if(c) {
-               focus(c);
-               restack();
-       }
-}
-
-static void
-focusprev(const char *arg) {
-       Client *c;
-
-       if(!sel)
-               return;
-       for(c = sel->prev; c && !isvisible(c); c = c->prev);
-       if(!c) {
-               for(c = clients; c && c->next; c = c->next);
-               for(; c && !isvisible(c); c = c->prev);
-       }
-       if(c) {
-               focus(c);
-               restack();
-       }
-}
-
-static void
-initlayouts(void) {
-       unsigned int i, w;
-
-       nlayouts = sizeof layouts / sizeof layouts[0];
-       for(blw = i = 0; i < nlayouts; i++) {
-               w = textw(layouts[i].symbol);
-               if(w > blw)
-                       blw = w;
-       }
-}
-
-static Bool
-isfloating(void) {
-       return layouts[ltidx].arrange == floating;
-}
-
-static Bool
-isvisible(Client *c) {
-       unsigned int i;
-
-       for(i = 0; i < ntags; i++)
-               if(c->tags[i] && seltags[i])
-                       return True;
-       return False;
-}
-
-static void
-restack(void) {
-       Client *c;
-       XEvent ev;
-       XWindowChanges wc;
-
-       drawbar();
-       if(!sel)
-               return;
-       if(sel->isfloating || isfloating())
-               XRaiseWindow(dpy, sel->win);
-       if(!isfloating()) {
-               wc.stack_mode = Below;
-               wc.sibling = barwin;
-               if(!sel->isfloating) {
-                       XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
-                       wc.sibling = sel->win;
-               }
-               for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
-                       if(c == sel)
-                               continue;
-                       XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
-                       wc.sibling = c->win;
-               }
-       }
-       XSync(dpy, False);
-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-static void
-setlayout(const char *arg) {
-       unsigned int i;
-
-       if(!arg) {
-               if(++ltidx == nlayouts)
-                       ltidx = 0;;
-       }
-       else {
-               for(i = 0; i < nlayouts; i++)
-                       if(!strcmp(arg, layouts[i].symbol))
-                               break;
-               if(i == nlayouts)
-                       return;
-               ltidx = i;
-       }
-       if(sel)
-               arrange();
-       else
-               drawbar();
-}
-
-static void
-tag(const char *arg) {
-       unsigned int i;
-
-       if(!sel)
-               return;
-       for(i = 0; i < ntags; i++)
-               sel->tags[i] = arg == NULL;
-       i = idxoftag(arg);
-       if(i >= 0 && i < ntags)
-               sel->tags[i] = True;
-       arrange();
-}
-
-static void
-togglefloating(const char *arg) {
-       if(!sel)
-               return;
-       sel->isfloating = !sel->isfloating;
-       if(sel->isfloating)
-               resize(sel, sel->x, sel->y, sel->w, sel->h, True);
-       arrange();
-}
-
-static void
-togglemax(const char *arg) {
+void
+run(void) {
+       char *p;
+       char buf[sizeof stext];
+       fd_set rd;
+       int r, xfd;
+       unsigned int len, offset;

        XEvent ev;
 
        XEvent ev;
 

-       if(!sel || (!isfloating() && !sel->isfloating) || sel->isfixed)
-               return;
-       if((sel->ismax = !sel->ismax)) {
-               sel->rx = sel->x;
-               sel->ry = sel->y;
-               sel->rw = sel->w;
-               sel->rh = sel->h;
-               resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
-       }
-       else
-               resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
-       drawbar();
-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-static void
-toggletag(const char *arg) {
-       unsigned int i, j;
-
-       if(!sel)
-               return;
-       i = idxoftag(arg);
-       sel->tags[i] = !sel->tags[i];
-       for(j = 0; j < ntags && !sel->tags[j]; j++);
-       if(j == ntags)
-               sel->tags[i] = True;
-       arrange();
-}
-
-static void
-toggleview(const char *arg) {
-       unsigned int i, j;
-
-       i = idxoftag(arg);
-       seltags[i] = !seltags[i];
-       for(j = 0; j < ntags && !seltags[j]; j++);
-       if(j == ntags)
-               seltags[i] = True; /* cannot toggle last view */
-       arrange();
-}
-
-static void
-view(const char *arg) {
-       unsigned int i;
-
-       for(i = 0; i < ntags; i++)
-               seltags[i] = arg == NULL;
-       i = idxoftag(arg);
-       if(i >= 0 && i < ntags)
-               seltags[i] = True;
-       arrange();
-}
-
-static void
-cleanup(void) {
-       close(STDIN_FILENO);
-       while(stack) {
-               unban(stack);
-               unmanage(stack);
-       }
-       if(dc.font.set)
-               XFreeFontSet(dpy, dc.font.set);
-       else
-               XFreeFont(dpy, dc.font.xfont);
-       XUngrabKey(dpy, AnyKey, AnyModifier, root);
-       XFreePixmap(dpy, dc.drawable);
-       XFreeGC(dpy, dc.gc);
-       XDestroyWindow(dpy, barwin);
-       XFreeCursor(dpy, cursor[CurNormal]);
-       XFreeCursor(dpy, cursor[CurResize]);
-       XFreeCursor(dpy, cursor[CurMove]);
-       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+       /* main event loop, also reads status text from stdin */

        XSync(dpy, False);
        XSync(dpy, False);

-       free(seltags);
-}
-
-static long
-getstate(Window w) {
-       int format, status;
-       long result = -1;
-       unsigned char *p = NULL;
-       unsigned long n, extra;
-       Atom real;
-
-       status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
-                       &real, &format, &n, &extra, (unsigned char **)&p);
-       if(status != Success)
-               return -1;
-       if(n != 0)
-               result = *p;
-       XFree(p);
-       return result;
+       xfd = ConnectionNumber(dpy);
+       readin = True;
+       offset = 0;
+       len = sizeof stext - 1;
+       buf[len] = stext[len] = '\0'; /* 0-terminator is never touched */
+       while(running) {
+               FD_ZERO(&rd);
+               if(readin)
+                       FD_SET(STDIN_FILENO, &rd);
+               FD_SET(xfd, &rd);
+               if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
+                       if(errno == EINTR)
+                               continue;
+                       eprint("select failed\n");
+               }
+               if(FD_ISSET(STDIN_FILENO, &rd)) {
+                       switch((r = read(STDIN_FILENO, buf + offset, len - offset))) {
+                       case -1:
+                               strncpy(stext, strerror(errno), len);
+                               readin = False;
+                               break;
+                       case 0:
+                               strncpy(stext, "EOF", 4);
+                               readin = False;
+                               break;
+                       default:
+                               for(p = buf + offset; r > 0; p++, r--, offset++)
+                                       if(*p == '\n' || *p == '\0') {
+                                               *p = '\0';
+                                               strncpy(stext, buf, len);
+                                               p += r - 1; /* p is buf + offset + r - 1 */
+                                               for(r = 0; *(p - r) && *(p - r) != '\n'; r++);
+                                               offset = r;
+                                               if(r)
+                                                       memmove(buf, p - r + 1, r);
+                                               break;
+                                       }
+                               break;
+                       }
+                       drawbar();
+               }
+               while(XPending(dpy)) {
+                       XNextEvent(dpy, &ev);
+                       if(handler[ev.type])
+                               (handler[ev.type])(&ev); /* call handler */
+               }
+       }

 }
 
 }
 

-static void
+void

 scan(void) {
        unsigned int i, num;
        Window *wins, d1, d2;
 scan(void) {
        unsigned int i, num;
        Window *wins, d1, d2;


@@ -1534,10 +1395,62 @@ scan(void) {
                XFree(wins);
 }
 
                XFree(wins);
 }
 

-static void
+void
+setclientstate(Client *c, long state) {
+       long data[] = {state, None};
+
+       XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
+                       PropModeReplace, (unsigned char *)data, 2);
+}
+
+void
+setlayout(const char *arg) {
+       unsigned int i;
+
+       if(!arg) {
+               if(++layout == &layouts[LENGTH(layouts)])
+                       layout = &layouts[0];
+       }
+       else {
+               for(i = 0; i < LENGTH(layouts); i++)
+                       if(!strcmp(arg, layouts[i].symbol))
+                               break;
+               if(i == LENGTH(layouts))
+                       return;
+               layout = &layouts[i];
+       }
+       if(sel)
+               arrange();
+       else
+               drawbar();
+}
+
+void
+setmwfact(const char *arg) {
+       double delta;
+
+       if(!domwfact)
+               return;
+       /* arg handling, manipulate mwfact */
+       if(arg == NULL)
+               mwfact = MWFACT;
+       else if(sscanf(arg, "%lf", &delta) == 1) {
+               if(arg[0] == '+' || arg[0] == '-')
+                       mwfact += delta;
+               else
+                       mwfact = delta;
+               if(mwfact < 0.1)
+                       mwfact = 0.1;
+               else if(mwfact > 0.9)
+                       mwfact = 0.9;
+       }
+       arrange();
+}
+
+void

 setup(void) {
 setup(void) {

-       int i, j;
-       unsigned int mask;
+       int d;
+       unsigned int i, j, mask;

        Window w;
        XModifierKeymap *modmap;
        XSetWindowAttributes wa;
        Window w;
        XModifierKeymap *modmap;
        XSetWindowAttributes wa;


@@ -1551,88 +1464,352 @@ setup(void) {
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
        XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
                        PropModeReplace, (unsigned char *) netatom, NetLast);
        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);
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
        /* init cursors */
        cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);

+
+       /* init geometry */
+       sx = sy = 0;
+       sw = DisplayWidth(dpy, screen);
+       sh = DisplayHeight(dpy, screen);
+

        /* init modifier map */
        modmap = XGetModifierMapping(dpy);
        /* init modifier map */
        modmap = XGetModifierMapping(dpy);

-       for (i = 0; i < 8; i++)
-               for (j = 0; j < modmap->max_keypermod; j++) {
+       for(i = 0; i < 8; i++)
+               for(j = 0; j < modmap->max_keypermod; j++) {

                        if(modmap->modifiermap[i * modmap->max_keypermod + j]
                        if(modmap->modifiermap[i * modmap->max_keypermod + j]

-                                       == XKeysymToKeycode(dpy, XK_Num_Lock))
+                       == XKeysymToKeycode(dpy, XK_Num_Lock))

                                numlockmask = (1 << i);
                }
        XFreeModifiermap(modmap);
                                numlockmask = (1 << i);
                }
        XFreeModifiermap(modmap);

+

        /* select for events */
        wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
                | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
        XSelectInput(dpy, root, wa.event_mask);
        /* select for events */
        wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
                | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
        wa.cursor = cursor[CurNormal];
        XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
        XSelectInput(dpy, root, wa.event_mask);

-       keypress(NULL); /* grabkeys */
+
+       /* grab keys */
+       grabkeys();
+
+       /* init tags */
+       memcpy(prevtags, seltags, sizeof seltags);

        compileregs();
        compileregs();

-       for(ntags = 0; tags[ntags]; ntags++);
-       seltags = emallocz(sizeof(Bool) * ntags);
-       seltags[0] = True;
-       /* geometry */
-       sx = sy = 0;
-       sw = DisplayWidth(dpy, screen);
-       sh = DisplayHeight(dpy, screen);
-       initstyle();
-       initlayouts();
-       initbar();
+
+       /* init appearance */
+       dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
+       dc.norm[ColBG] = getcolor(NORMBGCOLOR);
+       dc.norm[ColFG] = getcolor(NORMFGCOLOR);
+       dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
+       dc.sel[ColBG] = getcolor(SELBGCOLOR);
+       dc.sel[ColFG] = getcolor(SELFGCOLOR);
+       initfont(FONT);
+       dc.h = bh = dc.font.height + 2;
+
+       /* init layouts */
+       mwfact = MWFACT;
+       layout = &layouts[0];
+       for(blw = i = 0; i < LENGTH(layouts); i++) {
+               j = textw(layouts[i].symbol);
+               if(j > blw)
+                       blw = j;
+       }
+
+       /* init bar */
+       bpos = BARPOS;
+       wa.override_redirect = 1;
+       wa.background_pixmap = ParentRelative;
+       wa.event_mask = ButtonPressMask | ExposureMask;
+       barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0,
+                       DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
+                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
+       XDefineCursor(dpy, barwin, cursor[CurNormal]);
+       updatebarpos();
+       XMapRaised(dpy, barwin);
+       strcpy(stext, "dwm-"VERSION);
+       dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+       dc.gc = XCreateGC(dpy, root, 0, 0);
+       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+       if(!dc.font.set)
+               XSetFont(dpy, dc.gc, dc.font.xfont->fid);
+

        /* multihead support */
        /* multihead support */

-       selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
+       selscreen = XQueryPointer(dpy, root, &w, &w, &d, &d, &d, &d, &mask);
+

 }
 
 }
 

-/*
- * Startup Error handler to check if another window manager
- * is already running.
- */
-static int
-xerrorstart(Display *dsply, XErrorEvent *ee) {
-       otherwm = True;
-       return -1;
+void
+spawn(const char *arg) {
+       static char *shell = NULL;
+
+       if(!shell && !(shell = getenv("SHELL")))
+               shell = "/bin/sh";
+       if(!arg)
+               return;
+       /* The double-fork construct avoids zombie processes and keeps the code
+        * clean from stupid signal handlers. */
+       if(fork() == 0) {
+               if(fork() == 0) {
+                       if(dpy)
+                               close(ConnectionNumber(dpy));
+                       setsid();
+                       execl(shell, shell, "-c", arg, (char *)NULL);
+                       fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg);
+                       perror(" failed");
+               }
+               exit(0);
+       }
+       wait(0);
+}
+
+void
+tag(const char *arg) {
+       unsigned int i;
+
+       if(!sel)
+               return;
+       for(i = 0; i < LENGTH(tags); i++)
+               sel->tags[i] = (NULL == arg);
+       sel->tags[idxoftag(arg)] = True;
+       arrange();
+}
+
+unsigned int
+textnw(const char *text, unsigned int len) {
+       XRectangle r;
+
+       if(dc.font.set) {
+               XmbTextExtents(dc.font.set, text, len, NULL, &r);
+               return r.width;
+       }
+       return XTextWidth(dc.font.xfont, text, len);
+}
+
+unsigned int
+textw(const char *text) {
+       return textnw(text, strlen(text)) + dc.font.height;
+}
+
+void
+tile(void) {
+       unsigned int i, n, nx, ny, nw, nh, mw, th;
+       Client *c, *mc;
+
+       domwfact = dozoom = True;
+       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+               n++;
+
+       /* window geoms */
+       mw = (n == 1) ? waw : mwfact * waw;
+       th = (n > 1) ? wah / (n - 1) : 0;
+       if(n > 1 && th < bh)
+               th = wah;
+
+       nx = wax;
+       ny = way;
+       nw = 0; /* gcc stupidity requires this */
+       for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next), i++) {
+               if(i == 0) { /* master */
+                       nw = mw - 2 * c->border;
+                       nh = wah - 2 * c->border;
+               }
+               else {  /* tile window */
+                       if(i == 1) {
+                               ny = way;
+                               nx += mc->w + 2 * mc->border;
+                               nw = waw - nx - 2 * c->border;
+                       }
+                       if(i + 1 == n) /* remainder */
+                               nh = (way + wah) - ny - 2 * c->border;
+                       else
+                               nh = th - 2 * c->border;
+               }
+               resize(c, nx, ny, nw, nh, RESIZEHINTS);
+               if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)))
+                       /* client doesn't accept size constraints */
+                       resize(c, nx, ny, nw, nh, False);
+               if(n > 1 && th != wah)
+                       ny = c->y + c->h + 2 * c->border;
+       }
+}
+
+void
+togglebar(const char *arg) {
+       if(bpos == BarOff)
+               bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
+       else
+               bpos = BarOff;
+       updatebarpos();
+       arrange();
+}
+
+void
+togglefloating(const char *arg) {
+       if(!sel)
+               return;
+       sel->isfloating = !sel->isfloating;
+       if(sel->isfloating)
+               resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+       arrange();
+}
+
+void
+toggletag(const char *arg) {
+       unsigned int i, j;
+
+       if(!sel)
+               return;
+       i = idxoftag(arg);
+       sel->tags[i] = !sel->tags[i];
+       for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
+       if(j == LENGTH(tags))
+               sel->tags[i] = True; /* at least one tag must be enabled */
+       arrange();
+}
+
+void
+toggleview(const char *arg) {
+       unsigned int i, j;
+
+       i = idxoftag(arg);
+       seltags[i] = !seltags[i];
+       for(j = 0; j < LENGTH(tags) && !seltags[j]; j++);
+       if(j == LENGTH(tags))
+               seltags[i] = True; /* at least one tag must be viewed */
+       arrange();
+}
+
+void
+unban(Client *c) {
+       if(!c->isbanned)
+               return;
+       XMoveWindow(dpy, c->win, c->x, c->y);
+       c->isbanned = False;
+}
+
+void
+unmanage(Client *c) {
+       XWindowChanges wc;
+
+       wc.border_width = c->oldborder;
+       /* The server grab construct avoids race conditions. */
+       XGrabServer(dpy);
+       XSetErrorHandler(xerrordummy);
+       XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
+       detach(c);
+       detachstack(c);
+       if(sel == c)
+               focus(NULL);
+       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+       setclientstate(c, WithdrawnState);
+       free(c->tags);
+       free(c);
+       XSync(dpy, False);
+       XSetErrorHandler(xerror);
+       XUngrabServer(dpy);
+       arrange();
+}
+
+void
+unmapnotify(XEvent *e) {
+       Client *c;
+       XUnmapEvent *ev = &e->xunmap;
+
+       if((c = getclient(ev->window)))
+               unmanage(c);
+}
+
+void
+updatebarpos(void) {
+       XEvent ev;
+
+       wax = sx;
+       way = sy;
+       wah = sh;
+       waw = sw;
+       switch(bpos) {
+       default:
+               wah -= bh;
+               way += bh;
+               XMoveWindow(dpy, barwin, sx, sy);
+               break;
+       case BarBot:
+               wah -= bh;
+               XMoveWindow(dpy, barwin, sx, sy + wah);
+               break;
+       case BarOff:
+               XMoveWindow(dpy, barwin, sx, sy - bh);
+               break;
+       }
+       XSync(dpy, False);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));

 }
 
 }
 

-static Bool
-gettextprop(Window w, Atom atom, char *text, unsigned int size) {
-       char **list = NULL;
-       int n;
-       XTextProperty name;
+void
+updatesizehints(Client *c) {
+       long msize;
+       XSizeHints size;

 
 

-       if(!text || size == 0)
-               return False;
-       text[0] = '\0';
-       XGetTextProperty(dpy, w, &name, atom);
-       if(!name.nitems)
-               return False;
-       if(name.encoding == XA_STRING)
-               strncpy(text, (char *)name.value, size - 1);
-       else {
-               if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
-               && n > 0 && *list)
-               {
-                       strncpy(text, *list, size - 1);
-                       XFreeStringList(list);
-               }
+       if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
+               size.flags = PSize;
+       c->flags = size.flags;
+       if(c->flags & PBaseSize) {
+               c->basew = size.base_width;
+               c->baseh = size.base_height;

        }
        }

-       text[size - 1] = '\0';
-       XFree(name.value);
-       return True;
+       else if(c->flags & PMinSize) {
+               c->basew = size.min_width;
+               c->baseh = size.min_height;
+       }
+       else
+               c->basew = c->baseh = 0;
+       if(c->flags & PResizeInc) {
+               c->incw = size.width_inc;
+               c->inch = size.height_inc;
+       }
+       else
+               c->incw = c->inch = 0;
+       if(c->flags & PMaxSize) {
+               c->maxw = size.max_width;
+               c->maxh = size.max_height;
+       }
+       else
+               c->maxw = c->maxh = 0;
+       if(c->flags & PMinSize) {
+               c->minw = size.min_width;
+               c->minh = size.min_height;
+       }
+       else if(c->flags & PBaseSize) {
+               c->minw = size.base_width;
+               c->minh = size.base_height;
+       }
+       else
+               c->minw = c->minh = 0;
+       if(c->flags & PAspect) {
+               c->minax = size.min_aspect.x;
+               c->maxax = size.max_aspect.x;
+               c->minay = size.min_aspect.y;
+               c->maxay = size.max_aspect.y;
+       }
+       else
+               c->minax = c->maxax = c->minay = c->maxay = 0;
+       c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
+                       && c->maxw == c->minw && c->maxh == c->minh);

 }
 
 }
 

-static void
-quit(const char *arg) {
-       readin = running = False;
+void
+updatetitle(Client *c) {
+       if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
+               gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);

 }
 
 /* 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
 }
 
 /* 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 may call exit.
- */
-static int
+ * default error handler, which may call exit.  */
+int

 xerror(Display *dpy, XErrorEvent *ee) {
        if(ee->error_code == BadWindow
        || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
 xerror(Display *dpy, XErrorEvent *ee) {
        if(ee->error_code == BadWindow
        || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)


@@ -1648,142 +1825,45 @@ xerror(Display *dpy, XErrorEvent *ee) {
        return xerrorxlib(dpy, ee); /* may call exit */
 }
 
        return xerrorxlib(dpy, ee); /* may call exit */
 }
 

-static void
-arrange(void) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(isvisible(c))
-                       unban(c);
-               else
-                       ban(c);
-       layouts[ltidx].arrange();
-       focus(NULL);
-       restack();
-}
-
-static void
-attach(Client *c) {
-       if(clients)
-               clients->prev = c;
-       c->next = clients;
-       clients = c;
-}
-
-static void
-detach(Client *c) {
-       if(c->prev)
-               c->prev->next = c->next;
-       if(c->next)
-               c->next->prev = c->prev;
-       if(c == clients)
-               clients = c->next;
-       c->next = c->prev = NULL;
-}
-
-static void
-focus(Client *c) {
-       if((!c && selscreen) || (c && !isvisible(c)))
-               for(c = stack; c && !isvisible(c); c = c->snext);
-       if(sel && sel != c) {
-               grabbuttons(sel, False);
-               XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
-       }
-       if(c) {
-               detachstack(c);
-               attachstack(c);
-               grabbuttons(c, True);
-       }
-       sel = c;
-       drawbar();
-       if(!selscreen)
-               return;
-       if(c) {
-               XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
-               XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-       }
-       else
-               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-}
-
-static Bool
-isarrange(void (*func)())
-{
-       return func == layouts[ltidx].arrange;
+int
+xerrordummy(Display *dsply, XErrorEvent *ee) {
+       return 0;

 }
 
 }
 

-static Client *
-nexttiled(Client *c) {
-       for(; c && (c->isfloating || !isvisible(c)); c = c->next);
-       return c;
+/* Startup Error handler to check if another window manager
+ * is already running. */
+int
+xerrorstart(Display *dsply, XErrorEvent *ee) {
+       otherwm = True;
+       return -1;

 }
 
 }
 

-static void
-setmwfact(const char *arg) {
-       double delta;
+void
+view(const char *arg) {
+       unsigned int i;

 
 

-       if(!isarrange(tile))
-               return;
-       /* arg handling, manipulate mwfact */
-       if(arg == NULL)
-               mwfact = MWFACT;
-       else if(1 == sscanf(arg, "%lf", &delta)) {
-               if(arg[0] != '+' && arg[0] != '-')
-                       mwfact = delta;
-               else
-                       mwfact += delta;
-               if(mwfact < 0.1)
-                       mwfact = 0.1;
-               else if(mwfact > 0.9)
-                       mwfact = 0.9;
-       }
+       memcpy(prevtags, seltags, sizeof seltags);
+       for(i = 0; i < LENGTH(tags); i++)
+               seltags[i] = (NULL == arg);
+       seltags[idxoftag(arg)] = True;

        arrange();
 }
 
        arrange();
 }
 

-static void
-tile(void) {
-       unsigned int i, n, nx, ny, nw, nh, mw, th;
-       Client *c;
-
-       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
-
-       /* window geoms */
-       mw = (n == 1) ? waw : mwfact * waw;
-       th = (n > 1) ? wah / (n - 1) : 0;
-       if(n > 1 && th < bh)
-               th = wah;
+void
+viewprevtag(const char *arg) {
+       static Bool tmp[LENGTH(tags)];

 
 

-       nx = wax;
-       ny = way;
-       for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++) {
-               c->ismax = False;
-               if(i == 0) { /* master */
-                       nw = mw - 2 * c->border;
-                       nh = wah - 2 * c->border;
-               }
-               else {  /* tile window */
-                       if(i == 1) {
-                               ny = way;
-                               nx += mw;
-                       }
-                       nw = waw - mw - 2 * c->border;
-                       if(i + 1 == n) /* remainder */
-                               nh = (way + wah) - ny - 2 * c->border;
-                       else
-                               nh = th - 2 * c->border;
-               }
-               resize(c, nx, ny, nw, nh, RESIZEHINTS);
-               if(n > 1 && th != wah)
-                       ny += nh + 2 * c->border;
-       }
+       memcpy(tmp, seltags, sizeof seltags);
+       memcpy(seltags, prevtags, sizeof seltags);
+       memcpy(prevtags, tmp, sizeof seltags);
+       arrange();

 }
 
 }
 

-static void
+void

 zoom(const char *arg) {
        Client *c;
 
 zoom(const char *arg) {
        Client *c;
 

-       if(!sel || !isarrange(tile) || sel->isfloating)
+       if(!sel || !dozoom || sel->isfloating)

                return;
        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))
                return;
        if((c = sel) == nexttiled(clients))
                if(!(c = nexttiled(c->next)))


@@ -1796,76 +1876,25 @@ zoom(const char *arg) {
 
 int
 main(int argc, char *argv[]) {
 
 int
 main(int argc, char *argv[]) {

-       char *p;
-       int r, xfd;
-       fd_set rd;
-       XEvent ev;
-

        if(argc == 2 && !strcmp("-v", argv[1]))
        if(argc == 2 && !strcmp("-v", argv[1]))

-               eprint("dwm-"VERSION", © 2006-2007 A. R. Garbe, S. van Dijk, J. Salmi, P. Hruby, S. Nagy\n");
+               eprint("dwm-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk, "
+                      "Jukka Salmi, Premysl Hruby, Szabolcs Nagy\n");

        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");

+

        setlocale(LC_CTYPE, "");
        if(!(dpy = XOpenDisplay(0)))
                eprint("dwm: cannot open display\n");
        setlocale(LC_CTYPE, "");
        if(!(dpy = XOpenDisplay(0)))
                eprint("dwm: cannot open display\n");

-       xfd = ConnectionNumber(dpy);

        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);

-       otherwm = False;
-       XSetErrorHandler(xerrorstart);
-       /* this causes an error if some other window manager is running */
-       XSelectInput(dpy, root, SubstructureRedirectMask);
-       XSync(dpy, False);
-       if(otherwm)
-               eprint("dwm: another window manager is already running\n");

 
 

-       XSync(dpy, False);
-       XSetErrorHandler(NULL);
-       xerrorxlib = XSetErrorHandler(xerror);
-       XSync(dpy, False);
+       checkotherwm();

        setup();
        drawbar();
        scan();
        setup();
        drawbar();
        scan();

-
-       /* main event loop, also reads status text from stdin */
-       XSync(dpy, False);
-       readin = True;
-       while(running) {
-               FD_ZERO(&rd);
-               if(readin)
-                       FD_SET(STDIN_FILENO, &rd);
-               FD_SET(xfd, &rd);
-               if(select(xfd + 1, &rd, NULL, NULL, NULL) == -1) {
-                       if(errno == EINTR)
-                               continue;
-                       eprint("select failed\n");
-               }
-               if(FD_ISSET(STDIN_FILENO, &rd)) {
-                       switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
-                       case -1:
-                               strncpy(stext, strerror(errno), sizeof stext - 1);
-                               stext[sizeof stext - 1] = '\0';
-                               readin = False;
-                               break;
-                       case 0:
-                               strncpy(stext, "EOF", 4);
-                               readin = False;
-                               break;
-                       default:
-                               for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
-                               for(; p >= stext && *p != '\n'; --p);
-                               if(p > stext)
-                                       strncpy(stext, p + 1, sizeof stext);
-                       }
-                       drawbar();
-               }
-               while(XPending(dpy)) {
-                       XNextEvent(dpy, &ev);
-                       if(handler[ev.type])
-                               (handler[ev.type])(&ev); /* call handler */
-               }
-       }
+       run();

        cleanup();
        cleanup();

+

        XCloseDisplay(dpy);
        return 0;
 }
        XCloseDisplay(dpy);
        return 0;
 }