X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=1e65185420139d768f9a9d0cde816d0d2bf76545;hb=6afb32edb25533127a2ed3cc569516cfb752fea6;hp=62d5072c9b92a5bf5a45fd02311d3f60a6d0d167;hpb=e1edcbabb63e65d5d47c07a0836dd51d7e01de0e;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 62d5072..1e65185 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -347,7 +347,7 @@ static char *commentText;
 static int commentIndex;
 static Boolean editComment = FALSE;
 HWND commentDialog = NULL;
-BOOLEAN commentDialogUp = FALSE;
+int commentUp = FALSE;
 static int commentX, commentY, commentH, commentW;
 
 static char *analysisTitle;
@@ -435,7 +435,7 @@ BOOLEAN evalGraphDialogUp = FALSE;
 WindowPlacement wpEvalGraph;
 
 HWND engineOutputDialog = NULL;
-BOOLEAN engineOutputDialogUp = FALSE;
+int engineOutputDialogUp = FALSE;
 
 WindowPlacement wpEngineOutput;
 WindowPlacement wpGameList;
@@ -1496,6 +1496,10 @@ ParseFontName(char *name, MyFontParams *mfp)
   mfp->italic = (strchr(p, 'i') != NULL);
   mfp->underline = (strchr(p, 'u') != NULL);
   mfp->strikeout = (strchr(p, 's') != NULL);
+  mfp->charset = DEFAULT_CHARSET;
+  q = strchr(p, 'c');
+  if (q)
+    mfp->charset = (BYTE) atoi(q+1);
 }
 
 /* Color name parser.
@@ -1870,7 +1874,7 @@ LFfromMFP(LOGFONT* lf, MyFontParams *mfp)
   lf->lfItalic = mfp->italic;
   lf->lfUnderline = mfp->underline;
   lf->lfStrikeOut = mfp->strikeout;
-  lf->lfCharSet = DEFAULT_CHARSET;
+  lf->lfCharSet = mfp->charset;
   lf->lfOutPrecision = OUT_DEFAULT_PRECIS;
   lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;
   lf->lfQuality = DEFAULT_QUALITY;
@@ -2493,13 +2497,14 @@ SaveSettings(char* name)
 	for (bs=0; bs<NUM_SIZES; bs++) {
 	  MyFontParams *mfp = &font[bs][(int) ad->argLoc]->mfp;
           fprintf(f, "/size=%s ", sizeInfo[bs].name);
-	  fprintf(f, "/%s=\"%s:%g%s%s%s%s%s\"\n",
+	  fprintf(f, "/%s=\"%s:%g%s%s%s%s%sc%d\"\n",
 	    ad->argName, mfp->faceName, mfp->pointSize,
             mfp->bold || mfp->italic || mfp->underline || mfp->strikeout ? " " : "",
 	    mfp->bold ? "b" : "",
 	    mfp->italic ? "i" : "",
 	    mfp->underline ? "u" : "",
-	    mfp->strikeout ? "s" : "");
+	    mfp->strikeout ? "s" : "",
+            (int)mfp->charset);
 	}
       }
       break;
@@ -4209,7 +4214,7 @@ BOOL DrawPositionNeedsFullRepaint()
         but animation is fast enough that it's difficult to notice.
     */
     if( animInfo.piece == EmptySquare ) {
-        if( (appData.highlightLastMove || appData.highlightDragging) && IsDrawArrowEnabled() && HasHighlightInfo() ) {
+        if( (appData.highlightLastMove || appData.highlightDragging) && IsDrawArrowEnabled() /*&& HasHighlightInfo()*/ ) {
             result = TRUE;
         }
     }
@@ -4842,7 +4847,7 @@ PaintProc(HWND hwnd)
  *   subtracted from x.
  */
 int EventToSquare(x, limit)
-     int x;
+     int x, limit;
 {
   if (x <= 0)
     return -2;
@@ -5423,7 +5428,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     
     JAWS_ALT_INTERCEPT
 
-    if (appData.icsActive && (char)wParam > ' ' && !((char)wParam >= '1' && (char)wParam <= '9')) { 
+    if (appData.icsActive && ((char)wParam == '\r' || (char)wParam > ' ' && !((char)wParam >= '1' && (char)wParam <= '9'))) { 
 	// [HGM] movenum: for non-zero digits we always do type-in dialog
 	HWND h = GetDlgItem(hwndConsole, OPT_ConsoleInput);
 	if (IsIconic(hwndConsole)) ShowWindow(hwndConsole, SW_RESTORE);
@@ -5775,7 +5780,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_EditComment:
-      if (commentDialogUp && editComment) {
+      if (commentUp && editComment) {
 	CommentPopDown();
       } else {
 	EditCommentEvent();
@@ -7131,14 +7136,14 @@ EitherCommentPopUp(int index, char *title, char *str, BOOLEAN edit)
 
   if (commentDialog) {
     SendMessage(commentDialog, WM_INITDIALOG, 0, 0);
-    if (!commentDialogUp) ShowWindow(commentDialog, SW_SHOW);
+    if (!commentUp) ShowWindow(commentDialog, SW_SHOW);
   } else {
     lpProc = MakeProcInstance((FARPROC)CommentDialog, hInst);
     CreateDialog(hInst, MAKEINTRESOURCE(DLG_EditComment),
 		 hwndMain, (DLGPROC)lpProc);
     FreeProcInstance(lpProc);
   }
-  commentDialogUp = TRUE;
+  commentUp = TRUE;
 }
 
 
@@ -7181,13 +7186,8 @@ TypeInMoveDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	}
 	// [HGM] movenum: allow move number to be typed in any mode
 	if(sscanf(move, "%d", &n) == 1 && n != 0 ) {
-	  currentMove = 2*n-1;
-	  if(currentMove > forwardMostMove)  currentMove = forwardMostMove;
-	  if(currentMove < backwardMostMove) currentMove = backwardMostMove;
+	  ToNrEvent(2*n-1);
 	  EndDialog(hDlg, TRUE);
-	  DrawPosition(TRUE, boards[currentMove]);
-	  if(currentMove > backwardMostMove) DisplayMove(currentMove - 1);
-	  else DisplayMessage("", "");
 	  return TRUE;
 	}
       }
@@ -9431,7 +9431,7 @@ CommentPopDown(void)
   if (commentDialog) {
     ShowWindow(commentDialog, SW_HIDE);
   }
-  commentDialogUp = FALSE;
+  commentUp = FALSE;
 }
 
 VOID