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 45acf2e..fd91af5 100644 (file)
--- a/client.c
+++ b/client.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)


@@ -416,20 +416,18 @@ 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) {
                sel = getnext(c->next);
                if(!sel)
        if(sel == c) {
                sel = getnext(c->next);
                if(!sel)


@@ -450,7 +448,7 @@ unmanage(Client *c)
 void
 zoom(Arg *arg)
 {
 void
 zoom(Arg *arg)
 {

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

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


@@ -461,13 +459,10 @@ zoom(Arg *arg)
        }
 
        /* pop */
        }
 
        /* 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;