applied the proposal by nsz

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index ab9c11b..997a220 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -17,16 +17,12 @@
  * 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 config.h.
  *
  * To understand everything else, start reading main().
  */
  *
  * Keys and tagging rules are organized as arrays and defined in config.h.
  *
  * To understand everything else, start reading main().
  */

-#include "dwm.h"
-

 #include <errno.h>
 #include <locale.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <locale.h>
 #include <stdarg.h>


@@ -37,40 +33,189 @@
 #include <sys/select.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/select.h>
 #include <sys/types.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 */
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 
 /* macros */

-#define BUTTONMASK             (ButtonPressMask | ButtonReleaseMask)
-#define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))
-#define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
+#define MAX(a, b) ((a)>(b)?(a):(b))
+#define MIN(a, b) ((a)<(b)?(a):(b))
+#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 DEFGEOM(GEONAME,BX,BY,BW,WX,WY,WW,WH,MX,MY,MW,MH,TX,TY,TW,TH,MOX,MOY,MOW,MOH) \
+void GEONAME(void) { \
+       bx = (BX); by = (BY); bw = (BW); \
+       wx = (WX); wy = (WY); ww = (WW); wh = (WH); \
+       mx = (MX); my = (MY); mw = (MW); mh = (MH); \
+       tx = (TX); ty = (TY); tw = (TW); th = (TH); \
+       mox = (MOX); moy = (MOY); mow = (MOW); moh = (MOH); \
+}
+
+/* enums */
+enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
+enum { ColBorder, ColFG, ColBG, ColLast };             /* color */
+enum { NetSupported, NetWMName, NetLast };             /* EWMH atoms */
+enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
+
+/* typedefs */
+typedef struct Client Client;
+struct Client {
+       char name[256];
+       int x, y, w, h;
+       int fx, fy, fw, fh;
+       int basew, baseh, incw, inch, maxw, maxh, minw, minh;
+       int minax, maxax, minay, maxay;
+       long flags;
+       unsigned int bw, oldbw;
+       Bool isbanned, isfixed, isfloating, isurgent;
+       Bool *tags;
+       Client *next;
+       Client *prev;
+       Client *snext;
+       Window win;
+};
+
+typedef struct {
+       int x, y, w, h;
+       unsigned long norm[ColLast];
+       unsigned long sel[ColLast];
+       Drawable drawable;
+       GC gc;
+       struct {
+               int ascent;
+               int descent;
+               int height;
+               XFontSet set;
+               XFontStruct *xfont;
+       } font;
+} DC; /* draw context */
+
+typedef struct {
+       const char *symbol;
+       void (*apply)(void);
+} Geom;
+
+typedef struct {
+       unsigned long mod;
+       KeySym keysym;
+       void (*func)(const char *arg);
+       const char *arg;
+} Key;

 
 

-/* local typedefs */

 typedef struct {
 typedef struct {

-       const char *prop;
-       const char *tags;
+       const char *symbol;
+       void (*arrange)(void);

        Bool isfloating;
        Bool isfloating;

-} Rule;
+} Layout;

 
 typedef struct {
 
 typedef struct {

-       regex_t *propregex;
-       regex_t *tagregex;
-} Regs;
+       const char *class;
+       const char *instance;
+       const char *title;
+       const char *tag;
+       Bool isfloating;
+} Rule;
+
+/* 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 configure(Client *c);
+void configurenotify(XEvent *e);
+void configurerequest(XEvent *e);
+unsigned int counttiled(void);
+void destroynotify(XEvent *e);
+void detach(Client *c);
+void detachstack(Client *c);
+void drawbar(void);
+void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
+void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
+void *emallocz(unsigned int size);
+void enternotify(XEvent *e);
+void eprint(const char *errstr, ...);
+void expose(XEvent *e);
+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 *t);
+void initfont(const char *fontstr);
+Bool isoccupied(unsigned int t);
+Bool isprotodel(Client *c);
+Bool isurgent(unsigned int t);
+Bool isvisible(Client *c);
+void keypress(XEvent *e);
+void killclient(const char *arg);
+void manage(Window w, XWindowAttributes *wa);
+void mappingnotify(XEvent *e);
+void maprequest(XEvent *e);
+void monocle(void);
+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 setgeom(const char *arg);
+void setlayout(const char *arg);
+void setmfact(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 tileh(void);
+void tilehstack(unsigned int n);
+Client *tilemaster(unsigned int n);
+void tileresize(Client *c, int x, int y, int w, int h);
+void tilev(void);
+void tilevstack(unsigned int n);
+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 updatewmhints(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 *dpy, XErrorEvent *ee);
+int xerrorstart(Display *dpy, XErrorEvent *ee);
+void zoom(const char *arg);

 
 /* variables */
 char stext[256];
 
 /* variables */
 char stext[256];

-double mwfact;
-int screen, sx, sy, sw, sh, wax, way, waw, wah;
+int screen, sx, sy, sw, sh;

 int (*xerrorxlib)(Display *, XErrorEvent *);
 int (*xerrorxlib)(Display *, XErrorEvent *);

-unsigned int bh, bpos;
-unsigned int blw = 0;
-unsigned int ltidx = 0; /* default */
-unsigned int nlayouts = 0;
-unsigned int nrules = 0;
+int bx, by, bw, bh, blw, bgw, mx, my, mw, mh, mox, moy, mow, moh, tx, ty, tw, th, wx, wy, ww, wh;
+int seltags = 0;
+double mfact;

 unsigned int numlockmask = 0;
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
 unsigned int numlockmask = 0;
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,


@@ -78,8 +223,8 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [ConfigureNotify] = configurenotify,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,
        [ConfigureNotify] = configurenotify,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,

-       [LeaveNotify] = leavenotify,

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

