X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Fgradient.c;h=8e3b207f58b05bb6a94786a12980c531cbece02a;hb=17a85c1cbdc310f5ae507dd9747e37e5067be830;hp=ec653b1e2bcf772de18e058dcf88fb51d63b37d2;hpb=ad4c3aad45d21b3f0c0b69cd8b532f775c5e5223;p=chaz%2Fopenbox

diff --git a/render/gradient.c b/render/gradient.c
index ec653b1e..8e3b207f 100644
--- a/render/gradient.c
+++ b/render/gradient.c
@@ -1,460 +1,543 @@
-#include <glib.h>
 #include "render.h"
 #include "gradient.h"
-#include "../kernel/openbox.h"
 #include "color.h"
+#include <glib.h>
 
-void gradient_render(Surface *sf, int w, int 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)
 {
-  pixel32 *data = sf->data.planar.pixel_data;
-  pixel32 current;
-  unsigned int r,g,b;
-  int off, x;
-
-  switch (sf->data.planar.grad) {
-  case Background_Solid: /* already handled */
-    return;
-  case Background_Vertical:
-    gradient_vertical(sf, w, h);
-    break;
-  case Background_Horizontal:
-    gradient_horizontal(sf, w, h);
-    break;
-  case Background_Diagonal:
-    gradient_diagonal(sf, w, h);
-    break;
-  case Background_CrossDiagonal:
-    gradient_crossdiagonal(sf, w, h);
-    break;
-  case Background_Pyramid:
-    gradient_pyramid(sf, w, h);
-    break;
-  case Background_PipeCross:
-    gradient_pipecross(sf, w, h);
-    break;
-  case Background_Rectangle:
-    gradient_rectangle(sf, w, h);
-    break;
-  default:
-    g_message("unhandled gradient");
-    return;
-  }
-  
-  if (sf->data.planar.relief == Flat && sf->data.planar.border) {
-    r = sf->data.planar.border_color->r;
-    g = sf->data.planar.border_color->g;
-    b = sf->data.planar.border_color->b;
-    current = (r << default_red_offset)
-            + (g << default_green_offset)
-            + (b << default_blue_offset);
-    for (off = 0, x = 0; x < w; ++x, off++) {
-      *(data + off) = current;
-      *(data + off + ((h-1) * w)) = current;
-    }
-    for (off = 0, x = 0; x < h; ++x, off++) {
-      *(data + (off * w)) = current;
-      *(data + (off * w) + w - 1) = current;
+    RrPixel32 *data = a->surface.RrPixel_data;
+    RrPixel32 current;
+    unsigned int r,g,b;
+    int off, x;
+
+    switch (a->surface.grad) {
+    case RR_SURFACE_SOLID:
+        gradient_solid(a, w, h);
+        return;
+    case RR_SURFACE_VERTICAL:
+        gradient_vertical(&a->surface, w, h);
+        break;
+    case RR_SURFACE_HORIZONTAL:
+        gradient_horizontal(&a->surface, w, h);
+        break;
+    case RR_SURFACE_DIAGONAL:
+        gradient_diagonal(&a->surface, w, h);
+        break;
+    case RR_SURFACE_CROSS_DIAGONAL:
+        gradient_crossdiagonal(&a->surface, w, h);
+        break;
+    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");
+        return;
     }
-  }
-
-  if (sf->data.planar.relief != Flat) {
-    if (sf->data.planar.bevel == Bevel1) {
-      for (off = 1, x = 1; x < w - 1; ++x, off++)
-        highlight(data + off,
-                  data + off + (h-1) * w,
-                  sf->data.planar.relief==Raised);
-      for (off = 0, x = 0; x < h; ++x, off++)
-        highlight(data + off * w,
-                  data + off * w + w - 1,
-                  sf->data.planar.relief==Raised);
+  
+    if (a->surface.relief == RR_RELIEF_FLAT && a->surface.border) {
+        r = a->surface.border_color->r;
+        g = a->surface.border_color->g;
+        b = a->surface.border_color->b;
+        current = (r << RrDefaultRedOffset)
+            + (g << RrDefaultGreenOffset)
+            + (b << RrDefaultBlueOffset);
+        for (off = 0, x = 0; x < w; ++x, off++) {
+            *(data + off) = current;
+            *(data + off + ((h-1) * w)) = current;
+        }
+        for (off = 0, x = 0; x < h; ++x, off++) {
+            *(data + (off * w)) = current;
+            *(data + (off * w) + w - 1) = current;
+        }
     }
 
-    if (sf->data.planar.bevel == Bevel2) {
-      for (off = 2, x = 2; x < w - 2; ++x, off++)
-        highlight(data + off + w,
-                  data + off + (h-2) * w,
-                  sf->data.planar.relief==Raised);
-      for (off = 1, x = 1; x < h-1; ++x, off++)
-        highlight(data + off * w + 1,
-                  data + off * w + w - 2,
-                  sf->data.planar.relief==Raised);
+    if (a->surface.relief != RR_RELIEF_FLAT) {
+        if (a->surface.bevel == RR_BEVEL_1) {
+            for (off = 1, x = 1; x < w - 1; ++x, off++)
+                highlight(data + off,
+                          data + off + (h-1) * w,
+                          a->surface.relief==RR_RELIEF_RAISED);
+            for (off = 0, x = 0; x < h; ++x, off++)
+                highlight(data + off * w,
+                          data + off * w + w - 1,
+                          a->surface.relief==RR_RELIEF_RAISED);
+        }
+
+        if (a->surface.bevel == RR_BEVEL_2) {
+            for (off = 2, x = 2; x < w - 2; ++x, off++)
+                highlight(data + off + w,
+                          data + off + (h-2) * w,
+                          a->surface.relief==RR_RELIEF_RAISED);
+            for (off = 1, x = 1; x < h-1; ++x, off++)
+                highlight(data + off * w + 1,
+                          data + off * w + w - 2,
+                          a->surface.relief==RR_RELIEF_RAISED);
+        }
     }
-  }
 }
 
 
 
-void gradient_vertical(Surface *sf, int w, int h)
+static void gradient_vertical(RrSurface *sf, int w, int h)
 {
-  pixel32 *data = sf->data.planar.pixel_data;
-  pixel32 current;
-  float dr, dg, db;
-  unsigned int r,g,b;
-  int x, y;
-
-  dr = (float)(sf->data.planar.secondary->r - sf->data.planar.primary->r);
-  dr/= (float)h;
-
-  dg = (float)(sf->data.planar.secondary->g - sf->data.planar.primary->g);
-  dg/= (float)h;
-
-  db = (float)(sf->data.planar.secondary->b - sf->data.planar.primary->b);
-  db/= (float)h;
-
-  for (y = 0; y < h; ++y) {
-    r = sf->data.planar.primary->r + (int)(dr * y);
-    g = sf->data.planar.primary->g + (int)(dg * y);
-    b = sf->data.planar.primary->b + (int)(db * y);
-    current = (r << default_red_offset)
-            + (g << default_green_offset)
-            + (b << default_blue_offset);
-    for (x = 0; x < w; ++x, ++data)
-      *data = current;
-  }
+    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;
+    }
 }
 
-void gradient_horizontal(Surface *sf, int w, int h)
+static void gradient_horizontal(RrSurface *sf, int w, int h)
 {
-  pixel32 *data = sf->data.planar.pixel_data;
-  pixel32 current;
-  float dr, dg, db;
-  unsigned int r,g,b;
-  int x, y;
-
-  dr = (float)(sf->data.planar.secondary->r - sf->data.planar.primary->r);
-  dr/= (float)w;
-
-  dg = (float)(sf->data.planar.secondary->g - sf->data.planar.primary->g);
-  dg/= (float)w;
-
-  db = (float)(sf->data.planar.secondary->b - sf->data.planar.primary->b);
-  db/= (float)w;
-
-  for (x = 0; x < w; ++x, ++data) {
-    r = sf->data.planar.primary->r + (int)(dr * x);
-    g = sf->data.planar.primary->g + (int)(dg * x);
-    b = sf->data.planar.primary->b + (int)(db * x);
-    current = (r << default_red_offset)
-            + (g << default_green_offset)
-            + (b << default_blue_offset);
-    for (y = 0; y < h; ++y)
-      *(data + y*w) = current;
-  }
-}
+    RrPixel32 *data = sf->RrPixel_data;
+    RrPixel32 current;
+    float dr, dg, db;
+    unsigned int r,g,b;
+    int x, y;
 
-void gradient_diagonal(Surface *sf, int w, int h)
-{
-  pixel32 *data = sf->data.planar.pixel_data;
-  pixel32 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->data.planar.secondary->r - sf->data.planar.primary->r);
-    dry = drx/(float)h;
-    drx/= (float)w;
+    dr = (float)(sf->secondary->r - sf->primary->r);
+    dr/= (float)w;
 
-    dgx = (float)(sf->data.planar.secondary->g - sf->data.planar.primary->g);
-    dgy = dgx/(float)h;
-    dgx/= (float)w;
+    dg = (float)(sf->secondary->g - sf->primary->g);
+    dg/= (float)w;
+
+    db = (float)(sf->secondary->b - sf->primary->b);
+    db/= (float)w;
 
-    dbx = (float)(sf->data.planar.secondary->b - sf->data.planar.primary->b);
-    dby = dbx/(float)h;
-    dbx/= (float)w;
     for (x = 0; x < w; ++x, ++data) {
-      r = sf->data.planar.primary->r + ((int)(drx * x) + (int)(dry * y))/2;
-      g = sf->data.planar.primary->g + ((int)(dgx * x) + (int)(dgy * y))/2;
-      b = sf->data.planar.primary->b + ((int)(dbx * x) + (int)(dby * y))/2;
-      current = (r << default_red_offset)
-              + (g << default_green_offset)
-              + (b << default_blue_offset);
-      *data = current;
+        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;
     }
-  }
 }
 
