rename osx to mirrorhorizontal and split to splitvertical, this will make all themes...

diff --git a/CHANGELOG b/CHANGELOG
index 238813f334da0afc6c12947e6ea2786f12625b8d..9e83b31fe34bdc309544bc13a73dc7edc139edda 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,8 +4,9 @@
   * Fix incorrect handling of window properties on 64 bit arches.
   * Fix pixelsize being the same as size for pango, now it is correct.
   * Fix drawing of icons taller than wide, eg gimp.
-  * Add a 'osx' gradient, like horizontal but mirrored in the center and
-    'split' which is like vertical but nonlinear in a fancy way.
+  * Add a 'mirrorhorizontal' gradient, like horizontal but mirrored in the
+    center and 'splitvertical' which is like vertical but nonlinear in a fancy
+    way.
   * Translations for de, hr and zh_TW added.
   * Add initial per-app settings support.
   * Fix some outstanding issues with 64-bit support.

diff --git a/render/gradient.c b/render/gradient.c
index e4ec20a1000ce5f01a2409e460437572147223d1..d2cb6814cc9336b792e19e9a3ce5e01807d15c1d 100644 (file)
--- a/render/gradient.c
+++ b/render/gradient.c
@@ -25,10 +25,10 @@
 
 static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised);
 static void gradient_solid(RrAppearance *l, gint w, gint h);
-static void gradient_split(RrAppearance *a, gint w, gint h);
+static void gradient_splitvertical(RrAppearance *a, 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_osx(RrSurface *sf, gint w, gint h);
+static void gradient_mirrorhorizontal(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);
@@ -44,8 +44,8 @@ void RrRender(RrAppearance *a, gint w, gint h)
     case RR_SURFACE_SOLID:
         gradient_solid(a, w, h);
         break;
-    case RR_SURFACE_SPLIT:
-        gradient_split(a, w, h);
+    case RR_SURFACE_SPLIT_VERTICAL:
+        gradient_splitvertical(a, w, h);
         break;
     case RR_SURFACE_VERTICAL:
         gradient_vertical(&a->surface, w, h);
@@ -53,8 +53,8 @@ void RrRender(RrAppearance *a, gint w, gint h)
     case RR_SURFACE_HORIZONTAL:
         gradient_horizontal(&a->surface, w, h);
         break;
-    case RR_SURFACE_OSX:
-        gradient_osx(&a->surface, w, h);
+    case RR_SURFACE_MIRROR_HORIZONTAL:
+        gradient_mirrorhorizontal(&a->surface, w, h);
         break;
     case RR_SURFACE_DIAGONAL:
         gradient_diagonal(&a->surface, w, h);
@@ -363,7 +363,7 @@ static void gradient_solid(RrAppearance *l, gint w, gint h)
     }                                                     \
 }
 
-static void gradient_split(RrAppearance *a, gint w, gint h)
+static void gradient_splitvertical(RrAppearance *a, gint w, gint h)
 {
     gint x, y1, y3, r, g, b;
     RrSurface *sf = &a->surface;
@@ -449,7 +449,7 @@ static void gradient_horizontal(RrSurface *sf, gint w, gint h)
         *(data + y * w) = current;
 }
 
