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

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index b0d99c0..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;


@@ -910,8 +910,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size)
        if (!text || size == 0)
                return 0;
        text[0] = '\0';
        if (!text || size == 0)
                return 0;
        text[0] = '\0';

-       XGetTextProperty(dpy, w, &name, atom);
-       if (!name.nitems)
+       if (!XGetTextProperty(dpy, w, &name, atom) || !name.nitems)

                return 0;
        if (name.encoding == XA_STRING)
                strncpy(text, (char *)name.value, size - 1);
                return 0;
        if (name.encoding == XA_STRING)
                strncpy(text, (char *)name.value, size - 1);


@@ -1569,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 */