X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=render%2Fgradient.c;h=55a2fd27238c3d07ddc25a0a1976e04bdc37b672;hb=a098c2437e96d58c647559b46278bc92954e9bbe;hp=47f4850fdfbf9fc83ecbee7f43669310e076fabb;hpb=5be0a82a353b67160142134de1cc51fa31d72759;p=chaz%2Fopenbox

diff --git a/render/gradient.c b/render/gradient.c
index 47f4850f..55a2fd27 100644
--- a/render/gradient.c
+++ b/render/gradient.c
@@ -13,7 +13,7 @@ static void gradient_pyramid(RrSurface *sf, int inw, int inh);
 
 void RrRender(RrAppearance *a, int w, int h)
 {
-    RrPixel32 *data = a->surface.RrPixel_data;
+    RrPixel32 *data = a->surface.pixel_data;
     RrPixel32 current;
     unsigned int r,g,b;
     int off, x;
@@ -163,7 +163,7 @@ static void gradient_solid(RrAppearance *l, int w, int h)
 
     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,
                    0, 0, w, h);
@@ -304,6 +304,9 @@ static void gradient_solid(RrAppearance *l, int w, int h)
      (color##x[1] << RrDefaultGreenOffset) + \
      (color##x[2] << RrDefaultBlueOffset))
 
+#define INCREMENT(x, i) \
+    (inc##x[i])
+
 #define NEXT(x)                                           \
 {                                                         \
     int i;                                                \
@@ -314,13 +317,13 @@ static void gradient_solid(RrAppearance *l, int w, int h)
             /* Y (color) is dependant on X */             \
             error##x[i] += cdelta##x[i];                  \
             if ((error##x[i] << 1) >= len##x) {           \
-                color##x[i] += inc##x[i];                 \
+                color##x[i] += INCREMENT(x, i);           \
                 error##x[i] -= len##x;                    \
             }                                             \
         } else {                                          \
             /* X is dependant on Y (color) */             \
             while (1) {                                   \
-                color##x[i] += inc##x[i];                 \
+                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];          \
@@ -334,7 +337,7 @@ static void gradient_solid(RrAppearance *l, int w, int h)
 static void gradient_horizontal(RrSurface *sf, int w, int h)
 {
     int x, y;
-    RrPixel32 *data = sf->RrPixel_data, *datav;
+    RrPixel32 *data = sf->pixel_data, *datav;
     RrPixel32 current;
 
     VARS(x);
@@ -359,7 +362,7 @@ static void gradient_horizontal(RrSurface *sf, int w, int h)
 static void gradient_vertical(RrSurface *sf, int w, int h)
 {
     int x, y;
-    RrPixel32 *data = sf->RrPixel_data;
+    RrPixel32 *data = sf->pixel_data;
     RrPixel32 current;
 
     VARS(y);
@@ -381,7 +384,7 @@ static void gradient_vertical(RrSurface *sf, int w, int h)
 static void gradient_diagonal(RrSurface *sf, int w, int h)
 {
     int x, y;
-    RrPixel32 *data = sf->RrPixel_data;
+    RrPixel32 *data = sf->pixel_data;
     RrColor left, right;
     RrColor extracorner;
 
@@ -428,7 +431,7 @@ static void gradient_diagonal(RrSurface *sf, int w, int h)
 static void gradient_crossdiagonal(RrSurface *sf, int w, int h)
 {
     int x, y;
-    RrPixel32 *data = sf->RrPixel_data;
+    RrPixel32 *data = sf->pixel_data;
     RrColor left, right;
     RrColor extracorner;
 
@@ -475,7 +478,7 @@ static void gradient_crossdiagonal(RrSurface *sf, int w, int h)
 static void gradient_pyramid(RrSurface *sf, int inw, int inh)
 {
     int x, y, w = (inw >> 1) + 1, h = (inh >> 1) + 1;
-    RrPixel32 *data = sf->RrPixel_data;
+    RrPixel32 *data = sf->pixel_data;
     RrPixel32 *end = data + inw*inh - 1;
     RrPixel32 current;
     RrColor left, right;