summaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
Diffstat (limited to 'render')
-rw-r--r--render/font.c2
-rw-r--r--render/render.h4
-rw-r--r--render/theme.c40
3 files changed, 23 insertions, 23 deletions
diff --git a/render/font.c b/render/font.c
index c3353b67..e91925b5 100644
--- a/render/font.c
+++ b/render/font.c
@@ -52,7 +52,7 @@ static void measure_font(const RrInstance *inst, RrFont *f)
g_free(locale);
}
-RrFont *RrFontOpen(const RrInstance *inst, gchar *name, gint size,
+RrFont *RrFontOpen(const RrInstance *inst, const gchar *name, gint size,
RrFontWeight weight, RrFontSlant slant)
{
RrFont *out;
diff --git a/render/render.h b/render/render.h
index 979bc933..7beef9c9 100644
--- a/render/render.h
+++ b/render/render.h
@@ -121,7 +121,7 @@ struct _RrTextureText {
RrFont *font;
RrJustify justify;
RrColor *color;
- gchar *string;
+ const gchar *string;
gint shadow_offset_x;
gint shadow_offset_y;
RrColor *shadow_color;
@@ -229,7 +229,7 @@ RrAppearance *RrAppearanceNew (const RrInstance *inst, gint numtex);
RrAppearance *RrAppearanceCopy (RrAppearance *a);
void RrAppearanceFree (RrAppearance *a);
-RrFont *RrFontOpen (const RrInstance *inst, gchar *name, gint size,
+RrFont *RrFontOpen (const RrInstance *inst, const gchar *name, gint size,
RrFontWeight weight, RrFontSlant slant);
RrFont *RrFontOpenDefault (const RrInstance *inst);
void RrFontClose (RrFont *f);
diff --git a/render/theme.c b/render/theme.c
index 4c38dbd2..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) {
@@ -1131,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;
@@ -1245,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;
@@ -1254,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;
@@ -1269,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);
@@ -1279,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))) {
@@ -1299,7 +1299,7 @@ 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)
{
@@ -1316,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,
@@ -1325,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;
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-17 12:48:02 +0000