X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=4436cf8430fb0b732e5fdb140221ef4e8a7d74cd;hb=bdf1662af23289fd5674252f6caaf63728a186c5;hp=eb72feb17c63ab7e8ab05761742e720b59b45d6f;hpb=f8a47de5ec444c452093371e3db16857eb39a490;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index eb72feb1..4436cf84 100644
--- a/render/font.c
+++ b/render/font.c
@@ -1,75 +1,125 @@
+#include "../kernel/openbox.h"
 #include "font.h"
 
-#include "../src/gettext.h"
+#include "../kernel/gettext.h"
 #define _(str) gettext(str)
 
-font_open(const std::string &fontstring,
-             bool shadow, unsigned char offset, unsigned char tint)
+#include <X11/Xft/Xft.h>
+#include <glib.h>
+
+void font_startup(void)
 {
-  assert(screen_num >= 0);
-  assert(tint <= CHAR_MAX);
-  
-  if (!_xft_init) {
+#ifdef DEBUG
+    int version;
+#endif /* DEBUG */
     if (!XftInit(0)) {
-      printf(_("Couldn't initialize Xft.\n\n"));
-      ::exit(3);
+        g_warning(_("Couldn't initialize Xft.\n"));
+        exit(3);
     }
 #ifdef DEBUG
-    int version = XftGetVersion();
-    printf("Using Xft %d.%d.%d (Built against %d.%d.%d).\n",
-           version / 10000 % 100, version / 100 % 100, version % 100,
-           XFT_MAJOR, XFT_MINOR, XFT_REVISION);
+    version = XftGetVersion();
+    g_message("Using Xft %d.%d.%d (Built against %d.%d.%d).",
+              version / 10000 % 100, version / 100 % 100, version % 100,
+              XFT_MAJOR, XFT_MINOR, XFT_REVISION);
 #endif
-    _xft_init = true;
-  }
+}
 
-  if ((_xftfont = XftFontOpenName(ob_display, _screen_num,
-                                  fontstring)))
-    return;
+static void measure_height(ObFont *f)
+{
+    XGlyphInfo info;
+    char *str;
 
-  printf(_("Unable to load font: %s\n"), _fontstring.c_str());
-  printf(_("Trying fallback font: %s\n"), "fixed");
+    /* XXX add some extended UTF8 characters in here? */
+    str = "12345678900-qwertyuiopasdfghjklzxcvbnm"
+        "!@#$%^&*()_+QWERTYUIOPASDFGHJKLZXCVBNM"
+        "`~[]\\;',./{}|:\"<>?";
 
-  if ((_xftfont = XftFontOpenName(ob_display, _screen_num,
-                                  "fixed")))
-    return;
+    XftTextExtentsUtf8(ob_display, f->xftfont,
+                       (FcChar8*)str, strlen(str), &info);
+    f->height = (signed) info.height;
+}
 
-  printf(_("Unable to load font: %s\n"), "fixed");
-  printf(_("Aborting!.\n"));
+ObFont *font_open(char *fontstring)
+{
+    ObFont *out;
+    XftFont *xf;
+    
+    if ((xf = XftFontOpenName(ob_display, ob_screen, fontstring))) {
+        out = g_new(ObFont, 1);
+        out->xftfont = xf;
+        measure_height(out);
+        return out;
+    }
+    g_warning(_("Unable to load font: %s\n"), fontstring);
+    g_warning(_("Trying fallback font: %s\n"), "fixed");
+
+    if ((xf = XftFontOpenName(ob_display, ob_screen, "fixed"))) {
+        out = g_new(ObFont, 1);
+        out->xftfont = xf;
+        measure_height(out);
+        return out;
+    }
+    g_warning(_("Unable to load font: %s\n"), "fixed");
+    g_warning(_("Aborting!.\n"));
 
-  exit(3); // can't continue without a font
+    exit(3); /* can't continue without a font */
 }
 
-
-destroy_fonts(void)
+void font_close(ObFont *f)
 {
-  if (_xftfont)
-    XftFontClose(ob_display, _xftfont);
+    XftFontClose(ob_display, f->xftfont);
+    g_free(f);
 }
 
-
-int font_measure_string(const char *)
+int font_measure_string(ObFont *f, char *str, int shadow, int offset)
 {
-  XGlyphInfo info;
+    XGlyphInfo info;
 
-  if (string.utf8())
-    XftTextExtentsUtf8(**display, _xftfont,
-                       (FcChar8*)string.c_str(), string.bytes(), &info);
-  else
-    XftTextExtents8(ob_display, _xftfont,
-                    (FcChar8*)string.c_str(), string.bytes(), &info);
+    XftTextExtentsUtf8(ob_display, f->xftfont,
+                       (FcChar8*)str, strlen(str), &info);
 
-  return (signed) info.xOff + (_shadow ? _offset : 0);
+    return (signed) info.xOff + (shadow ? offset : 0);
 }
 
-
-int font_height(void)
+int font_height(ObFont *f, int shadow, int offset)
 {
-  return (signed) _xftfont->height + (_shadow ? _offset : 0);
+    return f->height + (shadow ? offset : 0);
 }
 
+int font_max_char_width(ObFont *f)
+{
+    return (signed) f->xftfont->max_advance_width;
+}
 
-int font_max_char_width(void)
+void font_draw(XftDraw *d, TextureText *t, int x, int y, int w, int h)
 {
-  return (signed) _xftfont->max_advance_width;
+    XftColor c;
+
+    /* accomidate for areas bigger/smaller than Xft thinks the font is tall */
+    y -= (2 * (t->font->xftfont->ascent + t->font->xftfont->descent) -
+          (t->font->height + h)) / 2;
+
+    x += 3; /* XXX figure out X with justification */
+
+    if (t->shadow) {
+        c.color.red = 0;
+        c.color.green = 0;
+        c.color.blue = 0;
+        c.color.alpha = t->tint | t->tint << 8; /* transparent shadow */
+        c.pixel = BlackPixel(ob_display, ob_screen);
+  
+        XftDrawStringUtf8(d, &c, t->font->xftfont, x + t->offset,
+                          t->font->xftfont->ascent + y + t->offset,
+                          (FcChar8*)t->string, strlen(t->string));
+    }  
+    c.color.red = t->color->r | t->color->r << 8;
+    c.color.green = t->color->g | t->color->g << 8;
+    c.color.blue = t->color->b | t->color->b << 8;
+    c.color.alpha = 0xff | 0xff << 8; /* fully opaque text */
+    c.pixel = t->color->pixel;
+                     
+    XftDrawStringUtf8(d, &c, t->font->xftfont, x,
+                      t->font->xftfont->ascent + y,
+                      (FcChar8*)t->string, strlen(t->string));
+    return;
 }