qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

trying parsing a XLFD string first, then by pattern

Browse Source
This commit is contained in:
okan 2013-10-07 13:40:26 +00:00
parent 4d34166c4d
commit c42f6cebe3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/cwm/conf.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: conf.c,v 1.145 2013/07/16 14:22:25 okan Exp $ * $OpenBSD: conf.c,v 1.146 2013/10/07 13:40:26 okan Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -104,9 +104,12 @@ conf_screen(struct screen_ctx *sc)
sc->gap = Conf.gap; sc->gap = Conf.gap;
sc->xftfont = XftFontOpenXlfd(X_Dpy, sc->which, Conf.font);
if (sc->xftfont == NULL) {
sc->xftfont = XftFontOpenName(X_Dpy, sc->which, Conf.font); sc->xftfont = XftFontOpenName(X_Dpy, sc->which, Conf.font);
if (sc->xftfont == NULL) if (sc->xftfont == NULL)
errx(1, "XftFontOpenName"); errx(1, "XftFontOpenName");
}
for (i = 0; i < nitems(color_binds); i++) { for (i = 0; i < nitems(color_binds); i++) {
if (i == CWM_COLOR_MENU_FONT_SEL && *Conf.color[i] == '\0') { if (i == CWM_COLOR_MENU_FONT_SEL && *Conf.color[i] == '\0') {