X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=971309b91ccc02b42dcdf0112365b706dc3a88db;hb=a24992eef4621e0f45993a38cc6770cdb631d2cc;hp=d0eb77270bc521e9bbd434e4c8d181cd12f39a8c;hpb=3e9bdc4b4412453619340999d96d245c7f5f8b74;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index d0eb772..971309b 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -5,7 +5,7 @@
  * Massachusetts.
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -534,12 +534,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 },
@@ -587,7 +587,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] =
@@ -601,8 +601,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 },
 };
 
@@ -1283,6 +1284,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;
@@ -2350,13 +2353,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");
@@ -2392,7 +2399,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;
@@ -2513,7 +2520,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));
@@ -3990,6 +3997,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
   }
 
   if( appData.highlightMoveWithArrow ) {
+
     DrawArrowHighlight(hdcmem);
   }
 
@@ -4510,6 +4518,7 @@ static int promoStyle;
 LRESULT CALLBACK
 Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
+
   char promoChar;
 
   switch (message) {
@@ -4611,7 +4620,7 @@ PromotionPopup(HWND hwnd)
 void
 PromotionPopUp(char choice)
 {
-  promoStyle = (choice == '+');
+  promoStyle = (choice == '+' || IS_SHOGI(gameInfo.variant));
   DrawPosition(TRUE, NULL);
   PromotionPopup(hwndMain);
 }
@@ -5088,6 +5097,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     case IDM_TwoMachines:
       TwoMachinesEvent();
       /*
+
        * refresh the tags dialog only if it's visible
        */
       if (gameMode == TwoMachinesPlay && IsWindowVisible(editTagsDialog)) {
@@ -7644,7 +7654,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);
@@ -8712,8 +8722,11 @@ int GameListOptions()
     result = DialogBoxParam( hInst, MAKEINTRESOURCE(DLG_GameListOptions), hwndMain, (DLGPROC)lpProc, (LPARAM)lpUserGLT );
 
     if( result == 0 ) {
+        char *oldTags = appData.gameListTags;
         /* [AS] Memory leak here! */
         appData.gameListTags = strdup( lpUserGLT ); 
+        if(strcmp(oldTags, appData.gameListTags)) // [HGM] redo Game List when we changed something
+            GameListToListBox(NULL, TRUE, ".", NULL, FALSE, FALSE); // "." as filter is kludge to select all
     }
 
     return result;
@@ -9776,6 +9789,7 @@ OutputToProcess(ProcRef pr, char *message, int count, int *outError)
   int outCount = SOCKET_ERROR;
   ChildProc *cp = (ChildProc *) pr;
   static OVERLAPPED ovl;
+
   static int line = 0;
 
   if (pr == NoProc)