git.stevedylan.dev

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

Hiltjo Posthuma · 2017-11-03 21:20 3 file(s) · +13 −13

drw.c +5 −5

}

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;


/* 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++)

}

void
drw_setscheme(Drw *drw, Scm scm)
drw_setscheme(Drw *drw, Clr *scm)
{
	if (drw)
		drw->scheme = scm;

drw.h +6 −6

	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;

	Window root;
	Drawable drawable;
	GC gc;
	Scm scheme;
	Clr *scheme;
	Fnt *fonts;
} Drw;


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);


/* 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);

dwm.c +2 −2

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;

	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 */

180	180		}
181	181
182	182		void
183		-	drw_clr_create(Drw drw, XftColor dest, const char *clrname)
	183	+	drw_clr_create(Drw drw, Clr dest, const char *clrname)
184	184		{
185	185		if (!drw \|\| !dest \|\| !clrname)
186	186		return;

193	193
194	194		/* Wrapper to create color schemes. The caller has to call free(3) on the
195	195		* returned color scheme when done using it. */
196		-	Scm
	196	+	Clr *
197	197		drw_scm_create(Drw drw, const char clrnames[], size_t clrcount)
198	198		{
199	199		size_t i;
200		-	Scm ret;
	200	+	Clr *ret;
201	201
202	202		/* need at least two colors for a scheme */
203		-	if (!drw \|\| !clrnames \|\| clrcount < 2 \|\| !(ret = ecalloc(clrcount, sizeof(XftColor))))
	203	+	if (!drw \|\| !clrnames \|\| clrcount < 2 \|\| !(ret = ecalloc(clrcount, sizeof(Clr))))
204	204		return NULL;
205	205
206	206		for (i = 0; i < clrcount; i++)

216	216		}
217	217
218	218		void
219		-	drw_setscheme(Drw *drw, Scm scm)
	219	+	drw_setscheme(Drw drw, Clr scm)
220	220		{
221	221		if (drw)
222	222		drw->scheme = scm;

12	12		struct Fnt *next;
13	13		} Fnt;
14	14
15		-	enum { ColFg, ColBg, ColCount }; /* Scm index */
16		-	typedef XftColor *Scm;
	15	+	enum { ColFg, ColBg }; /* Clr scheme index */
	16	+	typedef XftColor Clr;
17	17
18	18		typedef struct {
19	19		unsigned int w, h;

22	22		Window root;
23	23		Drawable drawable;
24	24		GC gc;
25		-	Scm scheme;
	25	+	Clr *scheme;
26	26		Fnt *fonts;
27	27		} Drw;
28	28

38	38		void drw_font_getexts(Fnt font, const char text, unsigned int len, unsigned int w, unsigned int h);
39	39
40	40		/* Colorscheme abstraction */
41		-	void drw_clr_create(Drw drw, XftColor dest, const char *clrname);
42		-	Scm drw_scm_create(Drw drw, const char clrnames[], size_t clrcount);
	41	+	void drw_clr_create(Drw drw, Clr dest, const char *clrname);
	42	+	Clr drw_scm_create(Drw drw, const char *clrnames[], size_t clrcount);
43	43
44	44		/* Cursor abstraction */
45	45		Cur drw_cur_create(Drw drw, int shape);

47	47
48	48		/* Drawing context manipulation */
49	49		void drw_setfontset(Drw drw, Fnt set);
50		-	void drw_setscheme(Drw *drw, Scm scm);
	50	+	void drw_setscheme(Drw drw, Clr scm);
51	51
52	52		/* Drawing functions */
53	53		void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);

263	263		static Atom wmatom[WMLast], netatom[NetLast];
264	264		static int running = 1;
265	265		static Cur *cursor[CurLast];
266		-	static Scm *scheme;
	266	+	static Clr **scheme;
267	267		static Display *dpy;
268	268		static Drw *drw;
269	269		static Monitor mons, selmon;

1568	1568		cursor[CurResize] = drw_cur_create(drw, XC_sizing);
1569	1569		cursor[CurMove] = drw_cur_create(drw, XC_fleur);
1570	1570		/* init appearance */
1571		-	scheme = ecalloc(LENGTH(colors), sizeof(Scm));
	1571	+	scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
1572	1572		for (i = 0; i < LENGTH(colors); i++)
1573	1573		scheme[i] = drw_scm_create(drw, colors[i], 3);
1574	1574		/* init bars */