fixed urgent hint handling

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 3699f99..a1a34e2 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.
  *


@@ -40,13 +40,31 @@
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>

+/*
+ * TODO: Idea:
+ * I intend to not provide real Xinerama support, but instead having a Column
+ * tilecols[] array which is used by tile(), and a Column maxcols[] arrays which is used by
+ * monocle(). Those arrays should be initialized in config.h. For simplicity
+ * reasons mwfact should be replaced with a more advanced method which
+ * implements the same, but using the boundary between tilecols[0] and
+ * tilecols[1] instead. Besides this, get rid of BARPOS and use instead the
+ * following mechanism:
+ *
+ * #define BX 0
+ * #define BY 0
+ * #define BW sw
+ * bh is calculated automatically and should be used for the 
+ */
+//#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)

 
 
 /* enums */
 
 
 /* enums */


@@ -65,7 +83,7 @@ struct Client {
        int minax, maxax, minay, maxay;
        long flags;
        unsigned int border, oldborder;
        int minax, maxax, minay, maxay;
        long flags;
        unsigned int border, oldborder;

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

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


@@ -73,6 +91,10 @@ struct Client {
        Window win;
 };
 
        Window win;
 };
 

+typedef struct {
+       int x, y, w, h;
+} Column;
+

 typedef struct {
        int x, y, w, h;
        unsigned long norm[ColLast];
 typedef struct {
        int x, y, w, h;
        unsigned long norm[ColLast];


@@ -102,15 +124,10 @@ typedef struct {
 
 typedef struct {
        const char *prop;
 
 typedef struct {
        const char *prop;

-       const char *tags;
+       const char *tag;

        Bool isfloating;
 } Rule;
 
        Bool isfloating;
 } Rule;
 

-typedef struct {
-       regex_t *propregex;
-       regex_t *tagregex;
-} Regs;
-

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


@@ -120,7 +137,6 @@ 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);


@@ -128,8 +144,8 @@ void destroynotify(XEvent *e);
 void detach(Client *c);
 void detachstack(Client *c);
 void drawbar(void);
 void detach(Client *c);
 void detachstack(Client *c);
 void drawbar(void);

-void drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]);
-void drawtext(const char *text, unsigned long col[ColLast]);
+void 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, ...);


@@ -145,18 +161,18 @@ long getstate(Window w);
 Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 void grabbuttons(Client *c, Bool focused);
 void grabkeys(void);
 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);
+unsigned int idxoftag(const char *t);

 void initfont(const char *fontstr);
 Bool isoccupied(unsigned int t);
 Bool isprotodel(Client *c);
 void initfont(const char *fontstr);
 Bool isoccupied(unsigned int t);
 Bool isprotodel(Client *c);

+Bool isurgent(unsigned int t);

 Bool isvisible(Client *c);
 void keypress(XEvent *e);
 void killclient(const char *arg);
 Bool isvisible(Client *c);
 void keypress(XEvent *e);
 void killclient(const char *arg);

-void leavenotify(XEvent *e);

 void manage(Window w, XWindowAttributes *wa);
 void mappingnotify(XEvent *e);
 void maprequest(XEvent *e);
 void manage(Window w, XWindowAttributes *wa);
 void mappingnotify(XEvent *e);
 void maprequest(XEvent *e);

-void maximize(const char *arg);
+void monocle(void);

 void movemouse(Client *c);
 Client *nexttiled(Client *c);
 void propertynotify(XEvent *e);
 void movemouse(Client *c);
 Client *nexttiled(Client *c);
 void propertynotify(XEvent *e);


@@ -186,17 +202,19 @@ void unmapnotify(XEvent *e);
 void updatebarpos(void);
 void updatesizehints(Client *c);
 void updatetitle(Client *c);
 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 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);

+void selectview(const char *arg);

 
 /* variables */
 
 /* variables */

