set the log domain for each plugin properly

[chaz/openbox] / render / render.c

diff --git a/render/render.c b/render/render.c
index 0bc7bc496952752a25ebd84df431c2f2951ae308..51c3a9beb4a8134b7e0466dae6692da10e552c5a 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,7 +80,7 @@ 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...
@@ -93,7 +94,7 @@ void x_paint(Window win, Appearance *l, int w, int h)
         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, 0, 0, x, y, w, h);
         im->data = NULL;
         XDestroyImage(im);
     }
@@ -105,7 +106,12 @@ void x_paint(Window win, Appearance *l, int w, int h)
                 l->xftdraw = XftDrawCreate(ob_display, l->pixmap, 
                                         render_visual, render_colormap);
             }
-            font_draw(l->xftdraw, &l->texture[i].data.text);
+            font_draw(l->xftdraw, &l->texture[i].data.text, x, y, w, h);
+        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;
         }
     }