X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Ffont.c;h=5f0dbf8ba5cfb08868fd0e3f6af6ad242f741b3f;hb=d58799bc25333d6ace95325072c39072aa0e757c;hp=4e38de243cf883a282e7014ab674e6cb2fe6fc1e;hpb=60cbb9ee92058b7d52bf2a4542c64c7858b00cdd;p=chaz%2Fopenbox

diff --git a/render/font.c b/render/font.c
index 4e38de24..5f0dbf8b 100644
--- a/render/font.c
+++ b/render/font.c
@@ -1,11 +1,12 @@
 #include "../kernel/openbox.h"
 #include "font.h"
 
-#include "../src/gettext.h"
+#include "../kernel/gettext.h"
 #define _(str) gettext(str)
 
 #include <X11/Xft/Xft.h>
 #include <glib.h>
+#include "../kernel/geom.h"
 
 void font_startup(void)
 {
@@ -51,18 +52,18 @@ ObFont *font_open(char *fontstring)
         return out;
     }
     g_warning(_("Unable to load font: %s\n"), fontstring);
-    g_warning(_("Trying fallback font: %s\n"), "fixed");
+    g_warning(_("Trying fallback font: %s\n"), "sans");
 
-    if ((xf = XftFontOpenName(ob_display, ob_screen, "fixed"))) {
+    if ((xf = XftFontOpenName(ob_display, ob_screen, "sans"))) {
         out = g_new(ObFont, 1);
         out->xftfont = xf;
         measure_height(out);
         return out;
     }
-    g_warning(_("Unable to load font: %s\n"), "fixed");
+    g_warning(_("Unable to load font: %s\n"), "sans");
     g_warning(_("Aborting!.\n"));
 
-    exit(3); // can't continue without a font
+    exit(3); /* can't continue without a font */
 }
 
 void font_close(ObFont *f)
@@ -91,22 +92,36 @@ int font_max_char_width(ObFont *f)
     return (signed) f->xftfont->max_advance_width;
 }
 
-void font_draw(XftDraw *d, TextureText *t, int x, int y, int w, int h)
+void font_draw(XftDraw *d, TextureText *t, Rect *position)
 {
+    int x,y,w,h;
     XftColor c;
 
+    x = position->x;
+    y = position->y;
+    w = position->width;
+    h = position->height;
+
     /* accomidate for areas bigger/smaller than Xft thinks the font is tall */
-    y += (h - t->font->xftfont->height) / 2;
+    y -= (2 * (t->font->xftfont->ascent + t->font->xftfont->descent) -
+          (t->font->height + h) - 1) / 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);
-  
+        if (t->tint >= 0) {
+            c.color.red = 0;
+            c.color.green = 0;
+            c.color.blue = 0;
+            c.color.alpha = 0xffff * t->tint / 100; /* transparent shadow */
+            c.pixel = BlackPixel(ob_display, ob_screen);
+        } else {
+            c.color.red = 0xffff * -t->tint / 100;
+            c.color.green = 0xffff * -t->tint / 100;
+            c.color.blue = 0xffff * -t->tint / 100;
+            c.color.alpha = 0xffff * -t->tint / 100; /* transparent shadow */
+            c.pixel = WhitePixel(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));
@@ -118,8 +133,7 @@ void font_draw(XftDraw *d, TextureText *t, int x, int y, int w, int h)
     c.pixel = t->color->pixel;
                      
     XftDrawStringUtf8(d, &c, t->font->xftfont, x,
-                      t->font->xftfont->ascent + y -
-                      (t->font->xftfont->height - t->font->height) / 2,
-                     (FcChar8*)t->string, strlen(t->string));
+                      t->font->xftfont->ascent + y,
+                      (FcChar8*)t->string, strlen(t->string));
     return;
 }