X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=a55cb77a8e1bca0e1c8213dba8c8d0e694cdca97;hb=4b9556c03174d2c58492531f06eaf3718668162b;hp=eb72feb17c63ab7e8ab05761742e720b59b45d6f;hpb=f8a47de5ec444c452093371e3db16857eb39a490;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index eb72feb1..a55cb77a 100644
--- a/render/font.c
+++ b/render/font.c
@@ -1,75 +1,99 @@
+#include <stdlib.h>
+#include <X11/Xft/Xft.h>
+#include "../kernel/openbox.h"
 #include "font.h"
 
 #include "../src/gettext.h"
 #define _(str) gettext(str)
 
-font_open(const std::string &fontstring,
-             bool shadow, unsigned char offset, unsigned char tint)
+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\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).\n",
+              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;
-
-  printf(_("Unable to load font: %s\n"), _fontstring.c_str());
-  printf(_("Trying fallback font: %s\n"), "fixed");
+}
 
-  if ((_xftfont = XftFontOpenName(ob_display, _screen_num,
-                                  "fixed")))
-    return;
+ObFont *font_open(char *fontstring)
+{
+    ObFont *out;
+    XftFont *xf;
+    
+    if ((xf = XftFontOpenName(ob_display, ob_screen, fontstring))) {
+        out = malloc(sizeof(ObFont));
+        out->xftfont = xf;
+        return out;
+    }
+    g_warning(_("Unable to load font: %s\n"), fontstring);
+    g_warning(_("Trying fallback font: %s\n"), "fixed");
 
-  printf(_("Unable to load font: %s\n"), "fixed");
-  printf(_("Aborting!.\n"));
+    if ((xf = XftFontOpenName(ob_display, ob_screen, "fixed"))) {
+        out = malloc(sizeof(ObFont));
+        out->xftfont = xf;
+        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);
 }
 
-
-int font_measure_string(const char *)
+int font_measure_string(ObFont *f, const 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 (signed) f->xftfont->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)
 {
-  return (signed) _xftfont->max_advance_width;
+    int x = 0, y = 0;
+    XftColor c;
+    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.pixel = t->color->pixel;
+    c.color.alpha = 0xff | 0xff << 8; // no transparency in Color yet
+                     
+    XftDrawStringUtf8(d, &c, t->font->xftfont, x, t->font->xftfont->ascent + y,
+                     (FcChar8*)t->string, strlen(t->string));
+    return;
 }