From 9a6057d00614b65c8cc56687ff1398cd99e3cb21 Mon Sep 17 00:00:00 2001 From: Reginald Kennedy Date: Wed, 18 Jul 2012 04:45:24 +0800 Subject: [PATCH] Oops, bar_font conflicted, renamed bar_font to font in bar_setup. Add the correct libraries and include to linux Makefile. --- linux/Makefile | 4 ++-- spectrwm.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/linux/Makefile b/linux/Makefile index 7637692..8646531 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -1,6 +1,6 @@ -CFLAGS+= -Wall -Wextra -g -D_GNU_SOURCE -I. +CFLAGS+= -Wall -Wextra -g -D_GNU_SOURCE -I. -I/usr/include/freetype2 CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\" -LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest +LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft PREFIX?= /usr/local BINDIR?= $(PREFIX)/bin diff --git a/spectrwm.c b/spectrwm.c index 56b63b3..5667102 100644 --- a/spectrwm.c +++ b/spectrwm.c @@ -1841,7 +1841,7 @@ bar_refresh(void) void bar_setup(struct swm_region *r) { - char *bar_font; + char *font; xcb_screen_t *screen = get_screen(r->s->idx); uint32_t wa[3]; @@ -1853,19 +1853,19 @@ bar_setup(struct swm_region *r) if ((r->bar = calloc(1, sizeof(struct swm_bar))) == NULL) err(1, "bar_setup: calloc: failed to allocate memory."); - while ((bar_font = strsep(&bar_fonts, " ,")) != NULL) { - if (*bar_font == '\0') + while ((font = strsep(&bar_fonts, " ,")) != NULL) { + if (*font == '\0') continue; - DNPRINTF(SWM_D_INIT, "bar_setup: try font %s\n", bar_font); + DNPRINTF(SWM_D_INIT, "bar_setup: try font %s\n", font); bar_font = XftFontOpenName(display, DefaultScreen(display), - bar_font); + font); if (!bar_font) { - warnx("unable to load font %s", bar_font); + warnx("unable to load font %s", font); continue; } else { DNPRINTF(SWM_D_INIT, "successfully opened font %s\n", - bar_font); + font); break; } } -- 2.39.2