+       [FocusIn] = focusin,

        [KeyPress] = keypress,
        [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,
        [KeyPress] = keypress,
        [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,


@@ -89,54 +234,52 @@ void (*handler[LASTEvent]) (XEvent *) = {
 Atom wmatom[WMLast], netatom[NetLast];
 Bool otherwm, readin;
 Bool running = True;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool otherwm, readin;
 Bool running = True;

-Bool selscreen = True;
+Bool *tagset[2];

 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};

-Window barwin, root;
-Regs *regs = NULL;
+Geom geoms[];
+Geom *geom = geoms;
+Layout layouts[];
+Layout *lt = layouts;
+Window root, barwin;

 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"

+#define TAGSZ (LENGTH(tags) * sizeof(Bool))

 
 

-/* Statically define the number of tags. */
-unsigned int ntags = sizeof tags / sizeof tags[0];
-Bool seltags[sizeof tags / sizeof tags[0]] = {[0] = True};
-Bool prevtags[sizeof tags / sizeof tags[0]] = {[0] = True};
+/* function implementations */

 
 

-/* functions*/

 void
 applyrules(Client *c) {
 void
 applyrules(Client *c) {

-       static char buf[512];
-       unsigned int i, j;
-       regmatch_t tmp;
+       unsigned int i;

        Bool matched = False;
        Bool matched = False;

+       Rule *r;

        XClassHint ch = { 0 };
 
        /* rule matching */
        XGetClassHint(dpy, c->win, &ch);
        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;
-                               }
+       for(i = 0; i < LENGTH(rules); i++) {
+               r = &rules[i];
+               if((!r->title || strstr(c->name, r->title))
+               && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
+               && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
+                       c->isfloating = r->isfloating;
+                       if(r->tag) {
+                               c->tags[idxoftag(r->tag)] = True;
+                               matched = True;

                        }
                }
                        }
                }

+       }

        if(ch.res_class)
                XFree(ch.res_class);
        if(ch.res_name)
                XFree(ch.res_name);
        if(!matched)
        if(ch.res_class)
                XFree(ch.res_class);
        if(ch.res_name)
                XFree(ch.res_name);
        if(!matched)

-               memcpy(c->tags, seltags, sizeof seltags);
+               memcpy(c->tags, tagset[seltags], TAGSZ);

 }
 
 void
 }
 
 void


@@ -144,12 +287,17 @@ arrange(void) {
        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)

-               if(isvisible(c))
+               if(isvisible(c)) {

                        unban(c);
                        unban(c);

+                       if(lt->isfloating || c->isfloating)
+                               resize(c, c->fx, c->fy, c->fw, c->fh, True);
+               }

                else
                        ban(c);
                else
                        ban(c);

-       layouts[ltidx].arrange();
+

        focus(NULL);
        focus(NULL);

+       if(lt->arrange)
+               lt->arrange();

        restack();
 }
 
        restack();
 }
 


@@ -181,11 +329,15 @@ buttonpress(XEvent *e) {
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 

-       if(barwin == ev->window) {
-               x = 0;
-               for(i = 0; i < ntags; i++) {
+       if(ev->window == barwin) {
+               if((ev->x < bgw) && ev->button == Button1) {
+                       setgeom(NULL);
+                       return;
+               }
+               x = bgw;
+               for(i = 0; i < LENGTH(tags); i++) {

                        x += textw(tags[i]);
                        x += textw(tags[i]);

-                       if(ev->x < x) {
+                       if(ev->x >= bgw && ev->x < x) {

                                if(ev->button == Button1) {
                                        if(ev->state & MODKEY)
                                                tag(tags[i]);
                                if(ev->button == Button1) {
                                        if(ev->state & MODKEY)
                                                tag(tags[i]);


@@ -201,7 +353,7 @@ buttonpress(XEvent *e) {
                                return;
                        }
                }
                                return;
                        }
                }

-               if((ev->x < x + blw) && ev->button == Button1)
+               if((ev->x < x + blw) && ev->button == Button1) 

                        setlayout(NULL);
        }
        else if((c = getclient(ev->window))) {
                        setlayout(NULL);
        }
        else if((c = getclient(ev->window))) {


@@ -209,23 +361,17 @@ buttonpress(XEvent *e) {
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
                if(ev->button == Button1) {
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
                if(ev->button == Button1) {

-                       if(isarrange(floating) || c->isfloating)
-                               restack();
-                       else
-                               togglefloating(NULL);
+                       restack();

                        movemouse(c);
                }
                else if(ev->button == Button2) {
                        movemouse(c);
                }
                else if(ev->button == Button2) {

-                       if(ISTILE && !c->isfixed && c->isfloating)
+                       if(!lt->isfloating && c->isfloating)

                                togglefloating(NULL);
                        else
                                zoom(NULL);
                }
                else if(ev->button == Button3 && !c->isfixed) {
                                togglefloating(NULL);
                        else
                                zoom(NULL);
                }
                else if(ev->button == Button3 && !c->isfixed) {

-                       if(isarrange(floating) || c->isfloating)
-                               restack();
-                       else
-                               togglefloating(NULL);
+                       restack();

                        resizemouse(c);
                }
        }
                        resizemouse(c);
                }
        }


@@ -237,7 +383,7 @@ checkotherwm(void) {
        XSetErrorHandler(xerrorstart);
 
        /* this causes an error if some other window manager is running */
        XSetErrorHandler(xerrorstart);
 
        /* this causes an error if some other window manager is running */

-       XSelectInput(dpy, root, SubstructureRedirectMask);
+       XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);

        XSync(dpy, False);
        if(otherwm)
                eprint("dwm: another window manager is already running\n");
        XSync(dpy, False);
        if(otherwm)
                eprint("dwm: another window manager is already running\n");


@@ -261,39 +407,12 @@ cleanup(void) {
        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        XFreePixmap(dpy, dc.drawable);
        XFreeGC(dpy, dc.gc);
        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]);
        XFreeCursor(dpy, cursor[CurNormal]);
        XFreeCursor(dpy, cursor[CurResize]);
        XFreeCursor(dpy, cursor[CurMove]);

-       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+       XDestroyWindow(dpy, barwin);

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

-}
-
-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;
-               }
-       }
+       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);

 }
 
 void
 }
 
 void


@@ -308,7 +427,7 @@ configure(Client *c) {
        ce.y = c->y;
        ce.width = c->w;
        ce.height = c->h;
        ce.y = c->y;
        ce.width = c->w;
        ce.height = c->h;

-       ce.border_width = c->border;
+       ce.border_width = c->bw;

        ce.above = None;
        ce.override_redirect = False;
        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
        ce.above = None;
        ce.override_redirect = False;
        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);


@@ -321,11 +440,7 @@ configurenotify(XEvent *e) {
        if(ev->window == root && (ev->width != sw || ev->height != sh)) {
                sw = ev->width;
                sh = ev->height;
        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();
+               setgeom(geom->symbol);

        }
 }
 
        }
 }
 


@@ -336,24 +451,23 @@ configurerequest(XEvent *e) {
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {

-               c->ismax = False;

                if(ev->value_mask & CWBorderWidth)
                if(ev->value_mask & CWBorderWidth)

-                       c->border = ev->border_width;
-               if(c->isfixed || c->isfloating || isarrange(floating)) {
+                       c->bw = ev->border_width;
+               if(c->isfixed || c->isfloating || lt->isfloating) {

                        if(ev->value_mask & CWX)
                        if(ev->value_mask & CWX)

-                               c->x = ev->x;
+                               c->x = sx + ev->x;

                        if(ev->value_mask & CWY)
                        if(ev->value_mask & CWY)

-                               c->y = ev->y;
+                               c->y = sy + ev->y;

                        if(ev->value_mask & CWWidth)
                                c->w = ev->width;
                        if(ev->value_mask & CWHeight)
                                c->h = ev->height;
                        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)))
+                       if((c->x - sx + c->w) > sw && c->isfloating)
+                               c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */
+                       if((c->y - sy + c->h) > sh && c->isfloating)
+                               c->y = sy + (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);
                                configure(c);
                        if(isvisible(c))
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);