-void gradient_crossdiagonal(Surface *sf, int w, int h)
+static void gradient_diagonal(RrSurface *sf, int w, int h)
 {
-  pixel32 *data = sf->data.planar.pixel_data;
-  pixel32 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->data.planar.secondary->r - sf->data.planar.primary->r);
-    dry = drx/(float)h;
-    drx/= (float)w;
-
-    dgx = (float)(sf->data.planar.secondary->g - sf->data.planar.primary->g);
-    dgy = dgx/(float)h;
-    dgx/= (float)w;
+    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;
+        }
+    }
+}
 
-    dbx = (float)(sf->data.planar.secondary->b - sf->data.planar.primary->b);
-    dby = dbx/(float)h;
-    dbx/= (float)w;
-    for (x = w; x > 0; --x, ++data) {
-      r = sf->data.planar.primary->r + ((int)(drx * (x-1)) + (int)(dry * y))/2;
-      g = sf->data.planar.primary->g + ((int)(dgx * (x-1)) + (int)(dgy * y))/2;
-      b = sf->data.planar.primary->b + ((int)(dbx * (x-1)) + (int)(dby * y))/2;
-      current = (r << default_red_offset)
-              + (g << default_green_offset)
-              + (b << default_blue_offset);
-      *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;
+        }
     }
