several changes, made togglemax extern and separated it from zoom() - moved zoom...

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 486efe9..3d9cd40 100644 (file)
--- a/client.c
+++ b/client.c
@@ -9,9 +9,16 @@
 
 /* static */
 
 
 /* static */
 

+static void
+attachstack(Client *c) {
+       c->snext = stack;
+       stack = c;
+}
+

 static void
 detachstack(Client *c) {
        Client **tc;
 static void
 detachstack(Client *c) {
        Client **tc;

+

        for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
        *tc = c->snext;
 }
        for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
        *tc = c->snext;
 }


@@ -53,9 +60,25 @@ grabbuttons(Client *c, Bool focused) {
                                GrabModeAsync, GrabModeSync, None, None);
 }
 
                                GrabModeAsync, GrabModeSync, None, None);
 }
 

+static Bool
+isprotodel(Client *c) {
+       int i, n;
+       Atom *protocols;
+       Bool ret = False;
+
+       if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
+               for(i = 0; !ret && i < n; i++)
+                       if(protocols[i] == wmatom[WMDelete])
+                               ret = True;
+               XFree(protocols);
+       }
+       return ret;
+}
+

 static void
 setclientstate(Client *c, long state) {
        long data[] = {state, None};
 static void
 setclientstate(Client *c, long state) {
        long data[] = {state, None};

+

        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
                        PropModeReplace, (unsigned char *)data, 2);
 }
        XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
                        PropModeReplace, (unsigned char *)data, 2);
 }


