forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OEM charset face name on Windows

This commit is contained in:
Seo Youngjin 2020-07-16 13:09:24 +09:00
parent b5f42fb807
commit cd0415e79a
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/dlangui/platforms/windows/win32fonts.d
View File

@ -30,6 +30,7 @@ import dlangui.graphics.fonts;
import dlangui.platforms.windows.win32drawbuf; import dlangui.platforms.windows.win32drawbuf;
import std.string; import std.string;
import std.utf; import std.utf;
import std.windows.charset;
/// define debug=FontResources for logging of font file resources creation/freeing /// define debug=FontResources for logging of font file resources creation/freeing
//debug = FontResources; //debug = FontResources;
@ -446,9 +447,13 @@ class Win32Font : Font {
if (!isNull()) if (!isNull())
clear(); clear();
LOGFONTA lf; LOGFONTA lf;
lf.lfCharSet = ANSI_CHARSET; //DEFAULT_CHARSET; // OEM charset face name
lf.lfFaceName[0..def.face.length] = def.face; lf.lfCharSet = DEFAULT_CHARSET; //ANSI_CHARSET;
lf.lfFaceName[def.face.length] = 0; // lf.lfFaceName[0..def.face.length] = def.face;
// lf.lfFaceName[def.face.length] = 0;
string oemFace = fromStringz(toMBSz(def.face)).dup;
lf.lfFaceName[0..oemFace.length] = oemFace;
lf.lfFaceName[oemFace.length] = 0;
lf.lfHeight = -size; //pixelsToPoints(size); lf.lfHeight = -size; //pixelsToPoints(size);
lf.lfItalic = italic; lf.lfItalic = italic;
lf.lfWeight = weight; lf.lfWeight = weight;
@ -545,7 +550,7 @@ class Win32FontManager : FontManager {
debug Log.i("Win32FontManager.initialize()"); debug Log.i("Win32FontManager.initialize()");
Win32ColorDrawBuf drawbuf = new Win32ColorDrawBuf(1,1); Win32ColorDrawBuf drawbuf = new Win32ColorDrawBuf(1,1);
LOGFONTA lf; LOGFONTA lf;
lf.lfCharSet = ANSI_CHARSET; //DEFAULT_CHARSET; lf.lfCharSet = DEFAULT_CHARSET; //ANSI_CHARSET;
lf.lfFaceName[0] = 0; lf.lfFaceName[0] = 0;
HDC dc = drawbuf.dc; HDC dc = drawbuf.dc;
int res = int res =
@ -705,7 +710,9 @@ extern(Windows) {
{ {
void * p = cast(void*)lParam; void * p = cast(void*)lParam;
Win32FontManager fontman = cast(Win32FontManager)p; Win32FontManager fontman = cast(Win32FontManager)p;
string face = fromStringz(lf.lfFaceName.ptr).dup; // OEM charset face name
// string face = fromStringz(lf.lfFaceName.ptr).dup;
string face = fromMBSz(cast(immutable)lf.lfFaceName.ptr).dup;
FontFamily family = pitchAndFamilyToFontFamily(lf.lfPitchAndFamily); FontFamily family = pitchAndFamilyToFontFamily(lf.lfPitchAndFamily);
if (face.length < 2 || face[0] == '@') if (face.length < 2 || face[0] == '@')
return 1; return 1;