@@ -374,6 +488,15 @@ configurerequest(XEvent *e) {
        XSync(dpy, False);
 }
 
        XSync(dpy, False);
 }
 

+unsigned int
+counttiled(void) {
+       unsigned int n;
+       Client *c;
+
+       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
+       return n;
+}
+

 void
 destroynotify(XEvent *e) {
        Client *c;
 void
 destroynotify(XEvent *e) {
        Client *c;


@@ -405,50 +528,61 @@ detachstack(Client *c) {
 void
 drawbar(void) {
        int i, x;
 void
 drawbar(void) {
        int i, x;

+       Client *c;

 
 

-       dc.x = dc.y = 0;
-       for(i = 0; i < ntags; i++) {
+       dc.x = 0;
+       if(bgw > 0) {
+               dc.w = bgw;
+               drawtext(geom->symbol, dc.norm, False);
+               dc.x += bgw;
+       }
+       for(c = stack; c && !isvisible(c); c = c->snext);
+       for(i = 0; i < LENGTH(tags); i++) {

                dc.w = textw(tags[i]);
                dc.w = textw(tags[i]);

-               if(seltags[i]) {
-                       drawtext(tags[i], dc.sel);
-                       drawsquare(sel && sel->tags[i], isoccupied(i), dc.sel);
+               if(tagset[seltags][i]) {
+                       drawtext(tags[i], dc.sel, isurgent(i));
+                       drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);

                }
                else {
                }
                else {

-                       drawtext(tags[i], dc.norm);
-                       drawsquare(sel && sel->tags[i], isoccupied(i), dc.norm);
+                       drawtext(tags[i], dc.norm, isurgent(i));
+                       drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);

                }
                dc.x += dc.w;
        }
                }
                dc.x += dc.w;
        }

-       dc.w = blw;
-       drawtext(layouts[ltidx].symbol, dc.norm);
-       x = dc.x + dc.w;
+       if(blw > 0) {
+               dc.w = blw;
+               drawtext(lt->symbol, dc.norm, False);
+               x = dc.x + dc.w;
+       }
+       else
+               x = dc.x;

        dc.w = textw(stext);
        dc.w = textw(stext);

-       dc.x = sw - dc.w;
+       dc.x = bw - dc.w;

        if(dc.x < x) {
                dc.x = x;
        if(dc.x < x) {
                dc.x = x;

-               dc.w = sw - x;
+               dc.w = bw - x;

        }
        }

-       drawtext(stext, dc.norm);
+       drawtext(stext, dc.norm, False);

        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
        if((dc.w = dc.x - x) > bh) {
                dc.x = x;

-               if(sel) {
-                       drawtext(sel->name, dc.sel);
-                       drawsquare(sel->ismax, sel->isfloating, dc.sel);
+               if(c) {
+                       drawtext(c->name, dc.sel, False);
+                       drawsquare(False, c->isfloating, False, dc.sel);

                }
                else
                }
                else

-                       drawtext(NULL, dc.norm);
+                       drawtext(NULL, dc.norm, False);

        }
        }

-       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
+       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);

        XSync(dpy, False);
 }
 
 void
        XSync(dpy, False);
 }
 
 void

-drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
+drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {

        int x;
        XGCValues gcv;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 
        int x;
        XGCValues gcv;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 

-       gcv.foreground = col[ColFG];
+       gcv.foreground = col[invert ? ColBG : ColFG];

        XChangeGC(dpy, dc.gc, GCForeground, &gcv);
        x = (dc.font.ascent + dc.font.descent + 2) / 4;
        r.x = dc.x + 1;
        XChangeGC(dpy, dc.gc, GCForeground, &gcv);
        x = (dc.font.ascent + dc.font.descent + 2) / 4;
        r.x = dc.x + 1;


@@ -464,28 +598,27 @@ drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
 }
 
 void
 }
 
 void

-drawtext(const char *text, unsigned long col[ColLast]) {
+drawtext(const char *text, unsigned long col[ColLast], Bool invert) {

        int x, y, w, h;
        int x, y, w, h;

-       static char buf[256];

        unsigned int len, olen;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
        unsigned int len, olen;
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };

+       char buf[256];

 
 

-       XSetForeground(dpy, dc.gc, col[ColBG]);
+       XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);

        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        if(!text)
                return;
        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;
+       olen = strlen(text);
+       len = MIN(olen, sizeof buf);

        memcpy(buf, text, len);
        memcpy(buf, text, len);

-       buf[len] = 0;
+       w = 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 */
        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;
+       for(; len && (w = textnw(buf, len)) > dc.w - h; len--);
+       if (!len)
+               return;

        if(len < olen) {
                if(len > 1)
                        buf[len - 1] = '.';
        if(len < olen) {
                if(len > 1)
                        buf[len - 1] = '.';


@@ -494,9 +627,7 @@ drawtext(const char *text, unsigned long col[ColLast]) {
                if(len > 3)
                        buf[len - 3] = '.';
        }
                if(len > 3)
                        buf[len - 3] = '.';
        }

-       if(w > dc.w)
-               return; /* too long */
-       XSetForeground(dpy, dc.gc, col[ColFG]);
+       XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);

        if(dc.font.set)
                XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
        else
        if(dc.font.set)
                XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
        else


@@ -517,14 +648,12 @@ enternotify(XEvent *e) {
        Client *c;
        XCrossingEvent *ev = &e->xcrossing;
 
        Client *c;
        XCrossingEvent *ev = &e->xcrossing;
 

-       if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
+       if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)

                return;
        if((c = getclient(ev->window)))
                focus(c);
                return;
        if((c = getclient(ev->window)))
                focus(c);

-       else if(ev->window == root) {
-               selscreen = True;
+       else

                focus(NULL);
                focus(NULL);

-       }

 }
 
 void
 }
 
 void


@@ -541,24 +670,13 @@ void
 expose(XEvent *e) {
        XExposeEvent *ev = &e->xexpose;
 
 expose(XEvent *e) {
        XExposeEvent *ev = &e->xexpose;
 

-       if(ev->count == 0) {
-               if(barwin == ev->window)
-                       drawbar();
-       }
-}
-
-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);
+       if(ev->count == 0 && (ev->window == barwin))
+               drawbar();

 }
 
 void
 focus(Client *c) {
 }
 
 void
 focus(Client *c) {

-       if((!c && selscreen) || (c && !isvisible(c)))
+       if(!c || (c && !isvisible(c)))

                for(c = stack; c && !isvisible(c); c = c->snext);
        if(sel && sel != c) {
                grabbuttons(sel, False);
                for(c = stack; c && !isvisible(c); c = c->snext);
        if(sel && sel != c) {
                grabbuttons(sel, False);


@@ -570,15 +688,21 @@ focus(Client *c) {
                grabbuttons(c, True);
        }
        sel = 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);
        if(c) {
                XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        }
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);

+       drawbar();
+}
+
+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
 }
 
 void


