X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=6f26f2b7376d4bf6a370c583d592fab472f044ea;hb=222c259543a8125e7391106f8a6c0f9d9720efc9;hp=febef6b26315cd69be4e66f923a7994fb640ca36;hpb=9d6e29a51584a2c54397106536c9b2f9cc2a0d33;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index febef6b..6f26f2b 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -5,7 +5,7 @@
  * Massachusetts. 
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -249,7 +249,7 @@ Boolean barbaric; // flag indicating if translation is needed
 #define ABOUTBOX -1  /* not sure why these are needed */
 #define ABOUTBOX2 -1
 
-int dialogItems[][41	] = {
+int dialogItems[][42] = {
 { 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 }, 
@@ -302,7 +302,7 @@ int dialogItems[][41	] = {
   OPT_ChooseLightSquareColor, OPT_ChooseDarkSquareColor, OPT_ChooseWhitePieceColor,
   OPT_ChooseBlackPieceColor, OPT_ChooseHighlightSquareColor, OPT_ChoosePremoveHighlightColor,
   OPT_Monochrome, OPT_AllWhite, OPT_UpsideDown, OPT_DefaultBoardColors, GPB_Colors,
-  IDC_Light, IDC_Dark, IDC_White, IDC_Black, IDC_High, IDC_PreHigh, GPB_Size, OPT_Bitmaps, OPT_PieceFont }, 
+  IDC_Light, IDC_Dark, IDC_White, IDC_Black, IDC_High, IDC_PreHigh, GPB_Size, OPT_Bitmaps, OPT_PieceFont, OPT_Grid }, 
 { DLG_NewVariant, IDOK, IDCANCEL, OPT_VariantNormal, OPT_VariantFRC, OPT_VariantWildcastle,
   OPT_VariantNocastle, OPT_VariantLosers, OPT_VariantGiveaway, OPT_VariantSuicide,
   OPT_Variant3Check, OPT_VariantTwoKings, OPT_VariantAtomic, OPT_VariantCrazyhouse,
@@ -334,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;
@@ -388,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;
@@ -732,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
@@ -1133,15 +1139,6 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
                  0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
 #endif
     ShowWindow(hwndConsole, nCmdShow);
-    if(appData.chatBoxes) { // [HGM] chat: open chat boxes
-      char buf[MSG_SIZ], *p = buf, *q;
-	safeStrCpy(buf, appData.chatBoxes, sizeof(buf)/sizeof(buf[0]) );
-      do {
-	q = strchr(p, ';');
-	if(q) *q++ = 0;
-	if(*p) ChatPopUp(p);
-      } while(p=q);
-    }
     SetActiveWindow(hwndConsole);
   }
   if(!appData.noGUI)   UpdateWindow(hwnd);  else ShowWindow(hwnd, SW_MINIMIZE);
@@ -4140,9 +4137,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;
@@ -4222,9 +4219,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;
     }
@@ -4568,6 +4565,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) {
 
@@ -4595,7 +4593,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:
     
@@ -8530,7 +8544,19 @@ DisplayIcsInteractionTitle(char *str)
   char consoleTitle[MSG_SIZ];
 
     snprintf(consoleTitle, MSG_SIZ, "%s: %s", szConsoleTitle, str);
-  SetWindowText(hwndConsole, consoleTitle);
+    SetWindowText(hwndConsole, consoleTitle);
+
+    if(appData.chatBoxes) { // [HGM] chat: open chat boxes
+      char buf[MSG_SIZ], *p = buf, *q;
+	safeStrCpy(buf, appData.chatBoxes, sizeof(buf)/sizeof(buf[0]) );
+      do {
+	q = strchr(p, ';');
+	if(q) *q++ = 0;
+	if(*p) ChatPopUp(p);
+      } while(p=q);
+    }
+
+    SetActiveWindow(hwndMain);
 }
 
 void