-char stext[256];
+char stext[256], buf[256];

 double mwfact;
 double mwfact;

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

 int (*xerrorxlib)(Display *, XErrorEvent *);
 unsigned int bh, bpos;
 unsigned int blw = 0;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 unsigned int bh, bpos;
 unsigned int blw = 0;


@@ -210,7 +228,6 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [Expose] = expose,
        [FocusIn] = focusin,
        [KeyPress] = keypress,
        [Expose] = expose,
        [FocusIn] = focusin,
        [KeyPress] = keypress,

-       [LeaveNotify] = leavenotify,

        [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,
        [PropertyNotify] = propertynotify,
        [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,
        [PropertyNotify] = propertynotify,


@@ -221,52 +238,53 @@ Bool domwfact = True;
 Bool dozoom = True;
 Bool otherwm, readin;
 Bool running = True;
 Bool dozoom = True;
 Bool otherwm, readin;
 Bool running = True;

-Bool selscreen = True;
+Bool *prevtags;
+Bool *seltags;

 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;

+Column *cols = NULL;

 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};

-Layout *layout = NULL;
-Window barwin, root;
-Regs *regs = NULL;
+Layout *lt;
+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;
+       unsigned int i;

        Bool matched = False;
        Bool matched = False;

+       Rule *r;

        XClassHint ch = { 0 };
 
        /* rule matching */
        XGetClassHint(dpy, c->win, &ch);
        XClassHint ch = { 0 };
 
        /* rule matching */
        XGetClassHint(dpy, c->win, &ch);

-       snprintf(buf, sizeof buf, "%s:%s:%s",
-                       ch.res_class ? ch.res_class : "",
-                       ch.res_name ? ch.res_name : "", c->name);
-       for(i = 0; i < LENGTH(rules); i++)
-               if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
-                       c->isfloating = rules[i].isfloating;
-                       for(j = 0; regs[i].tagregex && j < LENGTH(tags); j++) {
-                               if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
-                                       matched = True;
-                                       c->tags[j] = True;
-                               }
+       for(i = 0; i < LENGTH(rules); i++) {
+               r = &rules[i];
+               if(strstr(c->name, r->prop)
+               || (ch.res_class && strstr(ch.res_class, r->prop))
+               || (ch.res_name && strstr(ch.res_name, r->prop)))
+               {
+                       c->isfloating = r->isfloating;
+                       if(r->tag) {
+                               c->tags[idxoftag(r->tag)] = True;
+                               matched = True;

                        }
                }
                        }
                }

+       }

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

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

 }
 
 void
 }
 
 void


@@ -278,8 +296,9 @@ arrange(void) {
                        unban(c);
                else
                        ban(c);
                        unban(c);
                else
                        ban(c);

-       layout->arrange();
+

        focus(NULL);
        focus(NULL);

+       lt->arrange();

        restack();
 }
 
        restack();
 }
 


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

-       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+       XMoveWindow(dpy, c->win, c->x + 3 * sw, c->y);

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


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

-                       if((layout->arrange == floating) || c->isfloating)
-                               restack();
-                       else
-                               togglefloating(NULL);
+                       restack();

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

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

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

-                       if((floating == layout->arrange) || c->isfloating)
-                               restack();
-                       else
-                               togglefloating(NULL);
+                       restack();

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


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

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

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


