From bd6cf29e239a4e2a37e1be631c82e41f6462222d Mon Sep 17 00:00:00 2001 From: speedie Date: Wed, 29 Mar 2023 12:10:36 +0200 Subject: [PATCH] color/alpha arrays should not be const --- buildconf | 2 +- libs/colors.h | 4 ++-- libs/sl/draw-pango.c | 4 ++-- libs/sl/draw-pango.h | 4 ++-- libs/sl/draw-xft.c | 4 ++-- libs/sl/draw-xft.h | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/buildconf b/buildconf index 30c583c..e29afb0 100755 --- a/buildconf +++ b/buildconf @@ -7,4 +7,4 @@ pangoxft=true xinerama=true openssl=true fribidi=true -CC=tcc +CC=gcc diff --git a/libs/colors.h b/libs/colors.h index f202939..5b42094 100644 --- a/libs/colors.h +++ b/libs/colors.h @@ -1,5 +1,5 @@ // color scheme arrays -static const unsigned int alphas[][3] = { +static unsigned int alphas[][3] = { // fg bg border [SchemeLArrow] = { fgalpha, bgalpha, borderalpha }, [SchemeRArrow] = { fgalpha, bgalpha, borderalpha }, @@ -18,7 +18,7 @@ static const unsigned int alphas[][3] = { [SchemeBorder] = { fgalpha, bgalpha, borderalpha }, }; -static const char *colors[SchemeLast][2] = { +static char *colors[SchemeLast][2] = { // fg bg [SchemeLArrow] = { col_larrowfg, col_larrowbg }, [SchemeRArrow] = { col_rarrowfg, col_rarrowbg }, diff --git a/libs/sl/draw-pango.c b/libs/sl/draw-pango.c index 8584419..7b83218 100644 --- a/libs/sl/draw-pango.c +++ b/libs/sl/draw-pango.c @@ -119,7 +119,7 @@ drw_font_free(Fnt *font) } void -drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha) +drw_clr_create(Drw *drw, Clr *dest, char *clrname, unsigned int alpha) { if (!drw || !dest || !clrname) return; @@ -134,7 +134,7 @@ drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha) /* Wrapper to create color schemes. The caller has to call free(3) on the * returned color scheme when done using it. */ Clr * -drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount) +drw_scm_create(Drw *drw, char *clrnames[], unsigned int alphas[], size_t clrcount) { size_t i; Clr *ret; diff --git a/libs/sl/draw-pango.h b/libs/sl/draw-pango.h index 2c85a97..906d571 100644 --- a/libs/sl/draw-pango.h +++ b/libs/sl/draw-pango.h @@ -40,8 +40,8 @@ unsigned int drw_font_getwidth(Drw *drw, const char *text, Bool markup); void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h, Bool markup); /* Colorscheme abstraction */ -void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, const unsigned int alpha); -Clr *drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount); +void drw_clr_create(Drw *drw, Clr *dest, char *clrname, unsigned int alpha); +Clr *drw_scm_create(Drw *drw, char *clrnames[], unsigned int alphas[], size_t clrcount); /* Cursor abstraction */ Cur *drw_cur_create(Drw *drw, int shape); diff --git a/libs/sl/draw-xft.c b/libs/sl/draw-xft.c index 4b6aca0..a2dddfb 100644 --- a/libs/sl/draw-xft.c +++ b/libs/sl/draw-xft.c @@ -186,7 +186,7 @@ drw_font_free(Fnt *font) } void -drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha) +drw_clr_create(Drw *drw, Clr *dest, char *clrname, unsigned int alpha) { if (!drw || !dest || !clrname) return; @@ -201,7 +201,7 @@ drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha) /* Wrapper to create color schemes. The caller has to call free(3) on the * returned color scheme when done using it. */ Clr * -drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount) +drw_scm_create(Drw *drw, char *clrnames[], unsigned int alphas[], size_t clrcount) { size_t i; Clr *ret; diff --git a/libs/sl/draw-xft.h b/libs/sl/draw-xft.h index 86feb2c..661354a 100644 --- a/libs/sl/draw-xft.h +++ b/libs/sl/draw-xft.h @@ -42,8 +42,8 @@ unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h, Bool markup); /* Colorscheme abstraction */ -void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha); -Clr *drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount); +void drw_clr_create(Drw *drw, Clr *dest, char *clrname, unsigned int alpha); +Clr *drw_scm_create(Drw *drw, char *clrnames[], unsigned int alphas[], size_t clrcount); /* Cursor abstraction */ Cur *drw_cur_create(Drw *drw, int shape);