removed artefacts of single-linked list (thanx to Jukka, I must have been mad)

[dwm.git] / client.c

diff --git a/client.c b/client.c
index c20c517..fd91af5 100644 (file)
--- a/client.c
+++ b/client.c
@@ -73,8 +73,8 @@ focusnext(Arg *arg)
        if(sel->ismax)
                togglemax(NULL);
 
        if(sel->ismax)
                togglemax(NULL);
 

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

        if(c) {
                higher(c);
                focus(c);
        if(c) {
                higher(c);
                focus(c);


@@ -244,11 +244,11 @@ manage(Window w, XWindowAttributes *wa)
        c->next = clients;
        clients = c;
 
        c->next = clients;
        clients = c;
 

-       XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonPressMask,
+       XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,

                        GrabModeAsync, GrabModeSync, None, None);
                        GrabModeAsync, GrabModeSync, None, None);

-       XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonPressMask,
+       XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,

                        GrabModeAsync, GrabModeSync, None, None);
                        GrabModeAsync, GrabModeSync, None, None);

-       XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonPressMask,
+       XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,

                        GrabModeAsync, GrabModeSync, None, None);
 
        if(!c->isfloat)
                        GrabModeAsync, GrabModeSync, None, None);
 
        if(!c->isfloat)


@@ -260,36 +260,10 @@ manage(Window w, XWindowAttributes *wa)
        arrange(NULL);
 
        /* mapping the window now prevents flicker */
        arrange(NULL);
 
        /* mapping the window now prevents flicker */

-       if(c->tags[tsel]) {
-               XMapRaised(dpy, c->win);
-               XMapRaised(dpy, c->title);
+       XMapRaised(dpy, c->win);
+       XMapRaised(dpy, c->title);
+       if(c->tags[tsel])

                focus(c);
                focus(c);

-       }
-       else {
-               XMapRaised(dpy, c->win);
-               XMapRaised(dpy, c->title);
-
-       }
-}
-
-void
-pop(Client *c)
-{
-       Client **l;
-
-       for(l = &clients; *l && *l != c; l = &(*l)->next);
-       if(c->prev)
-               c->prev->next = c->next;
-       if(c->next)
-               c->next->prev = c->prev;
-       *l = c->next;
-
-       c->prev = NULL;
-       if(clients)
-               clients->prev = c;
-       c->next = clients;
-       clients = c;
-       arrange(NULL);

 }
 
 void
 }
 
 void


@@ -442,22 +416,20 @@ togglemax(Arg *arg)
 void
 unmanage(Client *c)
 {
 void
 unmanage(Client *c)
 {

-       Client **l;
-

        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XDestroyWindow(dpy, c->title);
 
        XGrabServer(dpy);
        XSetErrorHandler(xerrordummy);
 
        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
        XDestroyWindow(dpy, c->title);
 

-       for(l = &clients; *l && *l != c; l = &(*l)->next);

        if(c->prev)
                c->prev->next = c->next;
        if(c->next)
                c->next->prev = c->prev;
        if(c->prev)
                c->prev->next = c->next;
        if(c->next)
                c->next->prev = c->prev;

-       *l = c->next;
+       if(c == clients)
+               clients = c->next;

        if(sel == c) {
        if(sel == c) {

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

                if(!sel)
                        sel = getprev(c->prev);
                if(!sel)
                if(!sel)
                        sel = getprev(c->prev);
                if(!sel)


@@ -476,24 +448,21 @@ unmanage(Client *c)
 void
 zoom(Arg *arg)
 {
 void
 zoom(Arg *arg)
 {

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

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

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

                        sel = c;
        }
 
        /* pop */
                        sel = c;
        }
 
        /* pop */

-       for(l = &clients; *l && *l != sel; l = &(*l)->next);

        if(sel->prev)
                sel->prev->next = sel->next;
        if(sel->next)
                sel->next->prev = sel->prev;
        if(sel->prev)
                sel->prev->next = sel->next;
        if(sel->next)
                sel->next->prev = sel->prev;

-       *l = sel->next;
-

        sel->prev = NULL;
        if(clients)
                clients->prev = sel;
        sel->prev = NULL;
        if(clients)
                clients->prev = sel;