applied yiyus domax patch with slight modifications

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 483641c..352e9db 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -52,6 +52,7 @@
 #define MAXTAGLEN       16
 #define MOUSEMASK       (BUTTONMASK|PointerMotionMask)
 #define TAGMASK         ((int)((1LL << LENGTH(tags)) - 1))
 #define MAXTAGLEN       16
 #define MOUSEMASK       (BUTTONMASK|PointerMotionMask)
 #define TAGMASK         ((int)((1LL << LENGTH(tags)) - 1))

+#define VISIBLE(x)      ((x)->tags & tagset[seltags])

 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */


@@ -70,7 +71,7 @@ struct Client {
        int minax, maxax, minay, maxay;
        long flags;
        int bw, oldbw;
        int minax, maxax, minay, maxay;
        long flags;
        int bw, oldbw;

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

        uint tags;
        Client *next;
        Client *prev;
        uint tags;
        Client *next;
        Client *prev;


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


@@ -149,7 +149,6 @@ void initfont(const char *fontstr);
 Bool isoccupied(uint t);
 Bool isprotodel(Client *c);
 Bool isurgent(uint t);
 Bool isoccupied(uint t);
 Bool isprotodel(Client *c);
 Bool isurgent(uint t);

-Bool isvisible(Client *c);

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


@@ -176,9 +175,9 @@ void tileresize(Client *c, int x, int y, int w, int h);
 void togglebar(const void *arg);
 void togglefloating(const void *arg);
 void togglelayout(const void *arg);
 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 toggletag(const void *arg);
 void toggleview(const void *arg);

-void unban(Client *c);

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


@@ -217,6 +216,7 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];
        [UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];

+Bool domax = False;

 Bool otherwm, readin;
 Bool running = True;
 uint tagset[] = {1, 1}; /* after start, first tag is selected */
 Bool otherwm, readin;
 Bool running = True;
 uint tagset[] = {1, 1}; /* after start, first tag is selected */


@@ -267,16 +267,17 @@ arrange(void) {
        Client *c;
 
        for(c = clients; c; c = c->next)
        Client *c;
 
        for(c = clients; c; c = c->next)

-               if(isvisible(c)) {
-                       unban(c);
+               if(VISIBLE(c)) {

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

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

 
        focus(NULL);
 
        focus(NULL);

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

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


@@ -295,14 +296,6 @@ 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) {
        uint i, x, mask;
 void
 buttonpress(XEvent *e) {
        uint i, x, mask;


@@ -330,23 +323,23 @@ buttonpress(XEvent *e) {
                                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 || domax)

                        return;
                        return;

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

                        movemouse(c);
                        movemouse(c);

-               }

                else if(ev->button == Button2)
                        togglefloating(NULL);
                else if(ev->button == Button2)
                        togglefloating(NULL);

-               else if(ev->button == Button3 && !c->isfixed) {
-                       restack();
+               else if(ev->button == Button3 && !c->isfixed)

                        resizemouse(c);
                        resizemouse(c);

-               }

        }
 }
 
        }
 }
 


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

-       while(stack) {
-               unban(stack);
+       view(NULL);
+       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


@@ -444,7 +436,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(VISIBLE(c))

                                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,7 +489,7 @@ drawbar(void) {
        Client *c;
 
        dc.x = 0;
        Client *c;
 
        dc.x = 0;

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

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


@@ -512,7 +504,7 @@ drawbar(void) {
        }
        if(blw > 0) {
                dc.w = blw;
        }
        if(blw > 0) {
                dc.w = blw;

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

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


@@ -628,8 +620,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 && !VISIBLE(c)))
+               for(c = stack; c && !VISIBLE(c); 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]);


@@ -641,6 +633,10 @@ focus(Client *c) {
        }
        sel = c;
        if(c) {
        }
        sel = c;
        if(c) {

+               if(domax) {
+                       XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
+                       c->ismax = True;
+               }

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


@@ -663,9 +659,9 @@ focusnext(const void *arg) {
 
        if(!sel)
                return;
 
        if(!sel)
                return;

-       for(c = sel->next; c && !isvisible(c); c = c->next);
+       for(c = sel->next; c && !VISIBLE(c); c = c->next);

        if(!c)
        if(!c)

-               for(c = clients; c && !isvisible(c); c = c->next);
+               for(c = clients; c && !VISIBLE(c); c = c->next);

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


@@ -678,10 +674,10 @@ focusprev(const void *arg) {
 
        if(!sel)
                return;
 
        if(!sel)
                return;

-       for(c = sel->prev; c && !isvisible(c); c = c->prev);
+       for(c = sel->prev; c && !VISIBLE(c); 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 && !VISIBLE(c); c = c->prev);

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


@@ -873,11 +869,6 @@ isurgent(uint t) {
        return False;
 }
 
        return False;
 }
 

-Bool
-isvisible(Client *c) {
-       return c->tags & tagset[seltags];
-}
-

 void
 keypress(XEvent *e) {
        uint i;
 void
 keypress(XEvent *e) {
        uint i;


@@ -965,7 +956,6 @@ manage(Window w, XWindowAttributes *wa) {
        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();


@@ -1000,6 +990,7 @@ movemouse(Client *c) {
        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,


@@ -1043,7 +1034,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 || !VISIBLE(c)); c = c->next);

        return c;
 }
 
        return c;
 }
 


@@ -1135,7 +1126,8 @@ 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(c->x != x || c->y != y || c->w != w || c->h != h || c->isbanned || c->ismax) {
+               c->isbanned = c->ismax = 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;


@@ -1154,6 +1146,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,


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

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

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

-       if(lt->arrange) {
+       if(!domax && 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)) {
+                       if(!c->isfloating && VISIBLE(c)) {

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


@@ -1536,6 +1529,12 @@ togglelayout(const void *arg) {
                drawbar();
 }
 
                drawbar();
 }
 

+void
+togglemax(const void *arg) {
+       domax = !domax;
+       arrange();
+}
+

 void
 toggletag(const void *arg) {
        if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) {
 void
 toggletag(const void *arg) {
        if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) {


@@ -1552,14 +1551,6 @@ toggleview(const void *arg) {
        }
 }
 
        }
 }
 

-void
-unban(Client *c) {
-       if(!c->isbanned)
-               return;
-       XMoveWindow(dpy, c->win, c->x, c->y);
-       c->isbanned = False;
-}
-

 void
 unmanage(Client *c) {
        XWindowChanges wc;
 void
 unmanage(Client *c) {
        XWindowChanges wc;