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 79cd698..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))


@@ -176,31 +192,28 @@ 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);
        wc.border_width = c->border;
        grabbuttons(c, False);
        wc.border_width = c->border;

-       XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
-       XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
+       XConfigureWindow(dpy, w, CWBorderWidth, &wc);
+       XSetWindowBorder(dpy, w, dc.norm[ColBorder]);

        configure(c); /* propagates border_width, if size doesn't change */
        updatetitle(c);
        configure(c); /* propagates border_width, if size doesn't change */
        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;
+       if(!c->isversatile)
+               c->isversatile = (t != NULL) || c->isfixed;
+       attach(c);
+       attachstack(c);

        c->isbanned = True;
        c->isbanned = True;

-       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-       XMapWindow(dpy, c->win);
+       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


@@ -271,6 +284,14 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
        }
 }
 
        }
 }
 

+void
+toggleversatile(Arg arg) {
+       if(!sel || lt->arrange == versatile)
+               return;
+       sel->isversatile = !sel->isversatile;
+       lt->arrange();
+}
+

 void
 updatesizehints(Client *c) {
        long msize;
 void
 updatesizehints(Client *c) {
        long msize;


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

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

 }
 }