setlayout and setgeom are now togglable again

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 9f1b1f4..e1c8c20 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -17,7 +17,7 @@
  * 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.  
+ * global tags array to indicate the tags of a client.

  *
  * Keys and tagging rules are organized as arrays and defined in config.h.
  *
  *
  * Keys and tagging rules are organized as arrays and defined in config.h.
  *


@@ -33,27 +33,29 @@
 #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/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.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>

-//#ifdef XINERAMA
-#include <X11/extensions/Xinerama.h>
-//#endif

 
 /* macros */
 
 /* macros */

-#define BUTTONMASK             (ButtonPressMask | ButtonReleaseMask)
-#define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))
+#define BUTTONMASK             (ButtonPressMask|ButtonReleaseMask)
+#define CLEANMASK(mask)                (mask & ~(numlockmask|LockMask))

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

-#define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
-
+#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 */
 
 /* enums */

-enum { BarTop, BarBot, BarOff };                       /* bar position */

 enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };             /* color */
 enum { NetSupported, NetWMName, NetLast };             /* EWMH atoms */
 enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };             /* color */
 enum { NetSupported, NetWMName, NetLast };             /* EWMH atoms */


@@ -67,14 +69,13 @@ struct Client {
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int minax, maxax, minay, maxay;
        long flags;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int minax, maxax, minay, maxay;
        long flags;

-       unsigned int border, oldborder;
+       unsigned int bw, oldbw;

        Bool isbanned, isfixed, isfloating, isurgent;
        Bool *tags;
        Client *next;
        Client *prev;
        Client *snext;
        Window win;
        Bool isbanned, isfixed, isfloating, isurgent;
        Bool *tags;
        Client *next;
        Client *prev;
        Client *snext;
        Window win;

-       int monitor;

 };
 
 typedef struct {
 };
 
 typedef struct {


@@ -92,6 +93,11 @@ typedef struct {
        } font;
 } DC; /* draw context */
 
        } font;
 } DC; /* draw context */
 

+typedef struct {
+       const char *symbol;
+       void (*apply)(void);
+} Geom;
+

 typedef struct {
        unsigned long mod;
        KeySym keysym;
 typedef struct {
        unsigned long mod;
        KeySym keysym;


@@ -102,32 +108,17 @@ typedef struct {
 typedef struct {
        const char *symbol;
        void (*arrange)(void);
 typedef struct {
        const char *symbol;
        void (*arrange)(void);

-} Layout;
+       Bool isfloating;
+} Layout; 

 
 typedef struct {
 
 typedef struct {

-       const char *prop;
-       const char *tags;
+       const char *class;
+       const char *instance;
+       const char *title;
+       const char *tag;

        Bool isfloating;
        Bool isfloating;

-       int monitor;

 } Rule;
 
 } Rule;
 

-typedef struct {
-       regex_t *propregex;
-       regex_t *tagregex;
-} Regs;
-
-typedef struct {
-       int screen;
-       Window root;
-       Window barwin;
-       int sx, sy, sw, sh, wax, way, wah, waw;
-       DC dc;
-       Bool *seltags;
-       Bool *prevtags;
-       Layout *layout;
-       double mwfact;
-} Monitor;
-

 /* function declarations */
 void applyrules(Client *c);
 void arrange(void);
 /* function declarations */
 void applyrules(Client *c);
 void arrange(void);


@@ -137,16 +128,16 @@ void ban(Client *c);
 void buttonpress(XEvent *e);
 void checkotherwm(void);
 void cleanup(void);
 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 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 destroynotify(XEvent *e);
 void detach(Client *c);
 void detachstack(Client *c);
 void drawbar(void);

-void drawsquare(Monitor *, Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
-void drawtext(Monitor *, const char *text, unsigned long col[ColLast], Bool invert);
+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 *emallocz(unsigned int size);
 void enternotify(XEvent *e);
 void eprint(const char *errstr, ...);


@@ -157,24 +148,25 @@ void focusin(XEvent *e);
 void focusnext(const char *arg);
 void focusprev(const char *arg);
 Client *getclient(Window w);
 void focusnext(const char *arg);
 void focusprev(const char *arg);
 Client *getclient(Window w);

-unsigned long getcolor(const char *colstr, int screen);
+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);
 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(Monitor*, const char *fontstr);
-Bool isoccupied(unsigned int monitor, unsigned int t);
+unsigned int idxoftag(const char *t);
+void initfont(const char *fontstr);
+Bool isoccupied(unsigned int t);

 Bool isprotodel(Client *c);
 Bool isprotodel(Client *c);

-Bool isurgent(unsigned int monitor, unsigned int t);
-Bool isvisible(Client *c, int monitor);
+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 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);
 void movemouse(Client *c);

-Client *nexttiled(Client *c, int monitor);
+Client *nexttiled(Client *c);

 void propertynotify(XEvent *e);
 void quit(const char *arg);
 void reapply(const char *arg);
 void propertynotify(XEvent *e);
 void quit(const char *arg);
 void reapply(const char *arg);


@@ -184,41 +176,41 @@ void restack(void);
 void run(void);
 void scan(void);
 void setclientstate(Client *c, long state);
 void run(void);
 void scan(void);
 void setclientstate(Client *c, long state);

+void setgeom(const char *arg);

 void setlayout(const char *arg);
 void setlayout(const char *arg);

-void setmwfact(const char *arg);

 void setup(void);
 void spawn(const char *arg);
 void tag(const char *arg);
 void setup(void);
 void spawn(const char *arg);
 void tag(const char *arg);

-unsigned int textnw(Monitor*, const char *text, unsigned int len);
-unsigned int textw(Monitor*, const char *text);
-void tile(void);
-void togglebar(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 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(Monitor *m);
+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);
 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 *dsply, XErrorEvent *ee);
-int xerrorstart(Display *dsply, XErrorEvent *ee);
+int xerrordummy(Display *dpy, XErrorEvent *ee);
+int xerrorstart(Display *dpy, XErrorEvent *ee);

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

-int monitorat(void);
-void movetomonitor(const char *arg);
-void selectmonitor(const char *arg);

 
 /* variables */
 
 /* variables */

-char stext[256];
-int mcount = 1;
+char stext[256], buf[256];
+int screen, sx, sy, sw, sh;

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

-unsigned int bh, bpos;
-unsigned int blw = 0;
+int bx, by, bw, bh, blw, bgw, mx, my, mw, mh, mox, moy, mow, moh, tx, ty, tw, th, wx, wy, ww, wh;

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


@@ -235,64 +227,55 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];
        [UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];

-Bool isxinerama = False;
-Bool domwfact = True;
-Bool dozoom = True;

 Bool otherwm, readin;
 Bool running = True;
 Bool otherwm, readin;
 Bool running = True;

+Bool *prevtags;
+Bool *seltags;

 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};

-Regs *regs = NULL;
-Monitor *monitors;
-int selmonitor = 0;
+Geom *geom = NULL;
+Layout *lt = NULL;
+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"

-
-//Bool prevtags[LENGTH(tags)];
+#define TAGSZ (LENGTH(tags) * sizeof(Bool))
+static Bool tmp[LENGTH(tags)];

 
 /* function implementations */
 
 /* function implementations */

+

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

