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

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index ee0c810..56ca615 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -112,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;


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


@@ -241,13 +241,15 @@ Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
 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 */
 


@@ -285,7 +287,7 @@ 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);
                        if(lt->isfloating || c->isfloating)
                                resize(c, c->fx, c->fy, c->fw, c->fh, True);
                        unban(c);
                        if(lt->isfloating || c->isfloating)
                                resize(c, c->fx, c->fy, c->fw, c->fh, True);


@@ -467,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


@@ -534,7 +536,7 @@ 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]);
                if(tagset[seltags][i]) {
        for(i = 0; i < LENGTH(tags); i++) {
                dc.w = textw(tags[i]);
                if(tagset[seltags][i]) {


@@ -674,8 +676,8 @@ expose(XEvent *e) {
 
 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]);


@@ -709,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();


@@ -724,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);


@@ -928,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] && tagset[seltags][i])
+               if(c->tags[i] && cmp[i])

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


@@ -1059,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);
 }
 


@@ -1113,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;
 }
 


@@ -1290,7 +1294,7 @@ restack(void) {
                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)) {
+                       if(!c->isfloating && isvisible(c, NULL)) {

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


@@ -1851,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;