Added tag 3.7 for changeset baee494346e5

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 45f2d19..d180278 100644 (file)
--- a/client.c
+++ b/client.c
@@ -9,6 +9,20 @@
 
 /* static */
 
 
 /* static */
 

+static void
+attachstack(Client *c) {
+       c->snext = stack;
+       stack = c;
+}
+
+static void
+detachstack(Client *c) {
+       Client **tc;
+
+       for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+       *tc = c->snext;
+}
+

 static void
 grabbuttons(Client *c, Bool focused) {
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 static void
 grabbuttons(Client *c, Bool focused) {
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);


@@ -64,6 +78,7 @@ isprotodel(Client *c) {
 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);
 }


@@ -83,12 +98,6 @@ attach(Client *c) {
        clients = c;
 }
 
        clients = c;
 }
 

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

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


@@ -118,13 +127,6 @@ detach(Client *c) {
        c->next = c->prev = NULL;
 }
 
        c->next = c->prev = NULL;
 }
 

-void
-detachstack(Client *c) {
-       Client **tc;
-       for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
-       *tc = c->snext;
-}
-

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


@@ -151,49 +153,7 @@ focus(Client *c) {
 }
 
 void
 }
 
 void

-focusnext(Arg *arg) {
-       Client *c;
-   
-       if(!sel)
-               return;
-       for(c = sel->next; c && !isvisible(c); c = c->next);
-       if(!c)
-               for(c = clients; c && !isvisible(c); c = c->next);
-       if(c) {
-               focus(c);
-               restack();
-       }
-}
-
-void
-focusprev(Arg *arg) {
-       Client *c;
-
-       if(!sel)
-               return;
-       for(c = sel->prev; c && !isvisible(c); c = c->prev);
-       if(!c) {
-               for(c = clients; c && c->next; c = c->next);
-               for(; c && !isvisible(c); c = c->prev);
-       }
-       if(c) {
-               focus(c);
-               restack();
-       }
-}
-
-Client *
-getclient(Window w) {
-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(c->win == w)
-                       return c;
-       return NULL;
-}
-
-void
-killclient(Arg *arg) {
+killclient(const char *arg) {

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


@@ -232,28 +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(!c->isfloating)
+               c->isfloating = (t != NULL) || c->isfixed;

        attach(c);
        attachstack(c);
        c->isbanned = True;
        attach(c);
        attachstack(c);
        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


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

+void
+togglefloating(const char *arg) {
+       if(!sel || lt->arrange == floating)
+               return;
+       sel->isfloating = !sel->isfloating;
+       lt->arrange();
+}
+

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


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

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

 }
 }