-       static char buf[512];
-       unsigned int i, j;
-       regmatch_t tmp;
-       Bool matched_tag = False;
-       Bool matched_monitor = False;
+       unsigned int i;
+       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 < LENGTH(rules); i++)
-               if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
-                       if (rules[i].monitor >= 0 && rules[i].monitor < mcount) {
-                               matched_monitor = True;
-                               c->monitor = rules[i].monitor;
-                       }
-
-                       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_tag = True;
-                                       c->tags[j] = True;
-                               }
+       for(i = 0; i < LENGTH(rules); i++) {
+               r = &rules[i];
+               if((r->title && strstr(c->name, r->title))
+               || (ch.res_class && r->class && strstr(ch.res_class, r->class))
+               || (ch.res_name && r->instance && 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(ch.res_class)
                XFree(ch.res_class);
        if(ch.res_name)
                XFree(ch.res_name);

-       if(!matched_tag)
-               memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);
-       if (!matched_monitor)
-               c->monitor = monitorat();
+       if(!matched)
+               memcpy(c->tags, seltags, TAGSZ);

 }
 
 void
 }
 
 void


@@ -300,13 +283,13 @@ arrange(void) {
        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)

-               if(isvisible(c, c->monitor))
+               if(isvisible(c))

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

-       monitors[selmonitor].layout->arrange();

        focus(NULL);
        focus(NULL);

+       lt->arrange();

        restack();
 }
 
        restack();
 }
 


@@ -328,7 +311,7 @@ void
 ban(Client *c) {
        if(c->isbanned)
                return;
 ban(Client *c) {
        if(c->isbanned)
                return;

-       XMoveWindow(dpy, c->win, c->x + 3 * monitors[c->monitor].sw, c->y);
+       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);

        c->isbanned = True;
 }
 
        c->isbanned = True;
 }
 


@@ -338,13 +321,15 @@ buttonpress(XEvent *e) {
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 

-       Monitor *m = &monitors[monitorat()];
-
-       if(ev->window == m->barwin) {
-               x = 0;
+       if(ev->window == barwin) {
+               if((ev->x < bgw) && ev->button == Button1) {
+                       setgeom(NULL);
+                       return;
+               }
+               x = bgw;

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

-                       x += textw(m, tags[i]);
-                       if(ev->x < x) {
+                       x += textw(tags[i]);
+                       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]);


@@ -360,7 +345,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))) {


@@ -372,7 +357,7 @@ buttonpress(XEvent *e) {
                        movemouse(c);
                }
                else if(ev->button == Button2) {
                        movemouse(c);
                }
                else if(ev->button == Button2) {

-                       if((floating != m->layout->arrange) && c->isfloating)
+                       if((floating != lt->arrange) && c->isfloating)

                                togglefloating(NULL);
                        else
                                zoom(NULL);
                                togglefloating(NULL);
                        else
                                zoom(NULL);


@@ -402,54 +387,24 @@ checkotherwm(void) {
 
 void
 cleanup(void) {
 
 void
 cleanup(void) {

-       unsigned int i;

        close(STDIN_FILENO);
        while(stack) {
                unban(stack);
                unmanage(stack);
        }
        close(STDIN_FILENO);
        while(stack) {
                unban(stack);
                unmanage(stack);
        }

-       for(i = 0; i < mcount; i++) {
-               Monitor *m = &monitors[i];
-               if(m->dc.font.set)
-                       XFreeFontSet(dpy, m->dc.font.set);
-               else
-                       XFreeFont(dpy, m->dc.font.xfont);
-               XUngrabKey(dpy, AnyKey, AnyModifier, m->root);
-               XFreePixmap(dpy, m->dc.drawable);
-               XFreeGC(dpy, m->dc.gc);
-               XDestroyWindow(dpy, m->barwin);
-               XFreeCursor(dpy, cursor[CurNormal]);
-               XFreeCursor(dpy, cursor[CurResize]);
-               XFreeCursor(dpy, cursor[CurMove]);
-               XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
-               XSync(dpy, False);
-       }
-}
-
-void
-compileregs(void) {
-       unsigned int i;
-       regex_t *reg;
-
-       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;
-               }
-       }
+       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);
+       XFreeCursor(dpy, cursor[CurNormal]);
+       XFreeCursor(dpy, cursor[CurResize]);
+       XFreeCursor(dpy, cursor[CurMove]);
+       XDestroyWindow(dpy, barwin);
+       XSync(dpy, False);
+       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);

 }
 
 void
 }
 
 void


@@ -464,7 +419,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);


@@ -473,16 +428,11 @@ configure(Client *c) {
 void
 configurenotify(XEvent *e) {
        XConfigureEvent *ev = &e->xconfigure;
 void
 configurenotify(XEvent *e) {
        XConfigureEvent *ev = &e->xconfigure;

-       Monitor *m = &monitors[selmonitor];

 
 

-       if(ev->window == m->root && (ev->width != m->sw || ev->height != m->sh)) {
-               m->sw = ev->width;
-               m->sh = ev->height;
-               XFreePixmap(dpy, dc.drawable);
-               dc.drawable = XCreatePixmap(dpy, m->root, m->sw, bh, DefaultDepth(dpy, m->screen));
-               XResizeWindow(dpy, m->barwin, m->sw, bh);
-               updatebarpos(m);
-               arrange();
+       if(ev->window == root && (ev->width != sw || ev->height != sh)) {
+               sw = ev->width;
+               sh = ev->height;
+               setgeom(geom->symbol);

        }
 }
 
        }
 }
 


@@ -493,26 +443,25 @@ configurerequest(XEvent *e) {
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {

-               Monitor *m = &monitors[c->monitor];

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

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

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

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

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

-                               c->y = m->sy+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 - m->sx + c->w) > m->sw && c->isfloating)
-                               c->x = m->sx + (m->sw / 2 - c->w / 2); /* center in x direction */
-                       if((c->y - m->sy + c->h) > m->sh && c->isfloating)
-                               c->y = m->sy + (m->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);
                                configure(c);

-                       if(isvisible(c, monitorat()))
+                       if(isvisible(c))

                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                }
                else
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                }
                else


@@ -531,6 +480,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;


@@ -561,86 +519,84 @@ detachstack(Client *c) {
 
 void
 drawbar(void) {
 
 void
 drawbar(void) {

-       int i, j, x;
+       int i, x;

        Client *c;
 
        Client *c;
 

-       for(i = 0; i < mcount; i++) {
-               Monitor *m = &monitors[i];
-               m->dc.x = 0;
-               for(c = stack; c && !isvisible(c, i); c = c->snext);
-               fprintf(stderr, "m%d %s\n", i, c ? c->name : "NIL");
-               for(j = 0; j < LENGTH(tags); j++) {
-                       m->dc.w = textw(m, tags[j]);
-                       if(m->seltags[j]) {
-                               drawtext(m, tags[j], m->dc.sel, isurgent(i, j));
-                               drawsquare(m, c && c->tags[j] && c->monitor == i,
-                                               isoccupied(i, j), isurgent(i, j), m->dc.sel);
-                       }
-                       else {
-                               drawtext(m, tags[j], m->dc.norm, isurgent(i, j));
-                               drawsquare(m, c && c->tags[j] && c->monitor == i,
-                                               isoccupied(i, j), isurgent(i, j), m->dc.norm);
-                       }
-                       m->dc.x += m->dc.w;
+       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]);
+               if(seltags[i]) {
+                       drawtext(tags[i], dc.sel, isurgent(i));
+                       drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.sel);

                }
                }

-               m->dc.w = blw;
-               drawtext(m, m->layout->symbol, m->dc.norm, False);
-               x = m->dc.x + m->dc.w;
-               if(i == selmonitor) {
-                       m->dc.w = textw(m, stext);
-                       m->dc.x = m->sw - m->dc.w;
-                       if(m->dc.x < x) {
-                               m->dc.x = x;
-                               m->dc.w = m->sw - x;
-                       }
-                       drawtext(m, stext, m->dc.norm, False);
+               else {
+                       drawtext(tags[i], dc.norm, isurgent(i));
+                       drawsquare(c && c->tags[i], isoccupied(i), isurgent(i), dc.norm);

                }
                }

-               else
-                       m->dc.x = m->sw;
-               if((m->dc.w = m->dc.x - x) > bh) {
-                       m->dc.x = x;
-                       if(c) {
-                               drawtext(m, c->name, m->dc.sel, False);
-                               drawsquare(m, False, c->isfloating, False, m->dc.sel);
-                       }
-                       else
-                               drawtext(m, NULL, m->dc.norm, False);
+               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.x = bw - dc.w;
+       if(dc.x < x) {
+               dc.x = x;
+               dc.w = bw - x;
+       }
+       drawtext(stext, dc.norm, False);
+       if((dc.w = dc.x - x) > bh) {
+               dc.x = x;
+               if(c) {
+                       drawtext(c->name, dc.sel, False);
+                       drawsquare(False, c->isfloating, False, dc.sel);

                }
                }

-               XCopyArea(dpy, m->dc.drawable, m->barwin, m->dc.gc, 0, 0, m->sw, bh, 0, 0);
-               XSync(dpy, False);
+               else
+                       drawtext(NULL, dc.norm, False);

        }
        }