@@ -379,6 +392,7 @@ checkotherwm(void) {
 
 void
 cleanup(void) {
 
 void
 cleanup(void) {

+

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


@@ -388,41 +402,16 @@ cleanup(void) {
                XFreeFontSet(dpy, dc.font.set);
        else
                XFreeFont(dpy, dc.font.xfont);
                XFreeFontSet(dpy, dc.font.set);
        else
                XFreeFont(dpy, dc.font.xfont);

+

        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        XFreePixmap(dpy, dc.drawable);
        XFreeGC(dpy, dc.gc);
        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        XFreePixmap(dpy, dc.drawable);
        XFreeGC(dpy, dc.gc);

-       XDestroyWindow(dpy, barwin);

        XFreeCursor(dpy, cursor[CurNormal]);
        XFreeCursor(dpy, cursor[CurResize]);
        XFreeCursor(dpy, cursor[CurMove]);
        XFreeCursor(dpy, cursor[CurNormal]);
        XFreeCursor(dpy, cursor[CurResize]);
        XFreeCursor(dpy, cursor[CurMove]);

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

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

-}
-
-void
-compileregs(void) {
-       unsigned int i;
-       regex_t *reg;
-
-       if(regs)
-               return;
-       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;
-               }
-       }
+       XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);

 }
 
 void
 }
 
 void


@@ -448,10 +437,11 @@ configurenotify(XEvent *e) {
        XConfigureEvent *ev = &e->xconfigure;
 
        if(ev->window == root && (ev->width != sw || ev->height != sh)) {
        XConfigureEvent *ev = &e->xconfigure;
 
        if(ev->window == root && (ev->width != sw || ev->height != sh)) {

+               /* TODO -- use Xinerama dimensions here ? */

                sw = ev->width;
                sh = ev->height;
                XFreePixmap(dpy, dc.drawable);
                sw = ev->width;
                sh = ev->height;
                XFreePixmap(dpy, dc.drawable);

-               dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
+               dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(root, screen), bh, DefaultDepth(dpy, screen));

                XResizeWindow(dpy, barwin, sw, bh);
                updatebarpos();
                arrange();
                XResizeWindow(dpy, barwin, sw, bh);
                updatebarpos();
                arrange();


@@ -464,24 +454,25 @@ configurerequest(XEvent *e) {
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
 
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
 

+       /* TODO -- consider Xinerama if necessary when centering */

        if((c = getclient(ev->window))) {
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
        if((c = getclient(ev->window))) {
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;

-               if(c->isfixed || c->isfloating || (floating == layout->arrange)) {
+               if(c->isfixed || c->isfloating || (floating == lt->arrange)) {

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

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

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

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

                        if(ev->value_mask & CWWidth)
                                c->w = ev->width;
                        if(ev->value_mask & CWHeight)
                                c->h = ev->height;
                        if(ev->value_mask & CWWidth)
                                c->w = ev->width;
                        if(ev->value_mask & CWHeight)
                                c->h = ev->height;

-                       if((c->x + c->w) > sw && c->isfloating)
-                               c->x = sw / 2 - c->w / 2; /* center in x direction */
-                       if((c->y + c->h) > sh && c->isfloating)
-                               c->y = sh / 2 - c->h / 2; /* center in y direction */
-                       if((ev->value_mask & (CWX | CWY))
-                       && !(ev->value_mask & (CWWidth | CWHeight)))
+                       if((c->x - sx + c->w) > sw && c->isfloating)
+                               c->x = sx + (sw / 2 - c->w / 2); /* center in x direction */
+                       if((c->y - sy + c->h) > sh && c->isfloating)
+                               c->y = sy + (sh / 2 - c->h / 2); /* center in y direction */
+                       if((ev->value_mask & (CWX|CWY))
+                       && !(ev->value_mask & (CWWidth|CWHeight)))

                                configure(c);
                        if(isvisible(c))
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                                configure(c);
                        if(isvisible(c))
                                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);


@@ -502,6 +493,16 @@ configurerequest(XEvent *e) {
        XSync(dpy, False);
 }
 
        XSync(dpy, False);
 }
 

+Bool
+conflicts(Client *c, unsigned int tidx) {
+       unsigned int i;
+
+       for(i = 0; i < LENGTH(tags); i++)
+               if(c->tags[i])
+                       return True; /* conflict */
+       return False;
+}
+

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


@@ -533,22 +534,24 @@ detachstack(Client *c) {
 void
 drawbar(void) {
        int i, x;
 void
 drawbar(void) {
        int i, x;

+       Client *c;

 
 

-       dc.x = dc.y = 0;
+       dc.x = 0;
+       for(c = stack; c && !isvisible(c); c = c->snext);

        for(i = 0; i < LENGTH(tags); i++) {
                dc.w = textw(tags[i]);
                if(seltags[i]) {
        for(i = 0; i < LENGTH(tags); i++) {
                dc.w = textw(tags[i]);
                if(seltags[i]) {

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

                }
                else {
                }
                else {

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

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

-       drawtext(layout->symbol, dc.norm);
+       drawtext(lt->symbol, dc.norm, False);

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


@@ -556,27 +559,27 @@ drawbar(void) {
                dc.x = x;
                dc.w = sw - x;
        }
                dc.x = x;
                dc.w = sw - x;
        }

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

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

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

                }
                else
                }
                else

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

        }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
        XSync(dpy, False);
 }
 
 void
        }
        XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, sw, bh, 0, 0);
        XSync(dpy, False);
 }
 
 void

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

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

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

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


@@ -592,13 +595,12 @@ drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
 }
 
 void
 }
 
 void

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

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

-       static char buf[256];

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

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

        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        if(!text)
                return;
        XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
        if(!text)
                return;


@@ -624,7 +626,7 @@ drawtext(const char *text, unsigned long col[ColLast]) {
        }
        if(w > dc.w)
                return; /* too long */
        }
        if(w > dc.w)
                return; /* too long */

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

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


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

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

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

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

                focus(NULL);
                focus(NULL);

-       }

 }
 
 void
 }
 
 void


