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

[dwm.git] / drw.c

diff --git a/drw.c b/drw.c
index 319eb6b..c638323 100644 (file)
--- a/drw.c
+++ b/drw.c
@@ -180,7 +180,7 @@ drw_fontset_free(Fnt *font)
 }
 
 void
 }
 
 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;
 {
        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. */
 
 /* 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;
 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 */
 
        /* 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++)
                return NULL;
 
        for (i = 0; i < clrcount; i++)


@@ -216,7 +216,7 @@ drw_setfontset(Drw *drw, Fnt *set)
 }
 
 void
 }
 
 void

-drw_setscheme(Drw *drw, Scm scm)
+drw_setscheme(Drw *drw, Clr *scm)

 {
        if (drw)
                drw->scheme = scm;
 {
        if (drw)
                drw->scheme = scm;