+       XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
+       XSync(dpy, False);

 }
 
 void
 }
 
 void

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

        int x;
        XGCValues gcv;
        int x;
        XGCValues gcv;

-       XRectangle r = { m->dc.x, m->dc.y, m->dc.w, m->dc.h };
+       XRectangle r = { dc.x, dc.y, dc.w, dc.h };

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

-       XChangeGC(dpy, m->dc.gc, GCForeground, &gcv);
-       x = (m->dc.font.ascent + m->dc.font.descent + 2) / 4;
-       r.x = m->dc.x + 1;
-       r.y = m->dc.y + 1;
+       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;
        if(filled) {
                r.width = r.height = x + 1;

-               XFillRectangles(dpy, m->dc.drawable, m->dc.gc, &r, 1);
+               XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);

        }
        else if(empty) {
                r.width = r.height = x;
        }
        else if(empty) {
                r.width = r.height = x;

-               XDrawRectangles(dpy, m->dc.drawable, m->dc.gc, &r, 1);
+               XDrawRectangles(dpy, dc.drawable, dc.gc, &r, 1);

        }
 }
 
 void
        }
 }
 
 void

-drawtext(Monitor *m, const char *text, unsigned long col[ColLast], Bool invert) {
+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;
        unsigned int len, olen;

-       XRectangle r = { m->dc.x, m->dc.y, m->dc.w, m->dc.h };
+       XRectangle r = { dc.x, dc.y, dc.w, dc.h };

 
 

-       XSetForeground(dpy, m->dc.gc, col[invert ? ColFG : ColBG]);
-       XFillRectangles(dpy, m->dc.drawable, m->dc.gc, &r, 1);
+       XSetForeground(dpy, dc.gc, col[invert ? ColFG : ColBG]);
+       XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);

        if(!text)
                return;
        w = 0;
        if(!text)
                return;
        w = 0;


@@ -649,11 +605,11 @@ drawtext(Monitor *m, const char *text, unsigned long col[ColLast], Bool invert)
                len = sizeof buf - 1;
        memcpy(buf, text, len);
        buf[len] = 0;
                len = sizeof buf - 1;
        memcpy(buf, text, len);
        buf[len] = 0;

-       h = m->dc.font.ascent + m->dc.font.descent;
-       y = m->dc.y + (m->dc.h / 2) - (h / 2) + m->dc.font.ascent;
-       x = m->dc.x + (h / 2);
+       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 */
        /* shorten text if necessary */

-       while(len && (w = textnw(m, buf, len)) > m->dc.w - h)
+       while(len && (w = textnw(buf, len)) > dc.w - h)

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


@@ -663,13 +619,13 @@ drawtext(Monitor *m, const char *text, unsigned long col[ColLast], Bool invert)
                if(len > 3)
                        buf[len - 3] = '.';
        }
                if(len > 3)
                        buf[len - 3] = '.';
        }

-       if(w > m->dc.w)
+       if(w > dc.w)

                return; /* too long */
                return; /* too long */

-       XSetForeground(dpy, m->dc.gc, col[invert ? ColBG : ColFG]);
-       if(m->dc.font.set)
-               XmbDrawString(dpy, m->dc.drawable, m->dc.font.set, m->dc.gc, x, y, buf, len);
+       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
        else

-               XDrawString(dpy, m->dc.drawable, m->dc.gc, x, y, buf, len);
+               XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);

 }
 
 void *
 }
 
 void *


@@ -686,17 +642,12 @@ enternotify(XEvent *e) {
        Client *c;
        XCrossingEvent *ev = &e->xcrossing;
 
        Client *c;
        XCrossingEvent *ev = &e->xcrossing;
 

-       if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) {
-               if(!isxinerama || ev->window != monitors[selmonitor].root)
-                       return;
-       }
+       if((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
+               return;

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

-       else {
-               selmonitor = monitorat();
-               fprintf(stderr, "updating selmonitor %d\n", selmonitor);
+       else

                focus(NULL);
                focus(NULL);

-       }

 }
 
 void
 }
 
 void


@@ -713,34 +664,26 @@ void
 expose(XEvent *e) {
        XExposeEvent *ev = &e->xexpose;
 
 expose(XEvent *e) {
        XExposeEvent *ev = &e->xexpose;
 

-       if(ev->count == 0) {
-               if(ev->window == monitors[selmonitor].barwin)
-                       drawbar();
-       }
+       if(ev->count == 0 && (ev->window == barwin))
+               drawbar();

 }
 
 void
 floating(void) { /* default floating layout */
        Client *c;
 
 }
 
 void
 floating(void) { /* default floating layout */
        Client *c;
 

-       domwfact = dozoom = False;

        for(c = clients; c; c = c->next)
        for(c = clients; c; c = c->next)

-               if(isvisible(c, selmonitor))
+               if(isvisible(c))

                        resize(c, c->x, c->y, c->w, c->h, True);
 }
 
 void
 focus(Client *c) {
                        resize(c, c->x, c->y, c->w, c->h, True);
 }
 
 void
 focus(Client *c) {

-       Monitor *m;
-
-       if(c)
-               selmonitor = c->monitor;
-       m = &monitors[selmonitor];
-       if(!c || (c && !isvisible(c, selmonitor)))
-               for(c = stack; c && !isvisible(c, c->monitor); c = c->snext);
+       if(!c || (c && !isvisible(c)))
+               for(c = stack; c && !isvisible(c); c = c->snext);

        if(sel && sel != c) {
                grabbuttons(sel, False);
        if(sel && sel != c) {
                grabbuttons(sel, False);

-               XSetWindowBorder(dpy, sel->win, monitors[sel->monitor].dc.norm[ColBorder]);
+               XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);

        }
        if(c) {
                detachstack(c);
        }
        if(c) {
                detachstack(c);


@@ -748,16 +691,13 @@ focus(Client *c) {
                grabbuttons(c, True);
        }
        sel = c;
                grabbuttons(c, True);
        }
        sel = c;

-       drawbar();

        if(c) {
        if(c) {

-               XSetWindowBorder(dpy, c->win, m->dc.sel[ColBorder]);
+               XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);

                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);

-               selmonitor = c->monitor;
-       }
-       else {
-               XSetInputFocus(dpy, m->root, RevertToPointerRoot, CurrentTime);
-               drawbar();

        }
        }