@@ -669,10 +669,8 @@ void
 expose(XEvent *e) {
        XExposeEvent *ev = &e->xexpose;
 
 expose(XEvent *e) {
        XExposeEvent *ev = &e->xexpose;
 

-       if(ev->count == 0) {
-               if(ev->window == barwin)
-                       drawbar();
-       }
+       if(ev->count == 0 && (ev->window == barwin))
+               drawbar();

 }
 
 void
 }
 
 void


@@ -687,7 +685,7 @@ floating(void) { /* default floating layout */
 
 void
 focus(Client *c) {
 
 void
 focus(Client *c) {

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

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


@@ -699,15 +697,13 @@ focus(Client *c) {
                grabbuttons(c, True);
        }
        sel = c;
                grabbuttons(c, True);
        }
        sel = c;

-       drawbar();
-       if(!selscreen)
-               return;

        if(c) {
                XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        }
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
        if(c) {
                XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
                XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
        }
        else
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);

+       drawbar();

 }
 
 void
 }
 
 void


@@ -819,29 +815,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


@@ -851,28 +847,38 @@ grabbuttons(Client *c, Bool focused) {
 
 void
 grabkeys(void)  {
 
 void
 grabkeys(void)  {

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

        KeyCode code;
        KeyCode code;

+       XModifierKeymap *modmap;
+
+       /* init modifier map */
+       modmap = XGetModifierMapping(dpy);
+       for(i = 0; i < 8; i++)
+               for(j = 0; j < modmap->max_keypermod; j++) {
+                       if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
+                               numlockmask = (1 << i);
+               }
+       XFreeModifiermap(modmap);

 
        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        for(i = 0; i < LENGTH(keys); i++) {
                code = XKeysymToKeycode(dpy, keys[i].keysym);
                XGrabKey(dpy, code, keys[i].mod, root, True,
                                GrabModeAsync, GrabModeAsync);
 
        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,
+               XGrabKey(dpy, code, keys[i].mod|LockMask, root, True,

                                GrabModeAsync, GrabModeAsync);
                                GrabModeAsync, GrabModeAsync);

-               XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
+               XGrabKey(dpy, code, keys[i].mod|numlockmask, root, True,

                                GrabModeAsync, GrabModeAsync);
                                GrabModeAsync, GrabModeAsync);

-               XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
+               XGrabKey(dpy, code, keys[i].mod|numlockmask|LockMask, root, True,

                                GrabModeAsync, GrabModeAsync);
        }
 }
 
 unsigned int
                                GrabModeAsync, GrabModeAsync);
        }
 }
 
 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)) && (tags[i] != t); i++);

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


