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

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;

diff --git a/drw.h b/drw.h
index ff4355b..4c67419 100644 (file)
--- a/drw.h
+++ b/drw.h
@@ -12,8 +12,8 @@ typedef struct Fnt {
        struct Fnt *next;
 } 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;
 
 typedef struct {
        unsigned int w, h;


@@ -22,7 +22,7 @@ typedef struct {
        Window root;
        Drawable drawable;
        GC gc;
        Window root;
        Drawable drawable;
        GC gc;

-       Scm scheme;
+       Clr *scheme;

        Fnt *fonts;
 } Drw;
 
        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_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);
 
 /* 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);
 
 /* 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);
 
 /* 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 (file)
--- 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 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;
 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 */
        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 */
        for (i = 0; i < LENGTH(colors); i++)
                scheme[i] = drw_scm_create(drw, colors[i], 3);
        /* init bars */