add funcs to grab buttons and keys

[chaz/openbox] / render / render.c

diff --git a/render/render.c b/render/render.c
index ebd681eabc3a4981b489cc91d87b51e5e9841e56..13257910d08368d16bd03a1f381935d59a2f0852 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,18 +54,19 @@ 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;
+    Pixmap oldp;
 
     if (w <= 0 || h <= 0) return;
 
     g_assert(l->surface.type == Surface_Planar);
 //    printf("painting window %ld\n", win);
 
-    if (l->pixmap != None) XFreePixmap(ob_display, l->pixmap);
-    l->pixmap = XCreatePixmap(ob_display, ob_root, w, h, render_depth);
+    oldp = l->pixmap; /* save to free after changing the visible pixmap */
+    l->pixmap = XCreatePixmap(ob_display, ob_root, x+w, y+h, render_depth);
     g_assert(l->pixmap != None);
 
     if (l->xftdraw != NULL)
@@ -78,20 +80,13 @@ 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);
-    for (i = 0; i < l->textures; i++) {
-        switch (l->texture[i].type) {
-        case Text:
-            if (l->xftdraw == NULL) {
-                l->xftdraw = XftDrawCreate(ob_display, l->pixmap, 
-                                        render_visual, render_colormap);
-            }
-            font_draw(l->xftdraw, &l->texture[i].data.text);
-        break;
-        }
-    }
-//reduce depth
+
+/*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);
@@ -99,12 +94,30 @@ 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);
     }
+
+    for (i = 0; i < l->textures; i++) {
+        switch (l->texture[i].type) {
+        case Text:
+            if (l->xftdraw == NULL) {
+                l->xftdraw = XftDrawCreate(ob_display, l->pixmap, 
+                                        render_visual, render_colormap);
+            }
+            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;
+        }
+    }
     XSetWindowBackgroundPixmap(ob_display, win, l->pixmap);
     XClearWindow(ob_display, win);
+    if (oldp != None) XFreePixmap(ob_display, oldp);
 }
 
 /*
@@ -128,6 +141,7 @@ Appearance *appearance_new(SurfaceType type, int numtex)
   out->textures = numtex;
   out->xftdraw = NULL;
   if (numtex) out->texture = g_new(Texture, numtex);
+  else out->texture = NULL;
   out->pixmap = None;
 
   switch (type) {
@@ -178,10 +192,7 @@ Appearance *appearance_copy(Appearance *orig)
     break;
     }
     copy->textures = orig->textures;
-    if (orig->textures) {
-        copy->texture = malloc(orig->textures * sizeof(Texture));
-        memcpy(copy->texture, orig->texture, orig->textures * sizeof(Texture));
-    } else copy->texture = NULL;
+    copy->texture = g_memdup(orig->texture, orig->textures * sizeof(Texture));
     copy->pixmap = None;
     copy->xftdraw = NULL;
     return copy;
@@ -199,6 +210,7 @@ void appearance_free(Appearance *a)
         if (p->primary != NULL) color_free(p->primary);
         if (p->secondary != NULL) color_free(p->secondary);
         if (p->border_color != NULL) color_free(p->border_color);
+        if (p->pixel_data != NULL) g_free(p->pixel_data);
     }
     g_free(a);
 }