@@ -943,6 +949,16 @@ isprotodel(Client *c) {
        return ret;
 }
 
        return ret;
 }
 

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

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


@@ -989,31 +1005,23 @@ killclient(const char *arg) {
                XKillClient(dpy, sel->win);
 }
 
                XKillClient(dpy, sel->win);
 }
 

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

 void
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t = NULL;
 void
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t = NULL;

-       Window trans;

        Status rettrans;
        Status rettrans;

+       Window trans;

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

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

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

-       c->x = wa->x;
-       c->y = wa->y;
+
+       c->x = wa->x + sx;
+       c->y = wa->y + sy;

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

+

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


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

-       XSelectInput(dpy, w, 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 seltags);
-       applyrules(c);
+               memcpy(c->tags, t->tags, TAGSZ);
+       else
+               applyrules(c);

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


@@ -1077,10 +1086,12 @@ maprequest(XEvent *e) {
 }
 
 void
 }
 
 void

-maximize(const char *arg) {
-       if(!sel || (!sel->isfloating && layout->arrange != floating))
-               return;
-       resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
+monocle(void) {
+       Client *c;
+
+       domwfact = dozoom = False;
+       for(c = nexttiled(clients); c; c = nexttiled(c->next))
+               resize(c, wax, way, waw - 2 * c->border, wah - 2 * c->border, RESIZEHINTS);

 }
 
 void
 }
 
 void


@@ -1097,7 +1108,7 @@ movemouse(Client *c) {
                return;
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {
                return;
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {

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

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


@@ -1111,7 +1122,7 @@ movemouse(Client *c) {
                        XSync(dpy, False);
                        nx = ocx + (ev.xmotion.x - x1);
                        ny = ocy + (ev.xmotion.y - y1);
                        XSync(dpy, False);
                        nx = ocx + (ev.xmotion.x - x1);
                        ny = ocy + (ev.xmotion.y - y1);

-                       if(abs(wax + nx) < SNAP)
+                       if(abs(wax - nx) < SNAP)

                                nx = wax;
                        else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP)
                                nx = wax + waw - c->w - 2 * c->border;
                                nx = wax;
                        else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP)
                                nx = wax + waw - c->w - 2 * c->border;


@@ -1119,7 +1130,10 @@ movemouse(Client *c) {
                                ny = way;
                        else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP)
                                ny = way + wah - c->h - 2 * c->border;
                                ny = way;
                        else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP)
                                ny = way + wah - c->h - 2 * c->border;

-                       resize(c, nx, ny, c->w, c->h, False);
+                       if(!c->isfloating && (lt->arrange != floating) && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
+                               togglefloating(NULL);
+                       if((lt->arrange == floating) || c->isfloating)
+                               resize(c, nx, ny, c->w, c->h, False);

                        break;
                }
        }
                        break;
                }
        }