-static void gradient_osx(RrSurface *sf, gint w, gint h)
+static void gradient_mirrorhorizontal(RrSurface *sf, gint w, gint h)
 {
     gint x, y;
     RrPixel32 *data = sf->pixel_data, *datav;

diff --git a/render/render.h b/render/render.h
index 38bcdeb5d225c6e98de12b7c17a6459a03cda209..fda4060718b21d7ce85e4670a50d655a9baaa64c 100644 (file)
--- a/render/render.h
+++ b/render/render.h
@@ -62,13 +62,13 @@ typedef enum {
     RR_SURFACE_NONE,
     RR_SURFACE_PARENTREL,
     RR_SURFACE_SOLID,
-    RR_SURFACE_SPLIT,
+    RR_SURFACE_SPLIT_VERTICAL,
     RR_SURFACE_HORIZONTAL,
     RR_SURFACE_VERTICAL,
     RR_SURFACE_DIAGONAL,
     RR_SURFACE_CROSS_DIAGONAL,
     RR_SURFACE_PYRAMID,
-    RR_SURFACE_OSX
+    RR_SURFACE_MIRROR_HORIZONTAL,
 } RrSurfaceColorType;
 
 typedef enum {

diff --git a/render/theme.c b/render/theme.c
index 31ef3b1a53780dd088f0abf466ddb020605e8cd6..b1cce15bc29ba5627f31d1a01d1c59ce6b33e115 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -1197,14 +1197,14 @@ static void parse_appearance(gchar *tex, RrSurfaceColorType *grad,
                 *grad = RR_SURFACE_CROSS_DIAGONAL;
             else if (strstr(tex, "pyramid") != NULL)
                 *grad = RR_SURFACE_PYRAMID;
-            else if (strstr(tex, "osx") != NULL)
-                *grad = RR_SURFACE_OSX;
+            else if (strstr(tex, "mirrorhorizontal") != NULL)
+                *grad = RR_SURFACE_MIRROR_HORIZONTAL;
             else if (strstr(tex, "horizontal") != NULL)
                 *grad = RR_SURFACE_HORIZONTAL;
             else if (strstr(tex, "vertical") != NULL)
                 *grad = RR_SURFACE_VERTICAL;
-            else if (strstr(tex, "split") != NULL)
-                *grad = RR_SURFACE_SPLIT;
+            else if (strstr(tex, "splitvertical") != NULL)
+                *grad = RR_SURFACE_SPLIT_VERTICAL;
             else
                 *grad = RR_SURFACE_DIAGONAL;
         } else {

diff --git a/themes/Natura/openbox-3/themerc b/themes/Natura/openbox-3/themerc
index 99add829854f83c9f21c856dbc93bf460887a663..10b30f1755d32f491b00aaff32797b272090d497 100644 (file)
--- a/themes/Natura/openbox-3/themerc
+++ b/themes/Natura/openbox-3/themerc
@@ -14,7 +14,7 @@ window.*.client.color: #eeeeee
 *.text.justify: left
 
 !! Menu
-menu.title.bg: flat gradient split
+menu.title.bg: flat gradient splitvertical
 menu.title.bg.color: #5c4e45
 menu.title.bg.colorTo: #51443e
 menu.title.text.color: #ffffff
@@ -25,13 +25,13 @@ menu.items.bg.color: #f9f2ee
 menu.items.text.color: #000000
 menu.items.disabled.text.color: #737573
 
-menu.items.active.bg: flat gradient split
+menu.items.active.bg: flat gradient splitvertical
 menu.items.active.bg.color:  #5c4e45
 menu.items.active.bg.colorTo:#51443e
 menu.items.active.text.color: #f9f2ee
 
 !! Active Windows
-window.active.title.bg: flat gradient split
+window.active.title.bg: flat gradient splitvertical
 window.active.title.bg.color: #5c4e45
 window.active.title.bg.colorTo: #51443e
 window.active.*.bg.border.color: #000000

diff --git a/themes/bear2/openbox-3/themerc b/themes/bear2/openbox-3/themerc
index 11f70634942e70b28c09a859bcbd26206e8f006f..b4c51d0320ac243becf506a40087ccd094c0d7e5 100644 (file)
--- a/themes/bear2/openbox-3/themerc
+++ b/themes/bear2/openbox-3/themerc
@@ -40,7 +40,7 @@ menu.items.active.bg.border.color: #416c98
 
 !!Active
 
-window.active.title.bg: flat border gradient osx
+window.active.title.bg: flat border gradient mirrorhorizontal
 window.active.title.bg.color: #3465A4
 window.active.title.bg.colorTo: #407CCA
 window.active.title.bg.border.color: #699acd
@@ -61,7 +61,7 @@ window.*.grip.bg: parentrelative
 
 !!Inactive
 
-window.inactive.title.bg: flat border gradient osx
+window.inactive.title.bg: flat border gradient mirrorhorizontal
 window.inactive.title.bg.color: #dcdcdc
 window.inactive.title.bg.colorTo: #eeeeec
 window.inactive.title.bg.border.color: #efefef