+       else
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+       drawbar();

 }
 
 void
 }
 
 void


@@ -774,9 +714,9 @@ focusnext(const char *arg) {
 
        if(!sel)
                return;
 
        if(!sel)
                return;

-       for(c = sel->next; c && !isvisible(c, selmonitor); c = c->next);
+       for(c = sel->next; c && !isvisible(c); c = c->next);

        if(!c)
        if(!c)

-               for(c = clients; c && !isvisible(c, selmonitor); c = c->next);
+               for(c = clients; c && !isvisible(c); c = c->next);

        if(c) {
                focus(c);
                restack();
        if(c) {
                focus(c);
                restack();


@@ -789,10 +729,10 @@ focusprev(const char *arg) {
 
        if(!sel)
                return;
 
        if(!sel)
                return;

-       for(c = sel->prev; c && !isvisible(c, selmonitor); c = c->prev);
+       for(c = sel->prev; c && !isvisible(c); c = c->prev);

        if(!c) {
                for(c = clients; c && c->next; c = c->next);
        if(!c) {
                for(c = clients; c && c->next; c = c->next);

-               for(; c && !isvisible(c, selmonitor); c = c->prev);
+               for(; c && !isvisible(c); c = c->prev);

        }
        if(c) {
                focus(c);
        }
        if(c) {
                focus(c);


@@ -809,7 +749,7 @@ getclient(Window w) {
 }
 
 unsigned long
 }
 
 unsigned long

-getcolor(const char *colstr, int screen) {
+getcolor(const char *colstr) {

        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 
        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 


@@ -869,29 +809,29 @@ grabbuttons(Client *c, Bool focused) {
        if(focused) {
                XGrabButton(dpy, Button1, MODKEY, 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,
+               XGrabButton(dpy, Button1, MODKEY|LockMask, c->win, False, BUTTONMASK,

                                GrabModeAsync, GrabModeSync, None, None);
                                GrabModeAsync, GrabModeSync, None, None);

-               XGrabButton(dpy, Button1, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+               XGrabButton(dpy, Button1, MODKEY|numlockmask, c->win, False, BUTTONMASK,

                                GrabModeAsync, GrabModeSync, None, None);
                                GrabModeAsync, GrabModeSync, None, None);

-               XGrabButton(dpy, Button1, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+               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);
                                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,
+               XGrabButton(dpy, Button2, MODKEY|LockMask, c->win, False, BUTTONMASK,

                                GrabModeAsync, GrabModeSync, None, None);
                                GrabModeAsync, GrabModeSync, None, None);

-               XGrabButton(dpy, Button2, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+               XGrabButton(dpy, Button2, MODKEY|numlockmask, c->win, False, BUTTONMASK,

                                GrabModeAsync, GrabModeSync, None, None);
                                GrabModeAsync, GrabModeSync, None, None);

-               XGrabButton(dpy, Button2, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+               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);
                                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,
+               XGrabButton(dpy, Button3, MODKEY|LockMask, c->win, False, BUTTONMASK,

                                GrabModeAsync, GrabModeSync, None, None);
                                GrabModeAsync, GrabModeSync, None, None);

-               XGrabButton(dpy, Button3, MODKEY | numlockmask, c->win, False, BUTTONMASK,
+               XGrabButton(dpy, Button3, MODKEY|numlockmask, c->win, False, BUTTONMASK,

                                GrabModeAsync, GrabModeSync, None, None);
                                GrabModeAsync, GrabModeSync, None, None);

-               XGrabButton(dpy, Button3, MODKEY | numlockmask | LockMask, c->win, False, BUTTONMASK,
+               XGrabButton(dpy, Button3, MODKEY|numlockmask|LockMask, c->win, False, BUTTONMASK,

                                GrabModeAsync, GrabModeSync, None, None);
        }
        else
                                GrabModeAsync, GrabModeSync, None, None);
        }
        else


@@ -914,79 +854,76 @@ grabkeys(void)  {
                }
        XFreeModifiermap(modmap);
 
                }
        XFreeModifiermap(modmap);
 

-       for(i = 0; i < mcount; i++) {
-               Monitor *m = &monitors[i];
-               XUngrabKey(dpy, AnyKey, AnyModifier, m->root);
-               for(j = 0; j < LENGTH(keys); j++) {
-                       code = XKeysymToKeycode(dpy, keys[j].keysym);
-                       XGrabKey(dpy, code, keys[j].mod, m->root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[j].mod | LockMask, m->root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[j].mod | numlockmask, m->root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[j].mod | numlockmask | LockMask, m->root, True,
-                                       GrabModeAsync, GrabModeAsync);
-               }
+       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
        }
 }
 
 unsigned int

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

        unsigned int i;
 
        unsigned int i;
 

-       for(i = 0; (i < LENGTH(tags)) && (tags[i] != tag); i++);
+       for(i = 0; (i < LENGTH(tags)) && t && strcmp(tags[i], t); i++);

        return (i < LENGTH(tags)) ? i : 0;
 }
 
 void
        return (i < LENGTH(tags)) ? i : 0;
 }
 
 void

-initfont(Monitor *m, const char *fontstr) {
+initfont(const char *fontstr) {

        char *def, **missing;
        int i, n;
 
        missing = NULL;
        char *def, **missing;
        int i, n;
 
        missing = NULL;

-       if(m->dc.font.set)
-               XFreeFontSet(dpy, m->dc.font.set);
-       m->dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
+       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(missing) {
                while(n--)
                        fprintf(stderr, "dwm: missing fontset: %s\n", missing[n]);
                XFreeStringList(missing);
        }

-       if(m->dc.font.set) {
+       if(dc.font.set) {

                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
                char **font_names;
                XFontSetExtents *font_extents;
                XFontStruct **xfonts;
                char **font_names;

-               m->dc.font.ascent = m->dc.font.descent = 0;
-               font_extents = XExtentsOfFontSet(m->dc.font.set);
-               n = XFontsOfFontSet(m->dc.font.set, &xfonts, &font_names);
-               for(i = 0, m->dc.font.ascent = 0, m->dc.font.descent = 0; i < n; i++) {
-                       if(m->dc.font.ascent < (*xfonts)->ascent)
-                               m->dc.font.ascent = (*xfonts)->ascent;
-                       if(m->dc.font.descent < (*xfonts)->descent)
-                               m->dc.font.descent = (*xfonts)->descent;
+               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 {
                        xfonts++;
                }
        }
        else {

-               if(m->dc.font.xfont)
-                       XFreeFont(dpy, m->dc.font.xfont);
-               m->dc.font.xfont = NULL;
-               if(!(m->dc.font.xfont = XLoadQueryFont(dpy, fontstr))
-               && !(m->dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
+               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);
                        eprint("error, cannot load font: '%s'\n", fontstr);

-               m->dc.font.ascent = m->dc.font.xfont->ascent;
-               m->dc.font.descent = m->dc.font.xfont->descent;
+               dc.font.ascent = dc.font.xfont->ascent;
+               dc.font.descent = dc.font.xfont->descent;

        }
        }

-       m->dc.font.height = m->dc.font.ascent + m->dc.font.descent;
+       dc.font.height = dc.font.ascent + dc.font.descent;

 }
 
 Bool
 }
 
 Bool

-isoccupied(unsigned int monitor, unsigned int t) {
+isoccupied(unsigned int t) {

        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)

-               if(c->tags[t] && c->monitor == monitor)
+               if(c->tags[t])

                        return True;
        return False;
 }
                        return True;
        return False;
 }


@@ -1007,23 +944,21 @@ isprotodel(Client *c) {
 }
 
 Bool
 }
 
 Bool

-isurgent(unsigned int monitor, unsigned int t) {
+isurgent(unsigned int t) {

        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)

-               if(c->monitor == monitor && c->isurgent && c->tags[t])
+               if(c->isurgent && c->tags[t])

                        return True;
        return False;
 }
 
 Bool
                        return True;
        return False;
 }
 
 Bool

