X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=render%2Fgradient.c;h=53f7e25c506eafb793d75cab6c74621b472ca070;hb=3603c20b4edb524a2ee08825ffb098b439efcc92;hp=8e3b207f58b05bb6a94786a12980c531cbece02a;hpb=bb6b616b9c4fad0e074f0eac2e9c85a482ab09ae;p=chaz%2Fopenbox

diff --git a/render/gradient.c b/render/gradient.c
index 8e3b207f..53f7e25c 100644
--- a/render/gradient.c
+++ b/render/gradient.c
@@ -1,29 +1,46 @@
+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+   gradient.c for the Openbox window manager
+   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003        Derek Foreman
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   See the COPYING file for a copy of the GNU General Public License.
+*/
+
 #include "render.h"
 #include "gradient.h"
 #include "color.h"
 #include <glib.h>
 
 static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised);
-static void gradient_solid(RrAppearance *l, int w, int h);
-static void gradient_vertical(RrSurface *sf, int w, int h);
-static void gradient_horizontal(RrSurface *sf, int w, int h);
-static void gradient_diagonal(RrSurface *sf, int w, int h);
-static void gradient_crossdiagonal(RrSurface *sf, int w, int h);
-static void gradient_pyramid(RrSurface *sf, int inw, int inh);
-static void gradient_rectangle(RrSurface *sf, int inw, int inh);
-static void gradient_pipecross(RrSurface *sf, int inw, int inh);
-
-void RrRender(RrAppearance *a, int w, int h)
+static void gradient_solid(RrAppearance *l, gint w, gint h);
+static void gradient_vertical(RrSurface *sf, gint w, gint h);
+static void gradient_horizontal(RrSurface *sf, gint w, gint h);
+static void gradient_diagonal(RrSurface *sf, gint w, gint h);
+static void gradient_crossdiagonal(RrSurface *sf, gint w, gint h);
+static void gradient_pyramid(RrSurface *sf, gint inw, gint inh);
+
+void RrRender(RrAppearance *a, gint w, gint h)
 {
-    RrPixel32 *data = a->surface.RrPixel_data;
+    RrPixel32 *data = a->surface.pixel_data;
     RrPixel32 current;
-    unsigned int r,g,b;
-    int off, x;
+    guint r,g,b;
+    gint off, x;
 
     switch (a->surface.grad) {
     case RR_SURFACE_SOLID:
         gradient_solid(a, w, h);
-        return;
+        break;
     case RR_SURFACE_VERTICAL:
         gradient_vertical(&a->surface, w, h);
         break;
@@ -39,17 +56,27 @@ void RrRender(RrAppearance *a, int w, int h)
     case RR_SURFACE_PYRAMID:
         gradient_pyramid(&a->surface, w, h);
         break;
-    case RR_SURFACE_PIPECROSS:
-        gradient_pipecross(&a->surface, w, h);
-        break;
-    case RR_SURFACE_RECTANGLE:
-        gradient_rectangle(&a->surface, w, h);
-        break;
     default:
-        g_message("unhandled gradient");
+        g_assert_not_reached(); /* unhandled gradient */
         return;
     }
   
+    if (a->surface.interlaced) {
+        gint i;
+        RrPixel32 *p;
+
+        r = a->surface.interlace_color->r;
+        g = a->surface.interlace_color->g;
+        b = a->surface.interlace_color->b;
+        current = (r << RrDefaultRedOffset)
+            + (g << RrDefaultGreenOffset)
+            + (b << RrDefaultBlueOffset);
+        p = data;
+        for (i = 0; i < h; i += 2, p += w)
+            for (x = 0; x < w; ++x, ++p)
+                *p = current;
+    }
+
     if (a->surface.relief == RR_RELIEF_FLAT && a->surface.border) {
         r = a->surface.border_color->r;
         g = a->surface.border_color->g;
@@ -92,145 +119,9 @@ void RrRender(RrAppearance *a, int w, int h)
     }
 }
 
