applied nsz's patches (many thanks!)

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 25bc926..05fbf58 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -16,8 +16,8 @@
  * 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
  * doubly-linked client list, the focus history is remembered through a global
  * 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
  * 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.
+ * stack list. 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.
  *
  *
  * Keys and tagging rules are organized as arrays and defined in config.h.
  *


@@ -39,33 +39,39 @@
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>

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

 
 /* macros */
 
 /* macros */

-#define MAX(a, b)      ((a) > (b) ? (a) : (b))
-#define MIN(a, b)      ((a) < (b) ? (a) : (b))
-#define BUTTONMASK     (ButtonPressMask|ButtonReleaseMask)
-#define CLEANMASK(mask)        (mask & ~(numlockmask|LockMask))
-#define LENGTH(x)      (sizeof x / sizeof x[0])
-#define MAXTAGLEN      16
-#define MOUSEMASK      (BUTTONMASK|PointerMotionMask)
+#define MAX(a, b)       ((a) > (b) ? (a) : (b))
+#define MIN(a, b)       ((a) < (b) ? (a) : (b))
+#define BUTTONMASK      (ButtonPressMask|ButtonReleaseMask)
+#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask))
+#define LENGTH(x)       (sizeof x / sizeof x[0])
+#define MAXTAGLEN       16
+#define MOUSEMASK       (BUTTONMASK|PointerMotionMask)
+#define TAGMASK         ((int)((1LL << LENGTH(tags)) - 1))
+#define TEXTW(x)        (textnw(x, strlen(x)) + dc.font.height)

 
 /* enums */
 
 /* enums */

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

 enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
 
 /* typedefs */
 enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
 
 /* typedefs */

+typedef unsigned int uint;
+typedef unsigned long ulong;

 typedef struct Client Client;
 struct Client {
        char name[256];
        int x, y, w, h;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int minax, maxax, minay, maxay;
 typedef struct Client Client;
 struct Client {
        char name[256];
        int x, y, w, h;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int minax, maxax, minay, maxay;

-       long flags;
-       unsigned int bw, oldbw;
-       Bool isbanned, isfixed, isfloating, isurgent;
-       Bool *tags;
+       int bw, oldbw;
+       Bool isbanned, isfixed, isfloating, ismoved, isurgent;
+       uint tags;

        Client *next;
        Client *prev;
        Client *snext;
        Client *next;
        Client *prev;
        Client *snext;


@@ -74,8 +80,8 @@ struct Client {
 
 typedef struct {
        int x, y, w, h;
 
 typedef struct {
        int x, y, w, h;

-       unsigned long norm[ColLast];
-       unsigned long sel[ColLast];
+       ulong norm[ColLast];
+       ulong sel[ColLast];

        Drawable drawable;
        GC gc;
        struct {
        Drawable drawable;
        GC gc;
        struct {


@@ -88,10 +94,10 @@ typedef struct {
 } DC; /* draw context */
 
 typedef struct {
 } DC; /* draw context */
 
 typedef struct {

-       unsigned long mod;
+       uint mod;

        KeySym keysym;
        KeySym keysym;

-       void (*func)(const char *arg);
-       const char *arg;
+       void (*func)(const void *arg);
+       const void *arg;

 } Key;
 
 typedef struct {
 } Key;
 
 typedef struct {


@@ -103,7 +109,7 @@ typedef struct {
        const char *class;
        const char *instance;
        const char *title;
        const char *class;
        const char *instance;
        const char *title;

-       const char *tag;
+       uint tags;

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


@@ -112,7 +118,6 @@ void applyrules(Client *c);
 void arrange(void);
 void attach(Client *c);
 void attachstack(Client *c);
 void arrange(void);
 void attach(Client *c);
 void attachstack(Client *c);

-void ban(Client *c);

 void buttonpress(XEvent *e);
 void checkotherwm(void);
 void cleanup(void);
 void buttonpress(XEvent *e);
 void checkotherwm(void);
 void cleanup(void);


@@ -123,57 +128,52 @@ 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, Bool invert, unsigned long col[ColLast]);
-void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
-void *emallocz(unsigned int size);
+void drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]);
+void drawtext(const char *text, ulong col[ColLast], Bool invert);

 void enternotify(XEvent *e);
 void eprint(const char *errstr, ...);
 void expose(XEvent *e);
 void focus(Client *c);
 void focusin(XEvent *e);
 void enternotify(XEvent *e);
 void eprint(const char *errstr, ...);
 void expose(XEvent *e);
 void focus(Client *c);
 void focusin(XEvent *e);

-void focusnext(const char *arg);
-void focusprev(const char *arg);
+void focusnext(const void *arg);
+void focusprev(const void *arg);

 Client *getclient(Window w);
 Client *getclient(Window w);

-unsigned long getcolor(const char *colstr);
+ulong getcolor(const char *colstr);

 long getstate(Window w);
 long getstate(Window w);

-Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
+Bool gettextprop(Window w, Atom atom, char *text, uint size);

 void grabbuttons(Client *c, Bool focused);
 void grabkeys(void);
 void grabbuttons(Client *c, Bool focused);
 void grabkeys(void);

-unsigned int idxoftag(const char *t);

 void initfont(const char *fontstr);
 void initfont(const char *fontstr);

-Bool isoccupied(unsigned int t);
+Bool isoccupied(uint t);

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

-Bool isurgent(unsigned int t);
-Bool isvisible(Client *c, Bool *cmp);
+Bool isurgent(uint t);

 void keypress(XEvent *e);
 void keypress(XEvent *e);

-void killclient(const char *arg);
+void killclient(const void *arg);

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

-void quit(const char *arg);
+void quit(const void *arg);

 void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
 void resizemouse(Client *c);
 void restack(void);
 void run(void);
 void scan(void);
 void setclientstate(Client *c, long state);
 void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
 void resizemouse(Client *c);
 void restack(void);
 void run(void);
 void scan(void);
 void setclientstate(Client *c, long state);

-void setmfact(const char *arg);
+void setmfact(const void *arg);

 void setup(void);
 void setup(void);

-void spawn(const char *arg);
-void tag(const char *arg);
-unsigned int textnw(const char *text, unsigned int len);
-unsigned int textw(const char *text);
-void tileresize(Client *c, int x, int y, int w, int h);
+void spawn(const void *arg);
+void tag(const void *arg);
+uint textnw(const char *text, uint len);

 void tile(void);
 void tile(void);

-void togglefloating(const char *arg);
-void togglelayout(const char *arg);
-void toggletag(const char *arg);
-void toggleview(const char *arg);
-void unban(Client *c);
+void togglebar(const void *arg);
+void togglefloating(const void *arg);
+void togglelayout(const void *arg);
+void togglemax(const void *arg);
+void toggletag(const void *arg);
+void toggleview(const void *arg);

 void unmanage(Client *c);
 void unmapnotify(XEvent *e);
 void updatebar(void);
 void unmanage(Client *c);
 void unmapnotify(XEvent *e);
 void updatebar(void);


@@ -181,21 +181,19 @@ void updategeom(void);
 void updatesizehints(Client *c);
 void updatetitle(Client *c);
 void updatewmhints(Client *c);
 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 */
+void view(const void *arg);

 int xerror(Display *dpy, XErrorEvent *ee);
 int xerrordummy(Display *dpy, XErrorEvent *ee);
 int xerrorstart(Display *dpy, XErrorEvent *ee);
 int xerror(Display *dpy, XErrorEvent *ee);
 int xerrordummy(Display *dpy, XErrorEvent *ee);
 int xerrorstart(Display *dpy, XErrorEvent *ee);

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

 
 /* variables */
 char stext[256];
 int screen, sx, sy, sw, sh;
 
 /* variables */
 char stext[256];
 int screen, sx, sy, sw, sh;

+int by, bh, blw, wx, wy, ww, wh;
+uint seltags = 0;

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

-int bx, by, bw, bh, blw, mx, my, mw, mh, tx, ty, tw, th, wx, wy, ww, wh;
-int seltags = 0;
-double mfact;
-unsigned int numlockmask = 0;
+uint numlockmask = 0;

 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
        [ConfigureRequest] = configurerequest,
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
        [ConfigureRequest] = configurerequest,


@@ -211,9 +209,10 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];
        [UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];

+Bool ismax = False;

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

-Bool *tagset[2];
+uint tagset[] = {1, 1}; /* after start, first tag is selected */

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


@@ -226,14 +225,14 @@ Window root, barwin;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"

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

 
 

-/* function implementations */
+/* compile-time check if all tags fit into an uint bit array. */
+struct NumTags { char limitexceeded[sizeof(uint) * 8 < LENGTH(tags) ? -1 : 1]; };

 
 

+/* function implementations */

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

-       unsigned int i;
-       Bool matched = False;
+       uint i;

        Rule *r;
        XClassHint ch = { 0 };
 
        Rule *r;
        XClassHint ch = { 0 };
 


@@ -245,18 +244,15 @@ applyrules(Client *c) {
                && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
                && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
                        c->isfloating = r->isfloating;
                && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
                && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
                        c->isfloating = r->isfloating;

-                       if(r->tag) {
-                               c->tags[idxoftag(r->tag)] = True;
-                               matched = True;
-                       }
+                       c->tags |= r->tags & TAGMASK;

                }
        }
        if(ch.res_class)
                XFree(ch.res_class);
        if(ch.res_name)
                XFree(ch.res_name);
                }
        }
        if(ch.res_class)
                XFree(ch.res_class);
        if(ch.res_name)
                XFree(ch.res_name);

-       if(!matched)
-               memcpy(c->tags, tagset[seltags], TAGSZ);
+       if(!c->tags)
+               c->tags = tagset[seltags];

 }
 
 void
 }
 
 void


