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

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 62d5072..24fd967 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -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;
@@ -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);