keep all transient windows above their parents

[chaz/openbox] / render / font.c

diff --git a/render/font.c b/render/font.c
index d783d9d6000efafb9abc95f0b3f5db559e98cd0c..c1139d6e70468ee3dba6583a3a7d70f8bac3a397 100644 (file)
--- a/render/font.c
+++ b/render/font.c
@@ -6,6 +6,7 @@
 
 #include <X11/Xft/Xft.h>
 #include <glib.h>
+#include "../kernel/geom.h"
 
 void font_startup(void)
 {
@@ -51,15 +52,15 @@ 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 */
@@ -67,8 +68,10 @@ ObFont *font_open(char *fontstring)
 
 void font_close(ObFont *f)
 {
-    XftFontClose(ob_display, f->xftfont);
-    g_free(f);
+    if (f) {
+        XftFontClose(ob_display, f->xftfont);
+        g_free(f);
+    }
 }
 
 int font_measure_string(ObFont *f, char *str, int shadow, int offset)
@@ -91,10 +94,16 @@ 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 -= (2 * (t->font->xftfont->ascent + t->font->xftfont->descent) -
           (t->font->height + h) - 1) / 2;
@@ -102,12 +111,19 @@ void font_draw(XftDraw *d, TextureText *t, int x, int y, int w, int h)
     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));