ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wineconsole: Leave room for wide characters only when using a DBCS codepage.

Browse Source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2016-12-22 14:23:54 +01:00
parent a8511a3e17
commit 29533e4844
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
programs/wineconsole/user.c
View File

@ -449,6 +449,7 @@ HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONTW* lf,
TEXTMETRICW tm; TEXTMETRICW tm;
HDC hDC; HDC hDC;
HFONT hFont, hOldFont; HFONT hFont, hOldFont;
CPINFO cpinfo;
if (!(hDC = GetDC(hWnd))) return NULL; if (!(hDC = GetDC(hWnd))) return NULL;
if (!(hFont = CreateFontIndirectW(lf))) if (!(hFont = CreateFontIndirectW(lf)))
@ -461,12 +462,16 @@ HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONTW* lf,
SelectObject(hDC, hOldFont); SelectObject(hDC, hOldFont);
ReleaseDC(hWnd, hDC); ReleaseDC(hWnd, hDC);
config->cell_width = tm.tmMaxCharWidth; config->cell_width = tm.tmAveCharWidth;
config->cell_height = tm.tmHeight + tm.tmExternalLeading; config->cell_height = tm.tmHeight + tm.tmExternalLeading;
config->font_weight = tm.tmWeight; config->font_weight = tm.tmWeight;
lstrcpyW(config->face_name, lf->lfFaceName); lstrcpyW(config->face_name, lf->lfFaceName);
if (el) *el = tm.tmExternalLeading; if (el) *el = tm.tmExternalLeading;
/* FIXME: use maximum width for DBCS codepages since some chars take two cells */
if (GetCPInfo( GetConsoleOutputCP(), &cpinfo ) && cpinfo.MaxCharSize > 1)
config->cell_width = tm.tmMaxCharWidth;
return hFont; return hFont;
} }