X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Ftheme.c;h=507ec70fa6da0b58744678ba22b041fb6f25a61e;hb=d20f84f5ded581c57df5904c6fa550dac05ad036;hp=c31ca1121f812abfabdbf87bfe0569be08d7dfe2;hpb=ec304c9e433e4b1cedf924ca64d783f05db7d42d;p=chaz%2Fopenbox

diff --git a/render/theme.c b/render/theme.c
index c31ca112..507ec70f 100644
--- a/render/theme.c
+++ b/render/theme.c
@@ -40,27 +40,27 @@ static void parse_style(gchar *tex, RrSurfaceColorType *grad,
                         RrReliefType *relief, RrBevelType *bevel,
                         gboolean *interlaced, gboolean *border,
                         gboolean allow_trans);
-static gboolean read_mask(ParseState *ps, gchar *maskname,
+static gboolean read_mask(ParseState *ps, const gchar *maskname,
                           RrPixmapMask **value);
 static RrPixel32* read_c_image(gint width, gint height, const guint8 *data);
 static void set_default_appearance(RrAppearance *a);
-static xmlNodePtr find_node(xmlNodePtr n, gchar *names[]);
-static gboolean find_int(ParseState *ps, xmlNodePtr n, gchar *names[],
+static xmlNodePtr find_node(xmlNodePtr n, const gchar *names[]);
+static gboolean find_int(ParseState *ps, xmlNodePtr n, const gchar *names[],
                          gint *integer, gint lower, gint upper);
-static gboolean find_string(ParseState *ps, xmlNodePtr n, gchar *names[],
-                            gchar **string);
-static gboolean find_color(ParseState *ps, xmlNodePtr n, gchar *names[],
+static gboolean find_string(ParseState *ps, xmlNodePtr n, const gchar *names[],
+                            const gchar **string);
+static gboolean find_color(ParseState *ps, xmlNodePtr n, const gchar *names[],
                            RrColor **color, gchar *alpha);
-    static gboolean find_point(ParseState *ps, xmlNodePtr n, gchar *names[],
+    static gboolean find_point(ParseState *ps, xmlNodePtr n, const gchar *names[],
                            gint *x, gint *y,
                            gint lowx, gint lowy, gint upx, gint upy);
-static gboolean find_shadow(ParseState *ps, xmlNodePtr n, gchar *names[],
+static gboolean find_shadow(ParseState *ps, xmlNodePtr n, const gchar *names[],
                             RrAppearance *a);
-static gboolean find_appearance(ParseState *ps, xmlNodePtr n, gchar *names[],
+static gboolean find_appearance(ParseState *ps, xmlNodePtr n, const gchar *names[],
                                 RrAppearance *a, gboolean allow_trans);
 
 /* make a null terminated array out of a list of strings */
-#define L(args...) (gchar*[]){args,NULL}
+#define L(args...) (const gchar*[]){args,NULL}
 /* shortcut to the various find_* functions */
 #define FIND(type, args...) find_##type(&ps, root, args)
 
@@ -71,7 +71,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     ParseState ps;
     xmlNodePtr root;
     RrJustify winjust, mtitlejust;
-    gchar *str;
+    const gchar *str;
     RrTheme *theme;
 
     if (name) {
@@ -987,8 +987,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name,
     }
     theme->button_size = theme->label_height - 2;
     theme->grip_width = 25;
-    theme->top_grip_height = MAX(theme->handle_height,
-                                 theme->title_height / 4);
 
     return theme;
 }
@@ -1133,7 +1131,7 @@ void RrThemeFree(RrTheme *theme)
     }
 }
 
-static gboolean read_mask(ParseState *ps, gchar *maskname,
+static gboolean read_mask(ParseState *ps, const gchar *maskname,
                           RrPixmapMask **value)
 {
     gboolean ret = FALSE;
@@ -1247,7 +1245,7 @@ static void parse_style(gchar *tex, RrSurfaceColorType *grad,
     }
 }
 
-static xmlNodePtr find_node(xmlNodePtr n, gchar *names[])
+static xmlNodePtr find_node(xmlNodePtr n, const gchar *names[])
 {
     gint i;
 
@@ -1256,7 +1254,7 @@ static xmlNodePtr find_node(xmlNodePtr n, gchar *names[])
     return n;
 }
 
-static gboolean find_int(ParseState *ps, xmlNodePtr n, gchar *names[],
+static gboolean find_int(ParseState *ps, xmlNodePtr n, const gchar *names[],
                          gint *integer, gint lower, gint upper)
 {
     gint i;
@@ -1271,8 +1269,8 @@ static gboolean find_int(ParseState *ps, xmlNodePtr n, gchar *names[],
     return FALSE;
 }
 
-static gboolean find_string(ParseState *ps, xmlNodePtr n, gchar *names[],
-                            gchar **string)
+static gboolean find_string(ParseState *ps, xmlNodePtr n, const gchar *names[],
+                            const gchar **string)
 {
     if ((n = find_node(n, names))) {
         *string = parse_string(ps->doc, n);
@@ -1281,7 +1279,7 @@ static gboolean find_string(ParseState *ps, xmlNodePtr n, gchar *names[],
     return FALSE;
 }
 
-static gboolean find_color(ParseState *ps, xmlNodePtr n, gchar *names[],
+static gboolean find_color(ParseState *ps, xmlNodePtr n, const gchar *names[],
                            RrColor **color, gchar *alpha)
 {
     if ((n = find_node(n, names))) {
@@ -1301,14 +1299,14 @@ static gboolean find_color(ParseState *ps, xmlNodePtr n, gchar *names[],
     return FALSE;
 }
 
-static gboolean find_point(ParseState *ps, xmlNodePtr n, gchar *names[],
+static gboolean find_point(ParseState *ps, xmlNodePtr n, const gchar *names[],
                            gint *x, gint *y,
                            gint lowx, gint upx, gint lowy, gint upy)
 {
     if ((n = find_node(n, names))) {
         gint a, b;
-        if (parse_attr_int("horizontal", n, &a) &&
-            parse_attr_int("vertical", n, &b) &&
+        if (parse_attr_int("x", n, &a) &&
+            parse_attr_int("y", n, &b) &&
             a >= lowx && a <= upx && b >= lowy && b <= upy)
         {
             *x = a; *y = b;
@@ -1318,7 +1316,7 @@ static gboolean find_point(ParseState *ps, xmlNodePtr n, gchar *names[],
     return FALSE;
 }
 
-static gboolean find_shadow(ParseState *ps, xmlNodePtr n, gchar *names[],
+static gboolean find_shadow(ParseState *ps, xmlNodePtr n, const gchar *names[],
                             RrAppearance *a)
 {
     return find_point(ps, n, names,
@@ -1327,7 +1325,7 @@ static gboolean find_shadow(ParseState *ps, xmlNodePtr n, gchar *names[],
                       -20, 20, -20, 20);
 }
 
-static gboolean find_appearance(ParseState *ps, xmlNodePtr n, gchar *names[],
+static gboolean find_appearance(ParseState *ps, xmlNodePtr n, const gchar *names[],
                                 RrAppearance *a, gboolean allow_trans)
 {
     xmlNodePtr n2;