summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHiltjo Posthuma2017-11-03 21:20:48 +0100
committerHiltjo Posthuma2017-11-03 21:20:48 +0100
commitb68d179254f36746638eb411b4fff5032fd9e39c (patch)
treea3b85fd2f493e52f01dc64fbb53f8e7d261741bd
parenta5a1ea1a08357fd9720c74ff70dc5e2ec22c7067 (diff)
downloadaur-b68d179254f36746638eb411b4fff5032fd9e39c.tar.gz
sync dmenu drw.{c,h} code: use Clr* (was Scm)
-rw-r--r--drw.c10
-rw-r--r--drw.h12
-rw-r--r--dwm.c4
3 files changed, 13 insertions, 13 deletions
diff --git a/drw.c b/drw.c
index 319eb6b0339..c6383231930 100644
--- a/drw.c
+++ b/drw.c
@@ -180,7 +180,7 @@ drw_fontset_free(Fnt *font)
}
void
-drw_clr_create(Drw *drw, XftColor *dest, const char *clrname)
+drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
{
if (!drw || !dest || !clrname)
return;
@@ -193,14 +193,14 @@ drw_clr_create(Drw *drw, XftColor *dest, const char *clrname)
/* Wrapper to create color schemes. The caller has to call free(3) on the
* returned color scheme when done using it. */
-Scm
+Clr *
drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
{
size_t i;
- Scm ret;
+ Clr *ret;
/* need at least two colors for a scheme */
- if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
+ if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(Clr))))
return NULL;
for (i = 0; i < clrcount; i++)
@@ -216,7 +216,7 @@ drw_setfontset(Drw *drw, Fnt *set)
}
void
-drw_setscheme(Drw *drw, Scm scm)
+drw_setscheme(Drw *drw, Clr *scm)
{
if (drw)
drw->scheme = scm;
diff --git a/drw.h b/drw.h
index ff4355b8389..4c67419a98d 100644
--- a/drw.h
+++ b/drw.h
@@ -12,8 +12,8 @@ typedef struct Fnt {
struct Fnt *next;
} Fnt;
-enum { ColFg, ColBg, ColCount }; /* Scm index */
-typedef XftColor *Scm;
+enum { ColFg, ColBg }; /* Clr scheme index */
+typedef XftColor Clr;
typedef struct {
unsigned int w, h;
@@ -22,7 +22,7 @@ typedef struct {
Window root;
Drawable drawable;
GC gc;
- Scm scheme;
+ Clr *scheme;
Fnt *fonts;
} Drw;
@@ -38,8 +38,8 @@ unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
/* Colorscheme abstraction */
-void drw_clr_create(Drw *drw, XftColor *dest, const char *clrname);
-Scm drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
+void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
+Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
/* Cursor abstraction */
Cur *drw_cur_create(Drw *drw, int shape);
@@ -47,7 +47,7 @@ void drw_cur_free(Drw *drw, Cur *cursor);
/* Drawing context manipulation */
void drw_setfontset(Drw *drw, Fnt *set);
-void drw_setscheme(Drw *drw, Scm scm);
+void drw_setscheme(Drw *drw, Clr *scm);
/* Drawing functions */
void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
diff --git a/dwm.c b/dwm.c
index 650d19f8ebe..ff893df5e8c 100644
--- a/dwm.c
+++ b/dwm.c
@@ -263,7 +263,7 @@ static void (*handler[LASTEvent]) (XEvent *) = {
static Atom wmatom[WMLast], netatom[NetLast];
static int running = 1;
static Cur *cursor[CurLast];
-static Scm *scheme;
+static Clr **scheme;
static Display *dpy;
static Drw *drw;
static Monitor *mons, *selmon;
@@ -1568,7 +1568,7 @@ setup(void)
cursor[CurResize] = drw_cur_create(drw, XC_sizing);
cursor[CurMove] = drw_cur_create(drw, XC_fleur);
/* init appearance */
- scheme = ecalloc(LENGTH(colors), sizeof(Scm));
+ scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
for (i = 0; i < LENGTH(colors); i++)
scheme[i] = drw_scm_create(drw, colors[i], 3);
/* init bars */