-  }
 }
 
-void highlight(pixel32 *x, pixel32 *y, gboolean raised)
+static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised)
 {
-  int r, g, b;
-
-  pixel32 *up, *down;
-  if (raised) {
-    up = x;
-    down = y;
-  } else {
-    up = y;
-    down = x;
-  }
-  r = (*up >> default_red_offset) & 0xFF;
-  r += r >> 1;
-  g = (*up >> default_green_offset) & 0xFF;
-  g += g >> 1;
-  b = (*up >> default_blue_offset) & 0xFF;
-  b += b >> 1;
-  if (r > 255) r = 255;
-  if (g > 255) g = 255;
-  if (b > 255) b = 255;
-  *up = (r << default_red_offset) + (g << default_green_offset)
-      + (b << default_blue_offset);
+    int r, g, b;
+
+    RrPixel32 *up, *down;
+    if (raised) {
+        up = x;
+        down = y;
+    } else {
+        up = y;
+        down = x;
+    }
+    r = (*up >> RrDefaultRedOffset) & 0xFF;
+    r += r >> 1;
+    g = (*up >> RrDefaultGreenOffset) & 0xFF;
+    g += g >> 1;
+    b = (*up >> RrDefaultBlueOffset) & 0xFF;
+    b += b >> 1;
+    if (r > 0xFF) r = 0xFF;
+    if (g > 0xFF) g = 0xFF;
+    if (b > 0xFF) b = 0xFF;
+    *up = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset)
+        + (b << RrDefaultBlueOffset);
   
