1.1 --- a/client.c	Fri Jul 14 22:33:38 2006 +0200
     1.2 +++ b/client.c	Fri Jul 14 22:54:09 2006 +0200
     1.3 @@ -17,14 +17,14 @@
     1.4  };
     1.5  
     1.6  Client *
     1.7 -next(Client *c)
     1.8 +getnext(Client *c)
     1.9  {
    1.10  	for(; c && !c->tags[tsel]; c = c->next);
    1.11  	return c;
    1.12  }
    1.13  
    1.14  void
    1.15 -ban_client(Client *c)
    1.16 +ban(Client *c)
    1.17  {
    1.18  	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
    1.19  	XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
    1.20 @@ -48,7 +48,7 @@
    1.21  }
    1.22  
    1.23  void
    1.24 -update_name(Client *c)
    1.25 +settitle(Client *c)
    1.26  {
    1.27  	XTextProperty name;
    1.28  	int n;
    1.29 @@ -76,7 +76,7 @@
    1.30  }
    1.31  
    1.32  void
    1.33 -update_size(Client *c)
    1.34 +setsize(Client *c)
    1.35  {
    1.36  	XSizeHints size;
    1.37  	long msize;
    1.38 @@ -114,7 +114,7 @@
    1.39  }
    1.40  
    1.41  void
    1.42 -craise(Client *c)
    1.43 +higher(Client *c)
    1.44  {
    1.45  	XRaiseWindow(dpy, c->win);
    1.46  	XRaiseWindow(dpy, c->title);
    1.47 @@ -136,8 +136,8 @@
    1.48  	XFlush(dpy);
    1.49  	sel = c;
    1.50  	if(old && old != c)
    1.51 -		draw_client(old);
    1.52 -	draw_client(c);
    1.53 +		drawtitle(old);
    1.54 +	drawtitle(c);
    1.55  	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
    1.56  	XFlush(dpy);
    1.57  	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
    1.58 @@ -196,8 +196,8 @@
    1.59  	c->h = wa->height;
    1.60  	c->th = bh;
    1.61  	c->border = 1;
    1.62 -	c->proto = win_proto(c->win);
    1.63 -	update_size(c);
    1.64 +	c->proto = proto(c->win);
    1.65 +	setsize(c);
    1.66  	XSelectInput(dpy, c->win,
    1.67  			StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
    1.68  	XGetTransientForHint(dpy, c->win, &trans);
    1.69 @@ -210,7 +210,7 @@
    1.70  			DefaultVisual(dpy, screen),
    1.71  			CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
    1.72  
    1.73 -	update_name(c);
    1.74 +	settitle(c);
    1.75  	init_tags(c);
    1.76  
    1.77  	for(l = &clients; *l; l = &(*l)->next);
    1.78 @@ -236,7 +236,7 @@
    1.79  		focus(c);
    1.80  	}
    1.81  	else {
    1.82 -		ban_client(c);
    1.83 +		ban(c);
    1.84  		XMapRaised(dpy, c->win);
    1.85  		XMapRaised(dpy, c->title);
    1.86  	}
    1.87 @@ -339,7 +339,7 @@
    1.88  }
    1.89  
    1.90  static int
    1.91 -dummy_error_handler(Display *dsply, XErrorEvent *err)
    1.92 +dummy_xerror(Display *dsply, XErrorEvent *err)
    1.93  {
    1.94  	return 0;
    1.95  }
    1.96 @@ -350,7 +350,7 @@
    1.97  	Client **l;
    1.98  
    1.99  	XGrabServer(dpy);
   1.100 -	XSetErrorHandler(dummy_error_handler);
   1.101 +	XSetErrorHandler(dummy_xerror);
   1.102  
   1.103  	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
   1.104  	XDestroyWindow(dpy, c->title);
   1.105 @@ -366,7 +366,7 @@
   1.106  	free(c);
   1.107  
   1.108  	XFlush(dpy);
   1.109 -	XSetErrorHandler(error_handler);
   1.110 +	XSetErrorHandler(xerror);
   1.111  	XUngrabServer(dpy);
   1.112  	arrange(NULL);
   1.113  	if(sel)