From: H.G.Muller <hgm@hgm-xboard.(none)>
Date: Thu, 4 Sep 2014 20:57:07 +0000 (+0200)
Subject: Verify if font-spec looks like one in Xaw
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=acd8b8e897a59954fdcaa8ab9d55af4b9c290778;p=xboard.git

Verify if font-spec looks like one in Xaw

To make XBoard resistant to mixed use of Xaw and GTK builds, which
would not understand each others font specs stored in the settings
file (they have in common), we now determine if the value looks like
an X-font. If it doesn't, the Xaw version ignores it. The GTK build already
ignored it if it did lool like an X-font spec.
---

diff --git a/xaw/xboard.c b/xaw/xboard.c
index ac57033..02149e5 100644
--- a/xaw/xboard.c
+++ b/xaw/xboard.c
@@ -496,7 +496,8 @@ ParseFont (char *name, int number)
   if(sscanf(name, "size%d:", &size)) {
     // [HGM] font: font is meant for specific boardSize (likely from settings file);
     //       defer processing it until we know if it matches our board size
-    if(size >= 0 && size<MAX_SIZE) { // for now, fixed limit
+    if(strstr(name, "-*-") &&        // only pay attention to things that look like X-fonts
+       size >= 0 && size<MAX_SIZE) { // for now, fixed limit
 	fontTable[number][size] = strdup(strchr(name, ':')+1);
 	fontValid[number][size] = True;
     }