-isvisible(Client *c, int monitor) {
+isvisible(Client *c) {

        unsigned int i;
 
        unsigned int i;
 

-       if(c->monitor != monitor)
-               return False;

        for(i = 0; i < LENGTH(tags); i++)
        for(i = 0; i < LENGTH(tags); i++)

-               if(c->tags[i] && monitors[c->monitor].seltags[i])
+               if(c->tags[i] && seltags[i])

                        return True;
        return False;
 }
                        return True;
        return False;
 }


@@ -1067,53 +1002,51 @@ killclient(const char *arg) {
 void
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t = NULL;
 void
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t = NULL;

-       Monitor *m;

        Status rettrans;
        Window trans;
        XWindowChanges wc;
 
        c = emallocz(sizeof(Client));
        Status rettrans;
        Window trans;
        XWindowChanges wc;
 
        c = emallocz(sizeof(Client));

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

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

-       applyrules(c);
-
-       m = &monitors[c->monitor];
-
-       c->x = wa->x + m->sx;
-       c->y = wa->y + m->sy;
+       /* geometry */
+       c->x = wa->x;
+       c->y = wa->y;

        c->w = wa->width;
        c->h = wa->height;
        c->w = wa->width;
        c->h = wa->height;

-       c->oldborder = wa->border_width;
-
-       if(c->w == m->sw && c->h == m->sh) {
-               c->x = m->sx;
-               c->y = m->sy;
-               c->border = wa->border_width;
+       c->oldbw = wa->border_width;
+       if(c->w == sw && c->h == sh) {
+               c->x = sx;
+               c->y = sy;
+               c->bw = wa->border_width;

        }
        else {
        }
        else {

-               if(c->x + c->w + 2 * c->border > m->wax + m->waw)
-                       c->x = m->wax + m->waw - c->w - 2 * c->border;
-               if(c->y + c->h + 2 * c->border > m->way + m->wah)
-                       c->y = m->way + m->wah - c->h - 2 * c->border;
-               if(c->x < m->wax)
-                       c->x = m->wax;
-               if(c->y < m->way)
-                       c->y = m->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;
+               if(c->x < wx)
+                       c->x = wx;
+               if(c->y < wy)
+                       c->y = wy;
+               c->bw = BORDERPX;

        }
        }

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

        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);

-       XSetWindowBorder(dpy, w, m->dc.norm[ColBorder]);
+       XSetWindowBorder(dpy, w, dc.norm[ColBorder]);

        configure(c); /* propagates border_width, if size doesn't change */
        updatesizehints(c);
        configure(c); /* propagates border_width, if size doesn't change */
        updatesizehints(c);

-       XSelectInput(dpy, w, EnterWindowMask | FocusChangeMask | PropertyChangeMask | StructureNotifyMask);
+       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 initags);
+               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);


@@ -1147,20 +1080,13 @@ maprequest(XEvent *e) {
                manage(ev->window, &wa);
 }
 
                manage(ev->window, &wa);
 }
 

-int
-monitorat() {
-       int i, x, y;
-       Window win;
-       unsigned int mask;
+void
+monocle(void) {
+       Client *c;

 
 

-       XQueryPointer(dpy, monitors[selmonitor].root, &win, &win, &x, &y, &i, &i, &mask);
-       for(i = 0; i < mcount; i++) {
-               if((x >= monitors[i].sx && x < monitors[i].sx + monitors[i].sw)
-               && (y >= monitors[i].sy && y < monitors[i].sy + monitors[i].sh)) {
-                       return i;
-               }
-       }
-       return 0;
+       for(c = clients; c; c = c->next)
+               if(isvisible(c))
+                       resize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw, RESIZEHINTS);

 }
 
 void
 }
 
 void


@@ -1172,12 +1098,12 @@ movemouse(Client *c) {
 
        ocx = nx = c->x;
        ocy = ny = c->y;
 
        ocx = nx = c->x;
        ocy = ny = c->y;

-       if(XGrabPointer(dpy, monitors[selmonitor].root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+       if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,

                        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
                        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;

-       XQueryPointer(dpy, monitors[selmonitor].root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
+       XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);

        for(;;) {
        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);


@@ -1191,28 +1117,26 @@ 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);

-                       Monitor *m = &monitors[monitorat()];
-                       if(abs(m->wax - nx) < SNAP)
-                               nx = m->wax;
-                       else if(abs((m->wax + m->waw) - (nx + c->w + 2 * c->border)) < SNAP)
-                               nx = m->wax + m->waw - c->w - 2 * c->border;
-                       if(abs(m->way - ny) < SNAP)
-                               ny = m->way;
-                       else if(abs((m->way + m->wah) - (ny + c->h + 2 * c->border)) < SNAP)
-                               ny = m->way + m->wah - c->h - 2 * c->border;
-                       if((monitors[selmonitor].layout->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+                       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);
                                togglefloating(NULL);

-                       if((monitors[selmonitor].layout->arrange == floating) || c->isfloating)
+                       if((lt->isfloating) || c->isfloating)

                                resize(c, nx, ny, c->w, c->h, False);
                                resize(c, nx, ny, c->w, c->h, False);

-                       memcpy(c->tags, monitors[monitorat()].seltags, sizeof initags);

                        break;
                }
        }
 }
 
 Client *
                        break;
                }
        }
 }
 
 Client *

-nexttiled(Client *c, int monitor) {
-       for(; c && (c->isfloating || !isvisible(c, monitor)); c = c->next);
+nexttiled(Client *c) {
+       for(; c && (c->isfloating || !isvisible(c)); c = c->next);

        return c;
 }
 
        return c;
 }
 


@@ -1226,19 +1150,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;
-                       case XA_WM_HINTS:
-                               updatewmhints(c);
-                               drawbar();
-                               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);


@@ -1268,8 +1192,6 @@ reapply(const char *arg) {
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
        XWindowChanges wc;
 void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
        XWindowChanges wc;

-       //Monitor scr = monitors[monitorat()];
-//     c->monitor = monitorat();

 
        if(sizehints) {
                /* set minimum possible */
 
        if(sizehints) {
                /* set minimum possible */


@@ -1311,24 +1233,22 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
        }
        if(w <= 0 || h <= 0)
                return;
        }
        if(w <= 0 || h <= 0)
                return;

-       /* TODO: offscreen appearance fixes */
-       /*
-       if(x > scr.sw)
-               x = scr.sw - w - 2 * c->border;
-       if(y > scr.sh)
-               y = scr.sh - h - 2 * c->border;
-       if(x + w + 2 * c->border < scr.sx)
-               x = scr.sx;
-       if(y + h + 2 * c->border < scr.sy)
-               y = scr.sy;
-       */
+       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;
+       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;
        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);
        }


