X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.c;h=e259f622d90e98fbaab2ac13517785baf33e300a;hb=d3c22b58cba15c9420a9c09225c4ba5c66edfa23;hp=2755e6678056f9fd60a9eaa3231715ed35a9cc84;hpb=66d6e1120ec4e66433ecec673258856def164070;p=chaz%2Fopenbox

diff --git a/render/render.c b/render/render.c
index 2755e667..e259f622 100644
--- a/render/render.c
+++ b/render/render.c
@@ -18,9 +18,6 @@
    See the COPYING file for a copy of the GNU General Public License.
 */
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
 #include "render.h"
 #include "gradient.h"
 #include "font.h"
@@ -30,6 +27,9 @@
 #include "theme.h"
 
 #include <glib.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xft/Xft.h>
 
 #ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
@@ -40,9 +40,8 @@ static void pixel_data_to_pixmap(RrAppearance *l,
 
 Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h)
 {
-    gint i, transferred = 0, sw, sh, partial_w, partial_h;
-    RrPixel32 *source, *dest;
-    Pixmap oldp;
+    gint i, transferred = 0, force_transfer = 0;
+    Pixmap oldp = None;
     RrRect tarea; /* area in which to draw textures */
     gboolean resized;
 
@@ -77,33 +76,12 @@ Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h)
                                RrVisual(a->inst), RrColormap(a->inst));
     g_assert(a->xftdraw != NULL);
 
-    g_free(a->surface.pixel_data);
-    a->surface.pixel_data = g_new(RrPixel32, w * h);
-
-    if (a->surface.grad == RR_SURFACE_PARENTREL) {
-        g_assert (a->surface.parent);
-        g_assert (a->surface.parent->w);
-
-        sw = a->surface.parent->w;
-        sh = a->surface.parent->h;
-
-        source = (a->surface.parent->surface.pixel_data +
-                  a->surface.parentx + sw * a->surface.parenty);
-        dest = a->surface.pixel_data;
-
-        if (a->surface.parentx + w > sw) {
-            partial_w = sw - a->surface.parentx;
-        } else partial_w = w;
+    if (resized) {
+        g_free(a->surface.pixel_data);
+        a->surface.pixel_data = g_new(RrPixel32, w * h);
+    }
 
-        if (a->surface.parenty + h > sh) {
-            partial_h = sh - a->surface.parenty;
-        } else partial_h = h;
-
-        for (i = 0; i < partial_h; i++, source += sw, dest += w) {
-            memcpy(dest, source, partial_w * sizeof(RrPixel32));
-        }
-    } else
-        RrRender(a, w, h);
+    RrRender(a, w, h);
 
     {
         gint l, t, r, b;
@@ -158,14 +136,18 @@ Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h)
                         &a->texture[i].data.rgba,
                         a->w, a->h,
                         &tarea);
+            force_transfer = 1;
         break;
         }
     }
 
     if (!transferred) {
         transferred = 1;
-        if ((a->surface.grad != RR_SURFACE_SOLID) || (a->surface.interlaced))
+        if ((a->surface.grad != RR_SURFACE_SOLID) || (a->surface.interlaced) ||
+            force_transfer)
+        {
             pixel_data_to_pixmap(a, 0, 0, w, h);
+        }
     }
 
     return oldp;
@@ -194,6 +176,14 @@ RrAppearance *RrAppearanceNew(const RrInstance *inst, gint numtex)
   return out;
 }
 
+void RrAppearanceAddTextures(RrAppearance *a, gint numtex)
+{
+    g_assert(a->textures == 0);
+
+    a->textures = numtex;
+    if (numtex) a->texture = g_new0(RrTexture, numtex);
+}
+
 RrAppearance *RrAppearanceCopy(RrAppearance *orig)
 {
     RrSurface *spo, *spc;
@@ -369,7 +359,7 @@ gint RrMinWidth(RrAppearance *a)
                                     a->texture[i].data.text.string, 
                                     a->texture[i].data.text.shadow_offset_x,
                                     a->texture[i].data.text.shadow_offset_y);
-            w = MAX(w, m->width + 4);
+            w = MAX(w, m->width);
             g_free(m);
             break;
         case RR_TEXTURE_RGBA: