measure the font's height instead of listening to Xft

[chaz/openbox] / render / render.c

diff --git a/render/render.c b/render/render.c
index ac5e00235c171e7274c91e4f98c7221f75fc1784..481ef098c2059800a2ecdce44d374ff8f173ebce 100644 (file)
--- a/render/render.c
+++ b/render/render.c
@@ -4,6 +4,7 @@
 #include "render.h"
 #include "gradient.h"
 #include "font.h"
+#include "mask.h"
 #include "../kernel/openbox.h"
 
 int render_depth;
@@ -53,7 +54,7 @@ void render_startup(void)
     }  
 }
 
-void x_paint(Window win, Appearance *l, int w, int h)
+void x_paint(Window win, Appearance *l, int x, int y, int w, int h)
 {
     int i;
     XImage *im;
@@ -65,7 +66,7 @@ void x_paint(Window win, Appearance *l, int w, int h)
 //    printf("painting window %ld\n", win);
 
     oldp = l->pixmap; /* save to free after changing the visible pixmap */
-    l->pixmap = XCreatePixmap(ob_display, ob_root, w, h, render_depth);
+    l->pixmap = XCreatePixmap(ob_display, ob_root, x+w, y+h, render_depth);
     g_assert(l->pixmap != None);
 
     if (l->xftdraw != NULL)
@@ -79,8 +80,25 @@ void x_paint(Window win, Appearance *l, int w, int h)
     l->surface.data.planar.pixel_data = g_new(pixel32, w * h);
 
     if (l->surface.data.planar.grad == Background_Solid)
-        gradient_solid(l, w, h);
+        gradient_solid(l, x, y, w, h);
     else gradient_render(&l->surface, w, h);
+
+/*reduce depth here...
+  also, this is not the right place for this code, it's only here so
+  text rendering shows up for now.
+*/
+    if (l->surface.data.planar.grad != Background_Solid) {
+        im = XCreateImage(ob_display, render_visual, render_depth,
+                          ZPixmap, 0, NULL, w, h, 32, 0);
+        g_assert(im != None);
+        im->byte_order = endian;
+        im->data = l->surface.data.planar.pixel_data;
+        XPutImage(ob_display, l->pixmap, DefaultGC(ob_display, ob_screen),
+                  im, 0, 0, x, y, w, h);
+        im->data = NULL;
+        XDestroyImage(im);
+    }
+
     for (i = 0; i < l->textures; i++) {
         switch (l->texture[i].type) {
         case Text:
@@ -90,20 +108,13 @@ void x_paint(Window win, Appearance *l, int w, int h)
             }
             font_draw(l->xftdraw, &l->texture[i].data.text);
         break;
+        case Bitmask:
+            if (l->texture[i].data.mask.color->gc == None)
+                color_allocate_gc(l->texture[i].data.mask.color);
+            mask_draw(l->pixmap, &l->texture[i].data.mask, w, h);
+        break;
         }
     }
-//reduce depth
-    if (l->surface.data.planar.grad != Background_Solid) {
-        im = XCreateImage(ob_display, render_visual, render_depth,
-                          ZPixmap, 0, NULL, w, h, 32, 0);
-        g_assert(im != None);
-        im->byte_order = endian;
-        im->data = l->surface.data.planar.pixel_data;
-        XPutImage(ob_display, l->pixmap, DefaultGC(ob_display, ob_screen),
-                  im, 0, 0, 0, 0, w, h);
-        im->data = NULL;
-        XDestroyImage(im);
-    }
     XSetWindowBackgroundPixmap(ob_display, win, l->pixmap);
     XClearWindow(ob_display, win);
     if (oldp != None) XFreePixmap(ob_display, oldp);