implemented exact focus next, if arg != NULL to focus{next,prev}

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 7643764..56ca615 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -68,6 +68,7 @@ typedef struct Client Client;
 struct Client {
        char name[256];
        int x, y, w, h;
 struct Client {
        char name[256];
        int x, y, w, h;

+       int fx, fy, fw, fh;

        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int minax, maxax, minay, maxay;
        long flags;
        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
        int minax, maxax, minay, maxay;
        long flags;


@@ -111,7 +112,7 @@ typedef struct {
        const char *symbol;
        void (*arrange)(void);
        Bool isfloating;
        const char *symbol;
        void (*arrange)(void);
        Bool isfloating;

-} Layout; 
+} Layout;

 
 typedef struct {
        const char *class;
 
 typedef struct {
        const char *class;


@@ -144,7 +145,6 @@ void *emallocz(unsigned int size);
 void enternotify(XEvent *e);
 void eprint(const char *errstr, ...);
 void expose(XEvent *e);
 void enternotify(XEvent *e);
 void eprint(const char *errstr, ...);
 void expose(XEvent *e);

-void floating(void); /* default floating layout */

 void focus(Client *c);
 void focusin(XEvent *e);
 void focusnext(const char *arg);
 void focus(Client *c);
 void focusin(XEvent *e);
 void focusnext(const char *arg);


@@ -160,7 +160,7 @@ void initfont(const char *fontstr);
 Bool isoccupied(unsigned int t);
 Bool isprotodel(Client *c);
 Bool isurgent(unsigned int t);
 Bool isoccupied(unsigned int t);
 Bool isprotodel(Client *c);
 Bool isurgent(unsigned int t);

-Bool isvisible(Client *c);
+Bool isvisible(Client *c, Bool *cmp);

 void keypress(XEvent *e);
 void killclient(const char *arg);
 void manage(Window w, XWindowAttributes *wa);
 void keypress(XEvent *e);
 void killclient(const char *arg);
 void manage(Window w, XWindowAttributes *wa);


@@ -214,7 +214,7 @@ char stext[256];
 int screen, sx, sy, sw, sh;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 int bx, by, bw, bh, blw, bgw, mx, my, mw, mh, mox, moy, mow, moh, tx, ty, tw, th, wx, wy, ww, wh;
 int screen, sx, sy, sw, sh;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 int bx, by, bw, bh, blw, bgw, mx, my, mw, mh, mox, moy, mow, moh, tx, ty, tw, th, wx, wy, ww, wh;

-int viewtags_set = 0;
+int seltags = 0;

 double mfact;
 unsigned int numlockmask = 0;
 void (*handler[LASTEvent]) (XEvent *) = {
 double mfact;
 unsigned int numlockmask = 0;
 void (*handler[LASTEvent]) (XEvent *) = {


@@ -234,21 +234,22 @@ void (*handler[LASTEvent]) (XEvent *) = {
 Atom wmatom[WMLast], netatom[NetLast];
 Bool otherwm, readin;
 Bool running = True;
 Atom wmatom[WMLast], netatom[NetLast];
 Bool otherwm, readin;
 Bool running = True;

-Bool *seltags;
-Bool *viewtags[2];
+Bool *tagset[2];

 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};

+Geom geoms[];
+Geom *geom = geoms;
+Layout layouts[];
+Layout *lt = layouts;

 Window root, barwin;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 #define TAGSZ (LENGTH(tags) * sizeof(Bool))
 Window root, barwin;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 #define TAGSZ (LENGTH(tags) * sizeof(Bool))

-Layout *lt = layouts;
-Geom *geom = geoms;

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


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

-               memcpy(c->tags, seltags, TAGSZ);
+               memcpy(c->tags, tagset[seltags], TAGSZ);

 }
 
 void
 }
 
 void


@@ -286,13 +287,17 @@ arrange(void) {
        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)

-               if(isvisible(c))
+               if(isvisible(c, NULL)) {

                        unban(c);
                        unban(c);

+                       if(lt->isfloating || c->isfloating)
+                               resize(c, c->fx, c->fy, c->fw, c->fh, True);
+               }

                else
                        ban(c);
 
        focus(NULL);
                else
                        ban(c);
 
        focus(NULL);

-       lt->arrange();
+       if(lt->arrange)
+               lt->arrange();

        restack();
 }
 
        restack();
 }
 


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

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

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


@@ -464,7 +469,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))
+                       if(isvisible(c, NULL))

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