@@ -264,16 +260,22 @@ arrange(void) {
        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)

-               if(isvisible(c, NULL)) {
-                       unban(c);
-                       if(!lt->arrange || c->isfloating)
+               if(c->tags & tagset[seltags]) { /* is visible */
+                       if(ismax && !c->isfixed) {
+                               XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
+                               c->ismoved = True;
+                       }
+                       else if(!lt->arrange || c->isfloating)

                                resize(c, c->x, c->y, c->w, c->h, True);
                                resize(c, c->x, c->y, c->w, c->h, True);

+                       c->isbanned = False;
+               }
+               else if(!c->isbanned) {
+                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+                       c->isbanned = c->ismoved = True;

                }
                }

-               else
-                       ban(c);

 
        focus(NULL);
 
        focus(NULL);

-       if(lt->arrange)
+       if(lt->arrange && !ismax)

                lt->arrange();
        restack();
 }
                lt->arrange();
        restack();
 }


@@ -292,61 +294,50 @@ attachstack(Client *c) {
        stack = c;
 }
 
        stack = c;
 }
 

-void
-ban(Client *c) {
-       if(c->isbanned)
-               return;
-       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-       c->isbanned = True;
-}
-

 void
 buttonpress(XEvent *e) {
 void
 buttonpress(XEvent *e) {

-       unsigned int i, x;
+       uint i, x, mask;

        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 
        if(ev->window == barwin) {
                x = 0;
                for(i = 0; i < LENGTH(tags); i++) {
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 
        if(ev->window == barwin) {
                x = 0;
                for(i = 0; i < LENGTH(tags); i++) {

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

                        if(ev->x < x) {
                        if(ev->x < x) {

+                               mask = 1 << i;

                                if(ev->button == Button1) {
                                        if(ev->state & MODKEY)
                                if(ev->button == Button1) {
                                        if(ev->state & MODKEY)

-                                               tag(tags[i]);
+                                               tag(&mask);

                                        else
                                        else

-                                               view(tags[i]);
+                                               view(&mask);

                                }
                                else if(ev->button == Button3) {
                                        if(ev->state & MODKEY)
                                }
                                else if(ev->button == Button3) {
                                        if(ev->state & MODKEY)

-                                               toggletag(tags[i]);
+                                               toggletag(&mask);

                                        else
                                        else

-                                               toggleview(tags[i]);
+                                               toggleview(&mask);

                                }
                                return;
                        }
                }
                                }
                                return;
                        }
                }

-               if((ev->x < x + blw) && ev->button == Button1) 
-                       togglelayout(NULL);
+               if(ev->x < x + blw) {
+                       if(ev->button == Button1) 
+                               togglelayout(NULL);
+                       else if(ev->button == Button3) 
+                               togglemax(NULL);
+               }

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

-               if(CLEANMASK(ev->state) != MODKEY)
+               if(CLEANMASK(ev->state) != MODKEY || (ismax && !c->isfixed))

                        return;
                        return;

-               if(ev->button == Button1) {
-                       restack();
+               if(ev->button == Button1)

                        movemouse(c);
                        movemouse(c);

-               }
-               else if(ev->button == Button2) {
-                       if(lt->arrange && c->isfloating)
-                               togglefloating(NULL);
-                       else
-                               zoom(NULL);
-               }
-               else if(ev->button == Button3 && !c->isfixed) {
-                       restack();
+               else if(ev->button == Button2)
+                       togglefloating(NULL);
+               else if(ev->button == Button3 && !c->isfixed)

                        resizemouse(c);
                        resizemouse(c);

-               }

        }
 }
 
        }
 }
 


