pop on heretag

[dwm.git] / client.c

diff --git a/client.c b/client.c
index 158b928..fa48644 100644 (file)
--- a/client.c
+++ b/client.c
@@ -66,8 +66,8 @@ focusnext(Arg *arg)
        if(!sel)
                return;
 
        if(!sel)
                return;
 

-       if(!(c = getnext(sel->next)))
-               c = getnext(clients);
+       if(!(c = getnext(sel->next, tsel)))
+               c = getnext(clients, tsel);

        if(c) {
                higher(c);
                c->revert = sel;
        if(c) {
                higher(c);
                c->revert = sel;


@@ -192,7 +192,7 @@ lower(Client *c)
 void
 manage(Window w, XWindowAttributes *wa)
 {
 void
 manage(Window w, XWindowAttributes *wa)
 {

-       Client *c, **l;
+       Client *c;

        XSetWindowAttributes twa;
        Window trans;
 
        XSetWindowAttributes twa;
        Window trans;
 


@@ -223,10 +223,11 @@ manage(Window w, XWindowAttributes *wa)
        settitle(c);
        settags(c);
 
        settitle(c);
        settags(c);
 

-       for(l = &clients; *l; l = &(*l)->next);
-       c->next = *l; /* *l == nil */
-       *l = c;
+       c->next = clients;
+       clients = c;

 
 

+       XGrabButton(dpy, Button1, ControlMask, c->win, False, ButtonPressMask,
+                       GrabModeAsync, GrabModeSync, None, None);

        XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
        XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
                        GrabModeAsync, GrabModeSync, None, None);
        XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,


@@ -234,8 +235,8 @@ manage(Window w, XWindowAttributes *wa)
        XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
                        GrabModeAsync, GrabModeSync, None, None);
 
        XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
                        GrabModeAsync, GrabModeSync, None, None);
 

-       if(!c->dofloat)
-               c->dofloat = trans
+       if(!c->isfloat)
+               c->isfloat = trans

                        || ((c->maxw == c->minw) && (c->maxh == c->minh));
 
        arrange(NULL);
                        || ((c->maxw == c->minw) && (c->maxh == c->minh));
 
        arrange(NULL);


@@ -249,6 +250,7 @@ manage(Window w, XWindowAttributes *wa)
                ban(c);
                XMapRaised(dpy, c->win);
                XMapRaised(dpy, c->title);
                ban(c);
                XMapRaised(dpy, c->win);
                XMapRaised(dpy, c->title);

+               XSync(dpy, False);

        }
 }
 
        }
 }
 


@@ -265,6 +267,18 @@ maximize(Arg *arg)
        resize(sel, False);
 }
 
        resize(sel, False);
 }
 

+void
+pop(Client *c)
+{
+       Client **l;
+       for(l = &clients; *l && *l != c; l = &(*l)->next);
+       *l = c->next;
+
+       c->next = clients; /* pop */
+       clients = c;
+       arrange(NULL);
+}
+

 void
 resize(Client *c, Bool inc)
 {
 void
 resize(Client *c, Bool inc)
 {


@@ -403,21 +417,16 @@ unmanage(Client *c)
 void
 zoom(Arg *arg)
 {
 void
 zoom(Arg *arg)
 {

-       Client **l, *c;
+       Client *c;

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

-       if(sel == getnext(clients) && sel->next)  {
-               if((c = getnext(sel->next)))
+       if(sel == getnext(clients, tsel) && sel->next)  {
+               if((c = getnext(sel->next, tsel)))

                        sel = c;
        }
 
                        sel = c;
        }
 

-       for(l = &clients; *l && *l != sel; l = &(*l)->next);
-       *l = sel->next;
-
-       sel->next = clients; /* pop */
-       clients = sel;
-       arrange(NULL);
+       pop(sel);

        focus(sel);
 }
        focus(sel);
 }