make these things one 'command' without braces

[chaz/openbox] / render / font.c

diff --git a/render/font.c b/render/font.c
index b92bafb1006a0c22ddffa36f76664bf5496c9c91..ee06caca861f9f6dee63917c31992787af5407e9 100644 (file)
--- a/render/font.c
+++ b/render/font.c
@@ -1,23 +1,25 @@
-#include <stdlib.h>
-#include <X11/Xft/Xft.h>
 #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)
 {
 #ifdef DEBUG
     int version;
 #endif /* DEBUG */
     if (!XftInit(0)) {
-        g_warning(_("Couldn't initialize Xft.\n\n"));
+        g_warning(_("Couldn't initialize Xft.\n"));
         exit(3);
     }
 #ifdef DEBUG
     version = XftGetVersion();
-    g_message("Using Xft %d.%d.%d (Built against %d.%d.%d).\n",
+    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
@@ -35,7 +37,6 @@ static void measure_height(ObFont *f)
 
     XftTextExtentsUtf8(ob_display, f->xftfont,
                        (FcChar8*)str, strlen(str), &info);
-    g_message("measured: %d", info.height);
     f->height = (signed) info.height;
 }
 
@@ -45,7 +46,7 @@ ObFont *font_open(char *fontstring)
     XftFont *xf;
     
     if ((xf = XftFontOpenName(ob_display, ob_screen, fontstring))) {
-        out = malloc(sizeof(ObFont));
+        out = g_new(ObFont, 1);
         out->xftfont = xf;
         measure_height(out);
         return out;
@@ -54,7 +55,7 @@ ObFont *font_open(char *fontstring)
     g_warning(_("Trying fallback font: %s\n"), "fixed");
 
     if ((xf = XftFontOpenName(ob_display, ob_screen, "fixed"))) {
-        out = malloc(sizeof(ObFont));
+        out = g_new(ObFont, 1);
         out->xftfont = xf;
         measure_height(out);
         return out;
@@ -62,15 +63,16 @@ ObFont *font_open(char *fontstring)
     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 */
 }
 
 void font_close(ObFont *f)
 {
     XftFontClose(ob_display, f->xftfont);
+    g_free(f);
 }
 
-int font_measure_string(ObFont *f, const char *str, int shadow, int offset)
+int font_measure_string(ObFont *f, char *str, int shadow, int offset)
 {
     XGlyphInfo info;
 
@@ -90,12 +92,19 @@ 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 */
 
@@ -103,7 +112,7 @@ void font_draw(XftDraw *d, TextureText *t, int x, int y, int w, int h)
         c.color.red = 0;
         c.color.green = 0;
         c.color.blue = 0;
-        c.color.alpha = t->tint | t->tint << 8; // transparent shadow
+        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,
@@ -113,12 +122,11 @@ void font_draw(XftDraw *d, TextureText *t, int x, int y, int w, int h)
     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;
-    c.color.alpha = 0xff | 0xff << 8; // no transparency in Color yet
                      
     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;
 }