@@ -1141,15 +1155,19 @@ propertynotify(XEvent *e) {
                return; /* ignore */
        if((c = getclient(ev->window))) {
                switch (ev->atom) {
                return; /* ignore */
        if((c = getclient(ev->window))) {
                switch (ev->atom) {

-                       default: break;
-                       case XA_WM_TRANSIENT_FOR:
-                               XGetTransientForHint(dpy, c->win, &trans);
-                               if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
-                                       arrange();
-                               break;
-                       case XA_WM_NORMAL_HINTS:
-                               updatesizehints(c);
-                               break;
+               default: break;
+               case XA_WM_TRANSIENT_FOR:
+                       XGetTransientForHint(dpy, c->win, &trans);
+                       if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
+                               arrange();
+                       break;
+               case XA_WM_NORMAL_HINTS:
+                       updatesizehints(c);
+                       break;
+               case XA_WM_HINTS:
+                       updatewmhints(c);
+                       drawbar();
+                       break;

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


@@ -1220,10 +1238,9 @@ 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;

-       /* offscreen appearance fixes */
-       if(x > sw)
+       if(x > sx + sw)

                x = sw - w - 2 * c->border;
                x = sw - w - 2 * c->border;

-       if(y > sh)
+       if(y > sy + sh)

                y = sh - h - 2 * c->border;
        if(x + w + 2 * c->border < sx)
                x = sx;
                y = sh - h - 2 * c->border;
        if(x + w + 2 * c->border < sx)
                x = sx;


@@ -1235,7 +1252,8 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
                c->w = wc.width = w;
                c->h = wc.height = h;
                wc.border_width = c->border;
                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);
+               XConfigureWindow(dpy, c->win,
+                               CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);

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


@@ -1254,7 +1272,7 @@ resizemouse(Client *c) {
                return;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
        for(;;) {
                return;
        XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
        for(;;) {

-               XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
+               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,


@@ -1273,7 +1291,10 @@ resizemouse(Client *c) {
                                nw = 1;
                        if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
                                nh = 1;
                                nw = 1;
                        if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
                                nh = 1;

-                       resize(c, c->x, c->y, nw, nh, True);
+                       if(!c->isfloating && (lt->arrange != floating) && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+                               togglefloating(NULL);
+                       if((lt->arrange == floating) || c->isfloating)
+                               resize(c, c->x, c->y, nw, nh, True);

                        break;
                }
        }
                        break;
                }
        }


@@ -1288,19 +1309,19 @@ restack(void) {
        drawbar();
        if(!sel)
                return;
        drawbar();
        if(!sel)
                return;

-       if(sel->isfloating || (layout->arrange == floating))
+       if(sel->isfloating || (lt->arrange == floating))

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

-       if(layout->arrange != floating) {
+       if(lt->arrange != floating) {

                wc.stack_mode = Below;
                wc.sibling = barwin;
                if(!sel->isfloating) {
                wc.stack_mode = Below;
                wc.sibling = barwin;
                if(!sel->isfloating) {

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

                        wc.sibling = sel->win;
                }
                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
                        if(c == sel)
                                continue;
                        wc.sibling = sel->win;
                }
                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
                        if(c == sel)
                                continue;

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

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


@@ -1311,7 +1332,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;


@@ -1323,7 +1344,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)


@@ -1335,7 +1356,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;


@@ -1345,15 +1366,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;


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

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

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


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

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

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


@@ -1408,8 +1429,9 @@ setlayout(const char *arg) {
        unsigned int i;
 
        if(!arg) {
        unsigned int i;
 
        if(!arg) {

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

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


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

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

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


@@ -1449,11 +1471,28 @@ setmwfact(const char *arg) {
 
 void
 setup(void) {
 
 void
 setup(void) {

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

        XSetWindowAttributes wa;
        XSetWindowAttributes wa;

+//#ifdef XINERAMA
+       XineramaScreenInfo *info;
+//#endif
+
+       /* init screen */
+       screen = DefaultScreen(dpy);
+       root = RootWindow(dpy, screen);
+       sx = 0;
+       sy = 0;
+       sw = DisplayWidth(dpy, screen);
+       sh = DisplayHeight(dpy, screen);
+       if(XineramaIsActive(dpy)) {
+               if((info = XineramaQueryScreens(dpy, &screens))) {
+                       sx = info[0].x_org;
+                       sy = info[0].y_org;
+                       sw = info[0].width;
+                       sh = info[0].height;
+               }
+       }

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


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

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

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

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

        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
        cursor[CurResize] = XCreateFontCursor(dpy, XC_sizing);
        cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 

-       /* init geometry */
-       sx = sy = 0;
-       sw = DisplayWidth(dpy, screen);
-       sh = DisplayHeight(dpy, screen);
-
-       /* init modifier map */
-       modmap = XGetModifierMapping(dpy);
-       for(i = 0; i < 8; i++)
-               for(j = 0; j < modmap->max_keypermod; j++) {
-                       if(modmap->modifiermap[i * modmap->max_keypermod + j]
-                       == XKeysymToKeycode(dpy, XK_Num_Lock))
-                               numlockmask = (1 << i);
+       ncols = 2;
+#if 0
+       if(XineramaIsActive(dpy)) {
+               if((info = XineramaQueryScreens(dpy, &screens))) {
+                       if(screens >= 1) {
+                               sx = info[0].x_org;
+                               sy = info[0].y_org;
+                               sw = info[0].width;
+                               sh = info[0].height;
+                       }
+                       else {
+                               ncols = screens;
+                               cols = emallocz(ncols * sizeof(Column));
+                               for(i = 0; i < ncols; i++) {
+                                       cols[i].x = info[i].x_org;
+                                       cols[i].y = info[i].y_org;
+                                       cols[i].w = info[i].width;
+                                       cols[i].h = info[i].height;
+                               }
+                       }
+                       XFree(info);

                }
                }

-       XFreeModifiermap(modmap);
-
-       /* select for events */
-       wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
-               | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
-       wa.cursor = cursor[CurNormal];
-       XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
-       XSelectInput(dpy, root, wa.event_mask);
-
-       /* grab keys */
-       grabkeys();
-
-       /* init tags */
-       memcpy(prevtags, seltags, sizeof seltags);
-       compileregs();
-
+       }
+       else
+       {
+               cols = emallocz(ncols * sizeof(Column));
+               cols[0].x = sx;
+               cols[0].y = sy;
+       }
+#endif

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


@@ -1508,37 +1546,56 @@ setup(void) {
        dc.sel[ColFG] = getcolor(SELFGCOLOR);
        initfont(FONT);
        dc.h = bh = dc.font.height + 2;
        dc.sel[ColFG] = getcolor(SELFGCOLOR);
        initfont(FONT);
        dc.h = bh = dc.font.height + 2;

+       dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
+       dc.gc = XCreateGC(dpy, root, 0, 0);
+       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+       if(!dc.font.set)
+               XSetFont(dpy, dc.gc, dc.font.xfont->fid);
+
+       /* init tags */
+       seltags = emallocz(TAGSZ);
+       prevtags = emallocz(TAGSZ);
+       seltags[0] = prevtags[0] = True;

 
        /* init layouts */
        mwfact = MWFACT;
 
        /* init layouts */
        mwfact = MWFACT;

-       layout = &layouts[0];
+       lt = &layouts[0];
+
+       /* TODO: Xinerama hints ? */
+       /* init bar */

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

-               j = textw(layouts[i].symbol);
-               if(j > blw)
-                       blw = j;
+               i = textw(layouts[i].symbol);
+               if(i > blw)
+                       blw = i;

        }
 
        }
 

-       /* init bar */

        bpos = BARPOS;
        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;
        bpos = BARPOS;
        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;

-       wa.event_mask = ButtonPressMask | ExposureMask;
-       barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0,
-                       DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen),
-                       CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
+       wa.event_mask = ButtonPressMask|ExposureMask;
+
+       barwin = XCreateWindow(dpy, root, sx, sy, sw, bh, 0, DefaultDepth(dpy, screen),
+                               CopyFromParent, DefaultVisual(dpy, screen),
+                               CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);

        XDefineCursor(dpy, barwin, cursor[CurNormal]);
        updatebarpos();
        XMapRaised(dpy, barwin);
        strcpy(stext, "dwm-"VERSION);
        XDefineCursor(dpy, barwin, cursor[CurNormal]);
        updatebarpos();
        XMapRaised(dpy, barwin);
        strcpy(stext, "dwm-"VERSION);

-       dc.drawable = XCreatePixmap(dpy, root, sw, bh, DefaultDepth(dpy, screen));
-       dc.gc = XCreateGC(dpy, root, 0, 0);
-       XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
-       if(!dc.font.set)
-               XSetFont(dpy, dc.gc, dc.font.xfont->fid);
+       drawbar();

 
 

-       /* multihead support */
-       selscreen = XQueryPointer(dpy, root, &w, &w, &d, &d, &d, &d, &mask);
+       /* 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);
+
+
+       /* grab keys */
+       grabkeys();

 }
 
 void
 }
 
 void


@@ -1599,6 +1656,9 @@ tile(void) {
        Client *c, *mc;
 
        domwfact = dozoom = True;
        Client *c, *mc;
 
        domwfact = dozoom = True;

+       nx = wax;
+       ny = way;
+       nw = 0;

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


@@ -1608,10 +1668,7 @@ tile(void) {
        if(n > 1 && th < bh)
                th = wah;
 
        if(n > 1 && th < bh)
                th = wah;
 

-       nx = wax;
-       ny = way;
-       nw = 0; /* gcc stupidity requires this */
-       for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next), i++) {
+       for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next)) {

                if(i == 0) { /* master */
                        nw = mw - 2 * c->border;
                        nh = wah - 2 * c->border;
                if(i == 0) { /* master */
                        nw = mw - 2 * c->border;
                        nh = wah - 2 * c->border;


@@ -1620,7 +1677,7 @@ tile(void) {
                        if(i == 1) {
                                ny = way;
                                nx += mc->w + 2 * mc->border;
                        if(i == 1) {
                                ny = way;
                                nx += mc->w + 2 * mc->border;

-                               nw = waw - nx - 2 * c->border;
+                               nw = waw - mw - 2 * c->border;

                        }
                        if(i + 1 == n) /* remainder */
                                nh = (way + wah) - ny - 2 * c->border;
                        }
                        if(i + 1 == n) /* remainder */
                                nh = (way + wah) - ny - 2 * c->border;


@@ -1633,6 +1690,7 @@ tile(void) {
                        resize(c, nx, ny, nw, nh, False);
                if(n > 1 && th != wah)
                        ny = c->y + c->h + 2 * c->border;
                        resize(c, nx, ny, nw, nh, False);
                if(n > 1 && th != wah)
                        ny = c->y + c->h + 2 * c->border;

+               i++;

        }
 }
 
        }
 }
 


@@ -1663,6 +1721,8 @@ toggletag(const char *arg) {
        if(!sel)
                return;
        i = idxoftag(arg);
        if(!sel)
                return;
        i = idxoftag(arg);

+       if(conflicts(sel, i))
+               return;

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


@@ -1806,6 +1866,44 @@ updatetitle(Client *c) {
                gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
 }
 
                gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
 }
 

+void
+updatewmhints(Client *c) {
+       XWMHints *wmh;
+
+       if((wmh = XGetWMHints(dpy, c->win))) {
+               if(c == sel)
+                       sel->isurgent = False;
+               else
+                       c->isurgent = (wmh->flags & XUrgencyHint) ? True : False;
+               XFree(wmh);
+       }
+}
+
+
+void
+view(const char *arg) {
+       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.  */


@@ -1826,46 +1924,25 @@ xerror(Display *dpy, XErrorEvent *ee) {
 }
 
 int
 }
 
 int

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

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

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

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

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

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

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

 
        if(!sel || !dozoom || sel->isfloating)
                return;
 
        if(!sel || !dozoom || sel->isfloating)
                return;

-       if((c = sel) == nexttiled(clients))
+       if(c == nexttiled(clients))

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


@@ -1877,20 +1954,16 @@ zoom(const char *arg) {
 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\n");
+               eprint("dwm-"VERSION", © 2006-2008 dwm engineers, see LICENSE for details\n");

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

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

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

-       drawbar();

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