@@ -1342,16 +1262,16 @@ resizemouse(Client *c) {
 
        ocx = c->x;
        ocy = c->y;
 
        ocx = c->x;
        ocy = c->y;

-       if(XGrabPointer(dpy, monitors[selmonitor].root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+       if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,

                        None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
                        None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;

-       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;


@@ -1362,13 +1282,13 @@ 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)
+                       if((nw = ev.xmotion.x - ocx - 2 * c->bw + 1) <= 0)

                                nw = 1;
                                nw = 1;

-                       if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
+                       if((nh = ev.xmotion.y - ocy - 2 * c->bw + 1) <= 0)

                                nh = 1;
                                nh = 1;

-                       if((monitors[selmonitor].layout->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+                       if(!c->isfloating && !lt->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))

                                togglefloating(NULL);
                                togglefloating(NULL);

-                       if((monitors[selmonitor].layout->arrange == floating) || c->isfloating)
+                       if((lt->isfloating) || c->isfloating)

                                resize(c, c->x, c->y, nw, nh, True);
                        break;
                }
                                resize(c, c->x, c->y, nw, nh, True);
                        break;
                }


@@ -1377,7 +1297,6 @@ resizemouse(Client *c) {
 
 void
 restack(void) {
 
 void
 restack(void) {

-       unsigned int i;

        Client *c;
        XEvent ev;
        XWindowChanges wc;
        Client *c;
        XEvent ev;
        XWindowChanges wc;


@@ -1385,22 +1304,20 @@ restack(void) {
        drawbar();
        if(!sel)
                return;
        drawbar();
        if(!sel)
                return;

-       if(sel->isfloating || (monitors[selmonitor].layout->arrange == floating))
+       if(sel->isfloating || lt->isfloating)

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

-       if(monitors[selmonitor].layout->arrange != floating) {
+       if(!lt->isfloating) {

                wc.stack_mode = Below;
                wc.stack_mode = Below;

-               wc.sibling = monitors[selmonitor].barwin;
+               wc.sibling = barwin;

                if(!sel->isfloating) {
                if(!sel->isfloating) {

-                       XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
+                       XConfigureWindow(dpy, sel->win, CWSibling|CWStackMode, &wc);

                        wc.sibling = sel->win;
                }
                        wc.sibling = sel->win;
                }

-               for(i = 0; i < mcount; i++) {
-                       for(c = nexttiled(clients, i); c; c = nexttiled(c->next, i)) {
-                               if(c == sel)
-                                       continue;
-                               XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
-                               wc.sibling = c->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);
                }
        }
        XSync(dpy, False);


@@ -1410,7 +1327,7 @@ restack(void) {
 void
 run(void) {
        char *p;
 void
 run(void) {
        char *p;

-       char buf[sizeof stext];
+       char sbuf[sizeof stext];

        fd_set rd;
        int r, xfd;
        unsigned int len, offset;
        fd_set rd;
        int r, xfd;
        unsigned int len, offset;


@@ -1422,7 +1339,7 @@ run(void) {
        readin = True;
        offset = 0;
        len = sizeof stext - 1;
        readin = True;
        offset = 0;
        len = sizeof stext - 1;

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

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


@@ -1434,7 +1351,7 @@ 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, buf + offset, len - offset))) {
+                       switch((r = read(STDIN_FILENO, sbuf + offset, len - offset))) {

                        case -1:
                                strncpy(stext, strerror(errno), len);
                                readin = False;
                        case -1:
                                strncpy(stext, strerror(errno), len);
                                readin = False;


@@ -1444,15 +1361,15 @@ run(void) {
                                readin = False;
                                break;
                        default:
                                readin = False;
                                break;
                        default:

-                               for(p = buf + offset; r > 0; p++, r--, offset++)
+                               for(p = sbuf + offset; r > 0; p++, r--, offset++)

                                        if(*p == '\n' || *p == '\0') {
                                                *p = '\0';
                                        if(*p == '\n' || *p == '\0') {
                                                *p = '\0';

-                                               strncpy(stext, buf, len);
-                                               p += r - 1; /* p is buf + offset + r - 1 */
+                                               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)
                                                for(r = 0; *(p - r) && *(p - r) != '\n'; r++);
                                                offset = r;
                                                if(r)

-                                                       memmove(buf, p - r + 1, r);
+                                                       memmove(sbuf, p - r + 1, r);

                                                break;
                                        }
                                break;
                                                break;
                                        }
                                break;


@@ -1469,32 +1386,29 @@ run(void) {
 
 void
 scan(void) {
 
 void
 scan(void) {

-       unsigned int i, j, num;
+       unsigned int i, num;

        Window *wins, d1, d2;
        XWindowAttributes wa;
 
        Window *wins, d1, d2;
        XWindowAttributes wa;
 

-       for(i = 0; i < mcount; i++) {
-               Monitor *m = &monitors[i];
-               wins = NULL;
-               if(XQueryTree(dpy, m->root, &d1, &d2, &wins, &num)) {
-                       for(j = 0; j < num; j++) {
-                               if(!XGetWindowAttributes(dpy, wins[j], &wa)
-                               || wa.override_redirect || XGetTransientForHint(dpy, wins[j], &d1))
-                                       continue;
-                               if(wa.map_state == IsViewable || getstate(wins[j]) == IconicState)
-                                       manage(wins[j], &wa);
-                       }
-                       for(j = 0; j < num; j++) { /* now the transients */
-                               if(!XGetWindowAttributes(dpy, wins[j], &wa))
-                                       continue;
-                               if(XGetTransientForHint(dpy, wins[j], &d1)
-                               && (wa.map_state == IsViewable || getstate(wins[j]) == IconicState))
-                                       manage(wins[j], &wa);
-                       }
+       wins = NULL;
+       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))
+                               continue;
+                       if(wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
+                               manage(wins[i], &wa);
+               }
+               for(i = 0; i < num; i++) { /* now the transients */
+                       if(!XGetWindowAttributes(dpy, wins[i], &wa))
+                               continue;
+                       if(XGetTransientForHint(dpy, wins[i], &d1)
+                                       && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
+                               manage(wins[i], &wa);

                }
                }

-               if(wins)
-                       XFree(wins);

        }
        }

+       if(wins)
+               XFree(wins);

 }
 
 void
 }
 
 void


@@ -1505,15 +1419,34 @@ 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;
 void
 setlayout(const char *arg) {
        unsigned int i;

-       Monitor *m = &monitors[monitorat()];

 
        if(!arg) {
 
        if(!arg) {

-               m->layout++;
-               if(m->layout == &layouts[LENGTH(layouts)])
-                       m->layout = &layouts[0];
+               if(++lt == &layouts[LENGTH(layouts)])
+                       lt = &layouts[0];

        }
        else {
                for(i = 0; i < LENGTH(layouts); i++)
        }
        else {
                for(i = 0; i < LENGTH(layouts); i++)


@@ -1521,7 +1454,7 @@ setlayout(const char *arg) {
                                break;
                if(i == LENGTH(layouts))
                        return;
                                break;
                if(i == LENGTH(layouts))
                        return;

-               m->layout = &layouts[i];
+               lt = &layouts[i];

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


@@ -1529,36 +1462,24 @@ setlayout(const char *arg) {
                drawbar();
 }
 
                drawbar();
 }
 

-void
-setmwfact(const char *arg) {
-       double delta;
-
-       Monitor *m = &monitors[monitorat()];
-
-       if(!domwfact)
-               return;
-       /* arg handling, manipulate mwfact */
-       if(arg == NULL)
-               m->mwfact = MWFACT;
-       else if(sscanf(arg, "%lf", &delta) == 1) {
-               if(arg[0] == '+' || arg[0] == '-')
-                       m->mwfact += delta;
-               else
-                       m->mwfact = delta;
-               if(m->mwfact < 0.1)
-                       m->mwfact = 0.1;
-               else if(m->mwfact > 0.9)
-                       m->mwfact = 0.9;
-       }
-       arrange();
-}
-

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

-       unsigned int i, j, k;
-       Monitor *m;
+       unsigned int i, w;

        XSetWindowAttributes wa;
        XSetWindowAttributes wa;

-       XineramaScreenInfo *info = NULL;
+
+       /* 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;
+       geom = &geoms[0];
+       geom->apply();

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


@@ -1573,99 +1494,66 @@ setup(void) {
        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 screens/monitors first
-       mcount = 1;
-       if((isxinerama = XineramaIsActive(dpy)))
-               info = XineramaQueryScreens(dpy, &mcount);
-       monitors = emallocz(mcount * sizeof(Monitor));
-
-       for(i = 0; i < mcount; i++) {
-               /* init geometry */
-               m = &monitors[i];
-
-               m->screen = isxinerama ? 0 : i;
-               m->root = RootWindow(dpy, m->screen);
-
-               if (mcount != 1 && isxinerama) {
-                       m->sx = info[i].x_org;
-                       m->sy = info[i].y_org;
-                       m->sw = info[i].width;
-                       m->sh = info[i].height;
-                       fprintf(stderr, "monitor[%d]: %d,%d,%d,%d\n", i, m->sx, m->sy, m->sw, m->sh);
-               }
-               else {
-                       m->sx = 0;
-                       m->sy = 0;
-                       m->sw = DisplayWidth(dpy, m->screen);
-                       m->sh = DisplayHeight(dpy, m->screen);
-               }
-
-               m->seltags = emallocz(sizeof initags);
-               m->prevtags = emallocz(sizeof initags);
-
-               memcpy(m->seltags, initags, sizeof initags);
-               memcpy(m->prevtags, initags, sizeof initags);
-
-               /* init appearance */
-               m->dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR, m->screen);
-               m->dc.norm[ColBG] = getcolor(NORMBGCOLOR, m->screen);
-               m->dc.norm[ColFG] = getcolor(NORMFGCOLOR, m->screen);
-               m->dc.sel[ColBorder] = getcolor(SELBORDERCOLOR, m->screen);
-               m->dc.sel[ColBG] = getcolor(SELBGCOLOR, m->screen);
-               m->dc.sel[ColFG] = getcolor(SELFGCOLOR, m->screen);
-               initfont(m, FONT);
-               m->dc.h = bh = m->dc.font.height + 2;
-
-               /* init layouts */
-               m->mwfact = MWFACT;
-               m->layout = &layouts[0];
-               for(blw = k = 0; k < LENGTH(layouts); k++) {
-                       j = textw(m, layouts[k].symbol);
-                       if(j > blw)
-                               blw = j;
-               }
+       /* 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.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);

 
 

-               // TODO: bpos per screen?
-               bpos = BARPOS;
-               wa.override_redirect = 1;
-               wa.background_pixmap = ParentRelative;
-               wa.event_mask = ButtonPressMask | ExposureMask;
-
-               /* init bars */
-               m->barwin = XCreateWindow(dpy, m->root, m->sx, m->sy, m->sw, bh, 0,
-                               DefaultDepth(dpy, m->screen), CopyFromParent, DefaultVisual(dpy, m->screen),
-                               CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-               XDefineCursor(dpy, m->barwin, cursor[CurNormal]);
-               updatebarpos(m);
-               XMapRaised(dpy, m->barwin);
-               strcpy(stext, "dwm-"VERSION);
-               m->dc.drawable = XCreatePixmap(dpy, m->root, m->sw, bh, DefaultDepth(dpy, m->screen));
-               m->dc.gc = XCreateGC(dpy, m->root, 0, 0);
-               XSetLineAttributes(dpy, m->dc.gc, 1, LineSolid, CapButt, JoinMiter);
-               if(!m->dc.font.set)
-                       XSetFont(dpy, m->dc.gc, m->dc.font.xfont->fid);
-
-               /* EWMH support per monitor */
-               XChangeProperty(dpy, m->root, netatom[NetSupported], XA_ATOM, 32,
-                               PropModeReplace, (unsigned char *) netatom, NetLast);
-
-               /* select for events */
-               wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
-                               | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
-               XChangeWindowAttributes(dpy, m->root, CWEventMask | CWCursor, &wa);
-               XSelectInput(dpy, m->root, wa.event_mask);
+       /* init tags */
+       seltags = emallocz(TAGSZ);
+       prevtags = emallocz(TAGSZ);
+       seltags[0] = prevtags[0] = True;
+
+       /* init layouts */
+       lt = &layouts[0];
+
+       /* init bar */
+       for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
+               w = textw(layouts[i].symbol);
+               if(w > blw)
+                       blw = w;
+       }
+       for(bgw = i = 0; LENGTH(geoms) > 1 && i < LENGTH(geoms); i++) {
+               w = textw(geoms[i].symbol);
+               if(w > bgw)
+                       bgw = w;

        }
        }

-       if(info)
-               XFree(info);

 
 

-       /* grab keys */
-       grabkeys();
+       wa.override_redirect = 1;
+       wa.background_pixmap = ParentRelative;
+       wa.event_mask = ButtonPressMask|ExposureMask;

 
 

-       /* init tags */
-       compileregs();
+       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]);
+       XMapRaised(dpy, barwin);
+       strcpy(stext, "dwm-"VERSION);
+       drawbar();
+
+       /* EWMH support per view */
+       XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
+                       PropModeReplace, (unsigned char *) netatom, NetLast);
+
+       /* select for events */
+       wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
+                       |EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
+       XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
+       XSelectInput(dpy, root, wa.event_mask);

 
 

-       selmonitor = monitorat();
-       fprintf(stderr, "selmonitor == %d\n", selmonitor);
+
+       /* grab keys */
+       grabkeys();

 }
 
 void
 }
 
 void


@@ -1705,81 +1593,92 @@ tag(const char *arg) {
 }
 
 unsigned int
 }
 
 unsigned int

-textnw(Monitor *m, const char *text, unsigned int len) {
+textnw(const char *text, unsigned int len) {

        XRectangle r;
 
        XRectangle r;
 

-       if(m->dc.font.set) {
-               XmbTextExtents(m->dc.font.set, text, len, NULL, &r);
+       if(dc.font.set) {
+               XmbTextExtents(dc.font.set, text, len, NULL, &r);

                return r.width;
        }
                return r.width;
        }

-       return XTextWidth(m->dc.font.xfont, text, len);
+       return XTextWidth(dc.font.xfont, text, len);

 }
 
 unsigned int
 }
 
 unsigned int

-textw(Monitor *m, const char *text) {
-       return textnw(m, text, strlen(text)) + m->dc.font.height;
+textw(const char *text) {
+       return textnw(text, strlen(text)) + dc.font.height;

 }
 
 void
 }
 
 void

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

 
 

-       domwfact = dozoom = True;
+       if(n == 0)
+               return;
+       c = tilemaster(n);
+       if(--n == 0)
+               return;

 
 

-       nx = ny = nw = 0; /* gcc stupidity requires this */
+       x = tx;
+       w = tw / n;
+       if(w < bh)
+               w = tw;

 
 

-       for (i = 0; i < mcount; i++) {
-               Monitor *m = &monitors[i];
+       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;
+       }
+}

 
 

-               for(n = 0, c = nexttiled(clients, i); c; c = nexttiled(c->next, i))
-                       n++;
+Client *
+tilemaster(unsigned int n) {
+       Client *c = nexttiled(clients);

 
 

-               /* window geoms */
-               mw = (n == 1) ? m->waw : m->mwfact * m->waw;
-               th = (n > 1) ? m->wah / (n - 1) : 0;
-               if(n > 1 && th < bh)
-                       th = m->wah;
+       if(n == 1)
+               tileresize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw);
+       else
+               tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw);
+       return c;
+}

 
 

