Put WinBoard language files in separate folder

A new string option -languageDir is added. When this not an empty string
it will be taken as the directory where WinBoard searches the *.lng
translation files. The option is persistent in WinBoard.

diff --git a/args.h b/args.h
index 3e376e5..a345145 100644 (file)
--- a/args.h
+++ b/args.h
@@ -520,6 +520,7 @@ ArgDescriptor argDescriptors[] = {
     !XBOARD, (ArgIniType) SCP_NAMES },
   { "themeNames", ArgString, (void *) &appData.themeNames, TRUE, (ArgIniType) "native -upf false -ub false -ubt false -pid \"\"\n" },
   { "engineList", ArgFilename, (void *) &engineListFile, TRUE, (ArgIniType) "" },
+  { "languageDir", ArgFilename, (void *) &appData.languageDir, !XBOARD, (ArgIniType) "" },
   { "addMasterOption", ArgMaster, NULL, FALSE, INVALID },
   { "installEngine", ArgInstall, (void *) &firstChessProgramNames, FALSE, (ArgIniType) "" },
   { "installTheme", ArgInstall, (void *) &appData.themeNames, FALSE, (ArgIniType) "" },

diff --git a/common.h b/common.h
index 1943341..6eb89df 100644 (file)
--- a/common.h
+++ b/common.h
@@ -750,6 +750,7 @@ typedef struct {
 
     char *serverFileName;
     char *serverMovesName;
+    char *languageDir;
     char *finger;
     Boolean suppressLoadMoves;
     int serverPause;

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 191ac62..81d6f2f 100644 (file)
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -383,6 +383,7 @@ LoadLanguageFile(char *name)
             languageBuf[--i] = k;\r
 \r
 \r
+\r
         }\r
         i++;\r
     }\r
@@ -459,6 +460,7 @@ void
 TranslateMenus(int addLanguage)\r
 {\r
     int i;\r
+    char buf[MSG_SIZ];\r
     WIN32_FIND_DATA fileData;\r
     HANDLE hFind;\r
 #define IDM_English 1970\r
@@ -474,7 +476,8 @@ TranslateMenus(int addLanguage)
     }\r
 \r
     if(!addLanguage) return;\r
-    if((hFind = FindFirstFile("*.LNG", &fileData)) != INVALID_HANDLE_VALUE) {\r
+    snprintf(buf, MSG_SIZ, "%s%s*.LNG", appData.languageDir, *appData.languageDir ? "\\" : "");\r
+    if((hFind = FindFirstFile(buf, &fileData)) != INVALID_HANDLE_VALUE) {\r
         HMENU mainMenu = GetMenu(hwndMain);\r
         HMENU subMenu = GetSubMenu(mainMenu, GetMenuItemCount(mainMenu)-1);\r
         AppendMenu(subMenu, MF_SEPARATOR, (UINT_PTR) 0, NULL);\r
@@ -483,7 +486,8 @@ TranslateMenus(int addLanguage)
         do {\r
             char *p, *q = fileData.cFileName;\r
             int checkFlag = MF_UNCHECKED;\r
-            languageFile[i] = strdup(q);\r
+            snprintf(buf, MSG_SIZ, "%s%s%s", appData.languageDir, *appData.languageDir ? "\\" : "", q);\r
+            languageFile[i] = strdup(buf);\r
             if(barbaric && !strcmp(oldLanguage, q)) {\r
                 checkFlag = MF_CHECKED;\r
                 lastChecked = IDM_English + i + 1;\r