@@ -665,8 +789,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
                strncpy(text, (char *)name.value, size - 1);
        else {
                if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
                strncpy(text, (char *)name.value, size - 1);
        else {
                if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success

-               && n > 0 && *list)
-               {
+               && n > 0 && *list) {

                        strncpy(text, *list, size - 1);
                        XFreeStringList(list);
                }
                        strncpy(text, *list, size - 1);
                        XFreeStringList(list);
                }


@@ -678,49 +801,57 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
 
 void
 grabbuttons(Client *c, Bool focused) {
 
 void
 grabbuttons(Client *c, Bool focused) {

+       int i, j;
+       unsigned int buttons[]   = { Button1, Button2, Button3 };
+       unsigned int modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
+                                    MODKEY|numlockmask|LockMask} ;
+

        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);

+       if(focused)
+               for(i = 0; i < LENGTH(buttons); i++)
+                       for(j = 0; j < LENGTH(modifiers); j++)
+                               XGrabButton(dpy, buttons[i], modifiers[j], c->win, False,
+                                           BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+       else
+               XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
+                           BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+}

 
 

-       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,
-                               GrabModeAsync, GrabModeSync, None, None);
-
-               XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button2, MODKEY | LockMask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-
-               XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button3, MODKEY | LockMask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
+void
+grabkeys(void)  {
+       unsigned int i, j;
+       KeyCode code;
+       XModifierKeymap *modmap;
+
+       /* init modifier map */
+       modmap = XGetModifierMapping(dpy);
+       for(i = 0; i < 8; i++)
+               for(j = 0; j < modmap->max_keypermod; j++) {
+                       if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
+                               numlockmask = (1 << i);
+               }
+       XFreeModifiermap(modmap);
+
+       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);

        }
        }

-       else
-               XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);

 }
 
 unsigned int
 }
 
 unsigned int

-idxoftag(const char *tag) {
+idxoftag(const char *t) {

        unsigned int i;
 
        unsigned int i;
 

-       for(i = 0; i < ntags; i++)
-               if(tags[i] == tag)
-                       return i;
-       return 0;
+       for(i = 0; (i < LENGTH(tags)) && t && strcmp(tags[i], t); i++);
+       return (i < LENGTH(tags)) ? i : 0;

 }
 
 void
 }
 
 void


@@ -745,10 +876,8 @@ initfont(const char *fontstr) {
                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++) {
                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;
+                       dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
+                       dc.font.descent = MAX(dc.font.descent,(*xfonts)->descent);

                        xfonts++;
                }
        }
                        xfonts++;
                }
        }


@@ -765,12 +894,6 @@ initfont(const char *fontstr) {
        dc.font.height = dc.font.ascent + dc.font.descent;
 }
 
        dc.font.height = dc.font.ascent + dc.font.descent;
 }
 

-Bool
-isarrange(void (*func)())
-{
-       return func == layouts[ltidx].arrange;
-}
-

 Bool
 isoccupied(unsigned int t) {
        Client *c;
 Bool
 isoccupied(unsigned int t) {
        Client *c;


@@ -796,43 +919,35 @@ isprotodel(Client *c) {
        return ret;
 }
 
        return ret;
 }
 

+Bool
+isurgent(unsigned int t) {
+       Client *c;
+
+       for(c = clients; c; c = c->next)
+               if(c->isurgent && c->tags[t])
+                       return True;
+       return False;
+}
+

 Bool
 isvisible(Client *c) {
        unsigned int i;
 
 Bool
 isvisible(Client *c) {
        unsigned int i;
 

-       for(i = 0; i < ntags; i++)
-               if(c->tags[i] && seltags[i])
+       for(i = 0; i < LENGTH(tags); i++)
+               if(c->tags[i] && tagset[seltags][i])

                        return True;
        return False;
 }
 
 void
 keypress(XEvent *e) {
                        return True;
        return False;
 }
 
 void
 keypress(XEvent *e) {

-       KEYS
-       unsigned int len = sizeof keys / sizeof keys[0];

        unsigned int i;
        unsigned int i;

-       KeyCode code;

        KeySym keysym;
        XKeyEvent *ev;
 
        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);
        ev = &e->xkey;
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);

-       for(i = 0; i < len; i++)
+       for(i = 0; i < LENGTH(keys); i++)

                if(keysym == keys[i].keysym
                && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
                {
                if(keysym == keys[i].keysym
                && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
                {


@@ -860,61 +975,54 @@ killclient(const char *arg) {
                XKillClient(dpy, sel->win);
 }
 
                XKillClient(dpy, sel->win);
 }
 

-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) {
        Client *c, *t = NULL;
 void
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t = NULL;

-       Window trans;

        Status rettrans;
        Status rettrans;

+       Window trans;

        XWindowChanges wc;
 
        c = emallocz(sizeof(Client));
        XWindowChanges wc;
 
        c = emallocz(sizeof(Client));

-       c->tags = emallocz(sizeof seltags);
+       c->tags = emallocz(TAGSZ);

        c->win = w;
        c->win = w;

+
+       /* geometry */

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

-       c->w = wa->width;
-       c->h = wa->height;
-       c->oldborder = wa->border_width;
+       c->w = c->fw = wa->width;
+       c->h = c->fh = wa->height;
+       c->oldbw = wa->border_width;

        if(c->w == sw && c->h == sh) {
                c->x = sx;
                c->y = sy;
        if(c->w == sw && c->h == sh) {
                c->x = sx;
                c->y = sy;

-               c->border = wa->border_width;
+               c->bw = wa->border_width;

        }
        else {
        }
        else {

-               if(c->x + c->w + 2 * c->border > wax + waw)
-                       c->x = wax + waw - c->w - 2 * c->border;
-               if(c->y + c->h + 2 * c->border > way + wah)
-                       c->y = way + wah - c->h - 2 * c->border;
-               if(c->x < wax)
-                       c->x = wax;
-               if(c->y < way)
-                       c->y = way;
-               c->border = BORDERPX;
+               if(c->x + c->w + 2 * c->bw > wx + ww)
+                       c->x = wx + ww - c->w - 2 * c->bw;
+               if(c->y + c->h + 2 * c->bw > wy + wh)
+                       c->y = wy + wh - c->h - 2 * c->bw;
+               c->x = MAX(c->x, wx);
+               c->y = MAX(c->y, wy);
+               c->bw = BORDERPX;

        }
        }

-       wc.border_width = c->border;
+       c->fx = c->x;
+       c->fy = c->y;
+
+       wc.border_width = c->bw;

        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
        XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
        configure(c); /* propagates border_width, if size doesn't change */
        updatesizehints(c);
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
        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)

-               memcpy(c->tags, t->tags, sizeof seltags);
-       applyrules(c);
+               memcpy(c->tags, t->tags, TAGSZ);
+       else
+               applyrules(c);

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


@@ -932,7 +1040,7 @@ mappingnotify(XEvent *e) {
 
        XRefreshKeyboardMapping(ev);
        if(ev->request == MappingKeyboard)
 
        XRefreshKeyboardMapping(ev);
        if(ev->request == MappingKeyboard)

-               keypress(NULL);
+               grabkeys();

 }
 
 void
 }
 
 void


@@ -948,6 +1056,15 @@ maprequest(XEvent *e) {
                manage(ev->window, &wa);
 }
 
                manage(ev->window, &wa);
 }
 

+void
+monocle(void) {
+       Client *c;
+
+       for(c = clients; c; c = c->next)
+               if((lt->isfloating || !c->isfloating) &&  isvisible(c))
+                       resize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw, RESIZEHINTS);
+}
+

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


