X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=render%2Frender.c;h=8cc443546a969366100b4d6992b23f3600619bb1;hb=07a52aeaff0d8f429d9a740f49a85f22d51cf597;hp=df0ed282e0d757f7e2e4e69679b39540e0c84d8b;hpb=de307661b6ce96e61e20a123b00297dbc57d5d85;p=chaz%2Fopenbox

diff --git a/render/render.c b/render/render.c
index df0ed282..8cc44354 100644
--- a/render/render.c
+++ b/render/render.c
@@ -6,6 +6,7 @@
 #include "font.h"
 #include "mask.h"
 #include "color.h"
+#include "image.h"
 #include "../kernel/openbox.h"
 
 int render_depth;
@@ -24,8 +25,8 @@ void render_startup(void)
 
     if (render_depth < 8) {
       XVisualInfo vinfo_template, *vinfo_return;
-      // search for a TrueColor Visual... if we can't find one...
-      // we will use the default visual for the screen
+      /* search for a TrueColor Visual... if we can't find one...
+         we will use the default visual for the screen */
       int vinfo_nitems;
       int best = -1;
 
@@ -40,7 +41,7 @@ void render_startup(void)
         for (i = 0; i < vinfo_nitems; ++i) {
           if (vinfo_return[i].depth > max_depth) {
             if (max_depth == 24 && vinfo_return[i].depth > 24)
-              break;          // prefer 24 bit over 32
+                break;          /* prefer 24 bit over 32 */
             max_depth = vinfo_return[i].depth;
             best = i;
           }
@@ -66,7 +67,7 @@ void truecolor_startup(void)
   timage = XCreateImage(ob_display, render_visual, render_depth,
                         ZPixmap, 0, NULL, 1, 1, 32, 0);
   g_assert(timage != NULL);
-  // find the offsets for each color in the visual's masks
+  /* find the offsets for each color in the visual's masks */
   red_mask = timage->red_mask;
   green_mask = timage->green_mask;
   blue_mask = timage->blue_mask;
@@ -92,7 +93,7 @@ void x_paint(Window win, Appearance *l, int x, int y, int w, int h)
     XImage *im = NULL;
     Pixmap oldp;
 
-    if (w <= 0 || h <= 0) return;
+    if (w <= 0 || h <= 0 || x+w <= 0 || y+h <= 0) return;
 
     g_assert(l->surface.type == Surface_Planar);
 
@@ -106,8 +107,7 @@ void x_paint(Window win, Appearance *l, int x, int y, int w, int h)
                                render_colormap);
     g_assert(l->xftdraw != NULL);
 
-    if (l->surface.data.planar.pixel_data != NULL)
-        g_free(l->surface.data.planar.pixel_data);
+    g_free(l->surface.data.planar.pixel_data);
     l->surface.data.planar.pixel_data = g_new(pixel32, w * h);
 
     if (l->surface.data.planar.grad == Background_Solid)
@@ -122,8 +122,8 @@ void x_paint(Window win, Appearance *l, int x, int y, int w, int h)
                           ZPixmap, 0, NULL, w, h, 32, 0);
         g_assert(im != NULL);
         im->byte_order = endian;
-        im->data = (unsigned char *)l->surface.data.planar.pixel_data;
-        reduce_depth(im->data, im);
+        im->data = (char *)l->surface.data.planar.pixel_data;
+        reduce_depth((pixel32*)im->data, im);
         XPutImage(ob_display, l->pixmap, DefaultGC(ob_display, ob_screen),
                   im, 0, 0, x, y, w, h);
         im->data = NULL;
@@ -137,12 +137,19 @@ void x_paint(Window win, Appearance *l, int x, int y, int w, int h)
                 l->xftdraw = XftDrawCreate(ob_display, l->pixmap, 
                                         render_visual, render_colormap);
             }
-            font_draw(l->xftdraw, &l->texture[i].data.text, x, y, w, h);
+            font_draw(l->xftdraw, &l->texture[i].data.text, 
+                      &l->texture[i].position);
         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);
+            mask_draw(l->pixmap, &l->texture[i].data.mask,
+                      &l->texture[i].position);
+        break;
+        case RGBA:
+            image_draw(l->surface.data.planar.pixel_data, 
+                       &l->texture[i].data.rgba,
+                       &l->texture[i].position);
         break;
         }
     }
@@ -171,7 +178,7 @@ Appearance *appearance_new(SurfaceType type, int numtex)
   out->surface.type = type;
   out->textures = numtex;
   out->xftdraw = NULL;
-  if (numtex) out->texture = g_new(Texture, numtex);
+  if (numtex) out->texture = g_new0(Texture, numtex);
   else out->texture = NULL;
   out->pixmap = None;