-
-
-static void gradient_vertical(RrSurface *sf, int w, int h)
-{
-    RrPixel32 *data = sf->RrPixel_data;
-    RrPixel32 current;
-    float dr, dg, db;
-    unsigned int r,g,b;
-    int x, y;
-
-    dr = (float)(sf->secondary->r - sf->primary->r);
-    dr/= (float)h;
-
-    dg = (float)(sf->secondary->g - sf->primary->g);
-    dg/= (float)h;
-
-    db = (float)(sf->secondary->b - sf->primary->b);
-    db/= (float)h;
-
-    for (y = 0; y < h; ++y) {
-        r = sf->primary->r + (int)(dr * y);
-        g = sf->primary->g + (int)(dg * y);
-        b = sf->primary->b + (int)(db * y);
-        current = (r << RrDefaultRedOffset)
-            + (g << RrDefaultGreenOffset)
-            + (b << RrDefaultBlueOffset);
-        for (x = 0; x < w; ++x, ++data)
-            *data = current;
-    }
-}
-
-static void gradient_horizontal(RrSurface *sf, int w, int h)
-{
-    RrPixel32 *data = sf->RrPixel_data;
-    RrPixel32 current;
-    float dr, dg, db;
-    unsigned int r,g,b;
-    int x, y;
-
-    dr = (float)(sf->secondary->r - sf->primary->r);
-    dr/= (float)w;
-
-    dg = (float)(sf->secondary->g - sf->primary->g);
-    dg/= (float)w;
-
-    db = (float)(sf->secondary->b - sf->primary->b);
-    db/= (float)w;
-
-    for (x = 0; x < w; ++x, ++data) {
-        r = sf->primary->r + (int)(dr * x);
-        g = sf->primary->g + (int)(dg * x);
-        b = sf->primary->b + (int)(db * x);
-        current = (r << RrDefaultRedOffset)
-            + (g << RrDefaultGreenOffset)
-            + (b << RrDefaultBlueOffset);
-        for (y = 0; y < h; ++y)
-            *(data + y*w) = current;
-    }
-}
-
-static void gradient_diagonal(RrSurface *sf, int w, int h)
-{
-    RrPixel32 *data = sf->RrPixel_data;
-    RrPixel32 current;
-    float drx, dgx, dbx, dry, dgy, dby;
-    unsigned int r,g,b;
-    int x, y;
-
-    for (y = 0; y < h; ++y) {
-        drx = (float)(sf->secondary->r -
-                      sf->primary->r);
-        dry = drx/(float)h;
-        drx/= (float)w;
-
-        dgx = (float)(sf->secondary->g -
-                      sf->primary->g);
-        dgy = dgx/(float)h;
-        dgx/= (float)w;
-
-        dbx = (float)(sf->secondary->b -
-                      sf->primary->b);
-        dby = dbx/(float)h;
-        dbx/= (float)w;
-        for (x = 0; x < w; ++x, ++data) {
-            r = sf->primary->r +
-                ((int)(drx * x) + (int)(dry * y))/2;
-            g = sf->primary->g +
-                ((int)(dgx * x) + (int)(dgy * y))/2;
-            b = sf->primary->b +
-                ((int)(dbx * x) + (int)(dby * y))/2;
-            current = (r << RrDefaultRedOffset)
-                + (g << RrDefaultGreenOffset)
-                + (b << RrDefaultBlueOffset);
-            *data = current;
-        }
-    }
-}
-
-static void gradient_crossdiagonal(RrSurface *sf, int w, int h)
-{
-    RrPixel32 *data = sf->RrPixel_data;
-    RrPixel32 current;
-    float drx, dgx, dbx, dry, dgy, dby;
-    unsigned int r,g,b;
-    int x, y;
-
-    for (y = 0; y < h; ++y) {
-        drx = (float)(sf->secondary->r -
-                      sf->primary->r);
-        dry = drx/(float)h;
-        drx/= (float)w;
-
-        dgx = (float)(sf->secondary->g -
-                      sf->primary->g);
-        dgy = dgx/(float)h;
-        dgx/= (float)w;
-
-        dbx = (float)(sf->secondary->b -
-                      sf->primary->b);
-        dby = dbx/(float)h;
-        dbx/= (float)w;
-        for (x = w; x > 0; --x, ++data) {
-            r = sf->primary->r +
-                ((int)(drx * (x-1)) + (int)(dry * y))/2;
-            g = sf->primary->g +
-                ((int)(dgx * (x-1)) + (int)(dgy * y))/2;
-            b = sf->primary->b +
-                ((int)(dbx * (x-1)) + (int)(dby * y))/2;
-            current = (r << RrDefaultRedOffset)
-                + (g << RrDefaultGreenOffset)
-                + (b << RrDefaultBlueOffset);
-            *data = current;
-        }
-    }
-}
-
 static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised)
 {
-    int r, g, b;
+    gint r, g, b;
 
     RrPixel32 *up, *down;
     if (raised) {
@@ -264,7 +155,7 @@ static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised)
 
 static void create_bevel_colors(RrAppearance *l)
 {
-    int r, g, b;
+    gint r, g, b;
 
     /* light color */
     r = l->surface.primary->r;
@@ -278,7 +169,6 @@ static void create_bevel_colors(RrAppearance *l)
     if (b > 0xFF) b = 0xFF;
     g_assert(!l->surface.bevel_light);
     l->surface.bevel_light = RrColorNew(l->inst, r, g, b);
-    RrColorAllocateGC(l->surface.bevel_light);
 
     /* dark color */
     r = l->surface.primary->r;
@@ -289,34 +179,30 @@ static void create_bevel_colors(RrAppearance *l)
     b = (b >> 1) + (b >> 2);
     g_assert(!l->surface.bevel_dark);
     l->surface.bevel_dark = RrColorNew(l->inst, r, g, b);
-    RrColorAllocateGC(l->surface.bevel_dark);
 }
 
-static void gradient_solid(RrAppearance *l, int w, int h) 
+static void gradient_solid(RrAppearance *l, gint w, gint h) 
 {
     RrPixel32 pix;
-    int i, a, b;
+    gint i, a, b;
     RrSurface *sp = &l->surface;
-    int left = 0, top = 0, right = w - 1, bottom = h - 1;
+    gint left = 0, top = 0, right = w - 1, bottom = h - 1;
 
-    if (sp->primary->gc == None)
-        RrColorAllocateGC(sp->primary);
     pix = (sp->primary->r << RrDefaultRedOffset)
         + (sp->primary->g << RrDefaultGreenOffset)
         + (sp->primary->b << RrDefaultBlueOffset);
 
     for (a = 0; a < w; a++)
         for (b = 0; b < h; b++)
-            sp->RrPixel_data[a + b * w] = pix;
+            sp->pixel_data[a + b * w] = pix;
 
-    XFillRectangle(RrDisplay(l->inst), l->pixmap, sp->primary->gc,
+    XFillRectangle(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->primary),
                    0, 0, w, h);
 
     if (sp->interlaced) {
-        if (sp->secondary->gc == None)
-            RrColorAllocateGC(sp->secondary);
         for (i = 0; i < h; i += 2)
-            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->secondary->gc,
+            XDrawLine(RrDisplay(l->inst), l->pixmap,
+                      RrColorGC(sp->interlace_color),
                       0, i, w, i);
     }
 
@@ -327,29 +213,25 @@ static void gradient_solid(RrAppearance *l, int w, int h)
 
         switch (sp->bevel) {
         case RR_BEVEL_1:
-            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
                       left, bottom, right, bottom);
-            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
                       right, bottom, right, top);
                 
-            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
+            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
                       left, top, right, top);
