X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Frender.c;h=c1ed1e114a127c6e813bff67b81f7baab9e8a705;hb=3a607fad9df628ab16e0f7436dfbfc9b22634003;hp=87706c8eea72c9d83e06d70758499968c5c8cbf4;hpb=dbe2851b910dcdb02afbb744dbb2926286ab8f65;p=chaz%2Fopenbox

diff --git a/render/render.c b/render/render.c
index 87706c8e..c1ed1e11 100644
--- a/render/render.c
+++ b/render/render.c
@@ -15,120 +15,116 @@
 #  include <stdlib.h>
 #endif
 
-static void RrPixel32_to_pixmap(RrAppearance *l, gint x, gint y, gint w, gint h);
+static void pixel_data_to_pixmap(RrAppearance *l,
+                                 gint x, gint y, gint w, gint h);
 
-void RrPaint(RrAppearance *l, Window win, gint w, gint h)
+void RrPaint(RrAppearance *a, Window win, gint w, gint h)
 {
     int i, transferred = 0, sw;
     RrPixel32 *source, *dest;
     Pixmap oldp;
-    Rect tarea; /* area in which to draw textures */
+    RrRect tarea; /* area in which to draw textures */
     gboolean resized;
 
     if (w <= 0 || h <= 0) return;
 
-    resized = (l->w != w || l->h != h);
+    resized = (a->w != w || a->h != h);
 
-    if (resized) {
-        oldp = l->pixmap; /* save to free after changing the visible pixmap */
-        l->pixmap = XCreatePixmap(RrDisplay(l->inst),
-                                  RrRootWindow(l->inst),
-                                  w, h, RrDepth(l->inst));
-    } else
-        oldp = None;
+    oldp = a->pixmap; /* save to free after changing the visible pixmap */
+    a->pixmap = XCreatePixmap(RrDisplay(a->inst),
+                              RrRootWindow(a->inst),
+                              w, h, RrDepth(a->inst));
 
-    g_assert(l->pixmap != None);
-    l->w = w;
-    l->h = h;
+    g_assert(a->pixmap != None);
+    a->w = w;
+    a->h = h;
 
-    if (l->xftdraw != NULL)
-        XftDrawDestroy(l->xftdraw);
-    l->xftdraw = XftDrawCreate(RrDisplay(l->inst), l->pixmap,
-                               RrVisual(l->inst), RrColormap(l->inst));
-    g_assert(l->xftdraw != NULL);
+    if (a->xftdraw != NULL)
+        XftDrawDestroy(a->xftdraw);
+    a->xftdraw = XftDrawCreate(RrDisplay(a->inst), a->pixmap,
+                               RrVisual(a->inst), RrColormap(a->inst));
+    g_assert(a->xftdraw != NULL);
 
-    g_free(l->surface.RrPixel_data);
-    l->surface.RrPixel_data = g_new(RrPixel32, w * h);
+    g_free(a->surface.pixel_data);
+    a->surface.pixel_data = g_new(RrPixel32, w * h);
 
-    if (l->surface.grad == RR_SURFACE_PARENTREL) {
-        g_assert (l->surface.parent);
-        g_assert (l->surface.parent->w);
+    if (a->surface.grad == RR_SURFACE_PARENTREL) {
+        g_assert (a->surface.parent);
+        g_assert (a->surface.parent->w);
 
-        sw = l->surface.parent->w;
-        source = (l->surface.parent->surface.RrPixel_data + l->surface.parentx +
-                  sw * l->surface.parenty);
-        dest = l->surface.RrPixel_data;
+        sw = a->surface.parent->w;
+        source = (a->surface.parent->surface.pixel_data +
+                  a->surface.parentx + sw * a->surface.parenty);
+        dest = a->surface.pixel_data;
         for (i = 0; i < h; i++, source += sw, dest += w) {
             memcpy(dest, source, w * sizeof(RrPixel32));
         }
-    } else if (l->surface.grad == RR_SURFACE_SOLID)
-        gradient_solid(l, 0, 0, w, h);
-    else
-        gradient_render(&l->surface, w, h);
-
-    RECT_SET(tarea, 0, 0, w, h);
-    if (l->surface.grad != RR_SURFACE_PARENTREL) {
-        if (l->surface.relief != RR_RELIEF_FLAT) {
-            switch (l->surface.bevel) {
-            case RR_BEVEL_1:
-                tarea.x += 1; tarea.y += 1;
-                tarea.width -= 2; tarea.height -= 2;
-                break;
-            case RR_BEVEL_2:
-                tarea.x += 2; tarea.y += 2;
-                tarea.width -= 4; tarea.height -= 4;
-                break;
-            }
-        } else if (l->surface.border) {
-            tarea.x += 1; tarea.y += 1;
-            tarea.width -= 2; tarea.height -= 2;
-        }
-    }
+    } else
+        RrRender(a, w, h);
 
-    for (i = 0; i < l->textures; i++) {
-        switch (l->texture[i].type) {
+    {
+        gint l, t, r, b;
+        RrMargins(a, &l, &t, &r, &b);
+        RECT_SET(tarea, l, t, w - l - r, h - t - b); 
+    }       
+
+    for (i = 0; i < a->textures; i++) {
+        switch (a->texture[i].type) {
         case RR_TEXTURE_NONE:
             break;
         case RR_TEXTURE_TEXT:
             if (!transferred) {
                 transferred = 1;
-                if (l->surface.grad != RR_SURFACE_SOLID)
-                    RrPixel32_to_pixmap(l, 0, 0, w, h);
+                if (a->surface.grad != RR_SURFACE_SOLID)
+                    pixel_data_to_pixmap(a, 0, 0, w, h);
             }
-            if (l->xftdraw == NULL) {
-                l->xftdraw = XftDrawCreate(RrDisplay(l->inst), l->pixmap, 
-                                           RrVisual(l->inst),
-                                           RrColormap(l->inst));
+            if (a->xftdraw == NULL) {
+                a->xftdraw = XftDrawCreate(RrDisplay(a->inst), a->pixmap, 
+                                           RrVisual(a->inst),
+                                           RrColormap(a->inst));
             }
-            RrFontDraw(l->xftdraw, &l->texture[i].data.text, &tarea);
-        break;
+            RrFontDraw(a->xftdraw, &a->texture[i].data.text, &tarea);
+            break;
+        case RR_TEXTURE_LINE_ART:
+            if (!transferred) {
+                transferred = 1;
+                if (a->surface.grad != RR_SURFACE_SOLID)
+                    pixel_data_to_pixmap(a, 0, 0, w, h);
+            }
+            XDrawLine(RrDisplay(a->inst), a->pixmap,
+                      RrColorGC(a->texture[i].data.lineart.color),
+                      a->texture[i].data.lineart.x1,
+                      a->texture[i].data.lineart.y1,
+                      a->texture[i].data.lineart.x2,
+                      a->texture[i].data.lineart.y2);
+            break;
         case RR_TEXTURE_MASK:
             if (!transferred) {
                 transferred = 1;
-                if (l->surface.grad != RR_SURFACE_SOLID)
-                    RrPixel32_to_pixmap(l, 0, 0, w, h);
+                if (a->surface.grad != RR_SURFACE_SOLID)
+                    pixel_data_to_pixmap(a, 0, 0, w, h);
             }
-            if (l->texture[i].data.mask.color->gc == None)
-                color_allocate_gc(l->texture[i].data.mask.color);
-            RrPixmapMaskDraw(l->pixmap, &l->texture[i].data.mask, &tarea);
-        break;
+            RrPixmapMaskDraw(a->pixmap, &a->texture[i].data.mask, &tarea);
+            break;
         case RR_TEXTURE_RGBA:
-            image_draw(l->surface.RrPixel_data,
-                       &l->texture[i].data.rgba, &tarea);
+            g_assert(!transferred);
+            RrImageDraw(a->surface.pixel_data,
+                        &a->texture[i].data.rgba,
+                        a->w, a->h,
+                        &tarea);
         break;
         }
     }
 
     if (!transferred) {
         transferred = 1;
-        if (l->surface.grad != RR_SURFACE_SOLID)
-            RrPixel32_to_pixmap(l, 0, 0, w, h);
+        if (a->surface.grad != RR_SURFACE_SOLID)
+            pixel_data_to_pixmap(a, 0, 0, w, h);
     }
 
-
-    XSetWindowBackgroundPixmap(RrDisplay(l->inst), win, l->pixmap);
-    XClearWindow(RrDisplay(l->inst), win);
-    if (oldp) XFreePixmap(RrDisplay(l->inst), oldp);
+    XSetWindowBackgroundPixmap(RrDisplay(a->inst), win, a->pixmap);
+    XClearWindow(RrDisplay(a->inst), win);
+    if (oldp) XFreePixmap(RrDisplay(a->inst), oldp);
 }
 
 RrAppearance *RrAppearanceNew(const RrInstance *inst, gint numtex)
@@ -147,6 +143,7 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig)
 {
     RrSurface *spo, *spc;
     RrAppearance *copy = g_new(RrAppearance, 1);
+    gint i;
 
     copy->inst = orig->inst;
 
@@ -176,6 +173,13 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig)
                                        spo->border_color->b);
     else spc->border_color = NULL;
 
+    if (spo->interlace_color != NULL)
+        spc->interlace_color = RrColorNew(copy->inst,
+                                       spo->interlace_color->r,
+                                       spo->interlace_color->g,
+                                       spo->interlace_color->b);
+    else spc->interlace_color = NULL;
+
     if (spo->bevel_dark != NULL)
         spc->bevel_dark = RrColorNew(copy->inst,
                                      spo->bevel_dark->r,
@@ -192,11 +196,17 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig)
 
     spc->interlaced = spo->interlaced;
     spc->border = spo->border;
-    spc->RrPixel_data = NULL;
+    spc->parent = NULL;
+    spc->parentx = spc->parenty = 0;
+    spc->pixel_data = NULL;
 
     copy->textures = orig->textures;
     copy->texture = g_memdup(orig->texture,
                              orig->textures * sizeof(RrTexture));
+    for (i = 0; i < copy->textures; ++i)
+        if (copy->texture[i].type == RR_TEXTURE_RGBA) {
+            copy->texture[i].data.rgba.cache = NULL;
+        }
     copy->pixmap = None;
     copy->xftdraw = NULL;
     copy->w = copy->h = 0;
@@ -205,26 +215,35 @@ RrAppearance *RrAppearanceCopy(RrAppearance *orig)
 
 void RrAppearanceFree(RrAppearance *a)
 {
+    gint i;
+
     if (a) {
         RrSurface *p;
         if (a->pixmap != None) XFreePixmap(RrDisplay(a->inst), a->pixmap);
         if (a->xftdraw != NULL) XftDrawDestroy(a->xftdraw);
+        for (i = 0; i < a->textures; ++i)
+            if (a->texture[i].type == RR_TEXTURE_RGBA) {
+                g_free(a->texture[i].data.rgba.cache);
+                a->texture[i].data.rgba.cache = NULL;
+            }
         if (a->textures)
             g_free(a->texture);
         p = &a->surface;
         RrColorFree(p->primary);
         RrColorFree(p->secondary);
         RrColorFree(p->border_color);
+        RrColorFree(p->interlace_color);
         RrColorFree(p->bevel_dark);
         RrColorFree(p->bevel_light);
-        g_free(p->RrPixel_data);
+        g_free(p->pixel_data);
 
         g_free(a);
     }
 }
 
 
-static void RrPixel32_to_pixmap(RrAppearance *l, gint x, gint y, gint w, gint h)
+static void pixel_data_to_pixmap(RrAppearance *l,
+                                 gint x, gint y, gint w, gint h)
 {
     RrPixel32 *in, *scratch;
     Pixmap out;
@@ -233,16 +252,15 @@ static void RrPixel32_to_pixmap(RrAppearance *l, gint x, gint y, gint w, gint h)
                       ZPixmap, 0, NULL, w, h, 32, 0);
     g_assert(im != NULL);
 
-    in = l->surface.RrPixel_data;
+    in = l->surface.pixel_data;
     out = l->pixmap;
 
-    im->byte_order = render_endian;
 /* this malloc is a complete waste of time on normal 32bpp
    as reduce_depth just sets im->data = data and returns
 */
     scratch = g_new(RrPixel32, im->width * im->height);
     im->data = (char*) scratch;
-    reduce_depth(l->inst, in, im);
+    RrReduceDepth(l->inst, in, im);
     XPutImage(RrDisplay(l->inst), out,
               DefaultGC(RrDisplay(l->inst), RrScreen(l->inst)),
               im, 0, 0, x, y, w, h);
@@ -251,54 +269,66 @@ static void RrPixel32_to_pixmap(RrAppearance *l, gint x, gint y, gint w, gint h)
     g_free(scratch);
 }
 