-               for(j = 0, c = mc = nexttiled(clients, i); c; c = nexttiled(c->next, i)) {
-                       if(j == 0) { /* master */
-                               nx = m->wax;
-                               ny = m->way;
-                               nw = mw - 2 * c->border;
-                               nh = m->wah - 2 * c->border;
-                       }
-                       else {  /* tile window */
-                               if(j == 1) {
-                                       ny = m->way;
-                                       nx += mc->w + 2 * mc->border;
-                                       nw = m->waw - mw - 2 * c->border;
-                               }
-                               if(j + 1 == n) /* remainder */
-                                       nh = (m->way + m->wah) - ny - 2 * c->border;
-                               else
-                                       nh = th - 2 * c->border;
-                       }
-                       fprintf(stderr, "tile(%d, %d, %d, %d)\n", nx, ny, nw, nh);
-                       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 != m->wah)
-                               ny = c->y + c->h + 2 * c->border;
-
-                       j++;
-               }
-       }
-       fprintf(stderr, "done\n");
+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
 void

-togglebar(const char *arg) {
-       if(bpos == BarOff)
-               bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
-       else
-               bpos = BarOff;
-       updatebarpos(&monitors[monitorat()]);
-       arrange();
+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


@@ -1810,13 +1709,11 @@ void
 toggleview(const char *arg) {
        unsigned int i, j;
 
 toggleview(const char *arg) {
        unsigned int i, j;
 

-       Monitor *m = &monitors[monitorat()];
-

        i = idxoftag(arg);
        i = idxoftag(arg);

-       m->seltags[i] = !m->seltags[i];
-       for(j = 0; j < LENGTH(tags) && !m->seltags[j]; j++);
+       seltags[i] = !seltags[i];
+       for(j = 0; j < LENGTH(tags) && !seltags[j]; j++);

        if(j == LENGTH(tags))
        if(j == LENGTH(tags))

-               m->seltags[i] = True; /* at least one tag must be viewed */
+               seltags[i] = True; /* at least one tag must be viewed */

        arrange();
 }
 
        arrange();
 }
 


@@ -1832,7 +1729,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);


