pass x,y to paint()

[chaz/openbox] / render / render.c

diff --git a/render/render.c b/render/render.c
index 0bc7bc496952752a25ebd84df431c2f2951ae308..fdbab06f340fe9c11b1c2aacecdfb6b1f9bd6991 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;
@@ -107,6 +108,11 @@ 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;
         }
     }
     XSetWindowBackgroundPixmap(ob_display, win, l->pixmap);