extended rule to apply monitors if set up accordingly

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 3857511..4d1493b 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -11,9 +11,9 @@
  * in O(1) time.
  *
  * Each child of the root window is called a client, except windows which have
  * in O(1) time.
  *
  * Each child of the root window is called a client, except windows which have

- * set the override_redirect flag.  Clients are organized in a global
- * linked client list, the focus history is remembered through a global
- * stack list. Each client contains a bit array to indicate the tags of a
+ * set the override_redirect flag.  Clients are organized in a linked client
+ * list on each monitor, the focus history is remembered through a stack list
+ * on each monitor. Each client contains a bit array to indicate the tags of a

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


@@ -66,7 +66,7 @@ typedef union {
        int i;
        unsigned int ui;
        float f;
        int i;
        unsigned int ui;
        float f;

-       void *v;
+       const void *v;

 } Arg;
 
 typedef struct {
 } Arg;
 
 typedef struct {


@@ -121,9 +121,9 @@ typedef struct {
 } Layout;
 
 struct Monitor {
 } Layout;
 
 struct Monitor {

-       int screen_number;

        float mfact;
        float mfact;

-       int by, btx;          /* bar geometry */
+       int num;
+       int by;               /* bar geometry */

        int mx, my, mw, mh;   /* screen size */
        int wx, wy, ww, wh;   /* window area  */
        unsigned int seltags;
        int mx, my, mw, mh;   /* screen size */
        int wx, wy, ww, wh;   /* window area  */
        unsigned int seltags;


@@ -136,6 +136,7 @@ struct Monitor {
        Client *stack;
        Monitor *next;
        Window barwin;
        Client *stack;
        Monitor *next;
        Window barwin;

+       const Layout *lt[2];

 };
 
 typedef struct {
 };
 
 typedef struct {


@@ -144,11 +145,12 @@ typedef struct {
        const char *title;
        unsigned int tags;
        Bool isfloating;
        const char *title;
        unsigned int tags;
        Bool isfloating;

+       int monitor;

 } Rule;
 
 /* function declarations */
 static void applyrules(Client *c);
 } Rule;
 
 /* function declarations */
 static void applyrules(Client *c);

-static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h);
+static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact);

 static void arrange(void);
 static void attach(Client *c);
 static void attachstack(Client *c);
 static void arrange(void);
 static void attach(Client *c);
 static void attachstack(Client *c);


@@ -164,6 +166,7 @@ static void destroynotify(XEvent *e);
 static void detach(Client *c);
 static void detachstack(Client *c);
 static void die(const char *errstr, ...);
 static void detach(Client *c);
 static void detachstack(Client *c);
 static void die(const char *errstr, ...);

+static Monitor *dirtomon(int dir);

 static void drawbar(Monitor *m);
 static void drawbars(void);
 static void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
 static void drawbar(Monitor *m);
 static void drawbars(void);
 static void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);


@@ -175,12 +178,11 @@ static void focusin(XEvent *e);
 static void focusmon(const Arg *arg);
 static void focusstack(const Arg *arg);
 static unsigned long getcolor(const char *colstr);
 static void focusmon(const Arg *arg);
 static void focusstack(const Arg *arg);
 static unsigned long getcolor(const char *colstr);

-static Bool getrootpointer(int *x, int *y);
+static Bool getrootptr(int *x, int *y);

 static long getstate(Window w);
 static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 static void grabbuttons(Client *c, Bool focused);
 static void grabkeys(void);
 static long getstate(Window w);
 static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 static void grabbuttons(Client *c, Bool focused);
 static void grabkeys(void);

-static Monitor *idxtomon(unsigned int n);

 static void initfont(const char *fontstr);
 static Bool isprotodel(Client *c);
 static void keypress(XEvent *e);
 static void initfont(const char *fontstr);
 static Bool isprotodel(Client *c);
 static void keypress(XEvent *e);


@@ -191,10 +193,10 @@ static void maprequest(XEvent *e);
 static void monocle(Monitor *m);
 static void movemouse(const Arg *arg);
 static Client *nexttiled(Client *c);
 static void monocle(Monitor *m);
 static void movemouse(const Arg *arg);
 static Client *nexttiled(Client *c);

-static Monitor *pointertomon(int x, int y);
+static Monitor *ptrtomon(int x, int y);

 static void propertynotify(XEvent *e);
 static void quit(const Arg *arg);
 static void propertynotify(XEvent *e);
 static void quit(const Arg *arg);

-static void resize(Client *c, int x, int y, int w, int h);
+static void resize(Client *c, int x, int y, int w, int h, Bool interact);

 static void resizemouse(const Arg *arg);
 static void restack(Monitor *m);
 static void run(void);
 static void resizemouse(const Arg *arg);
 static void restack(Monitor *m);
 static void run(void);


@@ -235,9 +237,9 @@ static int xerrorstart(Display *dpy, XErrorEvent *ee);
 static void zoom(const Arg *arg);
 
 /* variables */
 static void zoom(const Arg *arg);
 
 /* variables */

-static char stext[256];
+static char stext[256], ntext[8];

 static int screen;
 static int screen;