-  r = (*down >> default_red_offset) & 0xFF;
-  r = (r >> 1) + (r >> 2);
-  g = (*down >> default_green_offset) & 0xFF;
-  g = (g >> 1) + (g >> 2);
-  b = (*down >> default_blue_offset) & 0xFF;
-  b = (b >> 1) + (b >> 2);
-  *down = (r << default_red_offset) + (g << default_green_offset)
-        + (b << default_blue_offset);
+    r = (*down >> RrDefaultRedOffset) & 0xFF;
+    r = (r >> 1) + (r >> 2);
+    g = (*down >> RrDefaultGreenOffset) & 0xFF;
+    g = (g >> 1) + (g >> 2);
+    b = (*down >> RrDefaultBlueOffset) & 0xFF;
+    b = (b >> 1) + (b >> 2);
+    *down = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset)
+        + (b << RrDefaultBlueOffset);
 }
 
-void gradient_solid(Appearance *l, int x, int y, int w, int h) 
+static void create_bevel_colors(RrAppearance *l)
 {
-  pixel32 pix;
-  int i, a, b;
-  PlanarSurface *sp = &l->surface.data.planar;
-  int left = x, top = y, right = w - 1, bottom = h - 1;
-
-  if (sp->primary->gc == None)
-    color_allocate_gc(sp->primary);
-  pix = (sp->primary->r << default_red_offset)
-      + (sp->primary->g << default_green_offset)
-      + (sp->primary->b << default_blue_offset);
-
-  for (a = 0; a < l->area.width; a++)
-    for (b = 0; b < l->area.height; b++)
-      sp->pixel_data[a + b*l->area.width] = pix;
-
-  XFillRectangle(ob_display, l->pixmap, sp->primary->gc
-                 , x, y, w, h);
-
-  if (l->surface.data.planar.interlaced) {
-    if (sp->secondary->gc == None)
-      color_allocate_gc(sp->secondary);
-    for (i = y; i < h; i += 2)
-      XDrawLine(ob_display, l->pixmap, sp->secondary->gc,
-                x, i, w, i);
-  }
-/*
-  switch (texture.relief()) {
-  case RenderTexture::Raised:
-    switch (texture.bevel()) {
-    case RenderTexture::Bevel1:
-      XDrawLine(ob_display, l->pixmap, texture.bevelDarkColor().gc(),
-                left, bottom, right, bottom);
-      XDrawLine(ob_display, l->pixmap, texture.bevelDarkColor().gc(),
-                right, bottom, right, top);
-                
-      XDrawLine(ob_display, l->pixmap, texture.bevelLightColor().gc(),
-                left, top, right, top);
-      XDrawLine(ob_display, l->pixmap, texture.bevelLightColor().gc(),
-                left, bottom, left, top);
-      break;
-    case RenderTexture::Bevel2:
-      XDrawLine(ob_display, l->pixmap, texture.bevelDarkColor().gc(),
-                left + 1, bottom - 2, right - 2, bottom - 2);
-      XDrawLine(ob_display, l->pixmap, texture.bevelDarkColor().gc(),
-                right - 2, bottom - 2, right - 2, top + 1);
-
-      XDrawLine(ob_display, l->pixmap, texture.bevelLightColor().gc(),
-                left + 1, top + 1, right - 2, top + 1);
-      XDrawLine(**display, sf.pixmap(), texture.bevelLightColor().gc(),
-                left + 1, bottom - 2, left + 1, top + 1);
-      break;
-    default:
-      assert(false); // unhandled RenderTexture::BevelType   
+    int r, g, b;
+
+    /* light color */
+    r = l->surface.primary->r;
+    r += r >> 1;
+    g = l->surface.primary->g;
+    g += g >> 1;
+    b = l->surface.primary->b;
+    b += b >> 1;
+    if (r > 0xFF) r = 0xFF;
+    if (g > 0xFF) g = 0xFF;
+    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;
+    r = (r >> 1) + (r >> 2);
+    g = l->surface.primary->g;
+    g = (g >> 1) + (g >> 2);
+    b = l->surface.primary->b;
+    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) 
+{
+    RrPixel32 pix;
+    int i, a, b;
+    RrSurface *sp = &l->surface;
+    int 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;
+
+    XFillRectangle(RrDisplay(l->inst), l->pixmap, sp->primary->gc,
+                   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,
+                      0, i, w, i);
     }