@@ -960,10 +1077,9 @@ 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(;;) {
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {

-               XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
+               XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);

                switch (ev.type) {
                case ButtonRelease:
                        XUngrabPointer(dpy, CurrentTime);
                switch (ev.type) {
                case ButtonRelease:
                        XUngrabPointer(dpy, CurrentTime);


@@ -977,15 +1093,21 @@ movemouse(Client *c) {
                        XSync(dpy, False);
                        nx = ocx + (ev.xmotion.x - x1);
                        ny = ocy + (ev.xmotion.y - y1);
                        XSync(dpy, False);
                        nx = ocx + (ev.xmotion.x - x1);
                        ny = ocy + (ev.xmotion.y - y1);

-                       if(abs(wax + nx) < SNAP)
-                               nx = wax;
-                       else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP)
-                               nx = wax + waw - c->w - 2 * c->border;
-                       if(abs(way - ny) < SNAP)
-                               ny = way;
-                       else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP)
-                               ny = way + wah - c->h - 2 * c->border;
-                       resize(c, nx, ny, c->w, c->h, False);
+                       if(abs(wx - nx) < SNAP)
+                               nx = wx;
+                       else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < SNAP)
+                               nx = wx + ww - c->w - 2 * c->bw;
+                       if(abs(wy - ny) < SNAP)
+                               ny = wy;
+                       else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < SNAP)
+                               ny = wy + wh - c->h - 2 * c->bw;
+                       if(!c->isfloating && !lt->isfloating && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+                               togglefloating(NULL);
+                       if(lt->isfloating || c->isfloating) {
+                               c->fx = nx;
+                               c->fy = ny;
+                               resize(c, nx, ny, c->w, c->h, False);
+                       }

                        break;
                }
        }
                        break;
                }
        }


