fixed focus steeling bug done by clients like opera

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 36ca4eb..53e5cb2 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -17,9 +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.  For each client dwm
- * creates a small title window, which is resized whenever the (_NET_)WM_NAME
- * properties are updated or the client is moved/resized.
+ * global tags array to indicate the tags of a client.  

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


@@ -27,14 +25,15 @@
  */
 #include <errno.h>
 #include <locale.h>
  */
 #include <errno.h>
 #include <locale.h>

-#include <regex.h>

 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/select.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/select.h>

+#include <sys/types.h>

 #include <sys/wait.h>
 #include <sys/wait.h>

+#include <regex.h>

 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>


@@ -45,8 +44,11 @@
 /* macros */
 #define BUTTONMASK             (ButtonPressMask | ButtonReleaseMask)
 #define CLEANMASK(mask)                (mask & ~(numlockmask | LockMask))
 /* macros */
 #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 MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 

+

 /* enums */
 enum { BarTop, BarBot, BarOff };                       /* bar position */
 enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */
 /* enums */
 enum { BarTop, BarBot, BarOff };                       /* bar position */
 enum { CurNormal, CurResize, CurMove, CurLast };       /* cursor */


@@ -62,7 +64,7 @@ struct Client {
        int rx, ry, rw, rh; /* revert geometry */
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int minax, maxax, minay, maxay;
        int rx, ry, rw, rh; /* revert geometry */
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int minax, maxax, minay, maxay;

-       long flags; 
+       long flags;

        unsigned int border, oldborder;
        Bool isbanned, isfixed, ismax, isfloating, wasfloating;
        Bool *tags;
        unsigned int border, oldborder;
        Bool isbanned, isfixed, ismax, isfloating, wasfloating;
        Bool *tags;


@@ -110,7 +112,7 @@ typedef struct {
        regex_t *tagregex;
 } Regs;
 
        regex_t *tagregex;
 } Regs;
 

-/* forward declarations */
+/* function declarations */

 void applyrules(Client *c);
 void arrange(void);
 void attach(Client *c);
 void applyrules(Client *c);
 void arrange(void);
 void attach(Client *c);


@@ -135,6 +137,7 @@ void eprint(const char *errstr, ...);
 void expose(XEvent *e);
 void floating(void); /* default floating layout */
 void focus(Client *c);
 void expose(XEvent *e);
 void floating(void); /* default floating layout */
 void focus(Client *c);

+void focusin(XEvent *e);

 void focusnext(const char *arg);
 void focusprev(const char *arg);
 Client *getclient(Window w);
 void focusnext(const char *arg);
 void focusprev(const char *arg);
 Client *getclient(Window w);


@@ -142,9 +145,9 @@ unsigned long getcolor(const char *colstr);
 long getstate(Window w);
 Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 void grabbuttons(Client *c, Bool focused);
 long getstate(Window w);
 Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 void grabbuttons(Client *c, Bool focused);

+void grabkeys(void);

 unsigned int idxoftag(const char *tag);
 void initfont(const char *fontstr);
 unsigned int idxoftag(const char *tag);
 void initfont(const char *fontstr);

-Bool isarrange(void (*func)());

 Bool isoccupied(unsigned int t);
 Bool isprotodel(Client *c);
 Bool isvisible(Client *c);
 Bool isoccupied(unsigned int t);
 Bool isprotodel(Client *c);
 Bool isvisible(Client *c);


@@ -184,6 +187,7 @@ void updatebarpos(void);
 void updatesizehints(Client *c);
 void updatetitle(Client *c);
 void view(const char *arg);
 void updatesizehints(Client *c);
 void updatetitle(Client *c);
 void view(const char *arg);

+void viewprevtag(const char *arg);     /* views previous selected tags */

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


@@ -194,11 +198,8 @@ char stext[256];
 double mwfact;
 int screen, sx, sy, sw, sh, wax, way, waw, wah;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 double mwfact;
 int screen, sx, sy, sw, sh, wax, way, waw, wah;
 int (*xerrorxlib)(Display *, XErrorEvent *);