-    break;
-  case RenderTexture::Sunken:
-    switch (texture.bevel()) {
-    case RenderTexture::Bevel1:
-      XDrawLine(**display, sf.pixmap(), texture.bevelLightColor().gc(),
-                left, bottom, right, bottom);
-      XDrawLine(**display, sf.pixmap(), texture.bevelLightColor().gc(),
-                right, bottom, right, top);
+
+    switch (sp->relief) {
+    case RR_RELIEF_RAISED:
+        if (!sp->bevel_dark)
+            create_bevel_colors(l);
+
+        switch (sp->bevel) {
+        case RR_BEVEL_1:
+            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+                      left, bottom, right, bottom);
+            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+                      right, bottom, right, top);
+                
+            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
+                      left, top, right, top);
+            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
+                      left, bottom, left, top);
+            break;
+        case RR_BEVEL_2:
+            XDrawLine(RrDisplay(l->inst), l->pixmap,
+                      sp->bevel_dark->gc,
+                      left + 1, bottom - 2, right - 2, bottom - 2);
+            XDrawLine(RrDisplay(l->inst), l->pixmap,
+                      sp->bevel_dark->gc,
+                      right - 2, bottom - 2, right - 2, top + 1);
+
+            XDrawLine(RrDisplay(l->inst), l->pixmap,
+                      sp->bevel_light->gc,
+                      left + 1, top + 1, right - 2, top + 1);
+            XDrawLine(RrDisplay(l->inst), l->pixmap,
+                      sp->bevel_light->gc,
+                      left + 1, bottom - 2, left + 1, top + 1);
+            break;
+        default:
+            g_assert_not_reached(); /* unhandled BevelType */
+        }
+        break;
+    case RR_RELIEF_SUNKEN:
+        if (!sp->bevel_dark)
+            create_bevel_colors(l);
+
+        switch (sp->bevel) {
+        case RR_BEVEL_1:
+            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
+                      left, bottom, right, bottom);
+            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
+                      right, bottom, right, top);
       
