diff --git a/config.h b/config.h index 50a704d..b38e362 100644 --- a/config.h +++ b/config.h @@ -6,8 +6,9 @@ static unsigned int gappx = 10; /* gaps between windows */ static unsigned int snap = 32; /* snap pixel */ static int showbar = 1; /* 0 means no bar */ static int topbar = 0; /* 0 means bottom bar */ -static const char *fonts[] = { "Iosevka Custom:size=10" }; -static const char dmenufont[] = "Iosevka Custom:size=10"; +static char font[] = { "Iosevka:size=10" }; +static const char *fonts[] = { font }; +static const char dmenufont[] = "Iosevka:size=10"; static char normbgcolor[] = "#222222"; static char normbordercolor[] = "#444444"; static char normfgcolor[] = "#bbbbbb"; @@ -71,7 +72,8 @@ static const char *vol_mute[] = { "wpctl", "set-mute", "@DEFAULT_AUDIO_SINK@", " * Xresources preferences to load at startup */ ResourcePref resources[] = { - { "color0", STRING, &normbgcolor }, + { "font", STRING, &font }, + { "color0", STRING, &normbgcolor }, { "color0", STRING, &normbordercolor }, { "color10", STRING, &normfgcolor }, { "color10", STRING, &selbgcolor }, diff --git a/config.mk b/config.mk index 5d8a201..4e32528 100644 --- a/config.mk +++ b/config.mk @@ -28,7 +28,7 @@ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -O3 -flto ${INCS} ${CPPFLAGS} -LDFLAGS = ${LIBS} -fuse-ld=mold +LDFLAGS = ${LIBS} # Solaris #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" diff --git a/drw.c b/drw.c index e4968a0..016888c 100644 --- a/drw.c +++ b/drw.c @@ -201,7 +201,8 @@ drw_clr_create(Drw *drw, Clr *dest, const char *clrname) if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen), DefaultColormap(drw->dpy, drw->screen), clrname, dest)) - die("error, cannot allocate color '%s'", clrname); + die("error, cannot allocate color '%s'", clrname); + dest->pixel |= 0xff << 24; } /* Wrapper to create color schemes. The caller has to call free(3) on the diff --git a/drw.o b/drw.o index aac9d06..0ce1bd5 100644 Binary files a/drw.o and b/drw.o differ diff --git a/dwm b/dwm index 2022423..4d6d545 100755 Binary files a/dwm and b/dwm differ diff --git a/dwm.o b/dwm.o index dcf99db..f7f0187 100644 Binary files a/dwm.o and b/dwm.o differ diff --git a/util.o b/util.o index 24c5f22..cca79af 100644 Binary files a/util.o and b/util.o differ