X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=d0eb77270bc521e9bbd434e4c8d181cd12f39a8c;hb=50bc241d1d9c026d128eb29c7f3bdc2ba5525c46;hp=088badbace5e7777aae9d1fd9c041fb6783a0c05;hpb=699d2cc5efc5e3ef959813b16528e6b23d8de50a;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 088badb..d0eb772 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -166,7 +166,7 @@ BoardSize boardSize;
 Boolean chessProgram;
 //static int boardX, boardY;
 int  minX, minY; // [HGM] placement: volatile limits on upper-left corner
-int squareSize, lineGap, minorSize, border;
+int squareSize, lineGap, minorSize;
 static int winW, winH;
 static RECT messageRect, whiteRect, blackRect, leftLogoRect, rightLogoRect; // [HGM] logo
 static int logoHeight = 0;
@@ -786,12 +786,14 @@ void ThawUI()
  *
 \*---------------------------------------------------------------------------*/
 
+static void HandleMessage P((MSG *message));
+static HANDLE hAccelMain, hAccelNoAlt, hAccelNoICS;
+
 int APIENTRY
 WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	LPSTR lpCmdLine, int nCmdShow)
 {
   MSG msg;
-  HANDLE hAccelMain, hAccelNoAlt, hAccelNoICS;
 //  INITCOMMONCONTROLSEX ex;
 
   debugFP = stderr;
@@ -823,6 +825,17 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 		    0,    /* lowest message to examine */
 		    0))   /* highest message to examine */
     {
+	HandleMessage(&msg);
+    }
+
+
+  return (msg.wParam);	/* Returns the value from PostQuitMessage */
+}
+
+static void
+HandleMessage (MSG *message)
+{
+    MSG msg = *message;
 
       if(msg.message == WM_CHAR && msg.wParam == '\t') {
 	// [HGM] navigate: switch between all windows with tab
@@ -890,7 +903,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	  if(currentElement < 5 && IsIconic(hwndMain))    ShowWindow(hwndMain, SW_RESTORE); // all open together
 	  SetFocus(h);
 
-	  continue; // this message now has been processed
+	  return; // this message now has been processed
 	}
       }
 
@@ -909,14 +922,24 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
 	    if(chatHandle[i] && IsDialogMessage(chatHandle[i], &msg)) {
 		done = 1; break;
 	}
-	if(done) continue; // [HGM] chat: end patch
+	if(done) return; // [HGM] chat: end patch
 	TranslateMessage(&msg);	/* Translates virtual key codes */
 	DispatchMessage(&msg);	/* Dispatches message to window */
       }
-    }
-
+}
 
-  return (msg.wParam);	/* Returns the value from PostQuitMessage */
+void
+DoEvents ()
+{ /* Dispatch pending messages */
+  MSG msg;
+  while (PeekMessage(&msg, /* message structure */
+		     NULL, /* handle of window receiving the message */
+		     0,    /* lowest message to examine */
+		     0,    /* highest message to examine */
+		     PM_REMOVE))
+    {
+	HandleMessage(&msg);
+    }
 }
 
 /*---------------------------------------------------------------------------*\
@@ -1259,6 +1282,7 @@ LFfromMFP(LOGFONT* lf, MyFontParams *mfp)
   lf->lfStrikeOut = mfp->strikeout;
   lf->lfCharSet = mfp->charset;
   lf->lfOutPrecision = OUT_DEFAULT_PRECIS;
+
   lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;
   lf->lfQuality = DEFAULT_QUALITY;
   lf->lfPitchAndFamily = DEFAULT_PITCH|FF_DONTCARE;
@@ -2666,7 +2690,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
     pieceBitmap[1][WhiteLion] = DoLoadBitmap(hInst, "ln", squareSize, "o");
     pieceBitmap[2][WhiteLion] = DoLoadBitmap(hInst, "ln", squareSize, "w");
 
-    if(gameInfo.variant == VariantShogi) { /* promoted Gold represemtations */
+    if(gameInfo.variant == VariantShogi && BOARD_HEIGHT != 7) { /* promoted Gold representations (but not in Tori!)*/
       pieceBitmap[0][WhiteCannon] = DoLoadBitmap(hInst, "wp", squareSize, "s");
       pieceBitmap[1][WhiteCannon] = DoLoadBitmap(hInst, "wp", squareSize, "o");
       pieceBitmap[2][WhiteCannon] = DoLoadBitmap(hInst, "w", squareSize, "w");
@@ -4489,6 +4513,7 @@ Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
   char promoChar;
 
   switch (message) {
+
   case WM_INITDIALOG: /* message: initialize dialog box */
     /* Center the dialog over the application window */
     CenterWindow(hDlg, GetWindow(hDlg, GW_OWNER));
@@ -5714,6 +5739,8 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   default:	/* Passes it on if unprocessed */
     return (DefWindowProc(hwnd, message, wParam, lParam));
   }
+
+
   return 0;
 }