@@ -1007,15 +1129,19 @@ propertynotify(XEvent *e) {
                return; /* ignore */
        if((c = getclient(ev->window))) {
                switch (ev->atom) {
                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;
+               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;
+               case XA_WM_HINTS:
+                       updatewmhints(c);
+                       drawbar();
+                       break;

                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                        updatetitle(c);
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                        updatetitle(c);


@@ -1030,27 +1156,37 @@ quit(const char *arg) {
        readin = running = False;
 }
 
        readin = running = False;
 }
 

+void
+reapply(const char *arg) {
+       Client *c;
+
+       for(c = clients; c; c = c->next) {
+               memset(c->tags, 0, TAGSZ);
+               applyrules(c);
+       }
+       arrange();
+}
+

 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {

-       double dx, dy, max, min, ratio;

        XWindowChanges wc;
 
        if(sizehints) {
                /* set minimum possible */
        XWindowChanges wc;
 
        if(sizehints) {
                /* set minimum possible */

-               if (w < 1)
-                       w = 1;
-               if (h < 1)
-                       h = 1;
+               w = MAX(1, w);
+               h = MAX(1, h);

 
                /* temporarily remove base dimensions */
                w -= c->basew;
                h -= c->baseh;
 
                /* adjust for aspect limits */
 
                /* 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)
+               if(c->minax != c->maxax && c->minay != c->maxay 
+               && c->minax > 0 && c->maxax > 0 && c->minay > 0 && c->maxay > 0)
+               {
+                       if(w * c->maxay > h * c->maxax)

                                w = h * c->maxax / c->maxay;
                                w = h * c->maxax / c->maxay;

-                       else if (w * c->minay < h * c->minax)
+                       else if(w * c->minay < h * c->minax)

                                h = w * c->minay / c->minax;
                }
 
                                h = w * c->minay / c->minax;
                }
 


@@ -1064,33 +1200,33 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
                w += c->basew;
                h += c->baseh;
 
                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;
+               w = MAX(w, c->minw);
+               h = MAX(h, c->minh);
+               
+               if (c->maxw)
+                       w = MIN(w, c->maxw);
+
+               if (c->maxh)
+                       h = MIN(h, c->maxh);

        }
        if(w <= 0 || h <= 0)
                return;
        }
        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)
+       if(x > sx + sw)
+               x = sw - w - 2 * c->bw;
+       if(y > sy + sh)
+               y = sh - h - 2 * c->bw;
+       if(x + w + 2 * c->bw < sx)

                x = sx;
                x = sx;

-       if(y + h + 2 * c->border < sy)
+       if(y + h + 2 * c->bw < 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;
                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);
+               wc.border_width = c->bw;
+               XConfigureWindow(dpy, c->win,
+                               CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);

                configure(c);
                XSync(dpy, False);
        }
                configure(c);
                XSync(dpy, False);
        }


@@ -1107,14 +1243,13 @@ 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);
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);

        for(;;) {
        for(;;) {

-               XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
+               XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask , &ev);

                switch(ev.type) {
                case ButtonRelease:
                        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
                switch(ev.type) {
                case ButtonRelease:
                        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,

-                                       c->w + c->border - 1, c->h + c->border - 1);
+                                       c->w + c->bw - 1, c->h + c->bw - 1);

                        XUngrabPointer(dpy, CurrentTime);
                        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
                        return;
                        XUngrabPointer(dpy, CurrentTime);
                        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
                        return;


@@ -1125,11 +1260,18 @@ resizemouse(Client *c) {
                        break;
                case MotionNotify:
                        XSync(dpy, False);
                        break;
                case MotionNotify:
                        XSync(dpy, False);

-                       if((nw = ev.xmotion.x - ocx - 2 * c->border + 1) <= 0)
-                               nw = 1;
-                       if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
-                               nh = 1;
-                       resize(c, c->x, c->y, nw, nh, True);
+                       nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
+                       nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
+                       if(!c->isfloating && !lt->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP)) {
+                               c->fx = c->x;
+                               c->fy = c->y;
+                               togglefloating(NULL);
+                       }
+                       if((lt->isfloating) || c->isfloating) {
+                               resize(c, c->x, c->y, nw, nh, True);
+                               c->fw = nw;
+                               c->fh = nh;
+                       }

                        break;
                }
        }
                        break;
                }
        }


@@ -1144,21 +1286,16 @@ restack(void) {
        drawbar();
        if(!sel)
                return;
        drawbar();
        if(!sel)
                return;

-       if(sel->isfloating || isarrange(floating))
+       if(sel->isfloating || lt->isfloating)

                XRaiseWindow(dpy, sel->win);
                XRaiseWindow(dpy, sel->win);

-       if(!isarrange(floating)) {
+       if(!lt->isfloating) {

                wc.stack_mode = Below;
                wc.sibling = barwin;
                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;
-               }
+               for(c = stack; c; c = c->snext)
+                       if(!c->isfloating && isvisible(c)) {
+                               XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
+                               wc.sibling = c->win;
+                       }

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


@@ -1167,14 +1304,19 @@ restack(void) {
 void
 run(void) {
        char *p;
 void
 run(void) {
        char *p;

-       int r, xfd;
+       char sbuf[sizeof stext];

        fd_set rd;
        fd_set rd;

+       int r, xfd;
+       unsigned int len, offset;

        XEvent ev;
 
        /* main event loop, also reads status text from stdin */
        XSync(dpy, False);
        xfd = ConnectionNumber(dpy);
        readin = True;
        XEvent ev;
 
        /* main event loop, also reads status text from stdin */
        XSync(dpy, False);
        xfd = ConnectionNumber(dpy);
        readin = True;

+       offset = 0;
+       len = sizeof stext - 1;
+       sbuf[len] = stext[len] = '\0'; /* 0-terminator is never touched */

        while(running) {
                FD_ZERO(&rd);
                if(readin)
        while(running) {
                FD_ZERO(&rd);
                if(readin)


@@ -1186,10 +1328,9 @@ run(void) {
                        eprint("select failed\n");
                }
                if(FD_ISSET(STDIN_FILENO, &rd)) {
                        eprint("select failed\n");
                }
                if(FD_ISSET(STDIN_FILENO, &rd)) {

-                       switch(r = read(STDIN_FILENO, stext, sizeof stext - 1)) {
+                       switch((r = read(STDIN_FILENO, sbuf + offset, len - offset))) {

                        case -1:
                        case -1:

-                               strncpy(stext, strerror(errno), sizeof stext - 1);
-                               stext[sizeof stext - 1] = '\0';
+                               strncpy(stext, strerror(errno), len);

                                readin = False;
                                break;
                        case 0:
                                readin = False;
                                break;
                        case 0:


@@ -1197,10 +1338,18 @@ run(void) {
                                readin = False;
                                break;
                        default:
                                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);
+                               for(p = sbuf + offset; r > 0; p++, r--, offset++)
+                                       if(*p == '\n' || *p == '\0') {
+                                               *p = '\0';
+                                               strncpy(stext, sbuf, len);
+                                               p += r - 1; /* p is sbuf + offset + r - 1 */
+                                               for(r = 0; *(p - r) && *(p - r) != '\n'; r++);
+                                               offset = r;
+                                               if(r)
+                                                       memmove(sbuf, p - r + 1, r);
+                                               break;
+                                       }
+                               break;

                        }
                        drawbar();
                }
                        }
                        drawbar();
                }


@@ -1222,7 +1371,7 @@ scan(void) {
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa)
        if(XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
                for(i = 0; i < num; i++) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa)

-                       || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
+                                       || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))

                                continue;
                        if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
                                manage(wins[i], &wa);
                                continue;
                        if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
                                manage(wins[i], &wa);


@@ -1231,7 +1380,7 @@ scan(void) {
                        if(!XGetWindowAttributes(dpy, wins[i], &wa))
                                continue;
                        if(XGetTransientForHint(dpy, wins[i], &d1)
                        if(!XGetWindowAttributes(dpy, wins[i], &wa))
                                continue;
                        if(XGetTransientForHint(dpy, wins[i], &d1)

-                       && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
+                                       && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))

                                manage(wins[i], &wa);
                }
        }
                                manage(wins[i], &wa);
                }
        }


@@ -1247,21 +1396,42 @@ setclientstate(Client *c, long state) {
                        PropModeReplace, (unsigned char *)data, 2);
 }
 
                        PropModeReplace, (unsigned char *)data, 2);
 }
 

+void
+setgeom(const char *arg) {
+       unsigned int i;
+
+       if(!arg) {
+               if(++geom == &geoms[LENGTH(geoms)])
+                       geom = &geoms[0];
+       }
+       else {
+               for(i = 0; i < LENGTH(geoms); i++)
+                       if(!strcmp(geoms[i].symbol, arg))
+                               break;
+               if(i == LENGTH(geoms))
+                       return;
+               geom = &geoms[i];
+       }
+       geom->apply();
+       updatebarpos();
+       arrange();
+}
+

 void
 setlayout(const char *arg) {
        unsigned int i;
 
        if(!arg) {
 void
 setlayout(const char *arg) {
        unsigned int i;
 
        if(!arg) {

-               if(++ltidx == nlayouts)
-                       ltidx = 0;;
+               if(++lt == &layouts[LENGTH(layouts)])
+                       lt = &layouts[0];

        }
        else {
        }
        else {

-               for(i = 0; i < nlayouts; i++)
+               for(i = 0; i < LENGTH(layouts); i++)

                        if(!strcmp(arg, layouts[i].symbol))
                                break;
                        if(!strcmp(arg, layouts[i].symbol))
                                break;

-               if(i == nlayouts)
+               if(i == LENGTH(layouts))

                        return;
                        return;

-               ltidx = i;
+               lt = &layouts[i];

        }
        if(sel)
                arrange();
        }
        if(sel)
                arrange();


@@ -1270,35 +1440,43 @@ setlayout(const char *arg) {
 }
 
 void
 }
 
 void

-setmwfact(const char *arg) {
-       double delta;
+setmfact(const char *arg) {
+       double d;

 
 

-       if(!ISTILE)
+       if(lt->isfloating)

                return;
                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;
+       if(!arg)
+               mfact = MFACT;
+       else {
+               d = strtod(arg, NULL);
+               if(arg[0] == '-' || arg[0] == '+')
+                       d += mfact;
+               if(d < 0.1 || d > 0.9)
+                       return;
+               mfact = d;

        }
        }

-       arrange();
+       setgeom(geom->symbol);

 }
 
 void
 setup(void) {
 }
 
 void
 setup(void) {

-       int d;
-       unsigned int i, j, mask;
-       Window w;
-       XModifierKeymap *modmap;
+       unsigned int i, w;

        XSetWindowAttributes wa;
 
        XSetWindowAttributes wa;
 

+       /* init screen */
+       screen = DefaultScreen(dpy);
+       root = RootWindow(dpy, screen);
+       initfont(FONT);
+
+       /* apply default geometry */
+       sx = 0;
+       sy = 0;
+       sw = DisplayWidth(dpy, screen);
+       sh = DisplayHeight(dpy, screen);
+       bh = dc.font.height + 2;
+       mfact = MFACT;
+       geom->apply();
+

        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);


@@ -1306,42 +1484,12 @@ setup(void) {
        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);

-       XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
-                       PropModeReplace, (unsigned char *) netatom, NetLast);

 
        /* init cursors */
 
        /* init cursors */