-      XDrawLine(**display, sf.pixmap(), texture.bevelDarkColor().gc(),
-                left, top, right, top);
-      XDrawLine(**display, sf.pixmap(), texture.bevelDarkColor().gc(),
-                left, bottom, left, top);
-      break;
-    case RenderTexture::Bevel2:
-      XDrawLine(**display, sf.pixmap(), texture.bevelLightColor().gc(),
-                left + 1, bottom - 2, right - 2, bottom - 2);
-      XDrawLine(**display, sf.pixmap(), texture.bevelLightColor().gc(),
-                right - 2, bottom - 2, right - 2, top + 1);
+            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+                      left, top, right, top);
+            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+                      left, bottom, left, top);
+            break;
+        case RR_BEVEL_2:
+            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
+                      left + 1, bottom - 2, right - 2, bottom - 2);
+            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_light->gc,
+                      right - 2, bottom - 2, right - 2, top + 1);
       
-      XDrawLine(**display, sf.pixmap(), texture.bevelDarkColor().gc(),
-                left + 1, top + 1, right - 2, top + 1);
-      XDrawLine(**display, sf.pixmap(), texture.bevelDarkColor().gc(),
-                left + 1, bottom - 2, left + 1, top + 1);
-
-      break;
-    default:
-      assert(false); // unhandled RenderTexture::BevelType   
+            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+                      left + 1, top + 1, right - 2, top + 1);
+            XDrawLine(RrDisplay(l->inst), l->pixmap, sp->bevel_dark->gc,
+                      left + 1, bottom - 2, left + 1, top + 1);
+
+            break;
+        default:
+            g_assert_not_reached(); /* unhandled BevelType */
+        }
+        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,
+                           left, top, right, bottom);
+        }
+        break;
+    default:  
+        g_assert_not_reached(); /* unhandled ReliefType */
     }
-    break;
-  case RenderTexture::Flat:
-    if (texture.border())
-      XDrawRectangle(**display, sf.pixmap(), texture.borderColor().gc(),
-                     left, top, right, bottom);
-    break;
-  default:  
-    assert(false); // unhandled RenderTexture::ReliefType
-  }
-*/
 }
 
-void gradient_pyramid(Surface *sf, int inw, int inh)
+static void gradient_pyramid(RrSurface *sf, int inw, int inh)
 {
-  pixel32 *data = sf->data.planar.pixel_data;
-  pixel32 *end = data + inw*inh;
-  pixel32 current;
-  float drx, dgx, dbx, dry, dgy, dby;
-  unsigned int r,g,b;
-  int x, y, h=(inh/2) + 1, w=(inw/2) + 1;
-  for (y = 0; y < h; ++y) {
-    drx = (float)(sf->data.planar.secondary->r - sf->data.planar.primary->r);
+    RrPixel32 *data = sf->RrPixel_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->data.planar.secondary->g - sf->data.planar.primary->g);
+    dgx = (float)(sf->secondary->g -
+                  sf->primary->g);
     dgy = dgx/(float)h;
     dgx/= (float)w;
 
-    dbx = (float)(sf->data.planar.secondary->b - sf->data.planar.primary->b);
+    dbx = (float)(sf->secondary->b -
+                  sf->primary->b);
     dby = dbx/(float)h;
     dbx/= (float)w;
-    for (x = 0; x < w; ++x, data) {
-      r = sf->data.planar.primary->r + ((int)(drx * x) + (int)(dry * y))/2;
-      g = sf->data.planar.primary->g + ((int)(dgx * x) + (int)(dgy * y))/2;
-      b = sf->data.planar.primary->b + ((int)(dbx * x) + (int)(dby * y))/2;
-      current = (r << default_red_offset)
-              + (g << default_green_offset)
-              + (b << default_blue_offset);
-      *(data+x) = current;
-      *(data+inw-x) = current;
-      *(end-x) = current;
-      *(end-(inw-x)) = current;
+
+    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;
+        }
+        data+=inw;
+        end-=inw;
     }
-    data+=inw;
-    end-=inw;
-  }
 }
 
