1.1 --- a/client.c	Fri Jul 21 21:15:39 2006 +0200
     1.2 +++ b/client.c	Tue Aug 01 11:49:19 2006 +0200
     1.3 @@ -73,8 +73,8 @@
     1.4  	if(sel->ismax)
     1.5  		togglemax(NULL);
     1.6  
     1.7 -	if(!(c = getnext(sel->next, tsel)))
     1.8 -		c = getnext(clients, tsel);
     1.9 +	if(!(c = getnext(sel->next)))
    1.10 +		c = getnext(clients);
    1.11  	if(c) {
    1.12  		higher(c);
    1.13  		focus(c);
    1.14 @@ -260,36 +260,10 @@
    1.15  	arrange(NULL);
    1.16  
    1.17  	/* mapping the window now prevents flicker */
    1.18 -	if(c->tags[tsel]) {
    1.19 -		XMapRaised(dpy, c->win);
    1.20 -		XMapRaised(dpy, c->title);
    1.21 +	XMapRaised(dpy, c->win);
    1.22 +	XMapRaised(dpy, c->title);
    1.23 +	if(c->tags[tsel])
    1.24  		focus(c);
    1.25 -	}
    1.26 -	else {
    1.27 -		XMapRaised(dpy, c->win);
    1.28 -		XMapRaised(dpy, c->title);
    1.29 -
    1.30 -	}
    1.31 -}
    1.32 -
    1.33 -void
    1.34 -pop(Client *c)
    1.35 -{
    1.36 -	Client **l;
    1.37 -
    1.38 -	for(l = &clients; *l && *l != c; l = &(*l)->next);
    1.39 -	if(c->prev)
    1.40 -		c->prev->next = c->next;
    1.41 -	if(c->next)
    1.42 -		c->next->prev = c->prev;
    1.43 -	*l = c->next;
    1.44 -
    1.45 -	c->prev = NULL;
    1.46 -	if(clients)
    1.47 -		clients->prev = c;
    1.48 -	c->next = clients;
    1.49 -	clients = c;
    1.50 -	arrange(NULL);
    1.51  }
    1.52  
    1.53  void
    1.54 @@ -457,7 +431,7 @@
    1.55  		c->next->prev = c->prev;
    1.56  	*l = c->next;
    1.57  	if(sel == c) {
    1.58 -		sel = getnext(c->next, tsel);
    1.59 +		sel = getnext(c->next);
    1.60  		if(!sel)
    1.61  			sel = getprev(c->prev);
    1.62  		if(!sel)
    1.63 @@ -481,8 +455,8 @@
    1.64  	if(!sel)
    1.65  		return;
    1.66  
    1.67 -	if(sel == getnext(clients, tsel) && sel->next)  {
    1.68 -		if((c = getnext(sel->next, tsel)))
    1.69 +	if(sel == getnext(clients) && sel->next)  {
    1.70 +		if((c = getnext(sel->next)))
    1.71  			sel = c;
    1.72  	}
    1.73