-            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
+            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
                       left, bottom, left, top);
             break;
         case RR_BEVEL_2:
-            XDrawLine(RrDisplay(l->inst), l->pixmap,
-                      sp->bevel_dark->gc,
+            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
                       left + 1, bottom - 2, right - 2, bottom - 2);
-            XDrawLine(RrDisplay(l->inst), l->pixmap,
-                      sp->bevel_dark->gc,
+            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
                       right - 2, bottom - 2, right - 2, top + 1);
 
-            XDrawLine(RrDisplay(l->inst), l->pixmap,
-                      sp->bevel_light->gc,
+            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
                       left + 1, top + 1, right - 2, top + 1);
-            XDrawLine(RrDisplay(l->inst), l->pixmap,
-                      sp->bevel_light->gc,
+            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
                       left + 1, bottom - 2, left + 1, top + 1);
             break;
         default:
@@ -362,25 +244,25 @@ static void gradient_solid(RrAppearance *l, int w, int h)
 
         switch (sp->bevel) {
         case RR_BEVEL_1:
-            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
+            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
                       left, bottom, right, bottom);
-            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
+            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
                       right, bottom, right, top);
       
-            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
                       left, top, right, top);
-            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
                       left, bottom, left, top);
             break;
         case RR_BEVEL_2:
