X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=ca901bfc0377fdbb2674b24fad9417c139ae4969;hb=ebd7f78161504e46896f7d96bb41e29714b2fd53;hp=2183232575d72682f0231fcc264f9211e72001be;hpb=0278ebc80411a20fd23303156285e55ce8d2b0a5;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 2183232..ca901bf 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -535,12 +535,12 @@ typedef struct {
 
 SizeInfo sizeInfo[] = 
 {
-  { "tiny",     21, 0, 1, 1, 0, 0 },
-  { "teeny",    25, 1, 1, 1, 0, 0 },
-  { "dinky",    29, 1, 1, 1, 0, 0 },
-  { "petite",   33, 1, 1, 1, 0, 0 },
-  { "slim",     37, 2, 1, 0, 0, 0 },
-  { "small",    40, 2, 1, 0, 0, 0 },
+  { "tiny",     21, 0, 1, 2, 0, 0 },
+  { "teeny",    25, 1, 1, 2, 0, 0 },
+  { "dinky",    29, 1, 1, 2, 0, 0 },
+  { "petite",   33, 1, 1, 2, 0, 0 },
+  { "slim",     37, 2, 1, 1, 0, 0 },
+  { "small",    40, 2, 1, 1, 0, 0 },
   { "mediocre", 45, 2, 1, 0, 0, 0 },
   { "middling", 49, 2, 0, 0, 0, 0 },
   { "average",  54, 2, 0, 0, 0, 0 },
@@ -588,7 +588,7 @@ typedef struct {
   WNDPROC wndproc;
 } MyButtonDesc;
 
-#define BUTTON_WIDTH (tinyLayout ? 16 : 32)
+#define BUTTON_WIDTH (tinyLayout == 2 ? 16 : 32)
 #define N_BUTTONS 5
 
 MyButtonDesc buttonDesc[N_BUTTONS] =
@@ -602,8 +602,9 @@ MyButtonDesc buttonDesc[N_BUTTONS] =
 
 int tinyLayout = 0, smallLayout = 0;
 #define MENU_BAR_ITEMS 9
-char *menuBarText[2][MENU_BAR_ITEMS+1] = {
+char *menuBarText[3][MENU_BAR_ITEMS+1] = {
   { N_("&File"), N_("&Edit"), N_("&View"), N_("&Mode"), N_("&Action"), N_("E&ngine"), N_("&Options"), N_("&Help"), NULL },
+  { N_("&Fil"), N_("&Ed"), N_("&Vw"), N_("&Mod"), N_("&Act"), N_("E&ng"), N_("&Opt"), N_("&Hlp"), NULL },
   { N_("&F"), N_("&E"), N_("&V"), N_("&M"), N_("&A"), N_("&N"), N_("&O"), N_("&H"), NULL },
 };
 
@@ -1106,6 +1107,8 @@ InitGeometry()
   screenGeometry.bottom = screenGeometry.top + screenHeight;
 }
 
+ChessProgramState broadcast;
+
 BOOL
 InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
 {
@@ -1138,7 +1141,18 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
     appData.ringBellAfterMoves = TRUE;
   }
   if (appData.debugMode) {
-    debugFP = fopen(appData.nameOfDebugFile, "w");
+    char *c = appData.nameOfDebugFile;
+    if(strstr(c, "///") == c) {
+      broadcast.which = "broadcaster";
+      broadcast.pr   = NoProc;
+      broadcast.isr  = NULL;
+      broadcast.program = c + 3;
+      broadcast.dir  = ".";
+      broadcast.host = "localhost";
+      StartChessProgram(&broadcast);
+      debugFP = (FILE*) _fdopen(_open_osfhandle((long)(((ChildProc*)(broadcast.pr))->hTo), _O_WRONLY), "w");
+    } else
+    debugFP = fopen(c, "w");
     setbuf(debugFP, NULL);
   }
 
@@ -1284,6 +1298,8 @@ LFfromMFP(LOGFONT* lf, MyFontParams *mfp)
   lf->lfCharSet = mfp->charset;
   lf->lfOutPrecision = OUT_DEFAULT_PRECIS;
 
+
+
   lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;
   lf->lfQuality = DEFAULT_QUALITY;
   lf->lfPitchAndFamily = DEFAULT_PITCH|FF_DONTCARE;
@@ -2351,13 +2367,17 @@ InitDrawingSizes(BoardSize boardSize, int flags)
   minorSize = 0; /* [HGM] Kludge to see if demagnified pieces need to be shifted  */
   border = appData.useBorder && appData.border[0] ? squareSize/2 : 0;
 
+  // [HGM] decide on tininess based on total board width rather than square size
+  tinyLayout = squareSize * (BOARD_WIDTH);
+  tinyLayout = tinyLayout < 35*8 ? 2 : tinyLayout < 43*8 ? 1 : 0;
+
   if( appData.overrideLineGap >= 0 && appData.overrideLineGap <= 5 ) {
       lineGap = appData.overrideLineGap;
   }
 
   if (tinyLayout != oldTinyLayout) {
     long style = GetWindowLongPtr(hwndMain, GWL_STYLE);
-    if (tinyLayout) {
+    if (tinyLayout == 2) {
       style &= ~WS_SYSMENU;
       InsertMenu(hmenu, IDM_Exit, MF_BYCOMMAND, IDM_Minimize,
 		 "&Minimize\tCtrl+F4");
@@ -2393,7 +2413,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
   ReleaseDC(hwndMain, hdc);
 
   /* Compute where everything goes */
-  if((first.programLogo || second.programLogo) && !tinyLayout) {
+  if((first.programLogo || second.programLogo) && tinyLayout != 2) {
         /* [HGM] logo: if either logo is on, reserve space for it */
 	logoHeight =  2*clockSize.cy;
 	leftLogoRect.left   = OUTER_MARGIN;
@@ -2514,7 +2534,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
 		     messageRect.top, BUTTON_WIDTH, messageSize.cy, hwndMain,
 		     (HMENU) buttonDesc[i].id,
 		     (HINSTANCE) GetWindowLongPtr(hwndMain, GWLP_HINSTANCE), NULL);
-      if (tinyLayout) {
+      if (tinyLayout == 2) {
 	SendMessage(buttonDesc[i].hwnd, WM_SETFONT, 
 		    (WPARAM)font[boardSize][MESSAGE_FONT]->hf,
 		    MAKELPARAM(FALSE, 0));
@@ -2583,10 +2603,12 @@ InitDrawingSizes(BoardSize boardSize, int flags)
 	 piece = (ChessSquare) ((int) piece + 1)) {
       if (pieceBitmap[i][piece] != NULL)
 	DeleteObject(pieceBitmap[i][piece]);
+      pieceBitmap[i][piece] = NULL;
     }
   }
 
   fontBitmapSquareSize = 0; /* [HGM] render: make sure pieces will be recreated, as we might need others now */
+
   // Orthodox Chess pieces
   pieceBitmap[0][WhitePawn] = DoLoadBitmap(hInst, "p", squareSize, "s");
   pieceBitmap[0][WhiteKnight] = DoLoadBitmap(hInst, "n", squareSize, "s");
@@ -2684,12 +2706,27 @@ InitDrawingSizes(BoardSize boardSize, int flags)
     pieceBitmap[0][WhiteLance] = DoLoadBitmap(hInst, "l", squareSize, "s");
     pieceBitmap[1][WhiteLance] = DoLoadBitmap(hInst, "l", squareSize, "o");
     pieceBitmap[2][WhiteLance] = DoLoadBitmap(hInst, "l", squareSize, "w");
+    pieceBitmap[0][WhiteAmazon] = DoLoadBitmap(hInst, "l", squareSize, "s");
+    pieceBitmap[1][WhiteAmazon] = DoLoadBitmap(hInst, "l", squareSize, "o");
+    pieceBitmap[2][WhiteAmazon] = DoLoadBitmap(hInst, "l", squareSize, "w");
     pieceBitmap[0][WhiteUnicorn] = DoLoadBitmap(hInst, "u", squareSize, "s");
     pieceBitmap[1][WhiteUnicorn] = DoLoadBitmap(hInst, "u", squareSize, "o");
     pieceBitmap[2][WhiteUnicorn] = DoLoadBitmap(hInst, "u", squareSize, "w");
     pieceBitmap[0][WhiteLion] = DoLoadBitmap(hInst, "ln", squareSize, "s");
     pieceBitmap[1][WhiteLion] = DoLoadBitmap(hInst, "ln", squareSize, "o");
     pieceBitmap[2][WhiteLion] = DoLoadBitmap(hInst, "ln", squareSize, "w");
+    pieceBitmap[0][WhiteCub] = DoLoadBitmap(hInst, "ln", squareSize, "s");
+    pieceBitmap[1][WhiteCub] = DoLoadBitmap(hInst, "ln", squareSize, "o");
+    pieceBitmap[2][WhiteCub] = DoLoadBitmap(hInst, "ln", squareSize, "w");
+    pieceBitmap[0][WhiteWolf] = DoLoadBitmap(hInst, "wolf", squareSize, "s");
+    pieceBitmap[1][WhiteWolf] = DoLoadBitmap(hInst, "wolf", squareSize, "o");
+    pieceBitmap[2][WhiteWolf] = DoLoadBitmap(hInst, "wolf", squareSize, "w");
+    pieceBitmap[0][WhiteCamel] = DoLoadBitmap(hInst, "camel", squareSize, "s");
+    pieceBitmap[1][WhiteCamel] = DoLoadBitmap(hInst, "camel", squareSize, "o");
+    pieceBitmap[2][WhiteCamel] = DoLoadBitmap(hInst, "camel", squareSize, "w");
+    pieceBitmap[0][WhiteZebra] = DoLoadBitmap(hInst, "zebra", squareSize, "s");
+    pieceBitmap[1][WhiteZebra] = DoLoadBitmap(hInst, "zebra", squareSize, "o");
+    pieceBitmap[2][WhiteZebra] = DoLoadBitmap(hInst, "n", squareSize, "w");
 
     if(gameInfo.variant == VariantShogi && BOARD_HEIGHT != 7) { /* promoted Gold representations (but not in Tori!)*/
       pieceBitmap[0][WhiteCannon] = DoLoadBitmap(hInst, "wp", squareSize, "s");
@@ -2791,6 +2828,15 @@ InitDrawingSizes(BoardSize boardSize, int flags)
   pieceBitmap[2][WhiteSilver] = DoLoadBitmap(hInst, "sw", squareSize, "w");
   minorSize = 0;
   }
+
+  if(appData.pieceDirectory[0]) for(i=WhitePawn; i<BlackPawn; i++) { // try for all missing pieces with new naming convention
+    char buf[MSG_SIZ];
+    if(pieceBitmap[0][i]) continue;
+    snprintf(buf, MSG_SIZ, "piece%d_", i);
+    pieceBitmap[0][i] = DoLoadBitmap(hInst, buf, squareSize, "s");
+    pieceBitmap[1][i] = DoLoadBitmap(hInst, buf, squareSize, "o");
+    pieceBitmap[2][i] = DoLoadBitmap(hInst, buf, squareSize, "w");
+  }
 }
 
 HBITMAP
@@ -3991,6 +4037,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
   }
 
   if( appData.highlightMoveWithArrow ) {
+
     DrawArrowHighlight(hdcmem);
   }
 
@@ -4511,6 +4558,7 @@ static int promoStyle;
 LRESULT CALLBACK
 Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
+
   char promoChar;
 
   switch (message) {
@@ -4612,7 +4660,7 @@ PromotionPopup(HWND hwnd)
 void
 PromotionPopUp(char choice)
 {
-  promoStyle = (choice == '+');
+  promoStyle = (choice == '+' || IS_SHOGI(gameInfo.variant));
   DrawPosition(TRUE, NULL);
   PromotionPopup(hwndMain);
 }
@@ -5083,12 +5131,14 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_Match: // [HGM] match: flows into next case, after setting Match Mode and nr of Games
+      if(matchMode) EnableMenuItem(GetMenu(hwndMain), IDM_Match, MF_BYCOMMAND|MF_GRAYED);
       MatchEvent(2); // distinguish from command-line-triggered case (matchMode=1)
       break;
 
     case IDM_TwoMachines:
       TwoMachinesEvent();
       /*
+
        * refresh the tags dialog only if it's visible
        */
       if (gameMode == TwoMachinesPlay && IsWindowVisible(editTagsDialog)) {
@@ -5688,6 +5738,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             ReattachAfterMove( &rcMain, lpwp->x, lpwp->y, hwndConsole, &wpConsole );
 	    wpMain.x = lpwp->x;
             wpMain.y = lpwp->y;
+
         }
     }
     break;
@@ -6705,7 +6756,7 @@ TypeInNameDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     case IDOK:
       GetDlgItemText(hDlg, OPT_Name, move, sizeof(move));
       appData.userName = strdup(move);
-      SetUserLogo();
+      SetUserLogo(); DisplayLogos();
       SetGameInfo();
       if(gameMode == MachinePlaysWhite || gameMode == MachinePlaysBlack) {
 	snprintf(move, MSG_SIZ, "%s vs. %s", gameInfo.white, gameInfo.black);
@@ -7645,7 +7696,7 @@ DisplayAClock(HDC hdc, int timeRemaining, int highlight,
 
   if (twoBoards && partnerUp) return;
   if (appData.clockMode) {
-    if (tinyLayout)
+    if (tinyLayout == 2)
       snprintf(buf, sizeof(buf)/sizeof(buf[0]), "%c %s %s", color[0], TimeString(timeRemaining), flagFell);
     else
       snprintf(buf, sizeof(buf)/sizeof(buf[0]), "%s:%c%s %s", color, (logoHeight>0 ? 0 : ' '), TimeString(timeRemaining), flagFell);
@@ -7661,6 +7712,7 @@ DisplayAClock(HDC hdc, int timeRemaining, int highlight,
     oldFg = SetTextColor(hdc, RGB(0, 0, 0)); /* black */
     oldBg = SetBkColor(hdc, RGB(255, 255, 255)); /* white */
   }
+
   oldFont = SelectObject(hdc, font[boardSize][CLOCK_FONT]->hf);
 
   JAWS_SILENCE
@@ -7977,6 +8029,7 @@ Enables gnuEnables[] = {
   { IDM_Annotate, MF_BYCOMMAND|MF_GRAYED },
   { IDM_NewChat, MF_BYCOMMAND|MF_GRAYED },
 
+
   // Needed to switch from ncp to GNU mode on Engine Load
   { ACTION_POS, MF_BYPOSITION|MF_ENABLED },
   { IDM_MachineWhite, MF_BYCOMMAND|MF_ENABLED },
@@ -8206,6 +8259,8 @@ ModeHighlight()
     nowChecked = 0;
     break;
   }
+  if(prevChecked == IDM_TwoMachines) // [HGM] 'Machine Match' might have gotten disabled when stopping match
+    EnableMenuItem(GetMenu(hwndMain), IDM_Match, MF_BYCOMMAND|MF_ENABLED);
   CheckMark(prevChecked, MF_UNCHECKED);
   CheckMark(nowChecked, MF_CHECKED);
   CheckMark(IDM_Match, matchMode && matchGame < appData.matchGames ? MF_CHECKED : MF_UNCHECKED);