-void RrMinsize(RrAppearance *l, gint *w, gint *h)
+void RrMargins (RrAppearance *a, gint *l, gint *t, gint *r, gint *b)
+{
+    *l = *t = *r = *b = 0;
+
+    if (a->surface.grad != RR_SURFACE_PARENTREL) {
+        if (a->surface.relief != RR_RELIEF_FLAT) {
+            switch (a->surface.bevel) {
+            case RR_BEVEL_1:
+                *l = *t = *r = *b = 1;
+                break;
+            case RR_BEVEL_2:
+                *l = *t = *r = *b = 2;
+                break;
+            }
+        } else if (a->surface.border) {
+            *l = *t = *r = *b = 1;
+        }
+    }
+}
+
+void RrMinsize(RrAppearance *a, gint *w, gint *h)
 {
     gint i;
     gint m;
+    gint l, t, r, b;
     *w = *h = 0;
 
-    for (i = 0; i < l->textures; ++i) {
-        switch (l->texture[i].type) {
+    for (i = 0; i < a->textures; ++i) {
+        switch (a->texture[i].type) {
         case RR_TEXTURE_NONE:
             break;
         case RR_TEXTURE_MASK:
-            *w = MAX(*w, l->texture[i].data.mask.mask->width);
-            *h = MAX(*h, l->texture[i].data.mask.mask->height);
+            *w = MAX(*w, a->texture[i].data.mask.mask->width);
+            *h = MAX(*h, a->texture[i].data.mask.mask->height);
             break;
         case RR_TEXTURE_TEXT:
-            m = RrFontMeasureString(l->texture[i].data.text.font,
-                                    l->texture[i].data.text.string,
-                                    l->texture[i].data.text.shadow,
-                                    l->texture[i].data.text.offset);
+            m = RrFontMeasureString(a->texture[i].data.text.font,
+                                    a->texture[i].data.text.string);
             *w = MAX(*w, m);
-            m = RrFontHeight(l->texture[i].data.text.font,
-                             l->texture[i].data.text.shadow,
-                             l->texture[i].data.text.offset);
+            m = RrFontHeight(a->texture[i].data.text.font);
             *h += MAX(*h, m);
             break;
         case RR_TEXTURE_RGBA:
-            *w += MAX(*w, l->texture[i].data.rgba.width);
-            *h += MAX(*h, l->texture[i].data.rgba.height);
+            *w += MAX(*w, a->texture[i].data.rgba.width);
+            *h += MAX(*h, a->texture[i].data.rgba.height);
             break;
-        }
-    }
-
-    if (l->surface.relief != RR_RELIEF_FLAT) {
-        switch (l->surface.bevel) {
-        case RR_BEVEL_1:
-            *w += 2;
-            *h += 2;
-            break;
-        case RR_BEVEL_2:
-            *w += 4;
-            *h += 4;
+        case RR_TEXTURE_LINE_ART:
+            *w += MAX(*w, MAX(a->texture[i].data.lineart.x1,
+                              a->texture[i].data.lineart.x2));
+            *h += MAX(*h, MAX(a->texture[i].data.lineart.y1,
+                              a->texture[i].data.lineart.y2));
             break;
         }
-    } else if (l->surface.border) {
-        *w += 2;
-        *h += 2;
     }
 
+    RrMargins(a, &l, &t, &r, &b);
+
+    *w += l + r;
+    *h += t + b;
+
     if (*w < 1) *w = 1;
     if (*h < 1) *h = 1;
 }
@@ -331,12 +361,14 @@ gboolean RrPixmapToRGBA(const RrInstance *inst,
     if (mask) {
         xm = XGetImage(RrDisplay(inst), mask,
                        0, 0, mw, mh, 0xffffffff, ZPixmap);
-        if (!xm)
+        if (!xm) {
+            XDestroyImage(xi);
             return FALSE;
+        }
     }
 
     *data = g_new(RrPixel32, pw * ph);
-    increase_depth(inst, *data, xi);
+    RrIncreaseDepth(inst, *data, xi);
 
     if (mask) {
         /* apply transparency from the mask */
@@ -344,7 +376,7 @@ gboolean RrPixmapToRGBA(const RrInstance *inst,
         for (i = 0, y = 0; y < ph; ++y) {
             for (x = 0; x < pw; ++x, ++i) {
                 if (!((((unsigned)xm->data[di + x / 8]) >> (x % 8)) & 0x1))
-                    (*data)[i] &= ~(0xff << default_alpha_offset);
+                    (*data)[i] &= ~(0xff << RrDefaultAlphaOffset);
             }
             di += xm->bytes_per_line;
         }
@@ -353,5 +385,9 @@ gboolean RrPixmapToRGBA(const RrInstance *inst,
     *w = pw;
     *h = ph;
 
+    XDestroyImage(xi);
+    if (mask)
+        XDestroyImage(xm);
+
     return TRUE;
 }