-       cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
+       wa.cursor = cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);

        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
        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);
-       for(i = 0; i < 8; i++)
-               for(j = 0; j < modmap->max_keypermod; j++) {
-                       if(modmap->modifiermap[i * modmap->max_keypermod + j]
-                       == XKeysymToKeycode(dpy, XK_Num_Lock))
-                               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);
-
-       /* grab keys */
-       keypress(NULL);
-
-       /* init tags */
-       compileregs();
-

        /* init appearance */
        dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
        dc.norm[ColBG] = getcolor(NORMBGCOLOR);
        /* init appearance */
        dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
        dc.norm[ColBG] = getcolor(NORMBGCOLOR);


@@ -1350,37 +1498,53 @@ setup(void) {
        dc.sel[ColBG] = getcolor(SELBGCOLOR);
        dc.sel[ColFG] = getcolor(SELFGCOLOR);
        initfont(FONT);
        dc.sel[ColBG] = getcolor(SELBGCOLOR);
        dc.sel[ColFG] = getcolor(SELFGCOLOR);
        initfont(FONT);

-       dc.h = bh = dc.font.height + 2;
-
-       /* init layouts */
-       mwfact = MWFACT;
-       nlayouts = sizeof layouts / sizeof layouts[0];
-       for(blw = i = 0; i < nlayouts; i++) {
-               j = textw(layouts[i].symbol);
-               if(j > blw)
-                       blw = j;
-       }
+       dc.h = bh;
+       dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), 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);
+
+       /* init tags */
+       tagset[0] = emallocz(TAGSZ);
+       tagset[1] = emallocz(TAGSZ);
+       tagset[0][0] = tagset[1][0] = True;

 
        /* init bar */
 
        /* init bar */

-       bpos = BARPOS;
+       for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
+               w = textw(layouts[i].symbol);
+               blw = MAX(blw, w);
+       }
+       for(bgw = i = 0; LENGTH(geoms) > 1 && i < LENGTH(geoms); i++) {
+               w = textw(geoms[i].symbol);
+               bgw = MAX(bgw, w);
+       }
+

        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;
        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);
+       wa.event_mask = ButtonPressMask|ExposureMask;
+
+       barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
+                               CopyFromParent, DefaultVisual(dpy, screen),
+                               CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);

        XDefineCursor(dpy, barwin, cursor[CurNormal]);
        XDefineCursor(dpy, barwin, cursor[CurNormal]);

-       updatebarpos();

        XMapRaised(dpy, barwin);
        strcpy(stext, "dwm-"VERSION);
        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);
+       drawbar();
+
+       /* EWMH support per view */
+       XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
+                       PropModeReplace, (unsigned char *) netatom, NetLast);

 
 

-       /* multihead support */
-       selscreen = XQueryPointer(dpy, root, &w, &w, &d, &d, &d, &d, &mask);
+       /* select for events */
+       wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
+                       |EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
+       XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
+       XSelectInput(dpy, root, wa.event_mask);
+
+
+       /* grab keys */
+       grabkeys();

 }
 
 void
 }
 
 void


@@ -1413,11 +1577,9 @@ tag(const char *arg) {
 
        if(!sel)
                return;
 
        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;
+       for(i = 0; i < LENGTH(tags); i++)
+               sel->tags[i] = (NULL == arg);
+       sel->tags[idxoftag(arg)] = True;

        arrange();
 }
 
        arrange();
 }
 


@@ -1438,53 +1600,76 @@ textw(const char *text) {
 }
 
 void
 }
 
 void

-tile(void) {
-       unsigned int i, n, nx, ny, nw, nh, mw, th;
-       Client *c, *mc;
+tileh(void) {
+       int x, w;
+       unsigned int i, n = counttiled();
+       Client *c;

 
 

-       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
+       if(n == 0)
+               return;
+       c = tilemaster(n);
+       if(--n == 0)
+               return;

 
 

-       /* window geoms */
-       mw = (n == 1) ? waw : mwfact * waw;
-       th = (n > 1) ? wah / (n - 1) : 0;
-       if(n > 1 && th < bh)
-               th = wah;
+       x = tx;
+       w = tw / n;
+       if(w < bh)
+               w = tw;

 
 

-       nx = wax;
-       ny = way;
-       nw = 0; /* gcc stupidity requires this */
-       for(i = 0, c = mc = 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 += 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(n > 1 && th != wah)
-                       ny = c->y + c->h + 2 * c->border;
+       for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+               if(i + 1 == n) /* remainder */
+                       tileresize(c, x, ty, (tx + tw) - x - 2 * c->bw, th - 2 * c->bw);
+               else
+                       tileresize(c, x, ty, w - 2 * c->bw, th - 2 * c->bw);
+               if(w != tw)
+                       x = c->x + c->w + 2 * c->bw;

        }
 }
 
        }
 }
 

-void
-togglebar(const char *arg) {
-       if(bpos == BarOff)
-               bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
+Client *
+tilemaster(unsigned int n) {
+       Client *c = nexttiled(clients);
+
+       if(n == 1)
+               tileresize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw);

        else
        else

-               bpos = BarOff;
-       updatebarpos();
-       arrange();
+               tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw);
+       return c;
+}
+
+void
+tileresize(Client *c, int x, int y, int w, int h) {
+       resize(c, x, y, w, h, RESIZEHINTS);
+       if((RESIZEHINTS) && ((c->h < bh) || (c->h > h) || (c->w < bh) || (c->w > w)))
+               /* client doesn't accept size constraints */
+               resize(c, x, y, w, h, False);
+}
+
+void
+tilev(void) {
+       int y, h;
+       unsigned int i, n = counttiled();
+       Client *c;
+
+       if(n == 0)
+               return;
+       c = tilemaster(n);
+       if(--n == 0)
+               return;
+
+       y = ty;
+       h = th / n;
+       if(h < bh)
+               h = th;
+
+       for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
+               if(i + 1 == n) /* remainder */
+                       tileresize(c, tx, y, tw - 2 * c->bw, (ty + th) - y - 2 * c->bw);
+               else
+                       tileresize(c, tx, y, tw - 2 * c->bw, h - 2 * c->bw);
+               if(h != th)
+                       y = c->y + c->h + 2 * c->bw;
+       }

 }
 
 void
 }
 
 void


