place transients better

[chaz/openbox] / render / gradient.c

diff --git a/render/gradient.c b/render/gradient.c
index 26ebbdc60515b50c8e36c08216151fc6aa60894d..abbbc659ab42ad65f05a3ee1a9e3876201bef7c8 100644 (file)
--- 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;
@@ -38,7 +38,7 @@ void RrRender(RrAppearance *a, int w, int h)
         gradient_pyramid(&a->surface, w, h);
         break;
     default:
-        g_message("unhandled gradient");
+        g_assert_not_reached(); /* unhandled gradient */
         return;
     }
   
@@ -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);
@@ -183,9 +183,6 @@ static void gradient_solid(RrAppearance *l, int w, int h)
 
         switch (sp->bevel) {
         case RR_BEVEL_1:
-            g_message("%lx %lx %lx",
-                      sp->primary->pixel,
-                      sp->bevel_dark->pixel, sp->bevel_light->pixel);
             XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
                       left, bottom, right, bottom);
             XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
@@ -337,7 +334,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);
@@ -362,7 +359,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);
@@ -384,7 +381,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;
 
@@ -431,7 +428,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;
 
@@ -478,7 +475,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;