X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=a34b9cd63e2695dcdc9bf768ea6f024e349799fb;hb=82b4e616032702ec6e09b7b07d14a2275196f574;hp=0abb7e667506c244c57fbd0ca895569e7f8c2166;hpb=c69beebf3decbe67eb92beab56bbc34c41c39831;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 0abb7e6..a34b9cd 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -253,7 +253,8 @@ int dialogItems[][41	] = {
 { ABOUTBOX, IDOK, OPT_MESS, 400 }, 
 { DLG_TimeControl, IDC_Babble, OPT_TCUseMoves, OPT_TCUseInc, OPT_TCUseFixed, 
   OPT_TCtext1, OPT_TCtext2, OPT_TCitext1, OPT_TCitext2, OPT_TCftext, GPB_Factors,   IDC_Factor1, IDC_Factor2, IDOK, IDCANCEL }, 
-{ DLG_LoadOptions, OPT_Autostep, OPT_AStext1, IDOK, IDCANCEL },
+{ DLG_LoadOptions, OPT_Autostep, OPT_AStext1, OPT_Exact, OPT_Subset, OPT_Struct, OPT_Material, OPT_Range, OPT_Difference,
+  OPT_elo1t, OPT_elo2t, OPT_datet, OPT_Stretch, OPT_Stretcht, OPT_Reversed, OPT_SearchMode, OPT_Mirror, OPT_thresholds, IDOK, IDCANCEL }, 
 { DLG_SaveOptions, OPT_Autosave, OPT_AVPrompt, OPT_AVToFile, OPT_AVBrowse,
   801, OPT_PGN, OPT_Old, OPT_OutOfBookInfo, IDOK, IDCANCEL }, 
 { 1536, 1090, IDC_Directories, 1089, 1091, IDOK, IDCANCEL, 1038, IDC_IndexNr, 1037 }, 
@@ -333,7 +334,7 @@ int dialogItems[][41	] = {
 { 0 }
 };
 
-static char languageBuf[50000], *foreign[1000], *english[1000], *languageFile[MSG_SIZ];
+static char languageBuf[70000], *foreign[1000], *english[1000], *languageFile[MSG_SIZ];
 static int lastChecked;
 static char oldLanguage[MSG_SIZ], *menuText[10][30];
 extern int tinyLayout;
@@ -387,11 +388,16 @@ T_(char *s)
 {   // return the translation of the given string
     // efficiency can be improved a lot...
     int i=0;
+    static char buf[MSG_SIZ];
 //if(appData.debugMode) fprintf(debugFP, "T_(%s)\n", s);
     if(!barbaric) return s;
     if(!s) return ""; // sanity
     while(english[i]) {
         if(!strcmp(s, english[i])) return foreign[i];
+	if(english[i][0] == '%' && strstr(s, english[i]+1) == s) { // allow translation of strings with variable ending
+	    snprintf(buf, MSG_SIZ, "%s%s", foreign[i], s + strlen(english[i]+1)); // keep unmatched portion
+	    return buf;
+	}
         i++;
     }
     return s;
@@ -731,7 +737,8 @@ void ThawUI()
 #define JAWS_INIT
 #define JAWS_ARGS
 #define JAWS_ALT_INTERCEPT
-#define JAWS_KB_NAVIGATION
+#define JAWS_KBUP_NAVIGATION
+#define JAWS_KBDOWN_NAVIGATION
 #define JAWS_MENU_ITEMS
 #define JAWS_SILENCE
 #define JAWS_REPLAY
@@ -4139,9 +4146,9 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   switch (message) {
   case WM_LBUTTONDOWN:
       if (PtInRect((LPRECT) &whiteRect, pt)) {
-        ClockClick(flipClock);
+        ClockClick(flipClock); break;
       } else if (PtInRect((LPRECT) &blackRect, pt)) {
-	ClockClick(!flipClock);
+	ClockClick(!flipClock); break;
       }
       dragInfo.start.x = dragInfo.start.y = -1;
       dragInfo.from = dragInfo.start;
@@ -4221,9 +4228,9 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     if(y == -2) {
       /* [HGM] right mouse button in clock area edit-game mode ups clock */
       if (PtInRect((LPRECT) &whiteRect, pt)) {
-          if (gameMode == EditGame || GetKeyState(VK_SHIFT) < 0) AdjustClock(flipClock, 1);
+          if (GetKeyState(VK_SHIFT) < 0) AdjustClock(flipClock, 1);
       } else if (PtInRect((LPRECT) &blackRect, pt)) {
-          if (gameMode == EditGame || GetKeyState(VK_SHIFT) < 0) AdjustClock(!flipClock, 1);
+          if (GetKeyState(VK_SHIFT) < 0) AdjustClock(!flipClock, 1);
       }
       break;
     }
@@ -4567,6 +4574,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   char fileTitle[MSG_SIZ];
   char buf[MSG_SIZ];
   static SnapData sd;
+  static int peek=0;
 
   switch (message) {
 
@@ -4594,7 +4602,23 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     MouseEvent(hwnd, message, wParam, lParam);
     break;
 
-  JAWS_KB_NAVIGATION
+  case WM_KEYUP:
+    if((char)wParam == '\b') {
+      ForwardEvent(); peek = 0;
+    }
+
+    JAWS_KBUP_NAVIGATION
+
+    break;
+
+  case WM_KEYDOWN:
+    if((char)wParam == '\b') {
+      if(!peek) BackwardEvent(), peek = 1;
+    }
+
+    JAWS_KBDOWN_NAVIGATION
+
+    break;
 
   case WM_CHAR:
     
@@ -4924,7 +4948,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       } else {
 	if (!appData.showThinking) ToggleShowThinking();
 	AnalyzeFileEvent();
-	LoadGameDialog(hwnd, _("Analyze Game from File"));
+//	LoadGameDialog(hwnd, _("Analyze Game from File"));
 	AnalysisPeriodicEvent(1);
       }
       break;
@@ -5062,6 +5086,11 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       SetFocus(hwndMain);
       break;
 
+    case OPT_GameListNext: // [HGM] forward these two accelerators to Game List
+    case OPT_GameListPrev:
+      if(gameListDialog) SendMessage(gameListDialog, WM_COMMAND, wmId, 0);
+      break;
+
     case IDM_Revert:
       RevertEvent(FALSE);
       break;
@@ -8852,6 +8881,37 @@ IDLE_PRIORITY_CLASS         0x00000040
         return 0x00000040;
 }
 
+void RunCommand(char *cmdLine)
+{
+  /* Now create the child process. */
+  STARTUPINFO siStartInfo;
+  PROCESS_INFORMATION piProcInfo;
+
+  siStartInfo.cb = sizeof(STARTUPINFO);
+  siStartInfo.lpReserved = NULL;
+  siStartInfo.lpDesktop = NULL;
+  siStartInfo.lpTitle = NULL;
+  siStartInfo.dwFlags = STARTF_USESTDHANDLES;
+  siStartInfo.cbReserved2 = 0;
+  siStartInfo.lpReserved2 = NULL;
+  siStartInfo.hStdInput = NULL;
+  siStartInfo.hStdOutput = NULL;
+  siStartInfo.hStdError = NULL;
+
+  CreateProcess(NULL,
+		cmdLine,	   /* command line */
+		NULL,	   /* process security attributes */
+		NULL,	   /* primary thread security attrs */
+		TRUE,	   /* handles are inherited */
+		DETACHED_PROCESS|CREATE_NEW_PROCESS_GROUP,
+		NULL,	   /* use parent's environment */
+		NULL,
+		&siStartInfo, /* STARTUPINFO pointer */
+		&piProcInfo); /* receives PROCESS_INFORMATION */
+
+  CloseHandle(piProcInfo.hThread);
+}
+
 /* Start a child process running the given program.
    The process's standard output can be read from "from", and its
    standard input can be written to "to".
@@ -9587,6 +9647,12 @@ OutputToProcess(ProcRef pr, char *message, int count, int *outError)
   return outCount;
 }
 
+void
+DoSleep(int n)
+{
+    if(n != 0) Sleep(n);
+}
+
 int
 OutputToProcessDelayed(ProcRef pr, char *message, int count, int *outError,
 		       long msdelay)
@@ -9828,16 +9894,6 @@ Tween(start, mid, finish, factor, frames, nFrames)
 }
 
 void
-HistorySet( char movelist[][2*MOVE_LEN], int first, int last, int current )
-{
-    MoveHistorySet( movelist, first, last, current, pvInfoList );
-
-    EvalGraphSet( first, last, current, pvInfoList );
-
-    MakeEngineOutputTitle();
-}
-
-void
 SettingsPopUp(ChessProgramState *cps)
 {     // [HGM] wrapper needed because handles must not be passed through back-end
       EngineOptionsPopup(savedHwnd, cps);