-static int sw, sh;   /* X display screen geometry x, y, width, height */
+static int sw, sh;           /* X display screen geometry width, height */

 static int bh, blw = 0;      /* bar geometry */
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;
 static int bh, blw = 0;      /* bar geometry */
 static int (*xerrorxlib)(Display *, XErrorEvent *);
 static unsigned int numlockmask = 0;


@@ -261,9 +263,9 @@ static Bool running = True;
 static Cursor cursor[CurLast];
 static Display *dpy;
 static DC dc;
 static Cursor cursor[CurLast];
 static Display *dpy;
 static DC dc;

-static Layout *lt[] = { NULL, NULL };

 static Monitor *mons = NULL, *selmon = NULL;
 static Window root;
 static Monitor *mons = NULL, *selmon = NULL;
 static Window root;

+

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


@@ -274,7 +276,8 @@ struct NumTags { char limitexceeded[sizeof(unsigned int) * 8 < LENGTH(tags) ? -1
 void
 applyrules(Client *c) {
        unsigned int i;
 void
 applyrules(Client *c) {
        unsigned int i;

-       Rule *r;
+       const Rule *r;
+       Monitor *m;

        XClassHint ch = { 0 };
 
        /* rule matching */
        XClassHint ch = { 0 };
 
        /* rule matching */


@@ -284,9 +287,13 @@ applyrules(Client *c) {
                        r = &rules[i];
                        if((!r->title || strstr(c->name, r->title))
                        && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
                        r = &rules[i];
                        if((!r->title || strstr(c->name, r->title))
                        && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))

-                       && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
+                       && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance))))
+                       {

                                c->isfloating = r->isfloating;
                                c->tags |= r->tags;
                                c->isfloating = r->isfloating;
                                c->tags |= r->tags;

+                               for(m = mons; m && m->num != r->monitor; m = m->next);
+                               if(m)
+                                       c->mon = m;

                        }
                }
                if(ch.res_class)
                        }
                }
                if(ch.res_class)


@@ -298,36 +305,44 @@ applyrules(Client *c) {
 }
 
 Bool
 }
 
 Bool

-applysizehints(Client *c, int *x, int *y, int *w, int *h) {
+applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {

        Bool baseismin;
        Monitor *m = c->mon;
 
        /* set minimum possible */
        *w = MAX(1, *w);
        *h = MAX(1, *h);
        Bool baseismin;
        Monitor *m = c->mon;
 
        /* set minimum possible */
        *w = MAX(1, *w);
        *h = MAX(1, *h);

-
-       if(*x > m->mx + m->mw)
-               *x = m->mx + m->mw - WIDTH(c);
-       if(*y > m->my + m->mh)
-               *y = m->my + m->mh - HEIGHT(c);
-       if(*x + *w + 2 * c->bw < m->mx)
-               *x = m->mx;
-       if(*y + *h + 2 * c->bw < m->my)
-               *y = m->my;
+       if(interact) {
+               if(*x > sw)
+                       *x = sw - WIDTH(c);
+               if(*y > sh)
+                       *y = sh - HEIGHT(c);
+               if(*x + *w + 2 * c->bw < 0)
+                       *x = 0;
+               if(*y + *h + 2 * c->bw < 0)
+                       *y = 0;
+       }
+       else {
+               if(*x > m->mx + m->mw)
+                       *x = m->mx + m->mw - WIDTH(c);
+               if(*y > m->my + m->mh)
+                       *y = m->my + m->mh - HEIGHT(c);
+               if(*x + *w + 2 * c->bw < m->mx)
+                       *x = m->mx;
+               if(*y + *h + 2 * c->bw < m->my)
+                       *y = m->my;
+       }

        if(*h < bh)
                *h = bh;
        if(*w < bh)
                *w = bh;
        if(*h < bh)
                *h = bh;
        if(*w < bh)
                *w = bh;

-

        if(resizehints || c->isfloating) {
                /* see last two sentences in ICCCM 4.1.2.3 */
                baseismin = c->basew == c->minw && c->baseh == c->minh;
        if(resizehints || c->isfloating) {
                /* see last two sentences in ICCCM 4.1.2.3 */
                baseismin = c->basew == c->minw && c->baseh == c->minh;

-

                if(!baseismin) { /* temporarily remove base dimensions */
                        *w -= c->basew;
                        *h -= c->baseh;
                }
                if(!baseismin) { /* temporarily remove base dimensions */
                        *w -= c->basew;
                        *h -= c->baseh;
                }

-

                /* adjust for aspect limits */
                if(c->mina > 0 && c->maxa > 0) {
                        if(c->maxa < (float)*w / *h)
                /* adjust for aspect limits */
                if(c->mina > 0 && c->maxa > 0) {
                        if(c->maxa < (float)*w / *h)


@@ -335,28 +350,22 @@ applysizehints(Client *c, int *x, int *y, int *w, int *h) {
                        else if(c->mina < (float)*h / *w)
                                *h = *w * c->mina;
                }
                        else if(c->mina < (float)*h / *w)
                                *h = *w * c->mina;
                }

-

                if(baseismin) { /* increment calculation requires this */
                        *w -= c->basew;
                        *h -= c->baseh;
                }
                if(baseismin) { /* increment calculation requires this */
                        *w -= c->basew;
                        *h -= c->baseh;
                }

-

                /* adjust for increment value */
                if(c->incw)
                        *w -= *w % c->incw;
                if(c->inch)
                        *h -= *h % c->inch;
                /* adjust for increment value */
                if(c->incw)
                        *w -= *w % c->incw;
                if(c->inch)
                        *h -= *h % c->inch;

-

                /* restore base dimensions */
                *w += c->basew;
                *h += c->baseh;
                /* restore base dimensions */
                *w += c->basew;
                *h += c->baseh;

-

                *w = MAX(*w, c->minw);
                *h = MAX(*h, c->minh);
                *w = MAX(*w, c->minw);
                *h = MAX(*h, c->minh);

-

                if(c->maxw)
                        *w = MIN(*w, c->maxw);
                if(c->maxw)
                        *w = MIN(*w, c->maxw);

-

                if(c->maxh)
                        *h = MIN(*h, c->maxh);
        }
                if(c->maxh)
                        *h = MIN(*h, c->maxh);
        }


@@ -372,8 +381,8 @@ arrange(void) {
                showhide(m->stack);
        focus(NULL);
        for(m = mons; m; m = m->next) {
                showhide(m->stack);
        focus(NULL);
        for(m = mons; m; m = m->next) {

-               if(lt[m->sellt]->arrange)
-                       lt[m->sellt]->arrange(m);
+               if(m->lt[m->sellt]->arrange)
+                       m->lt[m->sellt]->arrange(m);

                restack(m);
        }
 }
                restack(m);
        }
 }


@@ -405,9 +414,8 @@ buttonpress(XEvent *e) {
                selmon = m;
                focus(NULL);
        }
                selmon = m;
                focus(NULL);
        }

-       if(ev->window == selmon->barwin && ev->x >= selmon->btx) {
-               i = 0;
-               x = selmon->btx;
+       if(ev->window == selmon->barwin) {
+               i = x = 0;

                do
                        x += TEXTW(tags[i]);
                while(ev->x >= x && ++i < LENGTH(tags));
                do
                        x += TEXTW(tags[i]);
                while(ev->x >= x && ++i < LENGTH(tags));


@@ -426,7 +434,6 @@ buttonpress(XEvent *e) {
                focus(c);
                click = ClkClientWin;
        }
                focus(c);
                click = ClkClientWin;
        }

-

        for(i = 0; i < LENGTH(buttons); i++)
                if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
                   && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
        for(i = 0; i < LENGTH(buttons); i++)
                if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
                   && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))