@@ -531,10 +536,10 @@ drawbar(void) {
                drawtext(geom->symbol, dc.norm, False);
                dc.x += bgw;
        }
                drawtext(geom->symbol, dc.norm, False);
                dc.x += bgw;
        }

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

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

-               if(seltags[i]) {
+               if(tagset[seltags][i]) {

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


@@ -669,19 +674,10 @@ expose(XEvent *e) {
                drawbar();
 }
 
                drawbar();
 }
 

-void
-floating(void) { /* default floating layout */
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(isvisible(c))
-                       resize(c, c->x, c->y, c->w, c->h, True);
-}
-

 void
 focus(Client *c) {
 void
 focus(Client *c) {

-       if(!c || (c && !isvisible(c)))
-               for(c = stack; c && !isvisible(c); c = c->snext);
+       if(!c || (c && !isvisible(c, NULL)))
+               for(c = stack; c && !isvisible(c, NULL); 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]);


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

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

        if(!c)
        if(!c)

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

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


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

-       for(c = sel->prev; c && !isvisible(c); c = c->prev);
+       for(c = sel->prev; c && !isvisible(c, arg ? sel->tags : NULL); 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); c = c->prev);
+               for(; c && !isvisible(c, arg ? sel->tags : NULL); c = c->prev);

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


@@ -934,11 +930,13 @@ isurgent(unsigned int t) {
 }
 
 Bool
 }
 
 Bool

-isvisible(Client *c) {
+isvisible(Client *c, Bool *cmp) {

        unsigned int i;
 
        unsigned int i;
 

+       if(!cmp)
+               cmp = tagset[seltags];

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

-               if(c->tags[i] && seltags[i])
+               if(c->tags[i] && cmp[i])

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


@@ -993,8 +991,8 @@ manage(Window w, XWindowAttributes *wa) {
        /* geometry */
        c->x = wa->x;
        c->y = wa->y;
        /* geometry */
        c->x = wa->x;
        c->y = wa->y;

-       c->w = wa->width;
-       c->h = wa->height;
+       c->w = c->fw = wa->width;
+       c->h = c->fh = wa->height;

        c->oldbw = wa->border_width;
        if(c->w == sw && c->h == sh) {
                c->x = sx;
        c->oldbw = wa->border_width;
        if(c->w == sw && c->h == sh) {
                c->x = sx;


@@ -1010,6 +1008,8 @@ manage(Window w, XWindowAttributes *wa) {
                c->y = MAX(c->y, wy);
                c->bw = BORDERPX;
        }
                c->y = MAX(c->y, wy);
                c->bw = BORDERPX;
        }

+       c->fx = c->x;
+       c->fy = c->y;

 
        wc.border_width = c->bw;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);
 
        wc.border_width = c->bw;
        XConfigureWindow(dpy, w, CWBorderWidth, &wc);


@@ -1063,7 +1063,7 @@ monocle(void) {
        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)

-               if((lt->isfloating || !c->isfloating) &&  isvisible(c))
+               if((lt->isfloating || !c->isfloating) &&  isvisible(c, NULL))

                        resize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw, RESIZEHINTS);
 }
 
                        resize(c, mox, moy, mow - 2 * c->bw, moh - 2 * c->bw, RESIZEHINTS);
 }
 


@@ -1105,8 +1105,11 @@ movemouse(Client *c) {
                                ny = wy + wh - c->h - 2 * c->bw;
                        if(!c->isfloating && !lt->isfloating && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
                                togglefloating(NULL);
                                ny = wy + wh - c->h - 2 * c->bw;
                        if(!c->isfloating && !lt->isfloating && (abs(nx - c->x) > SNAP || abs(ny - c->y) > SNAP))
                                togglefloating(NULL);

-                       if((lt->isfloating) || c->isfloating)
+                       if(lt->isfloating || c->isfloating) {
+                               c->fx = nx;
+                               c->fy = ny;

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

+                       }

                        break;
                }
        }
                        break;
                }
        }