-void gradient_rectangle(Surface *sf, int inw, int inh)
+static void gradient_rectangle(RrSurface *sf, int inw, int inh)
 {
-  pixel32 *data = sf->data.planar.pixel_data;
-  pixel32 *end = data + inw*inh;
-  pixel32 current;
-  float drx, dgx, dbx, dry, dgy, dby;
-  unsigned int r,g,b;
-  int x, y, h=(inh/2) + 1, w=(inw/2) + 1;
-  int val;
-
-  for (y = 0; y < h; ++y) {
-    drx = (float)(sf->data.planar.secondary->r - sf->data.planar.primary->r);
+    RrPixel32 *data = sf->RrPixel_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->primary->r -
+                  sf->secondary->r);
     dry = drx/(float)h;
     drx/= (float)w;
 
-    dgx = (float)(sf->data.planar.secondary->g - sf->data.planar.primary->g);
+    dgx = (float)(sf->primary->g -
+                  sf->secondary->g);
     dgy = dgx/(float)h;
     dgx/= (float)w;
 
-    dbx = (float)(sf->data.planar.secondary->b - sf->data.planar.primary->b);
+    dbx = (float)(sf->primary->b -
+                  sf->secondary->b);
     dby = dbx/(float)h;
     dbx/= (float)w;
-    for (x = 0; x < w; ++x, data) {
-      if ((float)x/(float)w < (float)y/(float)h) val = (int)(drx * x);
-      else val = (int)(dry * y);
-
-      r = sf->data.planar.primary->r + val;
-      g = sf->data.planar.primary->g + val;
-      b = sf->data.planar.primary->b + val;
-      current = (r << default_red_offset)
-              + (g << default_green_offset)
-              + (b << default_blue_offset);
-      *(data+x) = current;
-      *(data+inw-x) = current;
-      *(end-x) = current;
-      *(end-(inw-x)) = current;
+
+    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;
+        }
+        data+=inw;
+        end-=inw;
     }
-    data+=inw;
-    end-=inw;
-  }
 }
 
-void gradient_pipecross(Surface *sf, int inw, int inh)
+static void gradient_pipecross(RrSurface *sf, int inw, int inh)
 {
-  pixel32 *data = sf->data.planar.pixel_data;
-  pixel32 *end = data + inw*inh;
-  pixel32 current;
-  float drx, dgx, dbx, dry, dgy, dby;
-  unsigned int r,g,b;
-  int x, y, h=(inh/2) + 1, w=(inw/2) + 1;
-  int val;
-
-  for (y = 0; y < h; ++y) {
-    drx = (float)(sf->data.planar.secondary->r - sf->data.planar.primary->r);
+    RrPixel32 *data = sf->RrPixel_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->data.planar.secondary->g - sf->data.planar.primary->g);
+    dgx = (float)(sf->secondary->g -
+                  sf->primary->g);
     dgy = dgx/(float)h;
     dgx/= (float)w;
 
-    dbx = (float)(sf->data.planar.secondary->b - sf->data.planar.primary->b);
+    dbx = (float)(sf->secondary->b -
+                  sf->primary->b);
     dby = dbx/(float)h;
     dbx/= (float)w;
-    for (x = 0; x < w; ++x, data) {
-      if ((float)x/(float)w > (float)y/(float)h) val = (int)(drx * x);
-      else val = (int)(dry * y);
-
-      r = sf->data.planar.primary->r + val;
-      g = sf->data.planar.primary->g + val;
-      b = sf->data.planar.primary->b + val;
-      current = (r << default_red_offset)
-              + (g << default_green_offset)
-              + (b << default_blue_offset);
-      *(data+x) = current;
-      *(data+inw-x) = current;
-      *(end-x) = current;
-      *(end-(inw-x)) = current;
+
+    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;
+        }
+        data+=inw;
+        end-=inw;
     }
-    data+=inw;
-    end-=inw;
-  }
 }
-