@@ -437,7 +444,6 @@ void
 checkotherwm(void) {
        otherwm = False;
        xerrorxlib = XSetErrorHandler(xerrorstart);
 checkotherwm(void) {
        otherwm = False;
        xerrorxlib = XSetErrorHandler(xerrorstart);

-

        /* this causes an error if some other window manager is running */
        XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
        XSync(dpy, False);
        /* this causes an error if some other window manager is running */
        XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
        XSync(dpy, False);


@@ -454,7 +460,7 @@ cleanup(void) {
        Monitor *m;
 
        view(&a);
        Monitor *m;
 
        view(&a);

-       lt[selmon->sellt] = &foo;
+       selmon->lt[selmon->sellt] = &foo;

        for(m = mons; m; m = m->next)
                while(m->stack)
                        unmanage(m->stack);
        for(m = mons; m; m = m->next)
                while(m->stack)
                        unmanage(m->stack);


@@ -545,7 +551,7 @@ configurerequest(XEvent *e) {
        if((c = wintoclient(ev->window))) {
                if(ev->value_mask & CWBorderWidth)
                        c->bw = ev->border_width;
        if((c = wintoclient(ev->window))) {
                if(ev->value_mask & CWBorderWidth)
                        c->bw = ev->border_width;

-               else if(c->isfloating || !lt[selmon->sellt]->arrange) {
+               else if(c->isfloating || !selmon->lt[selmon->sellt]->arrange) {

                        m = c->mon;
                        if(ev->value_mask & CWX)
                                c->x = m->mx + ev->x;
                        m = c->mon;
                        if(ev->value_mask & CWX)
                                c->x = m->mx + ev->x;


@@ -620,26 +626,38 @@ die(const char *errstr, ...) {
        exit(EXIT_FAILURE);
 }
 
        exit(EXIT_FAILURE);
 }
 

+Monitor *
+dirtomon(int dir) {
+       Monitor *m = NULL;
+
+       if(dir > 0) {
+               if(!(m = selmon->next))
+                       m = mons;
+       }
+       else {
+               if(selmon == mons)
+                       for(m = mons; m->next; m = m->next);
+               else
+                       for(m = mons; m->next != selmon; m = m->next);
+       }
+       return m;
+}
+

 void
 drawbar(Monitor *m) {
        int x;
 void
 drawbar(Monitor *m) {
        int x;

-       unsigned int i, occ = 0, urg = 0;
+       unsigned int i, n = 0, occ = 0, urg = 0;

        unsigned long *col;
        Client *c;
 
        for(c = m->clients; c; c = c->next) {
        unsigned long *col;
        Client *c;
 
        for(c = m->clients; c; c = c->next) {

+               if(ISVISIBLE(c))
+                       n++;

                occ |= c->tags;
                if(c->isurgent)
                        urg |= c->tags;
        }
                occ |= c->tags;
                if(c->isurgent)
                        urg |= c->tags;
        }

-

        dc.x = 0;
        dc.x = 0;

-       if(mons->next) { /* more than a single monitor */
-               dc.w = TEXTW(monsyms[m->screen_number]);
-               drawtext(monsyms[m->screen_number], selmon == m ? dc.sel : dc.norm, False);
-               dc.x += dc.w;
-       }
-       m->btx = dc.x;

        for(i = 0; i < LENGTH(tags); i++) {
                dc.w = TEXTW(tags[i]);
                col = m->tagset[m->seltags] & 1 << i ? dc.sel : dc.norm;
        for(i = 0; i < LENGTH(tags); i++) {
                dc.w = TEXTW(tags[i]);
                col = m->tagset[m->seltags] & 1 << i ? dc.sel : dc.norm;


@@ -650,11 +668,13 @@ drawbar(Monitor *m) {
        }
        if(blw > 0) {
                dc.w = blw;
        }
        if(blw > 0) {
                dc.w = blw;

-               drawtext(lt[m->sellt]->symbol, dc.norm, False);
-               x = dc.x + dc.w;
+               drawtext(m->lt[m->sellt]->symbol, dc.norm, False);
+               dc.x += dc.w;

        }
        }

-       else
-               x = dc.x;
+       snprintf(ntext, sizeof ntext, "%u", n);
+       dc.w = TEXTW(ntext);
+       drawtext(ntext, dc.norm, False);
+       x = (dc.x += dc.w);

        if(m == selmon) { /* status is only drawn on selected monitor */
                dc.w = TEXTW(stext);
                dc.x = m->ww - dc.w;
        if(m == selmon) { /* status is only drawn on selected monitor */
                dc.w = TEXTW(stext);
                dc.x = m->ww - dc.w;


@@ -664,9 +684,8 @@ drawbar(Monitor *m) {
                }
                drawtext(stext, dc.norm, False);
        }
                }
                drawtext(stext, dc.norm, False);
        }

-       else {
+       else

                dc.x = m->ww;
                dc.x = m->ww;

-       }

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


@@ -798,10 +817,11 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
 
 void
 focusmon(const Arg *arg) {
 
 void
 focusmon(const Arg *arg) {

-       Monitor *m;
+       Monitor *m = NULL;

 
 

-       if(!(m = idxtomon(arg->ui)) || m == selmon)
+       if(!mons->next)

                return;
                return;

+       m = dirtomon(arg->i);

        unfocus(selmon->sel);
        selmon = m;
        focus(NULL);
        unfocus(selmon->sel);
        selmon = m;
        focus(NULL);


@@ -844,10 +864,11 @@ getcolor(const char *colstr) {
 }
 
 Bool
 }
 
 Bool

-getrootpointer(int *x, int *y) {
+getrootptr(int *x, int *y) {

        int di;
        unsigned int dui;
        Window dummy;
        int di;
        unsigned int dui;
        Window dummy;

+

        return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui);
 }
 
        return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui);
 }
 


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

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

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


@@ -910,7 +932,8 @@ grabbuttons(Client *c, Bool focused) {
                                                            buttons[i].mask | modifiers[j],
                                                            c->win, False, BUTTONMASK,
                                                            GrabModeAsync, GrabModeSync, None, None);
                                                            buttons[i].mask | modifiers[j],
                                                            c->win, False, BUTTONMASK,
                                                            GrabModeAsync, GrabModeSync, None, None);

-               } else
+               }
+               else

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


@@ -919,7 +942,7 @@ grabbuttons(Client *c, Bool focused) {
 void
 grabkeys(void) {
        updatenumlockmask();
 void
 grabkeys(void) {
        updatenumlockmask();

-       { /* grab keys */
+       {

                unsigned int i, j;
                unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
                KeyCode code;
                unsigned int i, j;
                unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
                KeyCode code;


@@ -934,15 +957,6 @@ grabkeys(void) {
        }
 }
 
        }
 }
 

-Monitor *
-idxtomon(unsigned int n) {
-       unsigned int i;
-       Monitor *m;
-
-       for(m = mons, i = 0; m && i != n; m = m->next, i++);
-       return m;
-}
-

 void
 initfont(const char *fontstr) {
        char *def, **missing;
 void
 initfont(const char *fontstr) {
        char *def, **missing;


@@ -1038,7 +1052,6 @@ manage(Window w, XWindowAttributes *wa) {
                die("fatal: could not malloc() %u bytes\n", sizeof(Client));
        *c = cz;
        c->win = w;
                die("fatal: could not malloc() %u bytes\n", sizeof(Client));
        *c = cz;
        c->win = w;

-

        if(XGetTransientForHint(dpy, w, &trans))
                t = wintoclient(trans);
        if(t) {
        if(XGetTransientForHint(dpy, w, &trans))
                t = wintoclient(trans);
        if(t) {


@@ -1049,7 +1062,6 @@ manage(Window w, XWindowAttributes *wa) {
                c->mon = selmon;
                applyrules(c);
        }
                c->mon = selmon;
                applyrules(c);
        }

-

        /* geometry */
        c->x = wa->x + c->mon->wx;
        c->y = wa->y + c->mon->wy;
        /* geometry */
        c->x = wa->x + c->mon->wx;
        c->y = wa->y + c->mon->wy;


@@ -1072,7 +1084,6 @@ manage(Window w, XWindowAttributes *wa) {
                           && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
                c->bw = borderpx;
        }
                           && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
                c->bw = borderpx;
        }

-

        wc.border_width = c->bw;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
        XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
        wc.border_width = c->bw;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
        XSetWindowBorder(dpy, w, dc.norm[ColBorder]);


@@ -1120,7 +1131,7 @@ monocle(Monitor *m) {
        Client *c;
 
        for(c = nexttiled(m->clients); c; c = nexttiled(c->next))
        Client *c;
 
        for(c = nexttiled(m->clients); c; c = nexttiled(c->next))

-               resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw);
+               resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, False);

 }
 
 void
 }
 
 void


@@ -1138,7 +1149,7 @@ movemouse(const Arg *arg) {
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;

-       if(!getrootpointer(&x, &y))
+       if(!getrootptr(&x, &y))

                return;
        do {
                XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
                return;
        do {
                XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);


@@ -1161,18 +1172,18 @@ movemouse(const Arg *arg) {
                                        ny = selmon->wy;
                                else if(abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
                                        ny = selmon->wy + selmon->wh - HEIGHT(c);
                                        ny = selmon->wy;
                                else if(abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
                                        ny = selmon->wy + selmon->wh - HEIGHT(c);

-                               if(!c->isfloating && lt[selmon->sellt]->arrange
+                               if(!c->isfloating && selmon->lt[selmon->sellt]->arrange

                                                  && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
                                        togglefloating(NULL);
                        }
                                                  && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
                                        togglefloating(NULL);
                        }

-                       if(!lt[selmon->sellt]->arrange || c->isfloating)
-                               resize(c, nx, ny, c->w, c->h);
+                       if(!selmon->lt[selmon->sellt]->arrange || c->isfloating)
+                               resize(c, nx, ny, c->w, c->h, True);

                        break;
                }
        }
        while(ev.type != ButtonRelease);
        XUngrabPointer(dpy, CurrentTime);
                        break;
                }
        }
        while(ev.type != ButtonRelease);
        XUngrabPointer(dpy, CurrentTime);

-       if((m = pointertomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
+       if((m = ptrtomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {

                sendmon(c, m);
                selmon = m;
                focus(NULL);
                sendmon(c, m);
                selmon = m;
                focus(NULL);


@@ -1186,7 +1197,7 @@ nexttiled(Client *c) {
 }
 
 Monitor *
 }
 
 Monitor *

-pointertomon(int x, int y) {
+ptrtomon(int x, int y) {

        Monitor *m;
 
        for(m = mons; m; m = m->next)
        Monitor *m;
 
        for(m = mons; m; m = m->next)


@@ -1235,10 +1246,10 @@ quit(const Arg *arg) {
 }
 
 void
 }
 
 void

-resize(Client *c, int x, int y, int w, int h) {
+resize(Client *c, int x, int y, int w, int h, Bool interact) {

        XWindowChanges wc;
 
        XWindowChanges wc;
 

-       if(applysizehints(c, &x, &y, &w, &h)) {
+       if(applysizehints(c, &x, &y, &w, &h, interact)) {

                c->x = wc.x = x;
                c->y = wc.y = y;
                c->w = wc.width = w;
                c->x = wc.x = x;
                c->y = wc.y = y;
                c->w = wc.width = w;


@@ -1278,15 +1289,14 @@ resizemouse(const Arg *arg) {
                case MotionNotify:
                        nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
                        nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
                case MotionNotify:
                        nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
                        nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);

-

                        if(snap && nw >= selmon->wx && nw <= selmon->wx + selmon->ww
                                && nh >= selmon->wy && nh <= selmon->wy + selmon->wh) {
                        if(snap && nw >= selmon->wx && nw <= selmon->wx + selmon->ww
                                && nh >= selmon->wy && nh <= selmon->wy + selmon->wh) {

-                               if(!c->isfloating && lt[selmon->sellt]->arrange
+                               if(!c->isfloating && selmon->lt[selmon->sellt]->arrange

                                   && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
                                        togglefloating(NULL);
                        }
                                   && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
                                        togglefloating(NULL);
                        }

-                       if(!lt[selmon->sellt]->arrange || c->isfloating)
-                               resize(c, c->x, c->y, nw, nh);
+                       if(!selmon->lt[selmon->sellt]->arrange || c->isfloating)
+                               resize(c, c->x, c->y, nw, nh, True);

                        break;
                }
        }
                        break;
                }
        }


@@ -1294,7 +1304,7 @@ resizemouse(const Arg *arg) {
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
        XUngrabPointer(dpy, CurrentTime);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
        XUngrabPointer(dpy, CurrentTime);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));

-       if((m = pointertomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {
+       if((m = ptrtomon(c->x + c->w / 2, c->y + c->h / 2)) != selmon) {

                sendmon(c, m);
                selmon = m;
                focus(NULL);
                sendmon(c, m);
                selmon = m;
                focus(NULL);


@@ -1310,9 +1320,9 @@ restack(Monitor *m) {
        drawbars();
        if(!m->sel)
                return;
        drawbars();
        if(!m->sel)
                return;

-       if(m->sel->isfloating || !lt[m->sellt]->arrange)
+       if(m->sel->isfloating || !m->lt[m->sellt]->arrange)

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

-       if(lt[m->sellt]->arrange) {
+       if(m->lt[m->sellt]->arrange) {

                wc.stack_mode = Below;
                wc.sibling = m->barwin;
                for(c = m->stack; c; c = c->snext)
                wc.stack_mode = Below;
                wc.sibling = m->barwin;
                for(c = m->stack; c; c = c->snext)


@@ -1331,10 +1341,9 @@ run(void) {
 
        /* main event loop */
        XSync(dpy, False);
 
        /* main event loop */
        XSync(dpy, False);

-       while(running && !XNextEvent(dpy, &ev)) {
+       while(running && !XNextEvent(dpy, &ev))

                if(handler[ev.type])
                        (handler[ev.type])(&ev); /* call handler */
                if(handler[ev.type])
                        (handler[ev.type])(&ev); /* call handler */

-       }

 }
 
 void
 }
 
 void


@@ -1380,7 +1389,7 @@ sendmon(Client *c, Monitor *m) {
 
 void
 setclientstate(Client *c, long state) {
 
 void
 setclientstate(Client *c, long state) {

-       long data[] = {state, None};
+       long data[] = { state, None };

 
        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
                        PropModeReplace, (unsigned char *)data, 2);
 
        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
                        PropModeReplace, (unsigned char *)data, 2);


@@ -1388,10 +1397,10 @@ setclientstate(Client *c, long state) {
 
 void
 setlayout(const Arg *arg) {
 
 void
 setlayout(const Arg *arg) {

-       if(!arg || !arg->v || arg->v != lt[selmon->sellt])
+       if(!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])

                selmon->sellt ^= 1;
        if(arg && arg->v)
                selmon->sellt ^= 1;
        if(arg && arg->v)

-               lt[selmon->sellt] = (Layout *)arg->v;
+               selmon->lt[selmon->sellt] = (Layout *)arg->v;

        if(selmon->sel)
                arrange();
        else
        if(selmon->sel)
                arrange();
        else


@@ -1403,7 +1412,7 @@ void
 setmfact(const Arg *arg) {
        float f;
 
 setmfact(const Arg *arg) {
        float f;
 

-       if(!arg || !lt[selmon->sellt]->arrange)
+       if(!arg || !selmon->lt[selmon->sellt]->arrange)

                return;
        f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
        if(f < 0.1 || f > 0.9)
                return;
        f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
        if(f < 0.1 || f > 0.9)


@@ -1425,22 +1434,17 @@ setup(void) {
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        bh = dc.h = dc.font.height + 2;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        bh = dc.h = dc.font.height + 2;

-       lt[0] = &layouts[0];
-       lt[1] = &layouts[1 % LENGTH(layouts)];

        updategeom();
        updategeom();

-

        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
        /* init atoms */
        wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
        wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
        wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
        netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
        netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);

-

        /* init cursors */
        cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
        /* init cursors */
        cursor[CurNormal] = XCreateFontCursor(dpy, XC_left_ptr);
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);

-

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


@@ -1453,7 +1457,6 @@ setup(void) {
        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
        if(!dc.font.set)
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
        XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
        if(!dc.font.set)
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);

-

        /* init bars */
        for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
                w = TEXTW(layouts[i].symbol);
        /* init bars */
        for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
                w = TEXTW(layouts[i].symbol);


@@ -1461,11 +1464,9 @@ setup(void) {
        }
        updatebars();
        updatestatus();
        }
        updatebars();
        updatestatus();

-

        /* EWMH support per view */
        XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
                        PropModeReplace, (unsigned char *) netatom, NetLast);
        /* EWMH support per view */
        XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
                        PropModeReplace, (unsigned char *) netatom, NetLast);

-

        /* select for events */
        wa.cursor = cursor[CurNormal];
        wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
        /* select for events */
        wa.cursor = cursor[CurNormal];
        wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask


@@ -1473,7 +1474,6 @@ setup(void) {
                        |PropertyChangeMask;
        XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
        XSelectInput(dpy, root, wa.event_mask);
                        |PropertyChangeMask;
        XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
        XSelectInput(dpy, root, wa.event_mask);

-

        grabkeys();
 }
 
        grabkeys();
 }
 


@@ -1483,8 +1483,8 @@ showhide(Client *c) {
                return;
        if(ISVISIBLE(c)) { /* show clients top down */
                XMoveWindow(dpy, c->win, c->x, c->y);
                return;
        if(ISVISIBLE(c)) { /* show clients top down */
                XMoveWindow(dpy, c->win, c->x, c->y);

-               if(!lt[c->mon->sellt]->arrange || c->isfloating)
-                       resize(c, c->x, c->y, c->w, c->h);
+               if(!c->mon->lt[c->mon->sellt]->arrange || c->isfloating)
+                       resize(c, c->x, c->y, c->w, c->h, False);

                showhide(c->snext);
        }
        else { /* hide clients bottom up */
                showhide(c->snext);
        }
        else { /* hide clients bottom up */


@@ -1523,11 +1523,9 @@ tag(const Arg *arg) {
 
 void
 tagmon(const Arg *arg) {
 
 void
 tagmon(const Arg *arg) {

-       Monitor *m;
-
-       if(!selmon->sel || !(m = idxtomon(arg->ui)))
+       if(!selmon->sel || !mons->next)

                return;
                return;

-       sendmon(selmon->sel, m);
+       sendmon(selmon->sel, dirtomon(arg->i));

 }
 
 int
 }
 
 int


@@ -1550,15 +1548,12 @@ tile(Monitor *m) {
        for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
        if(n == 0)
                return;
        for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
        if(n == 0)
                return;

-

        /* master */
        c = nexttiled(m->clients);
        mw = m->mfact * m->ww;
        /* master */
        c = nexttiled(m->clients);
        mw = m->mfact * m->ww;

-       resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw);
-
+       resize(c, m->wx, m->wy, (n == 1 ? m->ww : mw) - 2 * c->bw, m->wh - 2 * c->bw, False);

        if(--n == 0)
                return;
        if(--n == 0)
                return;

-

        /* tile stack */
        x = (m->wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : m->wx + mw;
        y = m->wy;
        /* tile stack */
        x = (m->wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : m->wx + mw;
        y = m->wy;


@@ -1566,10 +1561,9 @@ tile(Monitor *m) {
        h = m->wh / n;
        if(h < bh)
                h = m->wh;
        h = m->wh / n;
        if(h < bh)
                h = m->wh;

-

        for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
                resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
        for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
                resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)

-                      ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw));
+                      ? m->wy + m->wh - y - 2 * c->bw : h - 2 * c->bw), False);

                if(h != m->wh)
                        y = c->y + HEIGHT(c);
        }
                if(h != m->wh)
                        y = c->y + HEIGHT(c);
        }


@@ -1589,7 +1583,8 @@ togglefloating(const Arg *arg) {
                return;
        selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
        if(selmon->sel->isfloating)
                return;
        selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
        if(selmon->sel->isfloating)

-               resize(selmon->sel, selmon->sel->x, selmon->sel->y, selmon->sel->w, selmon->sel->h);
+               resize(selmon->sel, selmon->sel->x, selmon->sel->y,
+                      selmon->sel->w, selmon->sel->h, False);

        arrange();
 }
 
        arrange();
 }
 


@@ -1599,7 +1594,6 @@ toggletag(const Arg *arg) {
 
        if(!selmon->sel)
                return;
 
        if(!selmon->sel)
                return;

-       

        mask = selmon->sel->tags ^ (arg->ui & TAGMASK);
        if(mask) {
                selmon->sel->tags = mask;
        mask = selmon->sel->tags ^ (arg->ui & TAGMASK);
        if(mask) {
                selmon->sel->tags = mask;


@@ -1664,10 +1658,8 @@ updatebars(void) {
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask|ExposureMask;
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask|ExposureMask;

-

        for(m = mons; m; m = m->next) {
                m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
        for(m = mons; m; m = m->next) {
                m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),

-

                                          CopyFromParent, DefaultVisual(dpy, screen),
                                          CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
                XDefineCursor(dpy, m->barwin, cursor[CurNormal]);
                                          CopyFromParent, DefaultVisual(dpy, screen),
                                          CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
                XDefineCursor(dpy, m->barwin, cursor[CurNormal]);


@@ -1692,7 +1684,7 @@ void
 updategeom(void) {
        int i, n = 1;
        Client *c;
 updategeom(void) {
        int i, n = 1;
        Client *c;

-       Monitor *newmons = NULL, *m, *tm;
+       Monitor *newmons = NULL, *m = NULL, *tm;

 
 #ifdef XINERAMA
        XineramaScreenInfo *info = NULL;
 
 #ifdef XINERAMA
        XineramaScreenInfo *info = NULL;


@@ -1702,16 +1694,16 @@ updategeom(void) {
 #endif /* XINERAMA */
        /* allocate monitor(s) for the new geometry setup */
        for(i = 0; i < n; i++) {
 #endif /* XINERAMA */
        /* allocate monitor(s) for the new geometry setup */
        for(i = 0; i < n; i++) {

-               m = (Monitor *)malloc(sizeof(Monitor));
+               if(!(m = (Monitor *)malloc(sizeof(Monitor))))
+                       die("fatal: could not malloc() %u bytes\n", sizeof(Monitor));

                m->next = newmons;
                newmons = m;
        }
                m->next = newmons;
                newmons = m;
        }

-

        /* initialise monitor(s) */
 #ifdef XINERAMA
        if(XineramaIsActive(dpy)) {
                for(i = 0, m = newmons; m; m = m->next, i++) {
        /* initialise monitor(s) */
 #ifdef XINERAMA
        if(XineramaIsActive(dpy)) {
                for(i = 0, m = newmons; m; m = m->next, i++) {

-                       m->screen_number = info[i].screen_number;
+                       m->num = info[i].screen_number;

                        m->mx = m->wx = info[i].x_org;
                        m->my = m->wy = info[i].y_org;
                        m->mw = m->ww = info[i].width;
                        m->mx = m->wx = info[i].x_org;
                        m->my = m->wy = info[i].y_org;
                        m->mw = m->ww = info[i].width;


@@ -1723,13 +1715,12 @@ updategeom(void) {
 #endif /* XINERAMA */
        /* default monitor setup */
        {
 #endif /* XINERAMA */
        /* default monitor setup */
        {

-               m->screen_number = 0;
+               m->num = 0;

                m->mx = m->wx = 0;
                m->my = m->wy = 0;
                m->mw = m->ww = sw;
                m->mh = m->wh = sh;
        }
                m->mx = m->wx = 0;
                m->my = m->wy = 0;
                m->mw = m->ww = sw;
                m->mh = m->wh = sh;
        }

-

        /* bar geometry setup */
        for(m = newmons; m; m = m->next) {
                m->sel = m->stack = m->clients = NULL;
        /* bar geometry setup */
        for(m = newmons; m; m = m->next) {
                m->sel = m->stack = m->clients = NULL;


@@ -1737,11 +1728,12 @@ updategeom(void) {
                m->sellt = 0;
                m->tagset[0] = m->tagset[1] = 1;
                m->mfact = mfact;
                m->sellt = 0;
                m->tagset[0] = m->tagset[1] = 1;
                m->mfact = mfact;

-               m->showbar = SHOWBAR;
-               m->topbar = TOPBAR;
+               m->showbar = showbar;
+               m->topbar = topbar;
+               m->lt[0] = &layouts[0];
+               m->lt[1] = &layouts[1 % LENGTH(layouts)];

                updatebarpos(m);
        }
                updatebarpos(m);
        }

-

        /* reassign left over clients of disappeared monitors */
        for(tm = mons; tm; tm = tm->next)
                while(tm->clients) {
        /* reassign left over clients of disappeared monitors */
        for(tm = mons; tm; tm = tm->next)
                while(tm->clients) {


@@ -1752,7 +1744,6 @@ updategeom(void) {
                        attach(c);
                        attachstack(c);
                }
                        attach(c);
                        attachstack(c);
                }

-

        /* select focused monitor */
        cleanupmons();
        selmon = mons = newmons;
        /* select focused monitor */
        cleanupmons();
        selmon = mons = newmons;


@@ -1848,7 +1839,6 @@ updatewmhints(Client *c) {
                }
                else
                        c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
                }
                else
                        c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;

-

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


@@ -1881,8 +1871,8 @@ wintomon(Window w) {
        Client *c;
        Monitor *m;
 
        Client *c;
        Monitor *m;
 

-       if(w == root && getrootpointer(&x, &y))
-               return pointertomon(x, y);
+       if(w == root && getrootptr(&x, &y))
+               return ptrtomon(x, y);

        for(m = mons; m; m = m->next)
                if(w == m->barwin)
                        return m;
        for(m = mons; m; m = m->next)
                if(w == m->barwin)
                        return m;


@@ -1928,7 +1918,9 @@ void
 zoom(const Arg *arg) {
        Client *c = selmon->sel;
 
 zoom(const Arg *arg) {
        Client *c = selmon->sel;
 

-       if(!lt[selmon->sellt]->arrange || lt[selmon->sellt]->arrange == monocle || (selmon->sel && selmon->sel->isfloating))
+       if(!selmon->lt[selmon->sellt]->arrange
+       || selmon->lt[selmon->sellt]->arrange == monocle
+       || (selmon->sel && selmon->sel->isfloating))

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


@@ -1945,19 +1937,15 @@ main(int argc, char *argv[]) {
                die("dwm-"VERSION", © 2006-2009 dwm engineers, see LICENSE for details\n");
        else if(argc != 1)
                die("usage: dwm [-v]\n");
                die("dwm-"VERSION", © 2006-2009 dwm engineers, see LICENSE for details\n");
        else if(argc != 1)
                die("usage: dwm [-v]\n");

-

        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fputs("warning: no locale support\n", stderr);
        if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
                fputs("warning: no locale support\n", stderr);

-

        if(!(dpy = XOpenDisplay(NULL)))
                die("dwm: cannot open display\n");
        if(!(dpy = XOpenDisplay(NULL)))
                die("dwm: cannot open display\n");

-

        checkotherwm();
        setup();
        scan();
        run();
        cleanup();
        checkotherwm();
        setup();
        scan();
        run();
        cleanup();

-

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