Skip to content

win32: Disable win32 font loading when using fontconfig #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
felipealmeida wants to merge 1 commit into
base: devs/expertise/native-windows
Choose a base branch
from
Open

win32: Disable win32 font loading when using fontconfig #448

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 40 additions & 35 deletions src/lib/evas/canvas/evas_font_dir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,40 +723,6 @@ evas_font_load(const Eina_List *font_paths, int hinting, Evas_Font_Description *
font = _evas_load_fontconfig(font, found_fd->set, size, wanted_rend, bitmap_scalable);
goto on_find;
}
#elif defined(_WIN32)
{
HFONT hfont = NULL, oldfont = NULL;
DWORD code;
DWORD buffer_size = 0;
void* buffer = NULL;
HDC dc = CreateCompatibleDC(NULL);

hfont = CreateFont (0, 1,
0, 0,
FW_DONTCARE,
0,0,
0, DEFAULT_CHARSET,
OUT_TT_ONLY_PRECIS/*OUT_OUTLINE_PRECIS*/, CLIP_DEFAULT_PRECIS,
DEFAULT_QUALITY, DEFAULT_PITCH, fdesc->name);
oldfont = SelectObject(dc, hfont);

code = GetFontData (dc, 0, 0, NULL, 0);
if (code != GDI_ERROR)
{
buffer_size = code;
buffer = calloc (buffer_size, 1);

code = GetFontData (dc, 0, 0, buffer, &buffer_size);
}

DeleteObject(hfont);
DeleteDC (dc);

fprintf(stderr, "Loading evas font %s %p\n", fdesc->name, buffer);
font = (Evas_Font_Set *)evas_common_font_memory_load(fdesc->name, fdesc->name, size, buffer, buffer_size, wanted_rend, EINA_FALSE);
free(buffer);
goto on_find;
}
#endif

EINA_LIST_FOREACH_SAFE(fonts_zero, l, l_next, fd)
Expand Down Expand Up @@ -1036,9 +1002,48 @@ evas_font_load(const Eina_List *font_paths, int hinting, Evas_Font_Description *
}
#endif
}
#elif defined(_WIN32)
if (!font)
{
HFONT hfont = NULL, oldfont = NULL;
DWORD code;
DWORD buffer_size = 0;
void* buffer = NULL;
HDC dc = CreateCompatibleDC(NULL);

if (dc)
{
hfont = CreateFont (0, 1,
0, 0,
FW_DONTCARE,
0,0,
0, DEFAULT_CHARSET,
OUT_TT_ONLY_PRECIS, CLIP_DEFAULT_PRECIS,
DEFAULT_QUALITY, DEFAULT_PITCH, fdesc->name);
if (hfont)
{
oldfont = SelectObject(dc, hfont);

code = GetFontData (dc, 0, 0, NULL, 0);
if (code != GDI_ERROR)
{
buffer_size = code;
buffer = calloc (buffer_size, 1);

code = GetFontData (dc, 0, 0, buffer, &buffer_size);
}

if (code != GDI_ERROR)
font = (Evas_Font_Set *)evas_common_font_memory_load(fdesc->name, fdesc->name, size, buffer, buffer_size, wanted_rend, EINA_FALSE);
free(buffer);
DeleteObject(hfont);
}
DeleteDC (dc);
}
}
#endif

#if defined(HAVE_FONTCONFIG) || defined(_WIN32)
#if defined(HAVE_FONTCONFIG)
on_find:
#endif
fd = calloc(1, sizeof(Fndat));
Expand Down