@@ -1114,7 +1117,7 @@ movemouse(Client *c) {
 
 Client *
 nexttiled(Client *c) {
 
 Client *
 nexttiled(Client *c) {

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

        return c;
 }
 
        return c;
 }
 


@@ -1261,10 +1264,16 @@ 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->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP))
+                       if(!c->isfloating && !lt->isfloating && (abs(nw - c->w) > SNAP || abs(nh - c->h) > SNAP)) {
+                               c->fx = c->x;
+                               c->fy = c->y;

                                togglefloating(NULL);
                                togglefloating(NULL);

-                       if((lt->isfloating) || c->isfloating)
+                       }
+                       if((lt->isfloating) || c->isfloating) {

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

+                               c->fw = nw;
+                               c->fh = nh;
+                       }

                        break;
                }
        }
                        break;
                }
        }


@@ -1284,16 +1293,11 @@ restack(void) {
        if(!lt->isfloating) {
                wc.stack_mode = Below;
                wc.sibling = barwin;
        if(!lt->isfloating) {
                wc.stack_mode = Below;
                wc.sibling = barwin;

-               if(!sel->isfloating) {
-                       XConfigureWindow(dpy, sel->win, CWSibling|CWStackMode, &wc);
-                       wc.sibling = sel->win;
-               }
-               for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
-                       if(c == sel)
-                               continue;
-                       XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
-                       wc.sibling = c->win;
-               }
+               for(c = stack; c; c = c->snext)
+                       if(!c->isfloating && isvisible(c, NULL)) {
+                               XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
+                               wc.sibling = c->win;
+                       }

        }
        XSync(dpy, False);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
        }
        XSync(dpy, False);
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));


@@ -1504,10 +1508,9 @@ setup(void) {
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 
        /* init tags */
                XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 
        /* init tags */

-       viewtags[0] = emallocz(TAGSZ);
-       viewtags[1] = emallocz(TAGSZ);
-       viewtags[0][0] = viewtags[1][0] = True;
-       seltags = viewtags[0];
+       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++) {


@@ -1700,10 +1703,10 @@ toggleview(const char *arg) {
        unsigned int i, j;
 
        i = idxoftag(arg);
        unsigned int i, j;
 
        i = idxoftag(arg);

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

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

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

        arrange();
 }
 
        arrange();
 }
 


@@ -1829,23 +1832,15 @@ updatewmhints(Client *c) {
 
 void
 view(const char *arg) {
 
 void
 view(const char *arg) {

-       Bool tmp[LENGTH(tags)];
-       unsigned int i;
-
-       for(i = 0; i < LENGTH(tags); i++)
-               tmp[i] = (NULL == arg);
-       tmp[idxoftag(arg)] = True;
-
-       if(memcmp(seltags, tmp, TAGSZ) != 0) {
-               seltags = viewtags[viewtags_set ^= 1];  /* toggle tagset */
-               memcpy(seltags, tmp, TAGSZ);
-               arrange();
-       }
+       seltags ^= 1;
+       memset(tagset[seltags], (NULL == arg), TAGSZ);
+       tagset[seltags][idxoftag(arg)] = True;
+       arrange();

 }
 
 void
 viewprevtag(const char *arg) {
 }
 
 void
 viewprevtag(const char *arg) {

-       seltags = viewtags[viewtags_set ^= 1];  /* toggle tagset */
+       seltags ^= 1; /* toggle sel tagset */

        arrange();
 }
 
        arrange();
 }
 


@@ -1860,6 +1855,7 @@ xerror(Display *dpy, XErrorEvent *ee) {
        || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
        || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
        || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
        || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
        || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
        || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)

+       || (ee->request_code == X_GrabButton && ee->error_code == BadAccess)

        || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
        || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
                return 0;
        || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
        || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
                return 0;


@@ -1885,14 +1881,14 @@ void
 zoom(const char *arg) {
        Client *c = sel;
 
 zoom(const char *arg) {
        Client *c = sel;
 

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

        if(c == nexttiled(clients))
        if(c == nexttiled(clients))

-               if(!(c = nexttiled(c->next)))
+               if(!c || !(c = nexttiled(c->next)))

                        return;
                        return;

-       detach(c);
-       attach(c);
-       focus(c);
+       if(!lt->isfloating && !sel->isfloating) {
+               detach(c);
+               attach(c);
+               focus(c);
+       }

        arrange();
 }
 
        arrange();
 }