dwm-meillo

diff draw.h @ 26:e8f627998d6f

simplified several portions of code through replacing rect structs with x,y,h,w counterparts (much more readable)
author Anselm R. Garbe <garbeam@wmii.de>
date Wed, 12 Jul 2006 15:17:22 +0200
parents e5018cae273f
children
line diff
     1.1 --- a/draw.h	Wed Jul 12 00:53:11 2006 +0200
     1.2 +++ b/draw.h	Wed Jul 12 15:17:22 2006 +0200
     1.3 @@ -20,7 +20,7 @@
     1.4  struct Brush {
     1.5  	GC gc;
     1.6  	Drawable drawable;
     1.7 -	XRectangle rect;
     1.8 +	int x, y, w, h;
     1.9  	Fnt font;
    1.10  	unsigned long bg;
    1.11  	unsigned long fg;
    1.12 @@ -31,6 +31,6 @@
    1.13  extern void loadcolors(Display *dpy, int screen, Brush *b,
    1.14  		const char *bg, const char *fg, const char *bo);
    1.15  extern void loadfont(Display *dpy, Fnt *font, const char *fontstr);
    1.16 -extern unsigned int textwidth_l(Fnt *font, char *text, unsigned int len);
    1.17 -extern unsigned int textwidth(Fnt *font, char *text);
    1.18 -extern unsigned int labelheight(Fnt *font);
    1.19 +extern unsigned int textnw(Fnt *font, char *text, unsigned int len);
    1.20 +extern unsigned int textw(Fnt *font, char *text);
    1.21 +extern unsigned int texth(Fnt *font);