isync dmenu drw.{c,h} code: use Clr* (was Scm) - dwm - dynamic window manager Err parazyd.org 70 hgit clone https://git.parazyd.org/dwm URL:https://git.parazyd.org/dwm parazyd.org 70 1Log /git/dwm/log.gph parazyd.org 70 1Files /git/dwm/files.gph parazyd.org 70 1Refs /git/dwm/refs.gph parazyd.org 70 1README /git/dwm/file/README.gph parazyd.org 70 1LICENSE /git/dwm/file/LICENSE.gph parazyd.org 70 i--- Err parazyd.org 70 1commit 3756f7f6b8dccf7a31789ffaf073a76fd1a87eb9 /git/dwm/commit/3756f7f6b8dccf7a31789ffaf073a76fd1a87eb9.gph parazyd.org 70 1parent 99f78fa553f9ddb23fab73e47a408d66ca7f974c /git/dwm/commit/99f78fa553f9ddb23fab73e47a408d66ca7f974c.gph parazyd.org 70 hAuthor: Hiltjo Posthuma URL:mailto:hiltjo@codemadness.org parazyd.org 70 iDate: Fri, 3 Nov 2017 21:20:48 +0100 Err parazyd.org 70 i Err parazyd.org 70 isync dmenu drw.{c,h} code: use Clr* (was Scm) Err parazyd.org 70 i Err parazyd.org 70 iDiffstat: Err parazyd.org 70 i M drw.c | 10 +++++----- Err parazyd.org 70 i M drw.h | 12 ++++++------ Err parazyd.org 70 i M dwm.c | 4 ++-- Err parazyd.org 70 i Err parazyd.org 70 i3 files changed, 13 insertions(+), 13 deletions(-) Err parazyd.org 70 i--- Err parazyd.org 70 1diff --git a/drw.c b/drw.c /git/dwm/file/drw.c.gph parazyd.org 70 i@@ -180,7 +180,7 @@ drw_fontset_free(Fnt *font) Err parazyd.org 70 i } Err parazyd.org 70 i Err parazyd.org 70 i void Err parazyd.org 70 i-drw_clr_create(Drw *drw, XftColor *dest, const char *clrname) Err parazyd.org 70 i+drw_clr_create(Drw *drw, Clr *dest, const char *clrname) Err parazyd.org 70 i { Err parazyd.org 70 i if (!drw || !dest || !clrname) Err parazyd.org 70 i return; Err parazyd.org 70 i@@ -193,14 +193,14 @@ drw_clr_create(Drw *drw, XftColor *dest, const char *clrname) Err parazyd.org 70 i Err parazyd.org 70 i /* Wrapper to create color schemes. The caller has to call free(3) on the Err parazyd.org 70 i * returned color scheme when done using it. */ Err parazyd.org 70 i-Scm Err parazyd.org 70 i+Clr * Err parazyd.org 70 i drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) Err parazyd.org 70 i { Err parazyd.org 70 i size_t i; Err parazyd.org 70 i- Scm ret; Err parazyd.org 70 i+ Clr *ret; Err parazyd.org 70 i Err parazyd.org 70 i /* need at least two colors for a scheme */ Err parazyd.org 70 i- if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor)))) Err parazyd.org 70 i+ if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(Clr)))) Err parazyd.org 70 i return NULL; Err parazyd.org 70 i Err parazyd.org 70 i for (i = 0; i < clrcount; i++) Err parazyd.org 70 i@@ -216,7 +216,7 @@ drw_setfontset(Drw *drw, Fnt *set) Err parazyd.org 70 i } Err parazyd.org 70 i Err parazyd.org 70 i void Err parazyd.org 70 i-drw_setscheme(Drw *drw, Scm scm) Err parazyd.org 70 i+drw_setscheme(Drw *drw, Clr *scm) Err parazyd.org 70 i { Err parazyd.org 70 i if (drw) Err parazyd.org 70 i drw->scheme = scm; Err parazyd.org 70 1diff --git a/drw.h b/drw.h /git/dwm/file/drw.h.gph parazyd.org 70 i@@ -12,8 +12,8 @@ typedef struct Fnt { Err parazyd.org 70 i struct Fnt *next; Err parazyd.org 70 i } Fnt; Err parazyd.org 70 i Err parazyd.org 70 i-enum { ColFg, ColBg, ColCount }; /* Scm index */ Err parazyd.org 70 i-typedef XftColor *Scm; Err parazyd.org 70 i+enum { ColFg, ColBg }; /* Clr scheme index */ Err parazyd.org 70 i+typedef XftColor Clr; Err parazyd.org 70 i Err parazyd.org 70 i typedef struct { Err parazyd.org 70 i unsigned int w, h; Err parazyd.org 70 i@@ -22,7 +22,7 @@ typedef struct { Err parazyd.org 70 i Window root; Err parazyd.org 70 i Drawable drawable; Err parazyd.org 70 i GC gc; Err parazyd.org 70 i- Scm scheme; Err parazyd.org 70 i+ Clr *scheme; Err parazyd.org 70 i Fnt *fonts; Err parazyd.org 70 i } Drw; Err parazyd.org 70 i Err parazyd.org 70 i@@ -38,8 +38,8 @@ unsigned int drw_fontset_getwidth(Drw *drw, const char *text); Err parazyd.org 70 i void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h); Err parazyd.org 70 i Err parazyd.org 70 i /* Colorscheme abstraction */ Err parazyd.org 70 i-void drw_clr_create(Drw *drw, XftColor *dest, const char *clrname); Err parazyd.org 70 i-Scm drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount); Err parazyd.org 70 i+void drw_clr_create(Drw *drw, Clr *dest, const char *clrname); Err parazyd.org 70 i+Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount); Err parazyd.org 70 i Err parazyd.org 70 i /* Cursor abstraction */ Err parazyd.org 70 i Cur *drw_cur_create(Drw *drw, int shape); Err parazyd.org 70 i@@ -47,7 +47,7 @@ void drw_cur_free(Drw *drw, Cur *cursor); Err parazyd.org 70 i Err parazyd.org 70 i /* Drawing context manipulation */ Err parazyd.org 70 i void drw_setfontset(Drw *drw, Fnt *set); Err parazyd.org 70 i-void drw_setscheme(Drw *drw, Scm scm); Err parazyd.org 70 i+void drw_setscheme(Drw *drw, Clr *scm); Err parazyd.org 70 i Err parazyd.org 70 i /* Drawing functions */ Err parazyd.org 70 i void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert); Err parazyd.org 70 1diff --git a/dwm.c b/dwm.c /git/dwm/file/dwm.c.gph parazyd.org 70 i@@ -263,7 +263,7 @@ static void (*handler[LASTEvent]) (XEvent *) = { Err parazyd.org 70 i static Atom wmatom[WMLast], netatom[NetLast]; Err parazyd.org 70 i static int running = 1; Err parazyd.org 70 i static Cur *cursor[CurLast]; Err parazyd.org 70 i-static Scm *scheme; Err parazyd.org 70 i+static Clr **scheme; Err parazyd.org 70 i static Display *dpy; Err parazyd.org 70 i static Drw *drw; Err parazyd.org 70 i static Monitor *mons, *selmon; Err parazyd.org 70 i@@ -1568,7 +1568,7 @@ setup(void) Err parazyd.org 70 i cursor[CurResize] = drw_cur_create(drw, XC_sizing); Err parazyd.org 70 i cursor[CurMove] = drw_cur_create(drw, XC_fleur); Err parazyd.org 70 i /* init appearance */ Err parazyd.org 70 i- scheme = ecalloc(LENGTH(colors), sizeof(Scm)); Err parazyd.org 70 i+ scheme = ecalloc(LENGTH(colors), sizeof(Clr *)); Err parazyd.org 70 i for (i = 0; i < LENGTH(colors); i++) Err parazyd.org 70 i scheme[i] = drw_scm_create(drw, colors[i], 3); Err parazyd.org 70 i /* init bars */ Err parazyd.org 70 .