X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=fa310fe4faa7e277f7aac260010e48a6c8bdc3cf;hb=32d6537664a734207772608507882f5a682a2c0a;hp=5c2078f9135da7ab52e68e9bc98c130d6f73e6b2;hpb=8c6546e4aad5d8e926437a4ace9973123b35cc85;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 5c2078f..fa310fe 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);
                 }
@@ -3797,20 +3822,20 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       if (PtInRect((LPRECT) &whiteRect, pt)) {
         if (gameMode == EditPosition) {
 	  SetWhiteToPlayEvent();
+        } else if (gameMode == EditGame || GetKeyState(VK_SHIFT) < 0) {
+          AdjustClock(flipClock, -1);
 	} else if (gameMode == IcsPlayingBlack ||
 		   gameMode == MachinePlaysWhite) {
 	  CallFlagEvent();
-        } else if (gameMode == EditGame) {
-          AdjustClock(flipClock, -1);
         }
       } else if (PtInRect((LPRECT) &blackRect, pt)) {
 	if (gameMode == EditPosition) {
 	  SetBlackToPlayEvent();
+        } else if (gameMode == EditGame || GetKeyState(VK_SHIFT) < 0) {
+          AdjustClock(!flipClock, -1);
 	} else if (gameMode == IcsPlayingWhite ||
 		   gameMode == MachinePlaysBlack) {
 	  CallFlagEvent();
-        } else if (gameMode == EditGame) {
-          AdjustClock(!flipClock, -1);
 	}
       }
       dragInfo.start.x = dragInfo.start.y = -1;
@@ -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;
@@ -3890,10 +3915,11 @@ 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) AdjustClock(flipClock, 1);
+          if (gameMode == EditGame || GetKeyState(VK_SHIFT) < 0) AdjustClock(flipClock, 1);
       } else if (PtInRect((LPRECT) &blackRect, pt)) {
-          if (gameMode == EditGame) AdjustClock(!flipClock, 1);
+          if (gameMode == EditGame || GetKeyState(VK_SHIFT) < 0) AdjustClock(!flipClock, 1);
       }
+      break;
     }
     DrawPosition(TRUE, NULL);
 
@@ -4540,7 +4566,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:
@@ -4603,7 +4629,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:
@@ -8161,6 +8187,7 @@ ResetFrontEnd()
     ReleaseCapture();
     DrawPosition(TRUE, NULL);
   }
+  TagsPopDown();
 }