Also try to get help for engine options

[xboard.git] / dialogs.c

diff --git a/dialogs.c b/dialogs.c
index 50f40b1..d57b576 100644 (file)
--- a/dialogs.c
+++ b/dialogs.c
@@ -2458,16 +2458,17 @@ ReadLine (FILE *f)
 void
 GetHelpText (FILE *f, char *name)
 {
-    char *line, buf[MSG_SIZ], text[10000], *p = text, *q = text;
+    char *line, buf[MSG_SIZ], title[MSG_SIZ], text[10000], *p = text, *q = text;
     int len, cnt = 0;
     snprintf(buf, MSG_SIZ, ".B %s", name);
     len = strlen(buf);
     for(len=1; buf[len] == ' ' || buf[len] == '-' || isalpha(buf[len]) || isdigit(buf[len]); len++);
     buf[len] = NULLCHAR;
     while(buf[--len] == ' ') buf[len] = NULLCHAR;
+    snprintf(title, MSG_SIZ, "Help on '%s'", buf+3);
     while((line = ReadLine(f))) {
-       if(!strncmp(line, buf, len) && (strncmp(line, ".SS ", 4) || strncmp(line+4, buf+3, len-3))) {
-           while((line = ReadLine(f)) && (cnt == 0 || strncmp(line, ".B ", 3))) {
+       if(!strncmp(line, buf, len) || !strncmp(line, ".SS ", 4) && !strncmp(line+4, buf+3, len-3)) {
+           while((line = ReadLine(f)) && (cnt == 0 || strncmp(line, ".B ", 3) && strncmp(line, ".SS ", 4))) {
                if(!*line) { *p++ = '\n'; *p++ = '\n'; q = p; continue; }
                if(*line == '.') continue;
                *p++ = ' '; cnt++;
@@ -2479,7 +2480,7 @@ GetHelpText (FILE *f, char *name)
                if(p - text > 9900) break;
            }
            *p = NULLCHAR;
-           ErrorPopUp("Help", text, FALSE);
+           ErrorPopUp(title, text, FALSE);
            return;
        }
     }
@@ -2490,8 +2491,14 @@ GetHelpText (FILE *f, char *name)
 void
 DisplayHelp (char *name)
 {
-    char *manFile = DATADIR "/../../man/man6/xboard.6";
-    FILE *f = fopen(manFile, "r");
+    char buf[MSG_SIZ], *manFile = MANDIR "/man6/xboard.6";
+    FILE *f;
+    if(currentCps) snprintf(manFile = buf, MSG_SIZ, "/usr/share/man/man6/%s.6", currentCps->program);
+    f = fopen(manFile, "r");
+    if(!f && currentCps) { // engine manual could be in two places
+       snprintf(buf, MSG_SIZ, "/usr/man/man6/%s.6", currentCps->program);
+       f= fopen(buf, "r");
+    }
     if(f) {
        GetHelpText(f, name);
        fclose(f);