X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.c;h=4119dc7fb9f62484fe90ec3755ab327bb3bd843b;hb=2ee4251092a70af6a7c1826aaef01506dfcbf556;hp=b357f8a35f759857a0eee0cfb124d6309a068ac8;hpb=53066b1808701dc6c3497b2a4741ed6b82002c8f;p=chaz%2Fopenbox

diff --git a/render/render.c b/render/render.c
index b357f8a3..4119dc7f 100644
--- a/render/render.c
+++ b/render/render.c
@@ -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,39 +76,18 @@ 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 (a->surface.parenty + h > sh) {
-            partial_h = sh - a->surface.parenty;
-        } else partial_h = h;
+    if (resized) {
+        g_free(a->surface.pixel_data);
+        a->surface.pixel_data = g_new(RrPixel32, w * 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;
         RrMargins(a, &l, &t, &r, &b);
-        RECT_SET(tarea, l, t, w - l - r, h - t - b); 
-    }       
+        RECT_SET(tarea, l, t, w - l - r, h - t - b);
+    }
 
     for (i = 0; i < a->textures; i++) {
         switch (a->texture[i].type) {
@@ -123,7 +101,7 @@ Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h)
                     pixel_data_to_pixmap(a, 0, 0, w, h);
             }
             if (a->xftdraw == NULL) {
-                a->xftdraw = XftDrawCreate(RrDisplay(a->inst), a->pixmap, 
+                a->xftdraw = XftDrawCreate(RrDisplay(a->inst), a->pixmap,
                                            RrVisual(a->inst),
                                            RrColormap(a->inst));
             }
@@ -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;
@@ -189,6 +171,8 @@ RrAppearance *RrAppearanceNew(const RrInstance *inst, gint numtex)
   out = g_new0(RrAppearance, 1);
   out->inst = inst;
   out->textures = numtex;
+  out->surface.bevel_light_adjust = 128;
+  out->surface.bevel_dark_adjust = 64;
   if (numtex) out->texture = g_new0(RrTexture, numtex);
 
   return out;
@@ -218,7 +202,7 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig)
     if (spo->primary != NULL)
         spc->primary = RrColorNew(copy->inst,
                                   spo->primary->r,
-                                  spo->primary->g, 
+                                  spo->primary->g,
                                   spo->primary->b);
     else spc->primary = NULL;
 
@@ -257,7 +241,23 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig)
                                       spo->bevel_light->b);
     else spc->bevel_light = NULL;
 
+    if (spo->split_primary != NULL)
+        spc->split_primary = RrColorNew(copy->inst,
+                                        spo->split_primary->r,
+                                        spo->split_primary->g,
+                                        spo->split_primary->b);
+    else spc->split_primary = NULL;
+
+    if (spo->split_secondary != NULL)
+        spc->split_secondary = RrColorNew(copy->inst,
+                                        spo->split_secondary->r,
+                                        spo->split_secondary->g,
+                                        spo->split_secondary->b);
+    else spc->split_secondary = NULL;
+
     spc->interlaced = spo->interlaced;
+    spc->bevel_light_adjust = spo->bevel_light_adjust;
+    spc->bevel_dark_adjust = spo->bevel_dark_adjust;
     spc->border = spo->border;
     spc->parent = NULL;
     spc->parentx = spc->parenty = 0;
@@ -298,6 +298,8 @@ void RrAppearanceFree(RrAppearance *a)
         RrColorFree(p->interlace_color);
         RrColorFree(p->bevel_dark);
         RrColorFree(p->bevel_light);
+        RrColorFree(p->split_primary);
+        RrColorFree(p->split_secondary);
         g_free(p->pixel_data);
         p->pixel_data = NULL;
         g_free(a);
@@ -374,7 +376,7 @@ gint RrMinWidth(RrAppearance *a)
             break;
         case RR_TEXTURE_TEXT:
             m = RrFontMeasureString(a->texture[i].data.text.font,
-                                    a->texture[i].data.text.string, 
+                                    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);