X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=9cc79dacd2ba1d8428ce1c5eedfbb229393a9f1c;hb=2a9ed786fc7e279874d1fa22a6bcf87d89328d14;hp=195ecfc12e044442e7e2d63dc8ba39a377ef0048;hpb=0984533d7857a31638e2bcaa4eb085abd419aa3a;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 195ecfc..9cc79da 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -1222,7 +1222,14 @@ PrintCommPortSettings(FILE *f, char *name)
 int
 MySearchPath(char *installDir, char *name, char *fullname)
 {
-  char *dummy;
+  char *dummy, buf[MSG_SIZ];
+  if(name[0] == '%' && strchr(name+1, '%')) { // [HGM] recognize %*% as environment variable
+    strcpy(buf, name+1);
+    *strchr(buf, '%') = 0;
+    installDir = getenv(buf);
+    sprintf(fullname, "%s\\%s", installDir, strchr(name+1, '%')+1);
+    return strlen(fullname);
+  }
   return (int) SearchPath(installDir, name, NULL, MSG_SIZ, fullname, &dummy);
 }
 
@@ -2515,7 +2522,7 @@ DrawPieceOnDC(HDC hdc, ChessSquare piece, int color, int sqcolor, int x, int y,
   if (appData.blindfold) return;
 
   /* [AS] Use font-based pieces if needed */
-  if( fontBitmapSquareSize >= 0 && squareSize > 32 ) {
+  if( fontBitmapSquareSize >= 0 && (squareSize > 32 || gameInfo.variant >= VariantShogi)) {
     /* Create piece bitmaps, or do nothing if piece set is up to date */
     CreatePiecesFromFont();
 
@@ -2524,6 +2531,9 @@ DrawPieceOnDC(HDC hdc, ChessSquare piece, int color, int sqcolor, int x, int y,
 
         SelectObject( tmphdc, hPieceMask[ index ] );
 
+      if(appData.upsideDown ? color==flipView : (flipView && gameInfo.variant == VariantShogi))
+        StretchBlt(hdc, x+squareSize, y+squareSize, -squareSize, -squareSize, tmphdc, 0, 0, squareSize, squareSize, SRCAND);
+      else
         BitBlt( hdc,
             x, y,
             squareSize, squareSize,
@@ -2533,6 +2543,9 @@ DrawPieceOnDC(HDC hdc, ChessSquare piece, int color, int sqcolor, int x, int y,
 
         SelectObject( tmphdc, hPieceFace[ index ] );
 
+      if(appData.upsideDown ? color==flipView : (flipView && gameInfo.variant == VariantShogi))
+        StretchBlt(hdc, x+squareSize, y+squareSize, -squareSize, -squareSize, tmphdc, 0, 0, squareSize, squareSize, SRCPAINT);
+      else
         BitBlt( hdc,
             x, y,
             squareSize, squareSize,
@@ -2642,7 +2655,13 @@ VOID RebuildTextureSquareInfo()
             if( (col + row) & 1 ) {
                 /* Lite square */
                 if( lite_w >= squareSize && lite_h >= squareSize ) {
+                  if( lite_w >= squareSize*BOARD_WIDTH )
+                    backTextureSquareInfo[row][col].x = (2*col+1)*lite_w/(2*BOARD_WIDTH) - squareSize/2;  /* [HGM] cut out of center of virtual square */
+                  else
                     backTextureSquareInfo[row][col].x = col * (lite_w - squareSize) / (BOARD_WIDTH-1);  /* [HGM] divide by size-1 in stead of size! */
+                  if( lite_h >= squareSize*BOARD_HEIGHT )
+                    backTextureSquareInfo[row][col].y = (2*(BOARD_HEIGHT-row)-1)*lite_h/(2*BOARD_HEIGHT) - squareSize/2;
+                  else
                     backTextureSquareInfo[row][col].y = (BOARD_HEIGHT-1-row) * (lite_h - squareSize) / (BOARD_HEIGHT-1);
                     backTextureSquareInfo[row][col].mode = GetBackTextureMode(liteBackTextureMode);
                 }
@@ -2650,7 +2669,13 @@ VOID RebuildTextureSquareInfo()
             else {
                 /* Dark square */
                 if( dark_w >= squareSize && dark_h >= squareSize ) {
+                  if( dark_w >= squareSize*BOARD_WIDTH )
+                    backTextureSquareInfo[row][col].x = (2*col+1) * dark_w / (2*BOARD_WIDTH) - squareSize/2;
+                  else
                     backTextureSquareInfo[row][col].x = col * (dark_w - squareSize) / (BOARD_WIDTH-1);
+                  if( dark_h >= squareSize*BOARD_HEIGHT )
+                    backTextureSquareInfo[row][col].y = (2*(BOARD_HEIGHT-row)-1) * dark_h / (2*BOARD_HEIGHT) - squareSize/2;
+                  else
                     backTextureSquareInfo[row][col].y = (BOARD_HEIGHT-1-row) * (dark_h - squareSize) / (BOARD_HEIGHT-1);
                     backTextureSquareInfo[row][col].mode = GetBackTextureMode(darkBackTextureMode);
                 }
@@ -3859,12 +3884,12 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
        /* Mouse Wheel is being rolled forward
         * Play moves forward
         */
-       if((short)HIWORD(wParam) > 0 && currentMove < forwardMostMove) 
+       if((short)HIWORD(wParam) < 0 && currentMove < forwardMostMove) 
 		{ if(lastDir == 1) ForwardEvent(); else lastDir = 1; } // [HGM] suppress first event in direction
        /* Mouse Wheel is being rolled backward
         * Play moves backward
         */
-       if((short)HIWORD(wParam) < 0 && currentMove > backwardMostMove) 
+       if((short)HIWORD(wParam) > 0 && currentMove > backwardMostMove) 
 		{ if(lastDir == -1) BackwardEvent(); else lastDir = -1; }
     }
     break;
@@ -4530,6 +4555,12 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       SAY("computer starts playing black");
       break;
 
+    case IDM_Match: // [HGM] match: flows into next case, after setting Match Mode and nr of Games
+      if(gameMode != BeginningOfGame) break; // allow menu item to remain enabled for better mode highligting
+      matchMode = 2;// distinguish from command-line-triggered case (matchMode=1)
+      appData.matchGames = appData.defaultMatchGames;
+      matchGame = 1;
+
     case IDM_TwoMachines:
       TwoMachinesEvent();
       /*
@@ -4541,7 +4572,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 	  TagsPopUp(tags, CmailMsg());
 	  free(tags);
       }
-      SAY("programs start playing each other");
+      SAY("computer starts playing both sides");
       break;
 
     case IDM_AnalysisMode:
@@ -4604,7 +4635,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
     case IDM_EditPosition:
       EditPositionEvent();
-      SAY("to set up a position type a FEN");
+      SAY("enter a FEN string or setup a position on the board using the control R pop up menu");
       break;
 
     case IDM_Training:
@@ -7424,6 +7455,7 @@ Enables icsEnables[] = {
   { IDM_MachineWhite, MF_BYCOMMAND|MF_GRAYED },
   { IDM_MachineBlack, MF_BYCOMMAND|MF_GRAYED },
   { IDM_TwoMachines, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Match, MF_BYCOMMAND|MF_GRAYED },
   { IDM_MachineBoth, MF_BYCOMMAND|MF_GRAYED },
   { IDM_AnalysisMode, MF_BYCOMMAND|MF_ENABLED },
   { IDM_AnalyzeFile, MF_BYCOMMAND|MF_GRAYED },
@@ -7438,7 +7470,7 @@ Enables icsEnables[] = {
   { -1, -1 }
 };
 
-#ifdef ZIPPY
+#if ZIPPY
 Enables zippyEnables[] = {
   { IDM_MoveNow, MF_BYCOMMAND|MF_ENABLED },
   { IDM_Hint, MF_BYCOMMAND|MF_ENABLED },
@@ -7454,6 +7486,7 @@ Enables ncpEnables[] = {
   { IDM_MachineWhite, MF_BYCOMMAND|MF_GRAYED },
   { IDM_MachineBlack, MF_BYCOMMAND|MF_GRAYED },
   { IDM_TwoMachines, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Match, MF_BYCOMMAND|MF_GRAYED },
   { IDM_AnalysisMode, MF_BYCOMMAND|MF_GRAYED },
   { IDM_AnalyzeFile, MF_BYCOMMAND|MF_GRAYED },
   { IDM_IcsClient, MF_BYCOMMAND|MF_GRAYED },
@@ -7522,6 +7555,7 @@ Enables machineThinkingEnables[] = {
   { IDM_MachineWhite, MF_BYCOMMAND|MF_GRAYED },
   { IDM_MachineBlack, MF_BYCOMMAND|MF_GRAYED },
   { IDM_TwoMachines, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Match, MF_BYCOMMAND|MF_GRAYED },
   { IDM_TypeInMove, MF_BYCOMMAND|MF_GRAYED },
   { IDM_RetractMove, MF_BYCOMMAND|MF_GRAYED },
   { -1, -1 }
@@ -7541,6 +7575,7 @@ Enables userThinkingEnables[] = {
   { IDM_MachineWhite, MF_BYCOMMAND|MF_ENABLED },
   { IDM_MachineBlack, MF_BYCOMMAND|MF_ENABLED },
   { IDM_TwoMachines, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_Match, MF_BYCOMMAND|MF_ENABLED },
   { IDM_TypeInMove, MF_BYCOMMAND|MF_ENABLED },
   { IDM_RetractMove, MF_BYCOMMAND|MF_ENABLED },
   { -1, -1 }
@@ -7582,7 +7617,7 @@ ModeHighlight()
     nowChecked = IDM_MachineWhite;
     break;
   case TwoMachinesPlay:
-    nowChecked = IDM_TwoMachines;
+    nowChecked = matchMode ? IDM_Match : IDM_TwoMachines; // [HGM] match
     break;
   case AnalyzeMode:
     nowChecked = IDM_AnalysisMode;
@@ -7649,7 +7684,7 @@ SetICSMode()
   SetMenuEnables(hmenu, icsEnables);
   EnableMenuItem(GetSubMenu(hmenu, OPTIONS_POS), ICS_POS,
     MF_BYPOSITION|MF_ENABLED);
-#ifdef ZIPPY
+#if ZIPPY
   if (appData.zippyPlay) {
     SetMenuEnables(hmenu, zippyEnables);
     if (!appData.noChessProgram)     /* [DM] icsEngineAnalyze */
@@ -7723,7 +7758,7 @@ SetMachineThinkingEnables()
   } else if (gameMode == MachinePlaysWhite) {
     (void)EnableMenuItem(hMenu, IDM_MachineWhite, flags);
   } else if (gameMode == TwoMachinesPlay) {
-    (void)EnableMenuItem(hMenu, IDM_TwoMachines, flags);
+    (void)EnableMenuItem(hMenu, matchMode ? IDM_Match : IDM_TwoMachines, flags); // [HGM] match
   }
 }
 
@@ -8162,6 +8197,7 @@ ResetFrontEnd()
     ReleaseCapture();
     DrawPosition(TRUE, NULL);
   }
+  TagsPopDown();
 }