-            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
+            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
                       left + 1, bottom - 2, right - 2, bottom - 2);
-            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
+            XDrawLine(RrDisplay(l->inst), l->pixmap,RrColorGC(sp->bevel_light),
                       right - 2, bottom - 2, right - 2, top + 1);
       
-            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
                       left + 1, top + 1, right - 2, top + 1);
-            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+            XDrawLine(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->bevel_dark),
                       left + 1, bottom - 2, left + 1, top + 1);
 
             break;
@@ -390,9 +272,8 @@ static void gradient_solid(RrAppearance *l, int w, int h)
         break;
     case RR_RELIEF_FLAT:
         if (sp->border) {
-            if (sp->border_color->gc == None)
-                RrColorAllocateGC(sp->border_color);
-            XDrawRectangle(RrDisplay(l->inst), l->pixmap, sp->border_color->gc,
+            XDrawRectangle(RrDisplay(l->inst), l->pixmap,
+                           RrColorGC(sp->border_color),
                            left, top, right, bottom);
         }
         break;
@@ -401,143 +282,289 @@ static void gradient_solid(RrAppearance *l, int w, int h)
     }
 }
 
-static void gradient_pyramid(RrSurface *sf, int inw, int inh)
+/* * * * * * * * * * * * * * GRADIENT MAGIC WOOT * * * * * * * * * * * * * * */
+
+#define VARS(x)                                                     \
+    guint color##x[3];                                       \
+    gint len##x, cdelta##x[3], error##x[3] = { 0, 0, 0 }, inc##x[3]; \
+    gboolean bigslope##x[3] /* color slope > 1 */
+
+#define SETUP(x, from, to, w)         \
+    len##x = w;                       \
+                                      \
+    color##x[0] = from->r;            \
+    color##x[1] = from->g;            \
+    color##x[2] = from->b;            \
+                                      \
+    cdelta##x[0] = to->r - from->r;   \
+    cdelta##x[1] = to->g - from->g;   \
+    cdelta##x[2] = to->b - from->b;   \
+                                      \
+    if (cdelta##x[0] < 0) {           \
+        cdelta##x[0] = -cdelta##x[0]; \
+        inc##x[0] = -1;               \
+    } else                            \
+        inc##x[0] = 1;                \
+    if (cdelta##x[1] < 0) {           \
+        cdelta##x[1] = -cdelta##x[1]; \
+        inc##x[1] = -1;               \
+    } else                            \
+        inc##x[1] = 1;                \
+    if (cdelta##x[2] < 0) {           \
+        cdelta##x[2] = -cdelta##x[2]; \
+        inc##x[2] = -1;               \
+    } else                            \
+        inc##x[2] = 1;                \
+    bigslope##x[0] = cdelta##x[0] > w;\
+    bigslope##x[1] = cdelta##x[1] > w;\
+    bigslope##x[2] = cdelta##x[2] > w
+
+#define COLOR_RR(x, c)                       \
+    c->r = color##x[0];                      \
+    c->g = color##x[1];                      \
+    c->b = color##x[2]
+
+#define COLOR(x)                             \
+    ((color##x[0] << RrDefaultRedOffset) +   \
+     (color##x[1] << RrDefaultGreenOffset) + \
+     (color##x[2] << RrDefaultBlueOffset))
+
+#define INCREMENT(x, i) \
+    (inc##x[i])
+
+#define NEXT(x)                                           \
+{                                                         \
+    gint i;                                                \
+    for (i = 2; i >= 0; --i) {                            \
+        if (!cdelta##x[i]) continue;                      \
+                                                          \
+        if (!bigslope##x[i]) {                            \
+            /* Y (color) is dependant on X */             \
+            error##x[i] += cdelta##x[i];                  \
+            if ((error##x[i] << 1) >= len##x) {           \
+                color##x[i] += INCREMENT(x, i);           \
+                error##x[i] -= len##x;                    \
+            }                                             \
+        } else {                                          \
+            /* X is dependant on Y (color) */             \
+            while (1) {                                   \
+                color##x[i] += INCREMENT(x, i);           \
+                error##x[i] += len##x;                    \
+                if ((error##x[i] << 1) >= cdelta##x[i]) { \
+                    error##x[i] -= cdelta##x[i];          \
+                    break;                                \
+                }                                         \
+            }                                             \
+        }                                                 \
+    }                                                     \
+}
+
+static void gradient_horizontal(RrSurface *sf, gint w, gint h)
 {
-    RrPixel32 *data = sf->RrPixel_data;
-    RrPixel32 *end = data + inw*inh - 1;
+    gint x, y;
+    RrPixel32 *data = sf->pixel_data, *datav;
     RrPixel32 current;
-    float drx, dgx, dbx, dry, dgy, dby;
-    unsigned int r,g,b;
-    int x, y, h=(inh/2) + 1, w=(inw/2) + 1;
-
-    drx = (float)(sf->secondary->r -
-                  sf->primary->r);
-    dry = drx/(float)h;
-    drx/= (float)w;
-
-    dgx = (float)(sf->secondary->g -
-                  sf->primary->g);
-    dgy = dgx/(float)h;
-    dgx/= (float)w;
-
-    dbx = (float)(sf->secondary->b -
-                  sf->primary->b);
-    dby = dbx/(float)h;
-    dbx/= (float)w;
-
-    for (y = 0; y < h; ++y) {
-        for (x = 0; x < w; ++x, data) {
-            r = sf->primary->r +
-                ((int)(drx * x) + (int)(dry * y))/2;
-            g = sf->primary->g +
-                ((int)(dgx * x) + (int)(dgy * y))/2;
-            b = sf->primary->b +
-                ((int)(dbx * x) + (int)(dby * y))/2;
-            current = (r << RrDefaultRedOffset)
-                + (g << RrDefaultGreenOffset)
-                + (b << RrDefaultBlueOffset);
-            *(data+x) = current;
-            *(data+inw-x) = current;
-            *(end-x) = current;
-            *(end-(inw-x)) = current;
+
+    VARS(x);
+    SETUP(x, sf->primary, sf->secondary, w);
+
+    for (x = w - 1; x > 0; --x) {  /* 0 -> w-1 */
+        current = COLOR(x);
+        datav = data;
+        for (y = h - 1; y >= 0; --y) {  /* 0 -> h */
+            *datav = current;
+            datav += w;
         }
-        data+=inw;
-        end-=inw;
+        ++data;
+
+        NEXT(x);
     }
+    current = COLOR(x);
+    for (y = h - 1; y >= 0; --y)  /* 0 -> h */
+        *(data + y * w) = current;
 }
 
-static void gradient_rectangle(RrSurface *sf, int inw, int inh)
+static void gradient_vertical(RrSurface *sf, gint w, gint h)
 {
-    RrPixel32 *data = sf->RrPixel_data;
-    RrPixel32 *end = data + inw*inh - 1;
+    gint x, y;
+    RrPixel32 *data = sf->pixel_data;
     RrPixel32 current;
-    float drx, dgx, dbx, dry, dgy, dby;
-    unsigned int r,g,b;
-    int x, y, h=(inh/2) + 1, w=(inw/2) + 1;
-
-    drx = (float)(sf->primary->r -
-                  sf->secondary->r);
-    dry = drx/(float)h;
-    drx/= (float)w;
-
-    dgx = (float)(sf->primary->g -
-                  sf->secondary->g);
-    dgy = dgx/(float)h;
-    dgx/= (float)w;
-
-    dbx = (float)(sf->primary->b -
-                  sf->secondary->b);
-    dby = dbx/(float)h;
-    dbx/= (float)w;
-
-    for (y = 0; y < h; ++y) {
-        for (x = 0; x < w; ++x, data) {
-            if ((float)x/(float)w < (float)y/(float)h) {
-                r = sf->primary->r + (drx * x);
-                g = sf->primary->g + (dgx * x);
-                b = sf->primary->b + (dbx * x);
-            } else {
-                r = sf->primary->r + (dry * x);
-                g = sf->primary->g + (dgy * x);
-                b = sf->primary->b + (dby * x);
-            }
-            current = (r << RrDefaultRedOffset)
-                + (g << RrDefaultGreenOffset)
-                + (b << RrDefaultBlueOffset);
-            *(data+x) = current;
-            *(data+inw-x) = current;
-            *(end-x) = current;
-            *(end-(inw-x)) = current;
+
+    VARS(y);
+    SETUP(y, sf->primary, sf->secondary, h);
+
+    for (y = h - 1; y > 0; --y) {  /* 0 -> h-1 */
+        current = COLOR(y);
+        for (x = w - 1; x >= 0; --x)  /* 0 -> w */
+            *(data++) = current;
+
+        NEXT(y);
+    }
+    current = COLOR(y);
+    for (x = w - 1; x >= 0; --x)  /* 0 -> w */
+        *(data++) = current;
+}
+
+
+static void gradient_diagonal(RrSurface *sf, gint w, gint h)
+{
+    gint x, y;
+    RrPixel32 *data = sf->pixel_data;
+    RrColor left, right;
+    RrColor extracorner;
+
+    VARS(lefty);
+    VARS(righty);
+    VARS(x);
+
+    extracorner.r = (sf->primary->r + sf->secondary->r) / 2;
+    extracorner.g = (sf->primary->g + sf->secondary->g) / 2;
+    extracorner.b = (sf->primary->b + sf->secondary->b) / 2;
+
+    SETUP(lefty, sf->primary, (&extracorner), h);
+    SETUP(righty, (&extracorner), sf->secondary, h);
+
+    for (y = h - 1; y > 0; --y) {  /* 0 -> h-1 */
+        COLOR_RR(lefty, (&left));
+        COLOR_RR(righty, (&right));
+
+        SETUP(x, (&left), (&right), w);
+
+        for (x = w - 1; x > 0; --x) {  /* 0 -> w-1 */
+            *(data++) = COLOR(x);
+
+            NEXT(x);
         }
-        data+=inw;
-        end-=inw;
+        *(data++) = COLOR(x);
+
+        NEXT(lefty);
+        NEXT(righty);
     }
+    COLOR_RR(lefty, (&left));
+    COLOR_RR(righty, (&right));
+
+    SETUP(x, (&left), (&right), w);
+
+    for (x = w - 1; x > 0; --x) {  /* 0 -> w-1 */
+        *(data++) = COLOR(x);
+        
+        NEXT(x);
+    }
+    *data = COLOR(x);
+}
+
+static void gradient_crossdiagonal(RrSurface *sf, gint w, gint h)
+{
+    gint x, y;
+    RrPixel32 *data = sf->pixel_data;
+    RrColor left, right;
+    RrColor extracorner;
+
+    VARS(lefty);
+    VARS(righty);
+    VARS(x);
+
+    extracorner.r = (sf->primary->r + sf->secondary->r) / 2;
+    extracorner.g = (sf->primary->g + sf->secondary->g) / 2;
+    extracorner.b = (sf->primary->b + sf->secondary->b) / 2;
+
+    SETUP(lefty, (&extracorner), sf->secondary, h);
+    SETUP(righty, sf->primary, (&extracorner), h);
+
+    for (y = h - 1; y > 0; --y) {  /* 0 -> h-1 */
+        COLOR_RR(lefty, (&left));
+        COLOR_RR(righty, (&right));
+
+        SETUP(x, (&left), (&right), w);
+
+        for (x = w - 1; x > 0; --x) {  /* 0 -> w-1 */
+            *(data++) = COLOR(x);
+
+            NEXT(x);
+        }
+        *(data++) = COLOR(x);
+
+        NEXT(lefty);
+        NEXT(righty);
+    }
+    COLOR_RR(lefty, (&left));
+    COLOR_RR(righty, (&right));
+
+    SETUP(x, (&left), (&right), w);
+
+    for (x = w - 1; x > 0; --x) {  /* 0 -> w-1 */
+        *(data++) = COLOR(x);
+        
+        NEXT(x);
+    }
+    *data = COLOR(x);
 }
 
-static void gradient_pipecross(RrSurface *sf, int inw, int inh)
+static void gradient_pyramid(RrSurface *sf, gint inw, gint inh)
 {
-    RrPixel32 *data = sf->RrPixel_data;
+    gint x, y, w = (inw >> 1) + 1, h = (inh >> 1) + 1;
+    RrPixel32 *data = sf->pixel_data;
     RrPixel32 *end = data + inw*inh - 1;
     RrPixel32 current;
-    float drx, dgx, dbx, dry, dgy, dby;
-    unsigned int r,g,b;
-    int x, y, h=(inh/2) + 1, w=(inw/2) + 1;
-
-    drx = (float)(sf->secondary->r -
-                  sf->primary->r);
-    dry = drx/(float)h;
-    drx/= (float)w;
-
-    dgx = (float)(sf->secondary->g -
-                  sf->primary->g);
-    dgy = dgx/(float)h;
-    dgx/= (float)w;
-
-    dbx = (float)(sf->secondary->b -
-                  sf->primary->b);
-    dby = dbx/(float)h;
-    dbx/= (float)w;
-
-    for (y = 0; y < h; ++y) {
-        for (x = 0; x < w; ++x, data) {
-            if ((float)x/(float)w > (float)y/(float)h) {
-                r = sf->primary->r + (drx * x);
-                g = sf->primary->g + (dgx * x);
-                b = sf->primary->b + (dbx * x);
-            } else {
-                r = sf->primary->r + (dry * x);
-                g = sf->primary->g + (dgy * x);
-                b = sf->primary->b + (dby * x);
-            }
-            current = (r << RrDefaultRedOffset)
-                + (g << RrDefaultGreenOffset)
-                + (b << RrDefaultBlueOffset);
+    RrColor left, right;
+    RrColor extracorner;
+
+    VARS(lefty);
+    VARS(righty);
+    VARS(x);
+
+    extracorner.r = (sf->primary->r + sf->secondary->r) / 2;
+    extracorner.g = (sf->primary->g + sf->secondary->g) / 2;
+    extracorner.b = (sf->primary->b + sf->secondary->b) / 2;
+
+    SETUP(lefty, (&extracorner), sf->secondary, h);
+    SETUP(righty, sf->primary, (&extracorner), h);
+
+    for (y = h - 1; y > 0; --y) {  /* 0 -> h-1 */
+        COLOR_RR(lefty, (&left));
+        COLOR_RR(righty, (&right));
+
+        SETUP(x, (&left), (&right), w);
+
+        for (x = w - 1; x > 0; --x) {  /* 0 -> w-1 */
+            current = COLOR(x);
             *(data+x) = current;
             *(data+inw-x) = current;
             *(end-x) = current;
             *(end-(inw-x)) = current;
+
+            NEXT(x);
         }
+        current = COLOR(x);
+        *(data+x) = current;
+        *(data+inw-x) = current;
+        *(end-x) = current;
+        *(end-(inw-x)) = current;
+
         data+=inw;
         end-=inw;
+
+        NEXT(lefty);
+        NEXT(righty);
+    }
+    COLOR_RR(lefty, (&left));
+    COLOR_RR(righty, (&right));
+
+    SETUP(x, (&left), (&right), w);
+
+    for (x = w - 1; x > 0; --x) {  /* 0 -> w-1 */
+        current = COLOR(x);
+        *(data+x) = current;
+        *(data+inw-x) = current;
+        *(end-x) = current;
+        *(end-(inw-x)) = current;
+        
+        NEXT(x);
     }
+    current = COLOR(x);
+    *(data+x) = current;
+    *(data+inw-x) = current;
+    *(end-x) = current;
+    *(end-(inw-x)) = current;
 }
+