simplified several portions of code through replacing rect structs with x,y,h,w count...

[dwm.git] / font.c

diff --git a/font.c b/font.c
deleted file mode 100644 (file)
index a6b8225..0000000
--- a/font.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <locale.h>
-
-unsigned int
-textwidth_l(BlitzFont *font, char *text, unsigned int len)
-{
-       if(font->set) {
-               XRectangle r;
-               XmbTextExtents(font->set, text, len, nil, &r);
-               return r.width;
-       }
-       return XTextWidth(font->xfont, text, len);
-}
-
-unsigned int
-textwidth(BlitzFont *font, char *text)
-{
-       return blitz_textwidth_l(font, text, strlen(text));
-}
-
-void
-loadfont(Blitz *blitz, BlitzFont *font)
-{
-       char *fontname = font->fontstr;
-       char **missing = nil, *def = "?";
-       int n;
-
-       setlocale(LC_ALL, "");
-       if(font->set)
-               XFreeFontSet(blitz->dpy, font->set);
-       font->set = XCreateFontSet(blitz->dpy, fontname, &missing, &n, &def);
-       if(missing) {
-               while(n--)
-                       fprintf(stderr, "missing fontset: %s\n", missing[n]);
-               XFreeStringList(missing);
-               if(font->set) {
-                       XFreeFontSet(blitz->dpy, font->set);
-                       font->set = nil;
-               }
-       }
-       if(font->set) {
-               XFontSetExtents *font_extents;
-               XFontStruct **xfonts;
-               char **font_names;
-               unsigned int i;
-
-               font->ascent = font->descent = 0;
-               font_extents = XExtentsOfFontSet(font->set);
-               n = XFontsOfFontSet(font->set, &xfonts, &font_names);
-               for(i = 0, font->ascent = 0, font->descent = 0; i < n; i++) {
-                       if(font->ascent < (*xfonts)->ascent)
-                               font->ascent = (*xfonts)->ascent;
-                       if(font->descent < (*xfonts)->descent)
-                               font->descent = (*xfonts)->descent;
-                       xfonts++;
-               }
-       }
-       else {
-               if(font->xfont)
-                       XFreeFont(blitz->dpy, font->xfont);
-               font->xfont = nil;
-               font->xfont = XLoadQueryFont(blitz->dpy, fontname);
-               if (!font->xfont) {
-                       fontname = "fixed";
-                       font->xfont = XLoadQueryFont(blitz->dpy, fontname);
-               }
-               if (!font->xfont) {
-                       fprintf(stderr, "%s", "error, cannot load 'fixed' font\n");
-                       exit(1);
-               }
-               font->ascent = font->xfont->ascent;
-               font->descent = font->xfont->descent;
-       }
-}