From a3e52a291110ce7b866a0d11eeda1619d25f952b Mon Sep 17 00:00:00 2001 From: okan Date: Fri, 11 Jul 2008 14:21:28 +0000 Subject: spacing, declaration lineup to be consistent throughout cwm, readability, and a bit of knf. ok oga@ --- font.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'font.c') diff --git a/font.c b/font.c index 85f54e5..ea200e5 100644 --- a/font.c +++ b/font.c @@ -22,7 +22,7 @@ void font_init(struct screen_ctx *sc) { - XColor xcolor, tmp; + XColor xcolor, tmp; sc->xftdraw = XftDrawCreate(X_Dpy, sc->rootwin, DefaultVisual(X_Dpy, sc->which), DefaultColormap(X_Dpy, sc->which)); @@ -43,7 +43,8 @@ font_init(struct screen_ctx *sc) int font_width(const char *text, int len) { - XGlyphInfo extents; + XGlyphInfo extents; + XftTextExtents8(X_Dpy, Conf.DefaultFont, (const XftChar8*)text, len, &extents); @@ -63,9 +64,9 @@ font_draw(struct screen_ctx *sc, const char *text, int len, XftFont * font_make(struct screen_ctx *sc, const char *name) { - XftFont *fn = NULL; - FcPattern *pat, *patx; - XftResult res; + XftFont *fn = NULL; + FcPattern *pat, *patx; + XftResult res; if ((pat = FcNameParse(name)) == NULL) return (NULL); -- cgit v1.2.3-2-gb3c3