@@ -67,6 +90,14 @@ xerrordummy(Display *dsply, XErrorEvent *ee) {
 
 /* extern */
 
 
 /* extern */
 

+void
+attach(Client *c) {
+       if(clients)
+               clients->prev = c;
+       c->next = clients;
+       clients = c;
+}
+

 void
 configure(Client *c) {
        XConfigureEvent ce;
 void
 configure(Client *c) {
        XConfigureEvent ce;


@@ -85,6 +116,17 @@ configure(Client *c) {
        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
 }
 
        XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
 }
 

+void
+detach(Client *c) {
+       if(c->prev)
+               c->prev->next = c->next;
+       if(c->next)
+               c->next->prev = c->prev;
+       if(c == clients)
+               clients = c->next;
+       c->next = c->prev = NULL;
+}
+

 void
 focus(Client *c) {
        if(c && !isvisible(c))
 void
 focus(Client *c) {
        if(c && !isvisible(c))


@@ -95,8 +137,7 @@ focus(Client *c) {
        }
        if(c) {
                detachstack(c);
        }
        if(c) {
                detachstack(c);

-               c->snext = stack;
-               stack = c;
+               attachstack(c);

                grabbuttons(c, True);
        }
        sel = c;
                grabbuttons(c, True);
        }
        sel = c;


@@ -111,33 +152,8 @@ focus(Client *c) {
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 }
 
                XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 }
 

-Client *
-getclient(Window w) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(c->win == w)
-                       return c;
-       return NULL;
-}
-
-Bool
-isprotodel(Client *c) {
-       int i, n;
-       Atom *protocols;
-       Bool ret = False;
-
-       if(XGetWMProtocols(dpy, c->win, &protocols, &n)) {
-               for(i = 0; !ret && i < n; i++)
-                       if(protocols[i] == wmatom[WMDelete])
-                               ret = True;
-               XFree(protocols);
-       }
-       return ret;
-}
-

 void
 void

-killclient(Arg *arg) {
+killclient(Arg arg) {

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


@@ -150,6 +166,7 @@ void
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t;
        Window trans;
 manage(Window w, XWindowAttributes *wa) {
        Client *c, *t;
        Window trans;

+       XWindowChanges wc;

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


@@ -175,49 +192,50 @@ manage(Window w, XWindowAttributes *wa) {
                        c->y = way;
        }
        updatesizehints(c);
                        c->y = way;
        }
        updatesizehints(c);

-       XSelectInput(dpy, c->win,
+       XSelectInput(dpy, w,

                StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
                StructureNotifyMask | PropertyChangeMask | EnterWindowMask);

-       XGetTransientForHint(dpy, c->win, &trans);
+       XGetTransientForHint(dpy, w, &trans);

        grabbuttons(c, False);
        grabbuttons(c, False);

-       XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+       wc.border_width = c->border;
+       XConfigureWindow(dpy, w, CWBorderWidth, &wc);
+       XSetWindowBorder(dpy, w, dc.norm[ColBorder]);
+       configure(c); /* propagates border_width, if size doesn't change */

        updatetitle(c);
        updatetitle(c);

-       t = getclient(trans);
+       for(t = clients; t && t->win != trans; t = t->next);

        settags(c, t);
        settags(c, t);

-       if(!c->isfloat)
-               c->isfloat = (t != 0) || c->isfixed;
-       if(clients)
-               clients->prev = c;
-       c->next = clients;
-       c->snext = stack;
-       stack = clients = c;
-       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-       XMapWindow(dpy, c->win);
+       if(!c->isversatile)
+               c->isversatile = (t != NULL) || c->isfixed;
+       attach(c);
+       attachstack(c);
+       c->isbanned = True;
+       XMoveWindow(dpy, w, c->x + 2 * sw, c->y);
+       XMapWindow(dpy, w);

        setclientstate(c, NormalState);
        if(isvisible(c))
                focus(c);
        setclientstate(c, NormalState);
        if(isvisible(c))
                focus(c);

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

 }
 
 void
 }
 
 void

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

        float actual, dx, dy, max, min;
        XWindowChanges wc;
 
        float actual, dx, dy, max, min;
        XWindowChanges wc;
 

-       if(c->w <= 0 || c->h <= 0)
+       if(w <= 0 || h <= 0)

                return;
        if(sizehints) {
                return;
        if(sizehints) {

-               if(c->minw && c->w < c->minw)
-                       c->w = c->minw;
-               if(c->minh && c->h < c->minh)
-                       c->h = c->minh;
-               if(c->maxw && c->w > c->maxw)
-                       c->w = c->maxw;
-               if(c->maxh && c->h > c->maxh)
-                       c->h = c->maxh;
+               if(c->minw && w < c->minw)
+                       w = c->minw;
+               if(c->minh && h < c->minh)
+                       h = c->minh;
+               if(c->maxw && w > c->maxw)
+                       w = c->maxw;
+               if(c->maxh && h > c->maxh)
+                       h = c->maxh;

                /* inspired by algorithm from fluxbox */
                /* inspired by algorithm from fluxbox */

-               if(c->minay > 0 && c->maxay && (c->h - c->baseh) > 0) {
-                       dx = (float)(c->w - c->basew);
-                       dy = (float)(c->h - c->baseh);
+               if(c->minay > 0 && c->maxay && (h - c->baseh) > 0) {
+                       dx = (float)(w - c->basew);
+                       dy = (float)(h - c->baseh);

                        min = (float)(c->minax) / (float)(c->minay);
                        max = (float)(c->maxax) / (float)(c->maxay);
                        actual = dx / dy;
                        min = (float)(c->minax) / (float)(c->minay);
                        max = (float)(c->maxax) / (float)(c->maxay);
                        actual = dx / dy;


@@ -225,43 +243,53 @@ resize(Client *c, Bool sizehints) {
                                if(actual < min) {
                                        dy = (dx * min + dy) / (min * min + 1);
                                        dx = dy * min;
                                if(actual < min) {
                                        dy = (dx * min + dy) / (min * min + 1);
                                        dx = dy * min;

-                                       c->w = (int)dx + c->basew;
-                                       c->h = (int)dy + c->baseh;
+                                       w = (int)dx + c->basew;
+                                       h = (int)dy + c->baseh;

                                }
                                else if(actual > max) {
                                        dy = (dx * min + dy) / (max * max + 1);
                                        dx = dy * min;
                                }
                                else if(actual > max) {
                                        dy = (dx * min + dy) / (max * max + 1);
                                        dx = dy * min;

-                                       c->w = (int)dx + c->basew;
-                                       c->h = (int)dy + c->baseh;
+                                       w = (int)dx + c->basew;
+                                       h = (int)dy + c->baseh;

                                }
                        }
                }
                if(c->incw)
                                }
                        }
                }
                if(c->incw)

-                       c->w -= (c->w - c->basew) % c->incw;
+                       w -= (w - c->basew) % c->incw;

                if(c->inch)
                if(c->inch)

-                       c->h -= (c->h - c->baseh) % c->inch;
+                       h -= (h - c->baseh) % c->inch;

        }
        }

-       if(c->w == sw && c->h == sh)
+       if(w == sw && h == sh)

                c->border = 0;
        else
                c->border = BORDERPX;
        /* offscreen appearance fixes */
                c->border = 0;
        else
                c->border = BORDERPX;
        /* offscreen appearance fixes */

-       if(c->x > sw)
-               c->x = sw - c->w - 2 * c->border;
-       if(c->y > sh)
-               c->y = sh - c->h - 2 * c->border;
-       if(c->x + c->w + 2 * c->border < sx)
-               c->x = sx;
-       if(c->y + c->h + 2 * c->border < sy)
-               c->y = sy;
-       wc.x = c->x;
-       wc.y = c->y;
-       wc.width = c->w;
-       wc.height = c->h;
-       wc.border_width = c->border;
-       XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
-       configure(c);
-       XSync(dpy, False);
+       if(x > sw)
+               x = sw - w - 2 * c->border;
+       if(y > sh)
+               y = sh - h - 2 * c->border;
+       if(x + w + 2 * c->border < sx)
+               x = sx;
+       if(y + h + 2 * c->border < sy)
+               y = sy;
+       if(c->x != x || c->y != y || c->w != w || c->h != h) {
+               c->x = wc.x = x;
+               c->y = wc.y = y;
+               c->w = wc.width = w;
+               c->h = wc.height = h;
+               wc.border_width = c->border;
+               XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth, &wc);
+               configure(c);
+               XSync(dpy, False);
+       }
+}
+
+void
+toggleversatile(Arg arg) {
+       if(!sel || lt->arrange == versatile)
+               return;
+       sel->isversatile = !sel->isversatile;
+       lt->arrange();

 }
 
 void
 }
 
 void


@@ -354,5 +382,5 @@ unmanage(Client *c) {
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);
        XSync(dpy, False);
        XSetErrorHandler(xerror);
        XUngrabServer(dpy);

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

 }
 }