@@ -1861,29 +1758,12 @@ unmapnotify(XEvent *e) {
 }
 
 void
 }
 
 void

-updatebarpos(Monitor *m) {
-       XEvent ev;
+updatebarpos(void) {

 
 

-       m->wax = m->sx;
-       m->way = m->sy;
-       m->wah = m->sh;
-       m->waw = m->sw;
-       switch(bpos) {
-       default:
-               m->wah -= bh;
-               m->way += bh;
-               XMoveWindow(dpy, m->barwin, m->sx, m->sy);
-               break;
-       case BarBot:
-               m->wah -= bh;
-               XMoveWindow(dpy, m->barwin, m->sx, m->sy + m->wah);
-               break;
-       case BarOff:
-               XMoveWindow(dpy, m->barwin, m->sx, m->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


@@ -1949,11 +1829,39 @@ updatewmhints(Client *c) {
        XWMHints *wmh;
 
        if((wmh = XGetWMHints(dpy, c->win))) {
        XWMHints *wmh;
 
        if((wmh = XGetWMHints(dpy, c->win))) {

-               c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+               if(c == sel)
+                       sel->isurgent = False;
+               else
+                       c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;

                XFree(wmh);
        }
 }
 
                XFree(wmh);
        }
 }
 

+
+void
+view(const char *arg) {
+       unsigned int i;
+
+       for(i = 0; i < LENGTH(tags); i++)
+               tmp[i] = (NULL == arg);
+       tmp[idxoftag(arg)] = True;
+
+       if(memcmp(seltags, tmp, TAGSZ) != 0) {
+               memcpy(prevtags, seltags, TAGSZ);
+               memcpy(seltags, tmp, TAGSZ);
+               arrange();
+       }
+}
+
+void
+viewprevtag(const char *arg) {
+
+       memcpy(tmp, seltags, TAGSZ);
+       memcpy(seltags, prevtags, TAGSZ);
+       memcpy(prevtags, tmp, TAGSZ);
+       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.  */


@@ -1974,54 +1882,26 @@ 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;
-       Bool tmp[LENGTH(tags)];
-       Monitor *m = &monitors[monitorat()];
-
-       for(i = 0; i < LENGTH(tags); i++)
-               tmp[i] = (NULL == arg);
-       tmp[idxoftag(arg)] = True;
-       if(memcmp(m->seltags, tmp, sizeof initags) != 0) {
-               memcpy(m->prevtags, m->seltags, sizeof initags);
-               memcpy(m->seltags, tmp, sizeof initags);
-               arrange();
-       }
-}
-
-void
-viewprevtag(const char *arg) {
-       static Bool tmp[LENGTH(tags)];
-
-       Monitor *m = &monitors[monitorat()];
-
-       memcpy(tmp, m->seltags, sizeof initags);
-       memcpy(m->seltags, m->prevtags, sizeof initags);
-       memcpy(m->prevtags, tmp, sizeof initags);
-       arrange();
-}
-

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

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

 
 

-       if(!sel || !dozoom || sel->isfloating)
+       if(!sel || lt->isfloating || sel->isfloating)

                return;
                return;

-       if((c = sel) == nexttiled(clients, c->monitor))
-               if(!(c = nexttiled(c->next, c->monitor)))
+       if(c == nexttiled(clients))
+               if(!(c = nexttiled(c->next)))

                        return;
        detach(c);
        attach(c);
                        return;
        detach(c);
        attach(c);


@@ -2029,31 +1909,10 @@ zoom(const char *arg) {
        arrange();
 }
 
        arrange();
 }
 

-void
-movetomonitor(const char *arg) {
-       if (sel) {
-               sel->monitor = arg ? atoi(arg) : (sel->monitor+1) % mcount;
-
-               memcpy(sel->tags, monitors[sel->monitor].seltags, sizeof initags);
-               resize(sel, monitors[sel->monitor].wax, monitors[sel->monitor].way, sel->w, sel->h, True);
-               arrange();
-       }
-}
-
-void
-selectmonitor(const char *arg) {
-       Monitor *m = &monitors[arg ? atoi(arg) : (monitorat()+1) % mcount];
-
-       XWarpPointer(dpy, None, m->root, 0, 0, 0, 0, m->wax+m->waw/2, m->way+m->wah/2);
-       focus(NULL);
-}
-
-

 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))
 int
 main(int argc, char *argv[]) {
        if(argc == 2 && !strcmp("-v", argv[1]))

-               eprint("dwm-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk, "
-                      "Jukka Salmi, Premysl Hruby, Szabolcs Nagy, Christof Musik\n");
+               eprint("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");

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


@@ -2063,7 +1922,6 @@ main(int argc, char *argv[]) {
 
        checkotherwm();
        setup();
 
        checkotherwm();
        setup();

-       drawbar();

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