X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=a24c8e437e8188ef26df49063211bde0d7183565;hb=a01943bb611a77eabd7ab7539f2d9458854087bd;hp=1b6297eeabfe8a566dc3fe26c970372608f30475;hpb=2c44bdaf858118b04ef044e46f258235bd35a64e;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 1b6297e..a24c8e4 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -222,6 +222,9 @@ static struct { int x; int y; int mode; } backTextureSquareInfo[BOARD_RANKS][BOA
 #if __GNUC__ && !defined(_winmajor)
 #define oldDialog 0 /* cygwin doesn't define _winmajor; mingw does */
 #else
+
+
+
 #if defined(_winmajor)
 #define oldDialog (_winmajor < 4)
 #else
@@ -980,16 +983,17 @@ InitApplication(HINSTANCE hInstance)
 
 /* Set by InitInstance, used by EnsureOnScreen */
 int screenHeight, screenWidth;
+RECT screenGeometry;
 
 void
 EnsureOnScreen(int *x, int *y, int minX, int minY)
 {
 //  int gap = GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYCAPTION);
   /* Be sure window at (x,y) is not off screen (or even mostly off screen) */
-  if (*x > screenWidth - 32) *x = 0;
-  if (*y > screenHeight - 32) *y = 0;
-  if (*x < minX) *x = minX;
-  if (*y < minY) *y = minY;
+  if (*x > screenGeometry.right - 32) *x = screenGeometry.left;
+  if (*y > screenGeometry.bottom - 32) *y = screenGeometry.top;
+  if (*x < screenGeometry.left + minX) *x = screenGeometry.left + minX;
+  if (*y < screenGeometry.top + minY) *y = screenGeometry.top + minY;
 }
 
 VOID
@@ -1050,6 +1054,32 @@ InitTextures()
   }
 }
 
+#ifndef SM_CXVIRTUALSCREEN
+#define SM_CXVIRTUALSCREEN 78
+#endif
+#ifndef SM_CYVIRTUALSCREEN
+#define SM_CYVIRTUALSCREEN 79
+#endif
+#ifndef SM_XVIRTUALSCREEN 
+#define SM_XVIRTUALSCREEN 76
+#endif
+#ifndef SM_YVIRTUALSCREEN 
+#define SM_YVIRTUALSCREEN 77
+#endif
+
+VOID
+InitGeometry()
+{
+  screenHeight = GetSystemMetrics(SM_CYVIRTUALSCREEN);
+  if( !screenHeight ) screenHeight = GetSystemMetrics(SM_CYSCREEN);
+  screenWidth = GetSystemMetrics(SM_CXVIRTUALSCREEN);
+  if( !screenWidth ) screenWidth = GetSystemMetrics(SM_CXSCREEN);
+  screenGeometry.left = GetSystemMetrics(SM_XVIRTUALSCREEN);
+  screenGeometry.top = GetSystemMetrics(SM_YVIRTUALSCREEN);
+  screenGeometry.right = screenGeometry.left + screenWidth;
+  screenGeometry.bottom = screenGeometry.top + screenHeight;
+}
+
 BOOL
 InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
 {
@@ -1063,11 +1093,12 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
 
   if (SearchPath(NULL, "WinBoard.exe", NULL, MSG_SIZ, installDir, &filepart)) {
     *filepart = NULLCHAR;
+    SetCurrentDirectory(installDir);
   } else {
     GetCurrentDirectory(MSG_SIZ, installDir);
   }
   gameInfo.boardWidth = gameInfo.boardHeight = 8; // [HGM] won't have open window otherwise
-  screenWidth = screenHeight = 1000; // [HGM] placement: kludge to allow calling EnsureOnScreen from InitAppData
+  InitGeometry();
   InitAppData(lpCmdLine);      /* Get run-time parameters */
   /* xboard, and older WinBoards, controlled the move sound with the
      appData.ringBellAfterMoves option.  In the current WinBoard, we
@@ -1114,8 +1145,8 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
   iconBlack = LoadIcon(hInstance, "icon_black");
   iconCurrent = iconWhite;
   InitDrawingColors();
-  screenHeight = GetSystemMetrics(SM_CYSCREEN);
-  screenWidth = GetSystemMetrics(SM_CXSCREEN);
+
+  InitPosition(0); // to set nr of ranks and files, which might be non-default through command-line args
   for (ibs = (int) NUM_SIZES - 1; ibs >= 0; ibs--) {
     /* Compute window size for each board size, and use the largest
        size that fits on this screen as the default. */
@@ -2258,6 +2289,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
 
   /* [HGM] call with -2 uses old size (for if nr of files, ranks changes) */
   if(boardSize == (BoardSize)(-2) ) boardSize = oldBoardSize;
+  if(boardSize == -1) return;     // no size defined yet; abort (to allow early call of InitPosition)
   oldBoardSize = boardSize;
 
   if(boardSize != SizeMiddling && boardSize != SizePetite && boardSize != SizeBulky && !appData.useFont)
@@ -2272,7 +2304,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
                                    boardSize = SizeMiddling;
     }
   }
-  if(!appData.useFont && boardSize == SizePetite && (v == VariantShogi || v == VariantKnightmate)) boardSize = SizeMiddling; // no Unicorn in Petite
+  if(!appData.useFont && boardSize == SizePetite && (v == VariantKnightmate)) boardSize = SizeMiddling; // no Unicorn in Petite
 
   oldRect.left = wpMain.x; //[HGM] placement: remember previous window params
   oldRect.top = wpMain.y;
@@ -4257,6 +4289,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   }
 
   shiftKey = GetKeyState(VK_SHIFT) < 0; // [HGM] remember last shift status
+  controlKey = GetKeyState(VK_CONTROL) < 0; // [HGM] remember last shift status
 
   switch (message) {
   case WM_LBUTTONDOWN:
@@ -10031,6 +10064,6 @@ ActivateTheme (int new)
    InitTextures();
    if(new) InitDrawingColors();
    fontBitmapSquareSize = 0; // request creation of new font pieces
-   InitDrawingSizes(-2, 0);
+   InitDrawingSizes(boardSize, 0);
    InvalidateRect(hwndMain, NULL, TRUE);
 }