@@ -1497,34 +1682,6 @@ togglefloating(const char *arg) {
        arrange();
 }
 
        arrange();
 }
 

-void
-togglemax(const char *arg) {
-       XEvent ev;
-
-       if(!sel || sel->isfixed)
-               return;
-       if((sel->ismax = !sel->ismax)) {
-               if(isarrange(floating) || sel->isfloating)
-                       sel->wasfloating = True;
-               else {
-                       togglefloating(NULL);
-                       sel->wasfloating = False;
-               }
-               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);
-               if(!sel->wasfloating)
-                       togglefloating(NULL);
-       }
-       drawbar();
-       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-

 void
 toggletag(const char *arg) {
        unsigned int i, j;
 void
 toggletag(const char *arg) {
        unsigned int i, j;


@@ -1533,9 +1690,9 @@ toggletag(const char *arg) {
                return;
        i = idxoftag(arg);
        sel->tags[i] = !sel->tags[i];
                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;
+       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();
 }
 
        arrange();
 }
 


@@ -1544,10 +1701,10 @@ toggleview(const char *arg) {
        unsigned int i, j;
 
        i = idxoftag(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; /* at least one tag must be viewed */
+       tagset[seltags][i] = !tagset[seltags][i];
+       for(j = 0; j < LENGTH(tags) && !tagset[seltags][j]; j++);
+       if(j == LENGTH(tags))
+               tagset[seltags][i] = True; /* at least one tag must be viewed */

        arrange();
 }
 
        arrange();
 }
 


@@ -1563,7 +1720,7 @@ void
 unmanage(Client *c) {
        XWindowChanges wc;
 
 unmanage(Client *c) {
        XWindowChanges wc;
 

-       wc.border_width = c->oldborder;
+       wc.border_width = c->oldbw;

        /* The server grab construct avoids race conditions. */
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
        /* The server grab construct avoids race conditions. */
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);


@@ -1593,28 +1750,11 @@ unmapnotify(XEvent *e) {
 
 void
 updatebarpos(void) {
 
 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));
+       if(dc.drawable != 0)
+               XFreePixmap(dpy, dc.drawable);
+       dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
+       XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);

 }
 
 void
 }
 
 void


@@ -1675,6 +1815,33 @@ updatetitle(Client *c) {
                gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
 }
 
                gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
 }
 

+void
+updatewmhints(Client *c) {
+       XWMHints *wmh;
+
+       if((wmh = XGetWMHints(dpy, c->win))) {
+               if(c == sel)
+                       sel->isurgent = False;
+               else
+                       c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+               XFree(wmh);
+       }
+}
+
+void
+view(const char *arg) {
+       seltags ^= 1;
+       memset(tagset[seltags], (NULL == arg), TAGSZ);
+       tagset[seltags][idxoftag(arg)] = True;
+       arrange();
+}
+
+void
+viewprevtag(const char *arg) {
+       seltags ^= 1; /* toggle sel tagset */
+       arrange();
+}
+

 /* 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.  */
 /* 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.  */


@@ -1686,6 +1853,7 @@ xerror(Display *dpy, XErrorEvent *ee) {
        || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
        || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
        || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
        || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
        || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
        || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)

+       || (ee->request_code == X_GrabButton && ee->error_code == BadAccess)

        || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
        || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
                return 0;
        || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
        || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
                return 0;


@@ -1695,72 +1863,46 @@ xerror(Display *dpy, XErrorEvent *ee) {
 }
 
 int
 }
 
 int

-xerrordummy(Display *dsply, XErrorEvent *ee) {
+xerrordummy(Display *dpy, XErrorEvent *ee) {

        return 0;
 }
 
 /* Startup Error handler to check if another window manager
  * is already running. */
 int
        return 0;
 }
 
 /* Startup Error handler to check if another window manager
  * is already running. */
 int

-xerrorstart(Display *dsply, XErrorEvent *ee) {
+xerrorstart(Display *dpy, XErrorEvent *ee) {

        otherwm = True;
        return -1;
 }
 
        otherwm = True;
        return -1;
 }
 

-void
-view(const char *arg) {
-       unsigned int i;
-
-       memcpy(prevtags, seltags, sizeof seltags);
-       for(i = 0; i < ntags; i++)
-               seltags[i] = arg == NULL;
-       i = idxoftag(arg);
-       if(i >= 0 && i < ntags)
-               seltags[i] = True;
-       arrange();
-}
-
-void
-viewprevtag(const char *arg) {
-       static Bool tmptags[sizeof tags / sizeof tags[0]];
-
-       memcpy(tmptags, seltags, sizeof seltags);
-       memcpy(seltags, prevtags, sizeof seltags);
-       memcpy(prevtags, tmptags, sizeof seltags);
-       arrange();
-}
-

 void
 zoom(const char *arg) {
 void
 zoom(const char *arg) {

-       Client *c;
+       Client *c = sel;

 
 

-       if(!sel || !ISTILE || sel->isfloating)
-               return;
-       if((c = sel) == nexttiled(clients))
-               if(!(c = nexttiled(c->next)))
+       if(c == nexttiled(clients))
+               if(!c || !(c = nexttiled(c->next)))

                        return;
                        return;

-       detach(c);
-       attach(c);
-       focus(c);
+       if(!lt->isfloating && !sel->isfloating) {
+               detach(c);
+               attach(c);
+               focus(c);
+       }

        arrange();
 }
 
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))
        arrange();
 }
 
 int
 main(int argc, char *argv[]) {
        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-2008 dwm engineers, see LICENSE for details\n");

        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
 
        setlocale(LC_CTYPE, "");
        if(!(dpy = XOpenDisplay(0)))
                eprint("dwm: cannot open display\n");
        else if(argc != 1)
                eprint("usage: dwm [-v]\n");
 
        setlocale(LC_CTYPE, "");
        if(!(dpy = XOpenDisplay(0)))
                eprint("dwm: cannot open display\n");

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

 
        checkotherwm();
        setup();
 
        checkotherwm();
        setup();

-       drawbar();

        scan();
        run();
        cleanup();
        scan();
        run();
        cleanup();


@@ -1768,3 +1910,4 @@ main(int argc, char *argv[]) {
        XCloseDisplay(dpy);
        return 0;
 }
        XCloseDisplay(dpy);
        return 0;
 }

+