[hackers] [dwm] sync dmenu drw.{c,h} code: use Clr* (was Scm) || Hiltjo Posthuma

From: <git_AT_suckless.org>
Date: Fri, 3 Nov 2017 21:21:35 +0100 (CET)

commit 3756f7f6b8dccf7a31789ffaf073a76fd1a87eb9
Author: Hiltjo Posthuma <hiltjo_AT_codemadness.org>
AuthorDate: Fri Nov 3 21:20:48 2017 +0100
Commit: Hiltjo Posthuma <hiltjo_AT_codemadness.org>
CommitDate: Fri Nov 3 21:20:48 2017 +0100

    sync dmenu drw.{c,h} code: use Clr* (was Scm)

diff --git a/drw.c b/drw.c
index 319eb6b..c638323 100644
--- a/drw.c
+++ b/drw.c
_AT_@ -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;
_AT_@ -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++)
_AT_@ -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 ff4355b..4c67419 100644
--- a/drw.h
+++ b/drw.h
_AT_@ -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;
_AT_@ -22,7 +22,7 @@ typedef struct {
         Window root;
         Drawable drawable;
         GC gc;
- Scm scheme;
+ Clr *scheme;
         Fnt *fonts;
 } Drw;
 
_AT_@ -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);
_AT_@ -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 650d19f..ff893df 100644
--- a/dwm.c
+++ b/dwm.c
_AT_@ -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;
_AT_@ -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 */
Received on Fri Nov 03 2017 - 21:21:35 CET