@@ -360,7 +351,6 @@ checkotherwm(void) {
        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");

-       XSync(dpy, False);

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


@@ -369,10 +359,9 @@ checkotherwm(void) {
 void
 cleanup(void) {
        close(STDIN_FILENO);
 void
 cleanup(void) {
        close(STDIN_FILENO);

-       while(stack) {
-               unban(stack);
+       view((uint[]){~0});
+       while(stack)

                unmanage(stack);
                unmanage(stack);

-       }

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


@@ -428,7 +417,9 @@ configurerequest(XEvent *e) {
        if((c = getclient(ev->window))) {
                if(ev->value_mask & CWBorderWidth)
                        c->bw = ev->border_width;
        if((c = getclient(ev->window))) {
                if(ev->value_mask & CWBorderWidth)
                        c->bw = ev->border_width;

-               if(c->isfixed || c->isfloating || !lt->arrange) {
+               if(ismax && !c->isbanned && !c->isfixed)
+                       XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh + 2 * c->bw);
+               else if(c->isfloating || !lt->arrange) {

                        if(ev->value_mask & CWX)
                                c->x = sx + ev->x;
                        if(ev->value_mask & CWY)
                        if(ev->value_mask & CWX)
                                c->x = sx + ev->x;
                        if(ev->value_mask & CWY)


@@ -444,7 +435,7 @@ configurerequest(XEvent *e) {
                        if((ev->value_mask & (CWX|CWY))
                        && !(ev->value_mask & (CWWidth|CWHeight)))
                                configure(c);
                        if((ev->value_mask & (CWX|CWY))
                        && !(ev->value_mask & (CWWidth|CWHeight)))
                                configure(c);

-                       if(isvisible(c, NULL))
+                       if(!c->isbanned)

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


@@ -497,48 +488,48 @@ drawbar(void) {
        Client *c;
 
        dc.x = 0;
        Client *c;
 
        dc.x = 0;

-       for(c = stack; c && !isvisible(c, NULL); c = c->snext);
+       for(c = stack; c && c->isbanned; c = c->snext);

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

-               dc.w = textw(tags[i]);
-               if(tagset[seltags][i]) {
+               dc.w = TEXTW(tags[i]);
+               if(tagset[seltags] & 1 << i) {

                        drawtext(tags[i], dc.sel, isurgent(i));
                        drawtext(tags[i], dc.sel, isurgent(i));

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

                }
                else {
                        drawtext(tags[i], dc.norm, isurgent(i));
                }
                else {
                        drawtext(tags[i], dc.norm, isurgent(i));

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

                }
                dc.x += dc.w;
        }
        if(blw > 0) {
                dc.w = blw;
                }
                dc.x += dc.w;
        }
        if(blw > 0) {
                dc.w = blw;

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

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

-       dc.w = textw(stext);
-       dc.x = bw - dc.w;
+       dc.w = TEXTW(stext);
+       dc.x = ww - dc.w;

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

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

        }
        drawtext(stext, dc.norm, False);
        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
                if(c) {
                        drawtext(c->name, dc.sel, False);
        }
        drawtext(stext, dc.norm, False);
        if((dc.w = dc.x - x) > bh) {
                dc.x = x;
                if(c) {
                        drawtext(c->name, dc.sel, False);

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

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

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

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

-drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
+drawsquare(Bool filled, Bool empty, Bool invert, ulong 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 };


@@ -559,9 +550,8 @@ drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
 }
 
 void
 }
 
 void

-drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
-       int x, y, w, h;
-       unsigned int len, olen;
+drawtext(const char *text, ulong col[ColLast], Bool invert) {
+       int i, x, y, h, len, olen;

        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
        char buf[256];
 
        XRectangle r = { dc.x, dc.y, dc.w, dc.h };
        char buf[256];
 


@@ -572,22 +562,15 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
        olen = strlen(text);
        len = MIN(olen, sizeof buf);
        memcpy(buf, text, len);
        olen = strlen(text);
        len = MIN(olen, sizeof buf);
        memcpy(buf, text, len);

-       w = 0;

        h = dc.font.ascent + dc.font.descent;
        y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
        x = dc.x + (h / 2);
        /* shorten text if necessary */
        h = dc.font.ascent + dc.font.descent;
        y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
        x = dc.x + (h / 2);
        /* shorten text if necessary */

-       for(; len && (w = textnw(buf, len)) > dc.w - h; len--);
+       for(; len && (i = textnw(buf, len)) > dc.w - h; len--);

        if(!len)
                return;
        if(!len)
                return;

-       if(len < olen) {
-               if(len > 1)
-                       buf[len - 1] = '.';
-               if(len > 2)
-                       buf[len - 2] = '.';
-               if(len > 3)
-                       buf[len - 3] = '.';
-       }
+       if(len < olen)
+               for(i = len; i >= MAX(0, len - 3); buf[i--] = '.');

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


@@ -595,15 +578,6 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 }
 
                XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 }
 

-void *
-emallocz(unsigned int size) {
-       void *res = calloc(1, size);
-
-       if(!res)
-               eprint("fatal: could not malloc() %u bytes\n", size);
-       return res;
-}
-

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


@@ -637,8 +611,8 @@ expose(XEvent *e) {
 
 void
 focus(Client *c) {
 
 void
 focus(Client *c) {

-       if(!c || (c && !isvisible(c, NULL)))
-               for(c = stack; c && !isvisible(c, NULL); c = c->snext);
+       if(!c || c->isbanned)
+               for(c = stack; c && c->isbanned; c = c->snext);

        if(sel && sel != c) {
                grabbuttons(sel, False);
                XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
        if(sel && sel != c) {
                grabbuttons(sel, False);
                XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);


@@ -647,14 +621,12 @@ focus(Client *c) {
                detachstack(c);
                attachstack(c);
                grabbuttons(c, True);
                detachstack(c);
                attachstack(c);
                grabbuttons(c, True);

-       }
-       sel = c;
-       if(c) {

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

+       sel = c;

        drawbar();
 }
 
        drawbar();
 }
 


@@ -667,14 +639,14 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
 }
 
 void
 }
 
 void

-focusnext(const char *arg) {
+focusnext(const void *arg) {

        Client *c;
 
        if(!sel)
                return;
        Client *c;
 
        if(!sel)
                return;

-       for(c = sel->next; c && !isvisible(c, arg ? sel->tags : NULL); c = c->next);
+       for(c = sel->next; c && c->isbanned; c = c->next);

        if(!c)
        if(!c)

-               for(c = clients; c && !isvisible(c, arg ? sel->tags : NULL); c = c->next);
+               for(c = clients; c && c->isbanned; c = c->next);

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


@@ -682,15 +654,15 @@ focusnext(const char *arg) {
 }
 
 void
 }
 
 void

-focusprev(const char *arg) {
+focusprev(const void *arg) {

        Client *c;
 
        if(!sel)
                return;
        Client *c;
 
        if(!sel)
                return;

-       for(c = sel->prev; c && !isvisible(c, arg ? sel->tags : NULL); c = c->prev);
+       for(c = sel->prev; c && c->isbanned; c = c->prev);

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

-               for(; c && !isvisible(c, arg ? sel->tags : NULL); c = c->prev);
+               for(; c && c->isbanned; c = c->prev);

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


@@ -706,7 +678,7 @@ getclient(Window w) {
        return c;
 }
 
        return c;
 }
 

-unsigned long
+ulong

 getcolor(const char *colstr) {
        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;
 getcolor(const char *colstr) {
        Colormap cmap = DefaultColormap(dpy, screen);
        XColor color;


@@ -721,7 +693,7 @@ getstate(Window w) {
        int format, status;
        long result = -1;
        unsigned char *p = NULL;
        int format, status;
        long result = -1;
        unsigned char *p = NULL;

-       unsigned long n, extra;
+       ulong n, extra;

        Atom real;
 
        status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
        Atom real;
 
        status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],


@@ -735,7 +707,7 @@ getstate(Window w) {
 }
 
 Bool
 }
 
 Bool

-gettextprop(Window w, Atom atom, char *text, unsigned int size) {
+gettextprop(Window w, Atom atom, char *text, uint size) {

        char **list = NULL;
        int n;
        XTextProperty name;
        char **list = NULL;
        int n;
        XTextProperty name;


@@ -763,8 +735,8 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
 void
 grabbuttons(Client *c, Bool focused) {
        int i, j;
 void
 grabbuttons(Client *c, Bool focused) {
        int i, j;

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

                                MODKEY|numlockmask|LockMask} ;
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
                                MODKEY|numlockmask|LockMask} ;
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);


@@ -780,7 +752,7 @@ grabbuttons(Client *c, Bool focused) {
 
 void
 grabkeys(void) {
 
 void
 grabkeys(void) {

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

        KeyCode code;
        XModifierKeymap *modmap;
 
        KeyCode code;
        XModifierKeymap *modmap;
 


@@ -807,14 +779,6 @@ grabkeys(void) {
        }
 }
 
        }
 }
 

-unsigned int
-idxoftag(const char *t) {
-       unsigned int i;
-
-       for(i = 0; (i < LENGTH(tags)) && t && strcmp(tags[i], t); i++);
-       return (i < LENGTH(tags)) ? i : 0;
-}
-

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


@@ -856,11 +820,11 @@ initfont(const char *fontstr) {
 }
 
 Bool
 }
 
 Bool

-isoccupied(unsigned int t) {
+isoccupied(uint t) {

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

-               if(c->tags[t])
+               if(c->tags & 1 << t)

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


@@ -881,30 +845,18 @@ isprotodel(Client *c) {
 }
 
 Bool
 }
 
 Bool

-isurgent(unsigned int t) {
+isurgent(uint t) {

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

-               if(c->isurgent && c->tags[t])
-                       return True;
-       return False;
-}
-
-Bool
-isvisible(Client *c, Bool *cmp) {
-       unsigned int i;
-
-       if(!cmp)
-               cmp = tagset[seltags];
-       for(i = 0; i < LENGTH(tags); i++)
-               if(c->tags[i] && cmp[i])
+               if(c->isurgent && c->tags & 1 << t)

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

-       unsigned int i;
+       uint i;

        KeySym keysym;
        XKeyEvent *ev;
 
        KeySym keysym;
        XKeyEvent *ev;
 


@@ -912,15 +864,13 @@ keypress(XEvent *e) {
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        for(i = 0; i < LENGTH(keys); i++)
                if(keysym == keys[i].keysym
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        for(i = 0; i < LENGTH(keys); i++)
                if(keysym == keys[i].keysym

-               && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state))
-               {
-                       if(keys[i].func)
-                               keys[i].func(keys[i].arg);
-               }
+                  && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
+                  && keys[i].func)
+                       keys[i].func(keys[i].arg);

 }
 
 void
 }
 
 void

-killclient(const char *arg) {
+killclient(const void *arg) {

        XEvent ev;
 
        if(!sel)
        XEvent ev;
 
        if(!sel)


@@ -945,8 +895,8 @@ manage(Window w, XWindowAttributes *wa) {
        Window trans;
        XWindowChanges wc;
 
        Window trans;
        XWindowChanges wc;
 

-       c = emallocz(sizeof(Client));
-       c->tags = emallocz(TAGSZ);
+       if(!(c = calloc(1, sizeof(Client))))
+               eprint("fatal: could not calloc() %u bytes\n", sizeof(Client));

        c->win = w;
 
        /* geometry */
        c->win = w;
 
        /* geometry */


@@ -961,13 +911,13 @@ manage(Window w, XWindowAttributes *wa) {
                c->bw = wa->border_width;
        }
        else {
                c->bw = wa->border_width;
        }
        else {

-               if(c->x + c->w + 2 * c->bw > wx + ww)
-                       c->x = wx + ww - c->w - 2 * c->bw;
-               if(c->y + c->h + 2 * c->bw > wy + wh)
-                       c->y = wy + wh - c->h - 2 * c->bw;
-               c->x = MAX(c->x, wx);
-               c->y = MAX(c->y, wy);
-               c->bw = BORDERPX;
+               if(c->x + c->w + 2 * c->bw > sx + sw)
+                       c->x = sx + sw - c->w - 2 * c->bw;
+               if(c->y + c->h + 2 * c->bw > sy + sh)
+                       c->y = sy + sh - c->h - 2 * c->bw;
+               c->x = MAX(c->x, sx);
+               c->y = MAX(c->y, by == 0 ? bh : sy);
+               c->bw = borderpx;

        }
 
        wc.border_width = c->bw;
        }
 
        wc.border_width = c->bw;


@@ -981,15 +931,16 @@ manage(Window w, XWindowAttributes *wa) {
        if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
                for(t = clients; t && t->win != trans; t = t->next);
        if(t)
        if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
                for(t = clients; t && t->win != trans; t = t->next);
        if(t)

-               memcpy(c->tags, t->tags, TAGSZ);
+               c->tags = t->tags;

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

+       if(c->isfloating)
+               XRaiseWindow(dpy, c->win);

        attach(c);
        attachstack(c);
        XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
        attach(c);
        attachstack(c);
        XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */

-       ban(c);

        XMapWindow(dpy, c->win);
        setclientstate(c, NormalState);
        arrange();
        XMapWindow(dpy, c->win);
        setclientstate(c, NormalState);
        arrange();


@@ -1017,22 +968,14 @@ maprequest(XEvent *e) {
                manage(ev->window, &wa);
 }
 
                manage(ev->window, &wa);
 }
 

-void
-monocle(void) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(!c->isfloating && isvisible(c, NULL))
-                       resize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw, RESIZEHINTS);
-}
-

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

-       unsigned int dui;
+       uint dui;

        Window dummy;
        XEvent ev;
 
        Window dummy;
        XEvent ev;
 

+       restack();

        ocx = nx = c->x;
        ocy = ny = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
        ocx = nx = c->x;
        ocy = ny = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,


@@ -1054,16 +997,19 @@ 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(wx - nx) < SNAP)
-                               nx = wx;
-                       else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < SNAP)
-                               nx = wx + ww - c->w - 2 * c->bw;
-                       if(abs(wy - ny) < SNAP)
-                               ny = wy;
-                       else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < SNAP)
-                               ny = wy + wh - c->h - 2 * c->bw;
-                       if(!c->isfloating && lt->arrange && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
-                               togglefloating(NULL);
+                       if(snap && nx >= wx && nx <= wx + ww
+                               && ny >= wy && ny <= wy + wh) {
+                               if(abs(wx - nx) < snap)
+                                       nx = wx;
+                               else if(abs((wx + ww) - (nx + c->w + 2 * c->bw)) < snap)
+                                       nx = wx + ww - c->w - 2 * c->bw;
+                               if(abs(wy - ny) < snap)
+                                       ny = wy;
+                               else if(abs((wy + wh) - (ny + c->h + 2 * c->bw)) < snap)
+                                       ny = wy + wh - c->h - 2 * c->bw;
+                               if(!c->isfloating && lt->arrange && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+                                       togglefloating(NULL);
+                       }

                        if(!lt->arrange || c->isfloating)
                                resize(c, nx, ny, c->w, c->h, False);
                        break;
                        if(!lt->arrange || c->isfloating)
                                resize(c, nx, ny, c->w, c->h, False);
                        break;


@@ -1073,7 +1019,7 @@ movemouse(Client *c) {
 
 Client *
 nexttiled(Client *c) {
 
 Client *
 nexttiled(Client *c) {

-       for(; c && (c->isfloating || !isvisible(c, NULL)); c = c->next);
+       for(; c && (c->isfloating || c->isbanned); c = c->next);

        return c;
 }
 
        return c;
 }
 


@@ -1110,7 +1056,7 @@ propertynotify(XEvent *e) {
 }
 
 void
 }
 
 void

-quit(const char *arg) {
+quit(const void *arg) {

        readin = running = False;
 }
 
        readin = running = False;
 }
 


@@ -1165,7 +1111,12 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
                x = sx;
        if(y + h + 2 * c->bw < sy)
                y = sy;
                x = sx;
        if(y + h + 2 * c->bw < sy)
                y = sy;

-       if(c->x != x || c->y != y || c->w != w || c->h != h) {
+       if(h < bh)
+               h = bh;
+       if(w < bh)
+               w = bh;
+       if(c->x != x || c->y != y || c->w != w || c->h != h || c->ismoved) {
+               c->ismoved = False;

                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;


@@ -1184,6 +1135,7 @@ resizemouse(Client *c) {
        int nw, nh;
        XEvent ev;
 
        int nw, nh;
        XEvent ev;
 

+       restack();

        ocx = c->x;
        ocy = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
        ocx = c->x;
        ocy = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,


@@ -1208,8 +1160,12 @@ resizemouse(Client *c) {
                        XSync(dpy, False);
                        nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
                        nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
                        XSync(dpy, False);
                        nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
                        nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);

-                       if(!c->isfloating && lt->arrange && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP)) {
-                               togglefloating(NULL);
+
+                       if(snap && nw >= wx && nw <= wx + ww
+                               && nh >= wy && nh <= wy + wh) {
+                               if(!c->isfloating && lt->arrange
+                                  && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
+                                       togglefloating(NULL);

                        }
                        if(!lt->arrange || c->isfloating)
                                resize(c, c->x, c->y, nw, nh, True);
                        }
                        if(!lt->arrange || c->isfloating)
                                resize(c, c->x, c->y, nw, nh, True);


@@ -1227,13 +1183,13 @@ restack(void) {
        drawbar();
        if(!sel)
                return;
        drawbar();
        if(!sel)
                return;

-       if(sel->isfloating || !lt->arrange)
+       if(ismax || sel->isfloating || !lt->arrange)

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

-       if(lt->arrange) {
+       if(!ismax && lt->arrange) {

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

-                       if(!c->isfloating && isvisible(c, NULL)) {
+                       if(!c->isfloating && !c->isbanned) {

                                XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
                                wc.sibling = c->win;
                        }
                                XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
                                wc.sibling = c->win;
                        }


@@ -1248,7 +1204,7 @@ run(void) {
        char sbuf[sizeof stext];
        fd_set rd;
        int r, xfd;
        char sbuf[sizeof stext];
        fd_set rd;
        int r, xfd;

-       unsigned int len, offset;
+       uint len, offset;

        XEvent ev;
 
        /* main event loop, also reads status text from stdin */
        XEvent ev;
 
        /* main event loop, also reads status text from stdin */


@@ -1304,7 +1260,7 @@ run(void) {
 
 void
 scan(void) {
 
 void
 scan(void) {

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

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


@@ -1337,30 +1293,23 @@ setclientstate(Client *c, long state) {
                        PropModeReplace, (unsigned char *)data, 2);
 }
 
                        PropModeReplace, (unsigned char *)data, 2);
 }
 

-/* TODO: move this into tile.c */
+/* arg > 1.0 will set mfact absolutly */

 void
 void

-setmfact(const char *arg) {
-       double d;
+setmfact(const void *arg) {
+       double d = *((double*) arg);

 
 

-       if(!lt->arrange) /* TODO: check this against the actual tile() function */
+       if(!d || !lt->arrange)

                return;
                return;

-       if(!arg)
-               mfact = MFACT;
-       else {
-               d = strtod(arg, NULL);
-               if(arg[0] == '-' || arg[0] == '+')
-                       d += mfact;
-               if(d < 0.1 || d > 0.9)
-                       return;
-               mfact = d;
-       }
-       updategeom();
+       d = d < 1.0 ? d + mfact : d - 1.0;
+       if(d < 0.1 || d > 0.9)
+               return;
+       mfact = d;

        arrange();
 }
 
 void
 setup(void) {
        arrange();
 }
 
 void
 setup(void) {

-       unsigned int i, w;
+       uint i, w;

        XSetWindowAttributes wa;
 
        /* init screen */
        XSetWindowAttributes wa;
 
        /* init screen */


@@ -1372,7 +1321,6 @@ setup(void) {
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        bh = dc.font.height + 2;
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        bh = dc.font.height + 2;

-       mfact = MFACT;

        updategeom();
 
        /* init atoms */
        updategeom();
 
        /* init atoms */


@@ -1403,14 +1351,9 @@ setup(void) {
        if(!dc.font.set)
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 
        if(!dc.font.set)
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 

-       /* init tags */
-       tagset[0] = emallocz(TAGSZ);
-       tagset[1] = emallocz(TAGSZ);
-       tagset[0][0] = tagset[1][0] = True;
-

        /* init bar */
        for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {
        /* init bar */
        for(blw = i = 0; LENGTH(layouts) > 1 && i < LENGTH(layouts); i++) {

-               w = textw(layouts[i].symbol);
+               w = TEXTW(layouts[i].symbol);

                blw = MAX(blw, w);
        }
 
                blw = MAX(blw, w);
        }
 


@@ -1418,7 +1361,7 @@ setup(void) {
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask|ExposureMask;
 
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ButtonPressMask|ExposureMask;
 

-       barwin = XCreateWindow(dpy, root, bx, by, bw, bh, 0, DefaultDepth(dpy, screen),
+       barwin = XCreateWindow(dpy, root, wx, by, ww, bh, 0, DefaultDepth(dpy, screen),

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


@@ -1442,13 +1385,11 @@ setup(void) {
 }
 
 void
 }
 
 void

-spawn(const char *arg) {
+spawn(const void *arg) {

        static char *shell = NULL;
 
        if(!shell && !(shell = getenv("SHELL")))
                shell = "/bin/sh";
        static char *shell = NULL;
 
        if(!shell && !(shell = getenv("SHELL")))
                shell = "/bin/sh";

-       if(!arg)
-               return;

        /* The double-fork construct avoids zombie processes and keeps the code
         * clean from stupid signal handlers. */
        if(fork() == 0) {
        /* The double-fork construct avoids zombie processes and keeps the code
         * clean from stupid signal handlers. */
        if(fork() == 0) {


@@ -1456,8 +1397,8 @@ spawn(const char *arg) {
                        if(dpy)
                                close(ConnectionNumber(dpy));
                        setsid();
                        if(dpy)
                                close(ConnectionNumber(dpy));
                        setsid();

-                       execl(shell, shell, "-c", arg, (char *)NULL);
-                       fprintf(stderr, "dwm: execl '%s -c %s'", shell, arg);
+                       execl(shell, shell, "-c", (char *)arg, (char *)NULL);
+                       fprintf(stderr, "dwm: execl '%s -c %s'", shell, (char *)arg);

                        perror(" failed");
                }
                exit(0);
                        perror(" failed");
                }
                exit(0);


@@ -1466,19 +1407,15 @@ spawn(const char *arg) {
 }
 
 void
 }
 
 void

-tag(const char *arg) {
-       unsigned int i;
-
-       if(!sel)
-               return;
-       for(i = 0; i < LENGTH(tags); i++)
-               sel->tags[i] = (arg == NULL);
-       sel->tags[idxoftag(arg)] = True;
-       arrange();
+tag(const void *arg) {
+       if(sel && *(int *)arg & TAGMASK) {
+               sel->tags = *(int *)arg & TAGMASK;
+               arrange();
+       }

 }
 
 }
 

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

        XRectangle r;
 
        if(dc.font.set) {
        XRectangle r;
 
        if(dc.font.set) {


@@ -1488,23 +1425,10 @@ textnw(const char *text, unsigned int len) {
        return XTextWidth(dc.font.xfont, text, len);
 }
 
        return XTextWidth(dc.font.xfont, text, len);
 }
 

-unsigned int
-textw(const char *text) {
-       return textnw(text, strlen(text)) + dc.font.height;
-}
-
-void
-tileresize(Client *c, int x, int y, int w, int h) {
-       resize(c, x, y, w, h, RESIZEHINTS);
-       if((RESIZEHINTS) && ((c->h < bh) || (c->h > h) || (c->w < bh) || (c->w > w)))
-               /* client doesn't accept size constraints */
-               resize(c, x, y, w, h, False);
-}
-

 void
 tile(void) {
 void
 tile(void) {

-       int y, h;
-       unsigned int i, n;
+       int x, y, h, w, mw;
+       uint i, n;

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


@@ -1513,44 +1437,49 @@ tile(void) {
 
        /* master */
        c = nexttiled(clients);
 
        /* master */
        c = nexttiled(clients);

-
-       if(n == 1)
-               tileresize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
-       else
-               tileresize(c, mx, my, mw - 2 * c->bw, mh - 2 * c->bw);
+       mw = mfact * ww;
+       resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);

 
        if(--n == 0)
                return;
 
        /* tile stack */
 
        if(--n == 0)
                return;
 
        /* tile stack */

-       y = ty;
-       h = th / n;
+       x = (wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : wx + mw;
+       y = wy;
+       w = (wx + mw > c->x + c->w) ? wx + ww - x : ww - mw;
+       h = wh / n;

        if(h < bh)
        if(h < bh)

-               h = th;
+               h = wh;

 
        for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
 
        for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {

-               if(i + 1 == n) /* remainder */
-                       tileresize(c, tx, y, tw - 2 * c->bw, (ty + th) - y - 2 * c->bw);
-               else
-                       tileresize(c, tx, y, tw - 2 * c->bw, h - 2 * c->bw);
-               if(h != th)
+               resize(c, x, y, w - 2 * c->bw, /* remainder */ ((i + 1 == n)
+                      ? (wy + wh) - y : h) - 2 * c->bw, resizehints);
+               if(h != wh)

                        y = c->y + c->h + 2 * c->bw;
        }
 }
 
 void
                        y = c->y + c->h + 2 * c->bw;
        }
 }
 
 void

-togglefloating(const char *arg) {
+togglebar(const void *arg) {
+       showbar = !showbar;
+       updategeom();
+       updatebar();
+       arrange();
+}
+
+void
+togglefloating(const void *arg) {

        if(!sel)
                return;
        if(!sel)
                return;

-       sel->isfloating = !sel->isfloating;
+       sel->isfloating = !sel->isfloating || sel->isfixed;

        if(sel->isfloating)
                resize(sel, sel->x, sel->y, sel->w, sel->h, True);
        arrange();
 }
 
 void
        if(sel->isfloating)
                resize(sel, sel->x, sel->y, sel->w, sel->h, True);
        arrange();
 }
 
 void

-togglelayout(const char *arg) {
-       unsigned int i;
+togglelayout(const void *arg) {
+       uint i;

 
        if(!arg) {
                if(++lt == &layouts[LENGTH(layouts)])
 
        if(!arg) {
                if(++lt == &layouts[LENGTH(layouts)])


@@ -1558,7 +1487,7 @@ togglelayout(const char *arg) {
        }
        else {
                for(i = 0; i < LENGTH(layouts); i++)
        }
        else {
                for(i = 0; i < LENGTH(layouts); i++)

-                       if(!strcmp(arg, layouts[i].symbol))
+                       if(!strcmp((char *)arg, layouts[i].symbol))

                                break;
                if(i == LENGTH(layouts))
                        return;
                                break;
                if(i == LENGTH(layouts))
                        return;


@@ -1571,37 +1500,25 @@ togglelayout(const char *arg) {
 }
 
 void
 }
 
 void

-toggletag(const char *arg) {
-       unsigned int i, j;
-
-       if(!sel)
-               return;
-       i = idxoftag(arg);
-       sel->tags[i] = !sel->tags[i];
-       for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
-       if(j == LENGTH(tags))
-               sel->tags[i] = True; /* at least one tag must be enabled */
+togglemax(const void *arg) {
+       ismax = !ismax;

        arrange();
 }
 
 void
        arrange();
 }
 
 void

-toggleview(const char *arg) {
-       unsigned int i, j;
-
-       i = idxoftag(arg);
-       tagset[seltags][i] = !tagset[seltags][i];
-       for(j = 0; j < LENGTH(tags) && !tagset[seltags][j]; j++);
-       if(j == LENGTH(tags))
-               tagset[seltags][i] = True; /* at least one tag must be viewed */
-       arrange();
+toggletag(const void *arg) {
+       if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) {
+               sel->tags ^= (*(int *)arg) & TAGMASK;
+               arrange();
+       }

 }
 
 void
 }
 
 void

-unban(Client *c) {
-       if(!c->isbanned)
-               return;
-       XMoveWindow(dpy, c->win, c->x, c->y);
-       c->isbanned = False;
+toggleview(const void *arg) {
+       if((tagset[seltags] ^ ((*(int *)arg) & TAGMASK))) {
+               tagset[seltags] ^= (*(int *)arg) & TAGMASK;
+               arrange();
+       }

 }
 
 void
 }
 
 void


@@ -1619,7 +1536,6 @@ unmanage(Client *c) {
                focus(NULL);
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        setclientstate(c, WithdrawnState);
                focus(NULL);
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        setclientstate(c, WithdrawnState);

-       free(c->tags);

        free(c);
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        free(c);
        XSync(dpy, False);
        XSetErrorHandler(xerror);


@@ -1640,35 +1556,36 @@ void
 updatebar(void) {
        if(dc.drawable != 0)
                XFreePixmap(dpy, dc.drawable);
 updatebar(void) {
        if(dc.drawable != 0)
                XFreePixmap(dpy, dc.drawable);

-       dc.drawable = XCreatePixmap(dpy, root, bw, bh, DefaultDepth(dpy, screen));
-       XMoveResizeWindow(dpy, barwin, bx, by, bw, bh);
+       dc.drawable = XCreatePixmap(dpy, root, ww, bh, DefaultDepth(dpy, screen));
+       XMoveResizeWindow(dpy, barwin, wx, by, ww, bh);

 }
 
 void
 updategeom(void) {
 }
 
 void
 updategeom(void) {

-
-       /* bar geometry */
-       bx = 0;
-       by = 0;
-       bw = sw;
+#ifdef XINERAMA
+       int i;
+       XineramaScreenInfo *info = NULL;

 
        /* window area geometry */
 
        /* window area geometry */

-       wx = sx;
-       wy = sy + bh;
-       ww = sw;
-       wh = sh - bh;
-
-       /* master area geometry */
-       mx = wx;
-       my = wy;
-       mw = mfact * ww;
-       mh = wh;
+       if(XineramaIsActive(dpy)) {
+               info = XineramaQueryScreens(dpy, &i);
+               wx = info[0].x_org;
+               wy = showbar && topbar ? info[0].y_org + bh : info[0].y_org;
+               ww = info[0].width;
+               wh = showbar ? info[0].height - bh : info[0].height;
+               XFree(info);
+       }
+       else
+#endif
+       {
+               wx = sx;
+               wy = showbar && topbar ? sy + bh : sy;
+               ww = sw;
+               wh = showbar ? sh - bh : sh;
+       }

 
 

-       /* tile area geometry */
-       tx = mx + mw;
-       ty = wy;
-       tw = ww - mw;
-       th = wh;
+       /* bar position */
+       by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;

 }
 
 void
 }
 
 void


@@ -1676,42 +1593,40 @@ updatesizehints(Client *c) {
        long msize;
        XSizeHints size;
 
        long msize;
        XSizeHints size;
 

-       if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
-               size.flags = PSize;
-       c->flags = size.flags;
-       if(c->flags & PBaseSize) {
+       XGetWMNormalHints(dpy, c->win, &size, &msize);
+       if(size.flags & PBaseSize) {

                c->basew = size.base_width;
                c->baseh = size.base_height;
        }
                c->basew = size.base_width;
                c->baseh = size.base_height;
        }

-       else if(c->flags & PMinSize) {
+       else if(size.flags & PMinSize) {

                c->basew = size.min_width;
                c->baseh = size.min_height;
        }
        else
                c->basew = c->baseh = 0;
                c->basew = size.min_width;
                c->baseh = size.min_height;
        }
        else
                c->basew = c->baseh = 0;

-       if(c->flags & PResizeInc) {
+       if(size.flags & PResizeInc) {

                c->incw = size.width_inc;
                c->inch = size.height_inc;
        }
        else
                c->incw = c->inch = 0;
                c->incw = size.width_inc;
                c->inch = size.height_inc;
        }
        else
                c->incw = c->inch = 0;

-       if(c->flags & PMaxSize) {
+       if(size.flags & PMaxSize) {

                c->maxw = size.max_width;
                c->maxh = size.max_height;
        }
        else
                c->maxw = c->maxh = 0;
                c->maxw = size.max_width;
                c->maxh = size.max_height;
        }
        else
                c->maxw = c->maxh = 0;

-       if(c->flags & PMinSize) {
+       if(size.flags & PMinSize) {

                c->minw = size.min_width;
                c->minh = size.min_height;
        }
                c->minw = size.min_width;
                c->minh = size.min_height;
        }

-       else if(c->flags & PBaseSize) {
+       else if(size.flags & PBaseSize) {

                c->minw = size.base_width;
                c->minh = size.base_height;
        }
        else
                c->minw = c->minh = 0;
                c->minw = size.base_width;
                c->minh = size.base_height;
        }
        else
                c->minw = c->minh = 0;

-       if(c->flags & PAspect) {
+       if(size.flags & PAspect) {

                c->minax = size.min_aspect.x;
                c->maxax = size.max_aspect.x;
                c->minay = size.min_aspect.y;
                c->minax = size.min_aspect.x;
                c->maxax = size.max_aspect.x;
                c->minay = size.min_aspect.y;


@@ -1743,16 +1658,10 @@ updatewmhints(Client *c) {
 }
 
 void
 }
 
 void

-view(const char *arg) {
-       seltags ^= 1; /* toggle sel tagset */
-       memset(tagset[seltags], (NULL == arg), TAGSZ);
-       tagset[seltags][idxoftag(arg)] = True;
-       arrange();
-}
-
-void
-viewprevtag(const char *arg) {
+view(const void *arg) {

        seltags ^= 1; /* toggle sel tagset */
        seltags ^= 1; /* toggle sel tagset */

+       if(arg && (*(int *)arg & TAGMASK))
+               tagset[seltags] = *(int *)arg & TAGMASK;

        arrange();
 }
 
        arrange();
 }
 


@@ -1789,19 +1698,18 @@ xerrorstart(Display *dpy, XErrorEvent *ee) {
        return -1;
 }
 
        return -1;
 }
 

-/* TODO: move this into tile.c */

 void
 void

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

        Client *c = sel;
 
        Client *c = sel;
 

+       if(ismax || !lt->arrange || (sel && sel->isfloating))
+               return;

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

-       if(lt->arrange && !sel->isfloating) { /* TODO: check this against tile() */
-               detach(c);
-               attach(c);
-               focus(c);
-       }
+       detach(c);
+       attach(c);
+       focus(c);

        arrange();
 }
 
        arrange();
 }