remove the elliptic gradient type.

add bevel light/dark colors for solid textures with bevels

diff --git a/render/render.c b/render/render.c
index cfad7143f5bc8db961b244589e86e13f93e1fcac..9b721db30ada08708cbf54bd25a46eb92cbd02b2 100644 (file)
--- a/render/render.c
+++ b/render/render.c
@@ -333,6 +333,8 @@ Appearance *appearance_new(SurfaceType type, int numtex)
     p->primary = NULL;
     p->secondary = NULL;
     p->border_color = NULL;
+    p->bevel_dark = NULL;
+    p->bevel_light = NULL;
     p->pixel_data = NULL;
     break;
   }
@@ -369,6 +371,18 @@ Appearance *appearance_copy(Appearance *orig)
                                           spo->border_color->b);
         else spc->border_color = NULL;
 
+        if (spo->bevel_dark != NULL)
+            spc->bevel_dark = color_new(spo->bevel_dark->r,
+                                        spo->bevel_dark->g,
+                                        spo->bevel_dark->b);
+        else spc->bevel_dark = NULL;
+
+        if (spo->bevel_light != NULL)
+            spc->bevel_light = color_new(spo->bevel_light->r,
+                                         spo->bevel_light->g,
+                                         spo->bevel_light->b);
+        else spc->bevel_light = NULL;
+
         spc->interlaced = spo->interlaced;
         spc->border = spo->border;
         spc->pixel_data = NULL;
@@ -391,10 +405,12 @@ void appearance_free(Appearance *a)
             g_free(a->texture);
         if (a->surface.type == Surface_Planar) {
             p = &a->surface.data.planar;
-            if (p->primary != NULL) color_free(p->primary);
-            if (p->secondary != NULL) color_free(p->secondary);
-            if (p->border_color != NULL) color_free(p->border_color);
-            if (p->pixel_data != NULL) g_free(p->pixel_data);
+            color_free(p->primary);
+            color_free(p->secondary);
+            color_free(p->border_color);
+            color_free(p->bevel_dark);
+            color_free(p->bevel_light);
+            g_free(p->pixel_data);
         }
         g_free(a);
     }

diff --git a/render/render.h b/render/render.h
index 68fec4681ab1c9a06f437894d9844b1354432dea..a2bdd2620489bf82eb64ef9602c81e815b30a2a6 100644 (file)
--- a/render/render.h
+++ b/render/render.h
@@ -33,8 +33,7 @@ typedef enum {
     Background_CrossDiagonal,
     Background_PipeCross,
     Background_Rectangle,
-    Background_Pyramid,
-    Background_Elliptic
+    Background_Pyramid
 } SurfaceColorType;
 
 typedef enum {
@@ -53,6 +52,8 @@ typedef struct PlanarSurface {
     color_rgb *primary;
     color_rgb *secondary;
     color_rgb *border_color;
+    color_rgb *bevel_dark; 
+    color_rgb *bevel_light;
     gboolean interlaced;
     gboolean border;
     struct Appearance *parent;