speedie/spmenu
2
0
Fork 1
Code Issues 1 Pull requests Packages Projects Releases 15 Wiki Activity

color/alpha arrays should not be const

Browse source
This commit is contained in:
speedie 2023-03-29 12:10:36 +02:00
parent 0ad04fec26
commit bd6cf29e23
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
buildconf
View file

@ -7,4 +7,4 @@ pangoxft=true
xinerama=true xinerama=true
openssl=true openssl=true
fribidi=true fribidi=true
CC=tcc CC=gcc

4
libs/colors.h
View file

@ -1,5 +1,5 @@
// color scheme arrays // color scheme arrays
static const unsigned int alphas[][3] = { static unsigned int alphas[][3] = {
// fg bg border // fg bg border
[SchemeLArrow] = { fgalpha, bgalpha, borderalpha }, [SchemeLArrow] = { fgalpha, bgalpha, borderalpha },
[SchemeRArrow] = { fgalpha, bgalpha, borderalpha }, [SchemeRArrow] = { fgalpha, bgalpha, borderalpha },
@ -18,7 +18,7 @@ static const unsigned int alphas[][3] = {
[SchemeBorder] = { fgalpha, bgalpha, borderalpha }, [SchemeBorder] = { fgalpha, bgalpha, borderalpha },
}; };
static const char *colors[SchemeLast][2] = { static char *colors[SchemeLast][2] = {
// fg bg // fg bg
[SchemeLArrow] = { col_larrowfg, col_larrowbg }, [SchemeLArrow] = { col_larrowfg, col_larrowbg },
[SchemeRArrow] = { col_rarrowfg, col_rarrowbg }, [SchemeRArrow] = { col_rarrowfg, col_rarrowbg },

4
libs/sl/draw-pango.c
View file

@ -119,7 +119,7 @@ drw_font_free(Fnt *font)
} }
void 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) if (!drw || !dest || !clrname)
return; 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 /* Wrapper to create color schemes. The caller has to call free(3) on the
* returned color scheme when done using it. */ * returned color scheme when done using it. */
Clr * 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; size_t i;
Clr *ret; Clr *ret;

4
libs/sl/draw-pango.h
View file

@ -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); void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h, Bool markup);
/* Colorscheme abstraction */ /* Colorscheme abstraction */
void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, const unsigned int alpha); void drw_clr_create(Drw *drw, Clr *dest, char *clrname, unsigned int alpha);
Clr *drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount); Clr *drw_scm_create(Drw *drw, char *clrnames[], unsigned int alphas[], size_t clrcount);
/* Cursor abstraction */ /* Cursor abstraction */
Cur *drw_cur_create(Drw *drw, int shape); Cur *drw_cur_create(Drw *drw, int shape);

4
libs/sl/draw-xft.c
View file

@ -186,7 +186,7 @@ drw_font_free(Fnt *font)
} }
void 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) if (!drw || !dest || !clrname)
return; 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 /* Wrapper to create color schemes. The caller has to call free(3) on the
* returned color scheme when done using it. */ * returned color scheme when done using it. */
Clr * 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; size_t i;
Clr *ret; Clr *ret;

4
libs/sl/draw-xft.h
View file

@ -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); void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h, Bool markup);
/* Colorscheme abstraction */ /* Colorscheme abstraction */
void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha); void drw_clr_create(Drw *drw, Clr *dest, char *clrname, unsigned int alpha);
Clr *drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount); Clr *drw_scm_create(Drw *drw, char *clrnames[], unsigned int alphas[], size_t clrcount);
/* Cursor abstraction */ /* Cursor abstraction */
Cur *drw_cur_create(Drw *drw, int shape); Cur *drw_cur_create(Drw *drw, int shape);