X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=9bab615d9fbc984c0d4a456e7f9d6c4ebeb13631;hb=76e5723516d8510005ef608575a6ee6b5848e2c2;hp=8624ff4cd4b8e658c8f0f67dd0f5dcb09ce1955a;hpb=70a154066b96d5390c133ae8800ff1943d21ac0c;p=xboard.git

diff --git a/dialogs.c b/dialogs.c
index 8624ff4..9bab615 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -866,7 +866,9 @@ static void
 Test (int n)
 {
     GenericReadout(soundOptions, 1);
+    mute <<= 1; // temporarily enable
     if(soundFiles[values[2]]) PlaySoundFile(soundFiles[values[2]]);
+    mute >>= 1;
 }
 
 void
@@ -941,10 +943,10 @@ static Option boardOptions[] = {
 { 0, 0, 200, NULL, (void*) &appData.logoSize, "", NULL, Spin, N_("Logo Size (0=off, requires restart):") },
 { 0,-1, 5, NULL, (void*) &appData.overrideLineGap, "", NULL, Spin, N_("Line Gap (-1 = default for board size):") },
 { 0, 0, 0, NULL, (void*) &appData.useBitmaps, "", NULL, CheckBox, N_("Use Board Textures") },
-{ 0, 0, 0, NULL, (void*) &appData.liteBackTextureFile, ".png", NULL, FileName, N_("Light-Squares Texture File:") },
-{ 0, 0, 0, NULL, (void*) &appData.darkBackTextureFile, ".png", NULL, FileName, N_("Dark-Squares Texture File:") },
+{ 0, 0, 0, NULL, (void*) &appData.darkBackTextureFile, ".png", (char**)(intptr_t) 1, FileName, N_("Dark-Squares Texture File:") },
+{ 0, 0, 0, NULL, (void*) &appData.liteBackTextureFile, ".png", (char**)(intptr_t) 2, FileName, N_("Light-Squares Texture File:") },
 { 0, 0, 0, NULL, (void*) &appData.trueColors, "", NULL, CheckBox, N_("Use external piece bitmaps with their own colors") },
-{ 0, 0, 0, NULL, (void*) &appData.pieceDirectory, "", NULL, PathName, N_("Directory with Pieces Images:") },
+{ 0, 0, 0, NULL, (void*) &appData.pieceDirectory, "",  (char**)(intptr_t) 3, PathName, N_("Directory with Pieces Images:") },
 { 0, 0, 0, NULL, (void*) &BoardOptionsOK, "", NULL, EndMark , "" }
 };
 
@@ -1041,6 +1043,7 @@ void
 SendString (char *p)
 {
     char buf[MSG_SIZ], buf2[MSG_SIZ], *q;
+
     if(q = strstr(p, "$name")) { // in Xaw this is already intercepted
 	if(!shellUp[TextMenuDlg] || !clickedWord[0]) return;
 	strncpy(buf2, p, MSG_SIZ);
@@ -1225,7 +1228,7 @@ NewMove ()
 
 Option tagsOptions[] = {
 {   0,   0,   0, NULL, NULL, NULL, NULL, Label,  NULL },
-{ 200, T_VSCRL | T_FILL | T_WRAP | T_TOP, 200, NULL, (void*) &tagsText, NULL, (char **) &TagsClick, TextBox, "", &appData.tagsFont },
+{ 200, T_VSCRL | T_FILL | T_TOP, 200, NULL, (void*) &tagsText, NULL, (char **) &TagsClick, TextBox, "", &appData.tagsFont },
 {   0,   0, 100, NULL, (void*) &NewMove,    NULL, NULL, Button, N_("add next move") },
 { 0,SAME_ROW,100,NULL, (void*) &changeTags, NULL, NULL, Button, N_("commit changes") },
 { 0,SAME_ROW, 0, NULL, (void*) &NewTagsCallback, "", NULL, EndMark , "" }
@@ -1278,11 +1281,11 @@ EditTagsPopUp (char *tags, char **dest)
 }
 
 void
-EditEnginePopUp (char *tags, char **dest)
+EditAnyPopUp (char *tags, char **dest, char *title)
 {   // wrapper to preserve old name used in back-end
     TagsPopDown();
     resPtr = dest; 
-    NewTagsPopup(tags, NULL, _("Registered Engines"));
+    NewTagsPopup(tags, NULL, title);
 }
 
 void
@@ -2690,7 +2693,9 @@ DisplayHelp (char *name)
 	    FREE(manText[1]); manText[1] = NULL;      // so any currently held text is worthless
 	    safeStrCpy(tidy, buf, MSG_SIZ);           // remember current engine
 	    eng = BufferCommandOutput(tidy, MSG_SIZ); // obtain path to  its man file
+	    if(*eng)
 	    safeStrCpy(engMan, eng, strlen(eng));     // and remember that too
+	    else *engMan = NULLCHAR;
 	    FREE(eng);
 	}
 	safeStrCpy(buf, engMan, MSG_SIZ); n = 1;      // use engine man
@@ -3390,3 +3395,11 @@ ActivateTheme (int col)
     DrawPosition(True, NULL);
 }
 
+char *
+Shorten (char *s)
+{
+    static char buf[MSG_SIZ];
+    if(strstr(s, dataDir) != s) return s;
+    snprintf(buf, MSG_SIZ, "~~%s", s + strlen(dataDir));
+    return buf;
+}