-unsigned int bh, bpos, ntags;
+unsigned int bh, bpos;

 unsigned int blw = 0;
 unsigned int blw = 0;

-unsigned int ltidx = 0; /* default */
-unsigned int nlayouts = 0;
-unsigned int nrules = 0;

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


@@ -206,18 +207,20 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [ConfigureNotify] = configurenotify,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,
        [ConfigureNotify] = configurenotify,
        [DestroyNotify] = destroynotify,
        [EnterNotify] = enternotify,

-       [LeaveNotify] = leavenotify,

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

+       [FocusIn] = focusin,

        [KeyPress] = keypress,
        [KeyPress] = keypress,

+       [LeaveNotify] = leavenotify,

        [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,
        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];
        [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,
        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];

+Bool domwfact = True;
+Bool dozoom = True;

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

-Bool *seltags;

 Bool selscreen = True;
 Client *clients = NULL;
 Client *sel = NULL;
 Bool selscreen = True;
 Client *clients = NULL;
 Client *sel = NULL;


@@ -225,13 +228,16 @@ Client *stack = 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;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
 Window barwin, root;
 Regs *regs = NULL;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 

-/* functions*/
+Bool prevtags[LENGTH(tags)];
+
+/* function implementations */

 void
 applyrules(Client *c) {
        static char buf[512];
 void
 applyrules(Client *c) {
        static char buf[512];


@@ -245,10 +251,10 @@ applyrules(Client *c) {
        snprintf(buf, sizeof buf, "%s:%s:%s",
                        ch.res_class ? ch.res_class : "",
                        ch.res_name ? ch.res_name : "", c->name);
        snprintf(buf, sizeof buf, "%s:%s:%s",
                        ch.res_class ? ch.res_class : "",
                        ch.res_name ? ch.res_name : "", c->name);

-       for(i = 0; i < nrules; i++)
+       for(i = 0; i < LENGTH(rules); i++)

                if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
                        c->isfloating = rules[i].isfloating;
                if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
                        c->isfloating = rules[i].isfloating;

-                       for(j = 0; regs[i].tagregex && j < ntags; j++) {
+                       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;
                                if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
                                        matched = True;
                                        c->tags[j] = True;


@@ -260,8 +266,7 @@ applyrules(Client *c) {
        if(ch.res_name)
                XFree(ch.res_name);
        if(!matched)
        if(ch.res_name)
                XFree(ch.res_name);
        if(!matched)

-               for(i = 0; i < ntags; i++)
-                       c->tags[i] = seltags[i];
+               memcpy(c->tags, seltags, sizeof seltags);

 }
 
 void
 }
 
 void


@@ -273,7 +278,7 @@ arrange(void) {
                        unban(c);
                else
                        ban(c);
                        unban(c);
                else
                        ban(c);

-       layouts[ltidx].arrange();
+       layout->arrange();

        focus(NULL);
        restack();
 }
        focus(NULL);
        restack();
 }


@@ -306,9 +311,9 @@ buttonpress(XEvent *e) {
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 
        Client *c;
        XButtonPressedEvent *ev = &e->xbutton;
 

-       if(barwin == ev->window) {
+       if(ev->window == barwin) {

                x = 0;
                x = 0;

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

                        x += textw(tags[i]);
                        if(ev->x < x) {
                                if(ev->button == Button1) {
                        x += textw(tags[i]);
                        if(ev->x < x) {
                                if(ev->button == Button1) {


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

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

                                restack();
                                restack();

+                       else
+                               togglefloating(NULL);

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

-                       if(isarrange(tile) && !c->isfixed && c->isfloating)
+                       if((floating != layout->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(!isarrange(floating) && !c->isfloating)
-                               togglefloating(NULL);
-                       else
+                       if((floating == layout->arrange) || c->isfloating)

                                restack();
                                restack();

+                       else
+                               togglefloating(NULL);

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


@@ -392,7 +397,6 @@ cleanup(void) {
        XFreeCursor(dpy, cursor[CurMove]);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        XSync(dpy, False);
        XFreeCursor(dpy, cursor[CurMove]);
        XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
        XSync(dpy, False);

-       free(seltags);

 }
 
 void
 }
 
 void


@@ -402,9 +406,8 @@ compileregs(void) {
 
        if(regs)
                return;
 
        if(regs)
                return;

-       nrules = sizeof rules / sizeof rules[0];
-       regs = emallocz(nrules * sizeof(Regs));
-       for(i = 0; i < nrules; i++) {
+       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))
                if(rules[i].prop) {
                        reg = emallocz(sizeof(regex_t));
                        if(regcomp(reg, rules[i].prop, REG_EXTENDED))


@@ -444,7 +447,7 @@ void
 configurenotify(XEvent *e) {
        XConfigureEvent *ev = &e->xconfigure;
 
 configurenotify(XEvent *e) {
        XConfigureEvent *ev = &e->xconfigure;
 

-       if (ev->window == root && (ev->width != sw || ev->height != sh)) {
+       if(ev->window == root && (ev->width != sw || ev->height != sh)) {

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


@@ -465,7 +468,7 @@ configurerequest(XEvent *e) {
                c->ismax = False;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
                c->ismax = False;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;

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

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


@@ -533,7 +536,7 @@ drawbar(void) {
        int i, x;
 
        dc.x = dc.y = 0;
        int i, x;
 
        dc.x = dc.y = 0;

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

                dc.w = textw(tags[i]);
                if(seltags[i]) {
                        drawtext(tags[i], dc.sel);
                dc.w = textw(tags[i]);
                if(seltags[i]) {
                        drawtext(tags[i], dc.sel);


@@ -546,7 +549,7 @@ drawbar(void) {
                dc.x += dc.w;
        }
        dc.w = blw;
                dc.x += dc.w;
        }
        dc.w = blw;

-       drawtext(layouts[ltidx].symbol, dc.norm);
+       drawtext(layout->symbol, dc.norm);

        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;


@@ -668,7 +671,7 @@ expose(XEvent *e) {
        XExposeEvent *ev = &e->xexpose;
 
        if(ev->count == 0) {
        XExposeEvent *ev = &e->xexpose;
 
        if(ev->count == 0) {

-               if(barwin == ev->window)
+               if(ev->window == barwin)

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


@@ -677,6 +680,7 @@ void
 floating(void) { /* default floating layout */
        Client *c;
 
 floating(void) { /* default floating layout */
        Client *c;
 

+       domwfact = dozoom = False;

        for(c = clients; c; c = c->next)
                if(isvisible(c))
                        resize(c, c->x, c->y, c->w, c->h, True);
        for(c = clients; c; c = c->next)
                if(isvisible(c))
                        resize(c, c->x, c->y, c->w, c->h, True);


@@ -707,6 +711,14 @@ focus(Client *c) {
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 }
 
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 }
 

+void
+focusin(XEvent *e) { /* there are some broken focus acquiring clients */
+       XFocusChangeEvent *ev = &e->xfocus;
+
+       if(sel && ev->window != sel->win)
+               XSetInputFocus(dpy, sel->win, RevertToPointerRoot, CurrentTime);
+}
+

 void
 focusnext(const char *arg) {
        Client *c;
 void
 focusnext(const char *arg) {
        Client *c;


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

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

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


@@ -839,14 +850,31 @@ grabbuttons(Client *c, Bool focused) {
                                GrabModeAsync, GrabModeSync, None, None);
 }
 
                                GrabModeAsync, GrabModeSync, None, None);
 }
 

+void
+grabkeys(void)  {
+       unsigned int i;
+       KeyCode code;
+
+       XUngrabKey(dpy, AnyKey, AnyModifier, root);
+       for(i = 0; i < LENGTH(keys); i++) {
+               code = XKeysymToKeycode(dpy, keys[i].keysym);
+               XGrabKey(dpy, code, keys[i].mod, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
+                               GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
+                               GrabModeAsync, GrabModeAsync);
+       }
+}
+

 unsigned int
 idxoftag(const char *tag) {
        unsigned int i;
 
 unsigned int
 idxoftag(const char *tag) {
        unsigned int i;
 

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

 }
 
 void
 }
 
 void


@@ -883,7 +911,7 @@ initfont(const char *fontstr) {
                        XFreeFont(dpy, dc.font.xfont);
                dc.font.xfont = NULL;
                if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
                        XFreeFont(dpy, dc.font.xfont);
                dc.font.xfont = NULL;
                if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))

-               || !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
+               && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))

                        eprint("error, cannot load font: '%s'\n", fontstr);
                dc.font.ascent = dc.font.xfont->ascent;
                dc.font.descent = dc.font.xfont->descent;
                        eprint("error, cannot load font: '%s'\n", fontstr);
                dc.font.ascent = dc.font.xfont->ascent;
                dc.font.descent = dc.font.xfont->descent;


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

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

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


@@ -926,7 +948,7 @@ Bool
 isvisible(Client *c) {
        unsigned int i;
 
 isvisible(Client *c) {
        unsigned int i;
 

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

                if(c->tags[i] && seltags[i])
                        return True;
        return False;
                if(c->tags[i] && seltags[i])
                        return True;
        return False;


@@ -934,31 +956,13 @@ isvisible(Client *c) {
 
 void
 keypress(XEvent *e) {
 
 void
 keypress(XEvent *e) {

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

        unsigned int i;
        unsigned int i;

-       KeyCode code;

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

-       if(!e) { /* grabkeys */
-               XUngrabKey(dpy, AnyKey, AnyModifier, root);
-               for(i = 0; i < len; i++) {
-                       code = XKeysymToKeycode(dpy, keys[i].keysym);
-                       XGrabKey(dpy, code, keys[i].mod, root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[i].mod | LockMask, root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[i].mod | numlockmask, root, True,
-                                       GrabModeAsync, GrabModeAsync);
-                       XGrabKey(dpy, code, keys[i].mod | numlockmask | LockMask, root, True,
-                                       GrabModeAsync, GrabModeAsync);
-               }
-               return;
-       }

        ev = &e->xkey;
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
        ev = &e->xkey;
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);

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

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


@@ -998,14 +1002,13 @@ leavenotify(XEvent *e) {
 
 void
 manage(Window w, XWindowAttributes *wa) {
 
 void
 manage(Window w, XWindowAttributes *wa) {

-       unsigned int i;

        Client *c, *t = NULL;
        Window trans;
        Status rettrans;
        XWindowChanges wc;
 
        c = emallocz(sizeof(Client));
        Client *c, *t = NULL;
        Window trans;
        Status rettrans;
        XWindowChanges wc;
 
        c = emallocz(sizeof(Client));

-       c->tags = emallocz(ntags * sizeof(Bool));
+       c->tags = emallocz(sizeof seltags);

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


@@ -1033,15 +1036,13 @@ 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,
-               StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+       XSelectInput(dpy, w, EnterWindowMask | FocusChangeMask | PropertyChangeMask | StructureNotifyMask);

        grabbuttons(c, False);
        updatetitle(c);
        if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
                for(t = clients; t && t->win != trans; t = t->next);
        if(t)
        grabbuttons(c, False);
        updatetitle(c);
        if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
                for(t = clients; t && t->win != trans; t = t->next);
        if(t)

-               for(i = 0; i < ntags; i++)
-                       c->tags[i] = t->tags[i];
+               memcpy(c->tags, t->tags, sizeof seltags);

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


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

-               keypress(NULL);
+               grabkeys();

 }
 
 void
 }
 
 void


@@ -1158,45 +1159,48 @@ quit(const char *arg) {
        readin = running = False;
 }
 
        readin = running = False;
 }
 

+

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

-       double dx, dy, max, min, ratio;
-       XWindowChanges wc; 
+       XWindowChanges wc;

 
        if(sizehints) {
 
        if(sizehints) {

-               if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) {
-                       dx = (double)(w - c->basew);
-                       dy = (double)(h - c->baseh);
-                       min = (double)(c->minax) / (double)(c->minay);
-                       max = (double)(c->maxax) / (double)(c->maxay);
-                       ratio = dx / dy;
-                       if(max > 0 && min > 0 && ratio > 0) {
-                               if(ratio < min) {
-                                       dy = (dx * min + dy) / (min * min + 1);
-                                       dx = dy * min;
-                                       w = (int)dx + c->basew;
-                                       h = (int)dy + c->baseh;
-                               }
-                               else if(ratio > max) {
-                                       dy = (dx * min + dy) / (max * max + 1);
-                                       dx = dy * min;
-                                       w = (int)dx + c->basew;
-                                       h = (int)dy + c->baseh;
-                               }
-                       }
+               /* set minimum possible */
+               if (w < 1)
+                       w = 1;
+               if (h < 1)
+                       h = 1;
+
+               /* temporarily remove base dimensions */
+               w -= c->basew;
+               h -= c->baseh;
+
+               /* adjust for aspect limits */
+               if (c->minay > 0 && c->maxay > 0 && c->minax > 0 && c->maxax > 0) {
+                       if (w * c->maxay > h * c->maxax)
+                               w = h * c->maxax / c->maxay;
+                       else if (w * c->minay < h * c->minax)
+                               h = w * c->minay / c->minax;

                }
                }

-               if(c->minw && w < c->minw)
+
+               /* adjust for increment value */
+               if(c->incw)
+                       w -= w % c->incw;
+               if(c->inch)
+                       h -= h % c->inch;
+
+               /* restore base dimensions */
+               w += c->basew;
+               h += c->baseh;
+
+               if(c->minw > 0 && w < c->minw)

                        w = c->minw;
                        w = c->minw;

-               if(c->minh && h < c->minh)
+               if(c->minh > 0 && h < c->minh)

                        h = c->minh;
                        h = c->minh;

-               if(c->maxw && w > c->maxw)
+               if(c->maxw > 0 && w > c->maxw)

                        w = c->maxw;
                        w = c->maxw;

-               if(c->maxh && h > c->maxh)
+               if(c->maxh > 0 && h > c->maxh)

                        h = c->maxh;
                        h = c->maxh;

-               if(c->incw)
-                       w -= (w - c->basew) % c->incw;
-               if(c->inch)
-                       h -= (h - c->baseh) % c->inch;

        }
        if(w <= 0 || h <= 0)
                return;
        }
        if(w <= 0 || h <= 0)
                return;


@@ -1269,9 +1273,9 @@ restack(void) {
        drawbar();
        if(!sel)
                return;
        drawbar();
        if(!sel)
                return;

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

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

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

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


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

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

        fd_set rd;
        fd_set rd;

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

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

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

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


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

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

                        case -1:
                        case -1:

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

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


@@ -1322,10 +1330,18 @@ run(void) {
                                readin = False;
                                break;
                        default:
                                readin = False;
                                break;
                        default:

-                               for(stext[r] = '\0', p = stext + strlen(stext) - 1; p >= stext && *p == '\n'; *p-- = '\0');
-                               for(; p >= stext && *p != '\n'; --p);
-                               if(p > stext)
-                                       strncpy(stext, p + 1, sizeof stext);
+                               for(p = buf + offset; r > 0; p++, r--, offset++)
+                                       if(*p == '\n' || *p == '\0') {
+                                               *p = '\0';
+                                               strncpy(stext, buf, len);
+                                               p += r - 1; /* p is buf + offset + r - 1 */
+                                               for(r = 0; *(p - r) && *(p - r) != '\n'; r++);
+                                               offset = r;
+                                               if(r)
+                                                       memmove(buf, p - r + 1, r);
+                                               break;
+                                       }
+                               break;

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


@@ -1377,16 +1393,16 @@ setlayout(const char *arg) {
        unsigned int i;
 
        if(!arg) {
        unsigned int i;
 
        if(!arg) {

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

        }
        else {
        }
        else {

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

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

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

                        return;
                        return;

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

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


@@ -1398,16 +1414,16 @@ void
 setmwfact(const char *arg) {
        double delta;
 
 setmwfact(const char *arg) {
        double delta;
 

-       if(!isarrange(tile))
+       if(!domwfact)

                return;
        /* arg handling, manipulate mwfact */
        if(arg == NULL)
                mwfact = MWFACT;
                return;
        /* arg handling, manipulate mwfact */
        if(arg == NULL)
                mwfact = MWFACT;

-       else if(1 == sscanf(arg, "%lf", &delta)) {
-               if(arg[0] != '+' && arg[0] != '-')
-                       mwfact = delta;
-               else
+       else if(sscanf(arg, "%lf", &delta) == 1) {
+               if(arg[0] == '+' || arg[0] == '-')

                        mwfact += delta;
                        mwfact += delta;

+               else
+                       mwfact = delta;

                if(mwfact < 0.1)
                        mwfact = 0.1;
                else if(mwfact > 0.9)
                if(mwfact < 0.1)
                        mwfact = 0.1;
                else if(mwfact > 0.9)


@@ -1418,6 +1434,7 @@ setmwfact(const char *arg) {
 
 void
 setup(void) {
 
 void
 setup(void) {

+       int d;

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


@@ -1461,13 +1478,11 @@ setup(void) {
        XSelectInput(dpy, root, wa.event_mask);
 
        /* grab keys */
        XSelectInput(dpy, root, wa.event_mask);
 
        /* grab keys */

-       keypress(NULL);
+       grabkeys();

 
        /* init tags */
 
        /* init tags */

+       memcpy(prevtags, seltags, sizeof seltags);

        compileregs();
        compileregs();

-       for(ntags = 0; tags[ntags]; ntags++);
-       seltags = emallocz(sizeof(Bool) * ntags);
-       seltags[0] = True;

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


@@ -1481,8 +1496,8 @@ setup(void) {
 
        /* init layouts */
        mwfact = MWFACT;
 
        /* init layouts */
        mwfact = MWFACT;

-       nlayouts = sizeof layouts / sizeof layouts[0];
-       for(blw = i = 0; i < nlayouts; i++) {
+       layout = &layouts[0];
+       for(blw = i = 0; i < LENGTH(layouts); i++) {

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


@@ -1507,7 +1522,8 @@ setup(void) {
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 
        /* multihead support */
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 
        /* multihead support */

-       selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
+       selscreen = XQueryPointer(dpy, root, &w, &w, &d, &d, &d, &d, &mask);
+

 }
 
 void
 }
 
 void


@@ -1540,11 +1556,9 @@ tag(const char *arg) {
 
        if(!sel)
                return;
 
        if(!sel)
                return;

-       for(i = 0; i < ntags; i++)
-               sel->tags[i] = arg == NULL;
-       i = idxoftag(arg);
-       if(i >= 0 && i < ntags)
-               sel->tags[i] = True;
+       for(i = 0; i < LENGTH(tags); i++)
+               sel->tags[i] = (NULL == arg);
+       sel->tags[idxoftag(arg)] = True;

        arrange();
 }
 
        arrange();
 }
 


@@ -1567,8 +1581,9 @@ textw(const char *text) {
 void
 tile(void) {
        unsigned int i, n, nx, ny, nw, nh, mw, th;
 void
 tile(void) {
        unsigned int i, n, nx, ny, nw, nh, mw, th;

-       Client *c;
+       Client *c, *mc;

 
 

+       domwfact = dozoom = True;

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


@@ -1580,7 +1595,8 @@ tile(void) {
 
        nx = wax;
        ny = way;
 
        nx = wax;
        ny = way;

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

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


@@ -1589,17 +1605,20 @@ tile(void) {
                else {  /* tile window */
                        if(i == 1) {
                                ny = way;
                else {  /* tile window */
                        if(i == 1) {
                                ny = way;

-                               nx += mw;
+                               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;
                        else
                                nh = th - 2 * c->border;
                }
                resize(c, nx, ny, nw, nh, RESIZEHINTS);
                        if(i + 1 == n) /* remainder */
                                nh = (way + wah) - ny - 2 * c->border;
                        else
                                nh = th - 2 * c->border;
                }
                resize(c, nx, ny, nw, nh, RESIZEHINTS);

+               if((RESIZEHINTS) && ((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw)))
+                       /* client doesn't accept size constraints */
+                       resize(c, nx, ny, nw, nh, False);

                if(n > 1 && th != wah)
                if(n > 1 && th != wah)

-                       ny += nh + 2 * c->border;
+                       ny = c->y + c->h + 2 * c->border;

        }
 }
 
        }
 }
 


@@ -1630,7 +1649,7 @@ togglemax(const char *arg) {
        if(!sel || sel->isfixed)
                return;
        if((sel->ismax = !sel->ismax)) {
        if(!sel || sel->isfixed)
                return;
        if((sel->ismax = !sel->ismax)) {

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

                        sel->wasfloating = True;
                else {
                        togglefloating(NULL);
                        sel->wasfloating = True;
                else {
                        togglefloating(NULL);


@@ -1644,7 +1663,7 @@ togglemax(const char *arg) {
        }
        else {
                resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
        }
        else {
                resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);

-               if (!sel->wasfloating)
+               if(!sel->wasfloating)

                        togglefloating(NULL);
        }
        drawbar();
                        togglefloating(NULL);
        }
        drawbar();


@@ -1659,9 +1678,9 @@ toggletag(const char *arg) {
                return;
        i = idxoftag(arg);
        sel->tags[i] = !sel->tags[i];
                return;
        i = idxoftag(arg);
        sel->tags[i] = !sel->tags[i];

-       for(j = 0; j < ntags && !sel->tags[j]; j++);
-       if(j == ntags)
-               sel->tags[i] = True;
+       for(j = 0; j < LENGTH(tags) && !sel->tags[j]; j++);
+       if(j == LENGTH(tags))
+               sel->tags[i] = True; /* at least one tag must be enabled */

        arrange();
 }
 
        arrange();
 }
 


@@ -1671,9 +1690,9 @@ toggleview(const char *arg) {
 
        i = idxoftag(arg);
        seltags[i] = !seltags[i];
 
        i = idxoftag(arg);
        seltags[i] = !seltags[i];

-       for(j = 0; j < ntags && !seltags[j]; j++);
-       if(j == ntags)
-               seltags[i] = True; /* cannot toggle last view */
+       for(j = 0; j < LENGTH(tags) && !seltags[j]; j++);
+       if(j == LENGTH(tags))
+               seltags[i] = True; /* at least one tag must be viewed */

        arrange();
 }
 
        arrange();
 }
 


@@ -1837,11 +1856,20 @@ void
 view(const char *arg) {
        unsigned int i;
 
 view(const char *arg) {
        unsigned int i;
 

-       for(i = 0; i < ntags; i++)
-               seltags[i] = arg == NULL;
-       i = idxoftag(arg);
-       if(i >= 0 && i < ntags)
-               seltags[i] = True;
+       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();
 }
 
        arrange();
 }
 


@@ -1849,7 +1877,7 @@ void
 zoom(const char *arg) {
        Client *c;
 
 zoom(const char *arg) {
        Client *c;
 

-       if(!sel || !isarrange(tile) || sel->isfloating)
+       if(!sel || !dozoom || sel->isfloating)

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


@@ -1863,7 +1891,8 @@ 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 A. R. Garbe, S. van Dijk, J. Salmi, P. Hruby, S. Nagy\n");
+               eprint("dwm-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk, "
+                      "Jukka Salmi, Premysl Hruby, Szabolcs Nagy\n");

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