forked from pyrite-dev/milsko
remove directwrite in favor of gdi
This commit is contained in:
parent
b7ed160614
commit
1fe59521bf
17 changed files with 21 additions and 24311 deletions
|
|
@ -39,19 +39,6 @@ else()
|
|||
endif()
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} STREQUAL Windows)
|
||||
if(${CMAKE_CROSSCOMPILING})
|
||||
message(STATUS "DirectWrite support has been enabled")
|
||||
option(MW_USE_DIRECTWRITE "Use DirectWrite" ON)
|
||||
else()
|
||||
# DirectWrite stuff can only be used on Win10+
|
||||
if(${CMAKE_SYSTEM_VERSION} GREATER_EQUAL 10)
|
||||
message(STATUS "DirectWrite support has been enabled")
|
||||
option(MW_USE_DIRECTWRITE "Use DirectWrite" ON)
|
||||
else()
|
||||
message(WARNING "DirectWrite support has been disabled (must be compiling on Win10+)")
|
||||
option(MW_USE_DIRECTWRITE "Use DirectWrite" OFF)
|
||||
endif()
|
||||
endif()
|
||||
option(MW_USE_GDI_TEXT "Use GDI for text rendering" ON)
|
||||
endif()
|
||||
|
||||
|
|
@ -164,13 +151,6 @@ if(MW_USE_FREETYPE2)
|
|||
endif()
|
||||
endif()
|
||||
|
||||
if(MW_USE_DIRECTWRITE)
|
||||
target_compile_definitions(
|
||||
Mw
|
||||
PRIVATE
|
||||
USE_DIRECTWRITE
|
||||
)
|
||||
endif()
|
||||
|
||||
if(MW_USE_GDI_TEXT)
|
||||
target_compile_definitions(
|
||||
|
|
|
|||
5
NTMakefile
generated
5
NTMakefile
generated
|
|
@ -64,7 +64,6 @@ clean:
|
|||
del /f /q src\icon\warning.obj
|
||||
del /f /q src\lowlevel.obj
|
||||
del /f /q src\string.obj
|
||||
del /f /q src\text\directwrite.obj
|
||||
del /f /q src\text\font\boldfont.obj
|
||||
del /f /q src\text\font\boldmonottf.obj
|
||||
del /f /q src\text\font\boldttf.obj
|
||||
|
|
@ -321,8 +320,8 @@ examples\gldemos\tripaint.obj: examples/gldemos/tripaint.c
|
|||
$(CC) $(EXE_CFLAGS) /Fo$@ examples/gldemos/tripaint.c
|
||||
|
||||
|
||||
src\Mw.dll: external\libz\src\adler32.obj external\libz\src\compress.obj external\libz\src\crc32.obj external\libz\src\deflate.obj external\libz\src\gzclose.obj external\libz\src\gzlib.obj external\libz\src\gzread.obj external\libz\src\gzwrite.obj external\libz\src\infback.obj external\libz\src\inffast.obj external\libz\src\inflate.obj external\libz\src\inftrees.obj external\libz\src\trees.obj external\libz\src\uncompr.obj external\libz\src\zutil.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\abstract\charset.obj src\abstract\directory.obj src\abstract\dynamic.obj src\abstract\time.obj src\backend\gdi.obj src\color.obj src\core.obj src\cursor\arrow.obj src\cursor\cross.obj src\cursor\default.obj src\cursor\hidden.obj src\cursor\text.obj src\default.obj src\dialog\colorpicker.obj src\dialog\directorychooser.obj src\dialog\filechooser.obj src\dialog\messagebox.obj src\draw.obj src\icon\back.obj src\icon\clock.obj src\icon\computer.obj src\icon\directory.obj src\icon\down.obj src\icon\error.obj src\icon\file.obj src\icon\forward.obj src\icon\info.obj src\icon\left.obj src\icon\news.obj src\icon\note.obj src\icon\right.obj src\icon\search.obj src\icon\up.obj src\icon\warning.obj src\lowlevel.obj src\string.obj src\text\directwrite.obj src\text\font\boldfont.obj src\text\font\boldmonottf.obj src\text\font\boldttf.obj src\text\font\font.obj src\text\font\monottf.obj src\text\font\ttf.obj src\text\ft2.obj src\text\gdi.obj src\text\stbtt.obj src\text\text.obj src\truetype.obj src\unicode.obj src\widget\box.obj src\widget\button.obj src\widget\calendar.obj src\widget\checkbox.obj src\widget\combobox.obj src\widget\entry.obj src\widget\frame.obj src\widget\image.obj src\widget\label.obj src\widget\listbox.obj src\widget\menu.obj src\widget\numberentry.obj src\widget\opengl.obj src\widget\progressbar.obj src\widget\radiobox.obj src\widget\scrollbar.obj src\widget\separator.obj src\widget\submenu.obj src\widget\subwindow.obj src\widget\tab.obj src\widget\table.obj src\widget\treeview.obj src\widget\viewport.obj src\widget\window.obj
|
||||
$(LD) $(MW_LDFLAGS) /OUT:$@ external\libz\src\adler32.obj external\libz\src\compress.obj external\libz\src\crc32.obj external\libz\src\deflate.obj external\libz\src\gzclose.obj external\libz\src\gzlib.obj external\libz\src\gzread.obj external\libz\src\gzwrite.obj external\libz\src\infback.obj external\libz\src\inffast.obj external\libz\src\inflate.obj external\libz\src\inftrees.obj external\libz\src\trees.obj external\libz\src\uncompr.obj external\libz\src\zutil.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\abstract\charset.obj src\abstract\directory.obj src\abstract\dynamic.obj src\abstract\time.obj src\backend\gdi.obj src\color.obj src\core.obj src\cursor\arrow.obj src\cursor\cross.obj src\cursor\default.obj src\cursor\hidden.obj src\cursor\text.obj src\default.obj src\dialog\colorpicker.obj src\dialog\directorychooser.obj src\dialog\filechooser.obj src\dialog\messagebox.obj src\draw.obj src\icon\back.obj src\icon\clock.obj src\icon\computer.obj src\icon\directory.obj src\icon\down.obj src\icon\error.obj src\icon\file.obj src\icon\forward.obj src\icon\info.obj src\icon\left.obj src\icon\news.obj src\icon\note.obj src\icon\right.obj src\icon\search.obj src\icon\up.obj src\icon\warning.obj src\lowlevel.obj src\string.obj src\text\directwrite.obj src\text\font\boldfont.obj src\text\font\boldmonottf.obj src\text\font\boldttf.obj src\text\font\font.obj src\text\font\monottf.obj src\text\font\ttf.obj src\text\ft2.obj src\text\gdi.obj src\text\stbtt.obj src\text\text.obj src\truetype.obj src\unicode.obj src\widget\box.obj src\widget\button.obj src\widget\calendar.obj src\widget\checkbox.obj src\widget\combobox.obj src\widget\entry.obj src\widget\frame.obj src\widget\image.obj src\widget\label.obj src\widget\listbox.obj src\widget\menu.obj src\widget\numberentry.obj src\widget\opengl.obj src\widget\progressbar.obj src\widget\radiobox.obj src\widget\scrollbar.obj src\widget\separator.obj src\widget\submenu.obj src\widget\subwindow.obj src\widget\tab.obj src\widget\table.obj src\widget\treeview.obj src\widget\viewport.obj src\widget\window.obj opengl32.lib gdi32.lib winmm.lib user32.lib advapi32.lib
|
||||
src\Mw.dll: external\libz\src\adler32.obj external\libz\src\compress.obj external\libz\src\crc32.obj external\libz\src\deflate.obj external\libz\src\gzclose.obj external\libz\src\gzlib.obj external\libz\src\gzread.obj external\libz\src\gzwrite.obj external\libz\src\infback.obj external\libz\src\inffast.obj external\libz\src\inflate.obj external\libz\src\inftrees.obj external\libz\src\trees.obj external\libz\src\uncompr.obj external\libz\src\zutil.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\abstract\charset.obj src\abstract\directory.obj src\abstract\dynamic.obj src\abstract\time.obj src\backend\gdi.obj src\color.obj src\core.obj src\cursor\arrow.obj src\cursor\cross.obj src\cursor\default.obj src\cursor\hidden.obj src\cursor\text.obj src\default.obj src\dialog\colorpicker.obj src\dialog\directorychooser.obj src\dialog\filechooser.obj src\dialog\messagebox.obj src\draw.obj src\icon\back.obj src\icon\clock.obj src\icon\computer.obj src\icon\directory.obj src\icon\down.obj src\icon\error.obj src\icon\file.obj src\icon\forward.obj src\icon\info.obj src\icon\left.obj src\icon\news.obj src\icon\note.obj src\icon\right.obj src\icon\search.obj src\icon\up.obj src\icon\warning.obj src\lowlevel.obj src\string.obj src\text\font\boldfont.obj src\text\font\boldmonottf.obj src\text\font\boldttf.obj src\text\font\font.obj src\text\font\monottf.obj src\text\font\ttf.obj src\text\ft2.obj src\text\gdi.obj src\text\stbtt.obj src\text\text.obj src\truetype.obj src\unicode.obj src\widget\box.obj src\widget\button.obj src\widget\calendar.obj src\widget\checkbox.obj src\widget\combobox.obj src\widget\entry.obj src\widget\frame.obj src\widget\image.obj src\widget\label.obj src\widget\listbox.obj src\widget\menu.obj src\widget\numberentry.obj src\widget\opengl.obj src\widget\progressbar.obj src\widget\radiobox.obj src\widget\scrollbar.obj src\widget\separator.obj src\widget\submenu.obj src\widget\subwindow.obj src\widget\tab.obj src\widget\table.obj src\widget\treeview.obj src\widget\viewport.obj src\widget\window.obj
|
||||
$(LD) $(MW_LDFLAGS) /OUT:$@ external\libz\src\adler32.obj external\libz\src\compress.obj external\libz\src\crc32.obj external\libz\src\deflate.obj external\libz\src\gzclose.obj external\libz\src\gzlib.obj external\libz\src\gzread.obj external\libz\src\gzwrite.obj external\libz\src\infback.obj external\libz\src\inffast.obj external\libz\src\inflate.obj external\libz\src\inftrees.obj external\libz\src\trees.obj external\libz\src\uncompr.obj external\libz\src\zutil.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\abstract\charset.obj src\abstract\directory.obj src\abstract\dynamic.obj src\abstract\time.obj src\backend\gdi.obj src\color.obj src\core.obj src\cursor\arrow.obj src\cursor\cross.obj src\cursor\default.obj src\cursor\hidden.obj src\cursor\text.obj src\default.obj src\dialog\colorpicker.obj src\dialog\directorychooser.obj src\dialog\filechooser.obj src\dialog\messagebox.obj src\draw.obj src\icon\back.obj src\icon\clock.obj src\icon\computer.obj src\icon\directory.obj src\icon\down.obj src\icon\error.obj src\icon\file.obj src\icon\forward.obj src\icon\info.obj src\icon\left.obj src\icon\news.obj src\icon\note.obj src\icon\right.obj src\icon\search.obj src\icon\up.obj src\icon\warning.obj src\lowlevel.obj src\string.obj src\text\font\boldfont.obj src\text\font\boldmonottf.obj src\text\font\boldttf.obj src\text\font\font.obj src\text\font\monottf.obj src\text\font\ttf.obj src\text\ft2.obj src\text\gdi.obj src\text\stbtt.obj src\text\text.obj src\truetype.obj src\unicode.obj src\widget\box.obj src\widget\button.obj src\widget\calendar.obj src\widget\checkbox.obj src\widget\combobox.obj src\widget\entry.obj src\widget\frame.obj src\widget\image.obj src\widget\label.obj src\widget\listbox.obj src\widget\menu.obj src\widget\numberentry.obj src\widget\opengl.obj src\widget\progressbar.obj src\widget\radiobox.obj src\widget\scrollbar.obj src\widget\separator.obj src\widget\submenu.obj src\widget\subwindow.obj src\widget\tab.obj src\widget\table.obj src\widget\treeview.obj src\widget\viewport.obj src\widget\window.obj opengl32.lib gdi32.lib winmm.lib user32.lib advapi32.lib
|
||||
|
||||
|
||||
.c.obj:
|
||||
|
|
|
|||
7
WatMakefile
generated
7
WatMakefile
generated
|
|
@ -63,7 +63,6 @@ clean: .SYMBOLIC
|
|||
%erase src/icon/warning.obj
|
||||
%erase src/lowlevel.obj
|
||||
%erase src/string.obj
|
||||
%erase src/text/directwrite.obj
|
||||
%erase src/text/font/boldfont.obj
|
||||
%erase src/text/font/boldmonottf.obj
|
||||
%erase src/text/font/boldttf.obj
|
||||
|
|
@ -320,8 +319,8 @@ examples/gldemos/tripaint.obj: examples/gldemos/tripaint.c
|
|||
$(CC) $(EXE_CFLAGS) -fo=$@ examples/gldemos/tripaint.c
|
||||
|
||||
|
||||
src/Mw.dll: external/libz/src/adler32.obj external/libz/src/compress.obj external/libz/src/crc32.obj external/libz/src/deflate.obj external/libz/src/gzclose.obj external/libz/src/gzlib.obj external/libz/src/gzread.obj external/libz/src/gzwrite.obj external/libz/src/infback.obj external/libz/src/inffast.obj external/libz/src/inflate.obj external/libz/src/inftrees.obj external/libz/src/trees.obj external/libz/src/uncompr.obj external/libz/src/zutil.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/abstract/charset.obj src/abstract/directory.obj src/abstract/dynamic.obj src/abstract/time.obj src/backend/gdi.obj src/color.obj src/core.obj src/cursor/arrow.obj src/cursor/cross.obj src/cursor/default.obj src/cursor/hidden.obj src/cursor/text.obj src/default.obj src/dialog/colorpicker.obj src/dialog/directorychooser.obj src/dialog/filechooser.obj src/dialog/messagebox.obj src/draw.obj src/icon/back.obj src/icon/clock.obj src/icon/computer.obj src/icon/directory.obj src/icon/down.obj src/icon/error.obj src/icon/file.obj src/icon/forward.obj src/icon/info.obj src/icon/left.obj src/icon/news.obj src/icon/note.obj src/icon/right.obj src/icon/search.obj src/icon/up.obj src/icon/warning.obj src/lowlevel.obj src/string.obj src/text/directwrite.obj src/text/font/boldfont.obj src/text/font/boldmonottf.obj src/text/font/boldttf.obj src/text/font/font.obj src/text/font/monottf.obj src/text/font/ttf.obj src/text/ft2.obj src/text/gdi.obj src/text/stbtt.obj src/text/text.obj src/truetype.obj src/unicode.obj src/widget/box.obj src/widget/button.obj src/widget/calendar.obj src/widget/checkbox.obj src/widget/combobox.obj src/widget/entry.obj src/widget/frame.obj src/widget/image.obj src/widget/label.obj src/widget/listbox.obj src/widget/menu.obj src/widget/numberentry.obj src/widget/opengl.obj src/widget/progressbar.obj src/widget/radiobox.obj src/widget/scrollbar.obj src/widget/separator.obj src/widget/submenu.obj src/widget/subwindow.obj src/widget/tab.obj src/widget/table.obj src/widget/treeview.obj src/widget/viewport.obj src/widget/window.obj
|
||||
$(LD) $(MW_LDFLAGS) option implib=src/Mw.lib name $@ file external/libz/src/adler32.obj file external/libz/src/compress.obj file external/libz/src/crc32.obj file external/libz/src/deflate.obj file external/libz/src/gzclose.obj file external/libz/src/gzlib.obj file external/libz/src/gzread.obj file external/libz/src/gzwrite.obj file external/libz/src/infback.obj file external/libz/src/inffast.obj file external/libz/src/inflate.obj file external/libz/src/inftrees.obj file external/libz/src/trees.obj file external/libz/src/uncompr.obj file external/libz/src/zutil.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.obj file src/abstract/charset.obj file src/abstract/directory.obj file src/abstract/dynamic.obj file src/abstract/time.obj file src/backend/gdi.obj file src/color.obj file src/core.obj file src/cursor/arrow.obj file src/cursor/cross.obj file src/cursor/default.obj file src/cursor/hidden.obj file src/cursor/text.obj file src/default.obj file src/dialog/colorpicker.obj file src/dialog/directorychooser.obj file src/dialog/filechooser.obj file src/dialog/messagebox.obj file src/draw.obj file src/icon/back.obj file src/icon/clock.obj file src/icon/computer.obj file src/icon/directory.obj file src/icon/down.obj file src/icon/error.obj file src/icon/file.obj file src/icon/forward.obj file src/icon/info.obj file src/icon/left.obj file src/icon/news.obj file src/icon/note.obj file src/icon/right.obj file src/icon/search.obj file src/icon/up.obj file src/icon/warning.obj file src/lowlevel.obj file src/string.obj file src/text/directwrite.obj file src/text/font/boldfont.obj file src/text/font/boldmonottf.obj file src/text/font/boldttf.obj file src/text/font/font.obj file src/text/font/monottf.obj file src/text/font/ttf.obj file src/text/ft2.obj file src/text/gdi.obj file src/text/stbtt.obj file src/text/text.obj file src/truetype.obj file src/unicode.obj file src/widget/box.obj file src/widget/button.obj file src/widget/calendar.obj file src/widget/checkbox.obj file src/widget/combobox.obj file src/widget/entry.obj file src/widget/frame.obj file src/widget/image.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/menu.obj file src/widget/numberentry.obj file src/widget/opengl.obj file src/widget/progressbar.obj file src/widget/radiobox.obj file src/widget/scrollbar.obj file src/widget/separator.obj file src/widget/submenu.obj file src/widget/subwindow.obj file src/widget/tab.obj file src/widget/table.obj file src/widget/treeview.obj file src/widget/viewport.obj file src/widget/window.obj library clib3r.lib library opengl32.lib library gdi32.lib library winmm.lib library user32.lib library advapi32.lib
|
||||
src/Mw.dll: external/libz/src/adler32.obj external/libz/src/compress.obj external/libz/src/crc32.obj external/libz/src/deflate.obj external/libz/src/gzclose.obj external/libz/src/gzlib.obj external/libz/src/gzread.obj external/libz/src/gzwrite.obj external/libz/src/infback.obj external/libz/src/inffast.obj external/libz/src/inflate.obj external/libz/src/inftrees.obj external/libz/src/trees.obj external/libz/src/uncompr.obj external/libz/src/zutil.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/abstract/charset.obj src/abstract/directory.obj src/abstract/dynamic.obj src/abstract/time.obj src/backend/gdi.obj src/color.obj src/core.obj src/cursor/arrow.obj src/cursor/cross.obj src/cursor/default.obj src/cursor/hidden.obj src/cursor/text.obj src/default.obj src/dialog/colorpicker.obj src/dialog/directorychooser.obj src/dialog/filechooser.obj src/dialog/messagebox.obj src/draw.obj src/icon/back.obj src/icon/clock.obj src/icon/computer.obj src/icon/directory.obj src/icon/down.obj src/icon/error.obj src/icon/file.obj src/icon/forward.obj src/icon/info.obj src/icon/left.obj src/icon/news.obj src/icon/note.obj src/icon/right.obj src/icon/search.obj src/icon/up.obj src/icon/warning.obj src/lowlevel.obj src/string.obj src/text/font/boldfont.obj src/text/font/boldmonottf.obj src/text/font/boldttf.obj src/text/font/font.obj src/text/font/monottf.obj src/text/font/ttf.obj src/text/ft2.obj src/text/gdi.obj src/text/stbtt.obj src/text/text.obj src/truetype.obj src/unicode.obj src/widget/box.obj src/widget/button.obj src/widget/calendar.obj src/widget/checkbox.obj src/widget/combobox.obj src/widget/entry.obj src/widget/frame.obj src/widget/image.obj src/widget/label.obj src/widget/listbox.obj src/widget/menu.obj src/widget/numberentry.obj src/widget/opengl.obj src/widget/progressbar.obj src/widget/radiobox.obj src/widget/scrollbar.obj src/widget/separator.obj src/widget/submenu.obj src/widget/subwindow.obj src/widget/tab.obj src/widget/table.obj src/widget/treeview.obj src/widget/viewport.obj src/widget/window.obj
|
||||
$(LD) $(MW_LDFLAGS) option implib=src/Mw.lib name $@ file external/libz/src/adler32.obj file external/libz/src/compress.obj file external/libz/src/crc32.obj file external/libz/src/deflate.obj file external/libz/src/gzclose.obj file external/libz/src/gzlib.obj file external/libz/src/gzread.obj file external/libz/src/gzwrite.obj file external/libz/src/infback.obj file external/libz/src/inffast.obj file external/libz/src/inflate.obj file external/libz/src/inftrees.obj file external/libz/src/trees.obj file external/libz/src/uncompr.obj file external/libz/src/zutil.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.obj file src/abstract/charset.obj file src/abstract/directory.obj file src/abstract/dynamic.obj file src/abstract/time.obj file src/backend/gdi.obj file src/color.obj file src/core.obj file src/cursor/arrow.obj file src/cursor/cross.obj file src/cursor/default.obj file src/cursor/hidden.obj file src/cursor/text.obj file src/default.obj file src/dialog/colorpicker.obj file src/dialog/directorychooser.obj file src/dialog/filechooser.obj file src/dialog/messagebox.obj file src/draw.obj file src/icon/back.obj file src/icon/clock.obj file src/icon/computer.obj file src/icon/directory.obj file src/icon/down.obj file src/icon/error.obj file src/icon/file.obj file src/icon/forward.obj file src/icon/info.obj file src/icon/left.obj file src/icon/news.obj file src/icon/note.obj file src/icon/right.obj file src/icon/search.obj file src/icon/up.obj file src/icon/warning.obj file src/lowlevel.obj file src/string.obj file src/text/font/boldfont.obj file src/text/font/boldmonottf.obj file src/text/font/boldttf.obj file src/text/font/font.obj file src/text/font/monottf.obj file src/text/font/ttf.obj file src/text/ft2.obj file src/text/gdi.obj file src/text/stbtt.obj file src/text/text.obj file src/truetype.obj file src/unicode.obj file src/widget/box.obj file src/widget/button.obj file src/widget/calendar.obj file src/widget/checkbox.obj file src/widget/combobox.obj file src/widget/entry.obj file src/widget/frame.obj file src/widget/image.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/menu.obj file src/widget/numberentry.obj file src/widget/opengl.obj file src/widget/progressbar.obj file src/widget/radiobox.obj file src/widget/scrollbar.obj file src/widget/separator.obj file src/widget/submenu.obj file src/widget/subwindow.obj file src/widget/tab.obj file src/widget/table.obj file src/widget/treeview.obj file src/widget/viewport.obj file src/widget/window.obj library clib3r.lib library opengl32.lib library gdi32.lib library winmm.lib library user32.lib library advapi32.lib
|
||||
|
||||
|
||||
|
||||
|
|
@ -433,8 +432,6 @@ src/lowlevel.obj: src/lowlevel.c
|
|||
$(CC) $(MW_CFLAGS) -fo=$@ src/lowlevel.c
|
||||
src/string.obj: src/string.c
|
||||
$(CC) $(MW_CFLAGS) -fo=$@ src/string.c
|
||||
src/text/directwrite.obj: src/text/directwrite.c
|
||||
$(CC) $(MW_CFLAGS) -fo=$@ src/text/directwrite.c
|
||||
src/text/font/boldfont.obj: src/text/font/boldfont.c
|
||||
$(CC) $(MW_CFLAGS) -fo=$@ src/text/font/boldfont.c
|
||||
src/text/font/boldmonottf.obj: src/text/font/boldmonottf.c
|
||||
|
|
|
|||
22
configure
vendored
22
configure
vendored
|
|
@ -59,7 +59,7 @@ my %features = (
|
|||
"stb-image" => "use stb_image, instead use libjpeg/libpng",
|
||||
"stb-truetype" => "use stb_truetype",
|
||||
"freetype2" => "use FreeType2",
|
||||
"directwrite" => "(Windows only) use DirectWrite",
|
||||
"gdi-text" => "(Windows only) use GDI Text",
|
||||
"xrender" => "(X11 only) use XRender",
|
||||
"opengl" => "build OpenGL widget",
|
||||
"vulkan" => "build Vulkan widget",
|
||||
|
|
@ -73,7 +73,7 @@ my %features = (
|
|||
);
|
||||
my @features_keys = (
|
||||
"1classic-theme", "1stb-image",
|
||||
"1stb-truetype", "1freetype2", "1directwrite",
|
||||
"1stb-truetype", "1freetype2", "1gdi-text",
|
||||
"1opengl", "2xrender",
|
||||
"1vulkan", "2vulkan-string-helper",
|
||||
"1shared", "1static",
|
||||
|
|
@ -101,23 +101,9 @@ sub def_platform {
|
|||
param_set("x11", 1);
|
||||
}
|
||||
if($target eq "Windows") {
|
||||
if ($^O eq "Win32")
|
||||
{
|
||||
require Win32;
|
||||
Win32->import();
|
||||
my ( $osvername, $major, $minor, $id ) = Win32::GetOSVersion();
|
||||
|
||||
if($major >= 10) {
|
||||
param_set("directwrite", 1);
|
||||
} else {
|
||||
param_set("directwrite", 0);
|
||||
}
|
||||
} else {
|
||||
# assume cross compiling
|
||||
param_set("directwrite", 1);
|
||||
}
|
||||
param_set("gdi-text", 1);
|
||||
} else {
|
||||
param_set("directwrite", 0);
|
||||
param_set("gdi-text", 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ int main() {
|
|||
MwNtext, "font",
|
||||
NULL);
|
||||
button4 = MwVaCreateWidget(MwButtonClass, "button", window, 50, 225, 100, 125,
|
||||
MwNtext, "lorem ipsum",
|
||||
MwNtext, "日本語の表記体系",
|
||||
MwNbackground, "#f66",
|
||||
MwNforeground, "#000",
|
||||
NULL);
|
||||
|
|
|
|||
|
|
@ -344,9 +344,7 @@ MWDECL int MwFL_FT2Setup(void);
|
|||
#ifdef USE_STB_TRUETYPE
|
||||
MWDECL int MwFL_STBTTSetup(void);
|
||||
#endif
|
||||
#ifdef USE_DIRECTWRITE
|
||||
MWDECL int MwFL_DWSetup(void);
|
||||
#endif
|
||||
|
||||
#ifdef USE_GDI_TEXT
|
||||
MWDECL int MwFL_GDISetup(void);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -134,8 +134,8 @@ if (param_get("freetype2")) {
|
|||
}
|
||||
}
|
||||
|
||||
if (param_get("directwrite")) {
|
||||
add_cflags("-DUSE_DIRECTWRITE");
|
||||
if (param_get("gdi-text")) {
|
||||
add_cflags("-DUSE_GDI_TEXT");
|
||||
}
|
||||
|
||||
if (param_get("vulkan") && param_get("vulkan-string-helper")) {
|
||||
|
|
|
|||
|
|
@ -315,7 +315,7 @@ static MwWidget MwCreateWidget_Internal(MwClass widget_class, const char* name,
|
|||
MwAddTickList(h);
|
||||
}
|
||||
|
||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_DIRECTWRITE)
|
||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_GDI_TEXT)
|
||||
if(IsFirstVisible(h)) {
|
||||
font_setup:
|
||||
h->root_font = MwFontLoad(MwTTFData, MwTTFDataSize);
|
||||
|
|
@ -744,7 +744,7 @@ int MwGetInteger(MwWidget handle, const char* key) {
|
|||
return MwDEFAULT;
|
||||
} else {
|
||||
if(shgeti(handle->integer, key) == -1) {
|
||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_DIRECTWRITE)
|
||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_GDI_TEXT)
|
||||
if(strcmp(key, MwNbitmapFont) == 0) return inherit_integer(handle, key, 0);
|
||||
#else
|
||||
if(strcmp(key, MwNbitmapFont) == 0) return inherit_integer(handle, key, 1);
|
||||
|
|
@ -795,7 +795,7 @@ const char* MwGetText(MwWidget handle, const char* key) {
|
|||
return shget(handle->text, key);
|
||||
}
|
||||
|
||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_DIRECTWRITE)
|
||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_GDI_TEXT)
|
||||
static void* inherit_void(MwWidget handle, const char* key) {
|
||||
void* v;
|
||||
|
||||
|
|
@ -811,7 +811,7 @@ void* MwGetVoid(MwWidget handle, const char* key) {
|
|||
|
||||
if(v != NULL) return v;
|
||||
|
||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_DIRECTWRITE)
|
||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_GDI_TEXT)
|
||||
if(strcmp(key, MwNfont) == 0 || strcmp(key, MwNboldFont) == 0 || strcmp(key, MwNmonospaceFont) == 0 || strcmp(key, MwNboldMonospaceFont) == 0) {
|
||||
v = inherit_void(handle, key);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,588 +0,0 @@
|
|||
/*
|
||||
* DirectWrite Font backend
|
||||
*
|
||||
* This should dynamically load everything necessary and then gracefully fallback if the user isn't on Windows 10.
|
||||
*/
|
||||
#ifdef USE_DIRECTWRITE
|
||||
#define INITGUID
|
||||
#include <Mw/Milsko.h>
|
||||
|
||||
#include <d2d1.h>
|
||||
#include <shobjidl.h>
|
||||
|
||||
#ifndef WINBOOL
|
||||
#define WINBOOL int
|
||||
#endif
|
||||
|
||||
/* dwrite is vendored because it's only mingw that gives us COBJMACRO */
|
||||
#include "dwrite.h"
|
||||
#include "dwrite_3.h"
|
||||
|
||||
typedef struct CustomTextRenderer {
|
||||
IDWriteTextRendererVtbl* lpVtbl;
|
||||
LONG refCount;
|
||||
IDWriteFactory6* write_factory;
|
||||
IDWriteBitmapRenderTarget* target;
|
||||
int red, blue, green;
|
||||
|
||||
} CustomTextRenderer;
|
||||
static CustomTextRenderer* CustomTextRenderer_Create(IDWriteFactory6* write_factory, IDWriteBitmapRenderTarget* target, MwLLColor color);
|
||||
|
||||
static struct dw {
|
||||
HMODULE d2d1_lib;
|
||||
HMODULE dwrite_lib;
|
||||
|
||||
HRESULT (*D2D1CreateFactory)(D2D1_FACTORY_TYPE factoryType, const IID* const riid, const D2D1_FACTORY_OPTIONS* pFactoryOptions, void** ppIFactory);
|
||||
HRESULT (*DWriteCreateFactory)(int factoryType, const IID* const iid, IUnknown** factory);
|
||||
|
||||
HMODULE kernel32_lib;
|
||||
} dw_table;
|
||||
|
||||
struct _MwFLFont {
|
||||
int px;
|
||||
void* data;
|
||||
MwBool valid;
|
||||
|
||||
IDWriteFactory6* write_factory;
|
||||
ID2D1Factory* d2dFactory;
|
||||
IDWriteGdiInterop* gdiInterop;
|
||||
IDWriteFontFile* file;
|
||||
IDWriteFontFace* font_face;
|
||||
IDWriteFontSetBuilder2* font_builder;
|
||||
IDWriteFontSet* font_set;
|
||||
IDWriteFontCollection1* font_collection;
|
||||
IDWriteTextFormat* text_format;
|
||||
|
||||
LOGFONTW logfont;
|
||||
HFONT font;
|
||||
};
|
||||
|
||||
static int unpack_ttf_data(WCHAR* temp_path_name, unsigned char* data, unsigned int size) {
|
||||
WCHAR temp_path_dir[MAX_PATH];
|
||||
HANDLE tempFile;
|
||||
int hr;
|
||||
|
||||
hr = GetTempPathW(MAX_PATH, temp_path_dir);
|
||||
if(hr == 0) {
|
||||
printf("GetTempPathW failed for TTF, cannot use DirectWrite\n");
|
||||
return 1;
|
||||
}
|
||||
hr = GetTempFileNameW(temp_path_dir, TEXT(L"MILSKO"), 0, temp_path_name);
|
||||
if(hr == 0) {
|
||||
printf("GetTempFileName failed for TTF, cannot use DirectWrite\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
tempFile = CreateFileW(temp_path_name,
|
||||
GENERIC_WRITE,
|
||||
0,
|
||||
NULL,
|
||||
CREATE_NEW,
|
||||
FILE_ATTRIBUTE_NORMAL,
|
||||
NULL);
|
||||
if(tempFile == INVALID_HANDLE_VALUE) {
|
||||
DWORD err = GetLastError();
|
||||
if(err == ERROR_FILE_EXISTS) {
|
||||
tempFile = CreateFileW(temp_path_name,
|
||||
GENERIC_WRITE,
|
||||
0,
|
||||
NULL,
|
||||
OPEN_ALWAYS,
|
||||
FILE_ATTRIBUTE_NORMAL,
|
||||
NULL);
|
||||
if(tempFile != INVALID_HANDLE_VALUE) {
|
||||
goto success;
|
||||
} else {
|
||||
err = GetLastError();
|
||||
}
|
||||
}
|
||||
printf("CreateFile failed for TTF (%ld), cannot use DirectWrite\n", err);
|
||||
return 1;
|
||||
}
|
||||
success:
|
||||
|
||||
hr = WriteFile(tempFile, data, size, NULL, NULL);
|
||||
if(!hr) {
|
||||
printf("WriteFile failed for TTF (%ld), cannot use DirectWrite\n", GetLastError());
|
||||
return 1;
|
||||
}
|
||||
|
||||
CloseHandle(tempFile);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void* dw_MwFontLoad(unsigned char* data, unsigned int size, int px) {
|
||||
MwFLFont ttf = malloc(sizeof(*ttf));
|
||||
HRESULT hr;
|
||||
WCHAR font_name[MAX_PATH];
|
||||
D2D1_FACTORY_OPTIONS d2d1_options;
|
||||
|
||||
d2d1_options.debugLevel = D2D1_DEBUG_LEVEL_ERROR;
|
||||
|
||||
#define INTERFACE_CHECK(x, factory) \
|
||||
do { \
|
||||
x* rsrc = NULL; \
|
||||
if(!SUCCEEDED((hr = x##_QueryInterface(factory, &IID_##x, (void**)&rsrc)))) { \
|
||||
printf("Query for interface " #x " failed (%08lX). Cannot use DirectWrite.\n", hr); \
|
||||
return NULL; \
|
||||
}; \
|
||||
} while(0);
|
||||
|
||||
memset(ttf, 0, sizeof(*ttf));
|
||||
ttf->data = malloc(size);
|
||||
memcpy(ttf->data, data, size);
|
||||
|
||||
ttf->px = px;
|
||||
|
||||
hr = dw_table.D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, &d2d1_options, (void**)&ttf->d2dFactory);
|
||||
if(!SUCCEEDED(hr)) {
|
||||
printf("D2D1CreateFactory failed for TTF (%08lX), cannot use DirectWrite\n", hr);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
INTERFACE_CHECK(ID2D1Factory, ttf->d2dFactory);
|
||||
|
||||
hr = dw_table.DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory, (struct IUnknown**)&ttf->write_factory);
|
||||
if(!SUCCEEDED(hr)) {
|
||||
printf("DWriteCreateFactory failed for TTF (%08lx), cannot use DirectWrite\n", hr);
|
||||
goto fail;
|
||||
}
|
||||
INTERFACE_CHECK(IDWriteFactory6, ttf->write_factory);
|
||||
|
||||
if(unpack_ttf_data(font_name, data, size) != 0) {
|
||||
goto fail;
|
||||
};
|
||||
|
||||
hr = IDWriteFactory6_CreateFontFileReference(ttf->write_factory, font_name, NULL, &ttf->file);
|
||||
if(!SUCCEEDED(hr)) {
|
||||
printf("CreateFontFileReference failed for TTF (%08lx), cannot use DirectWrite\n", hr);
|
||||
goto fail;
|
||||
}
|
||||
INTERFACE_CHECK(IDWriteFontFile, ttf->file);
|
||||
|
||||
hr = IDWriteFactory_CreateFontFace(ttf->write_factory, DWRITE_FONT_FACE_TYPE_TRUETYPE, 1, &ttf->file, 0, DWRITE_FONT_SIMULATIONS_NONE, &ttf->font_face);
|
||||
if(!SUCCEEDED(hr)) {
|
||||
printf("IDWriteFactory_CreateFontFace failed for TTF (%08lx), cannot use DirectWrite\n", hr);
|
||||
goto fail;
|
||||
}
|
||||
INTERFACE_CHECK(IDWriteFontFace, ttf->font_face);
|
||||
|
||||
hr = IDWriteFactory6_CreateFontSetBuilder(ttf->write_factory, &ttf->font_builder);
|
||||
if(!SUCCEEDED(hr)) {
|
||||
printf("IDWriteFactory6_CreateFontSetBuilder failed for TTF (%08lx), cannot use DirectWrite\n", hr);
|
||||
goto fail;
|
||||
}
|
||||
INTERFACE_CHECK(IDWriteFontSetBuilder2, ttf->font_builder);
|
||||
|
||||
hr = IDWriteFontSetBuilder2_AddFontFile(ttf->font_builder, font_name);
|
||||
if(!SUCCEEDED(hr)) {
|
||||
printf("IDWriteFontSetBuilder2_AddFontFile failed for TTF (%08lx), cannot use DirectWrite\n", hr);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
hr = IDWriteFontSetBuilder_CreateFontSet(ttf->font_builder, &ttf->font_set);
|
||||
if(!SUCCEEDED(hr)) {
|
||||
printf("IDWriteFontSetBuilder_CreateFontSet failed for TTF (%08lx), cannot use DirectWrite\n", hr);
|
||||
goto fail;
|
||||
}
|
||||
INTERFACE_CHECK(IDWriteFontSet, ttf->font_set);
|
||||
|
||||
hr = IDWriteFactory3_CreateFontCollectionFromFontSet(ttf->write_factory, ttf->font_set, &ttf->font_collection);
|
||||
if(!SUCCEEDED(hr)) {
|
||||
printf("IDWriteFactory3_CreateFontCollectionFromFontSet failed for TTF (%08lx), cannot use DirectWrite\n", hr);
|
||||
goto fail;
|
||||
}
|
||||
INTERFACE_CHECK(IDWriteFontCollection1, ttf->font_collection);
|
||||
|
||||
hr = IDWriteFactory6_GetGdiInterop(ttf->write_factory, &ttf->gdiInterop);
|
||||
if(!SUCCEEDED(hr)) {
|
||||
printf("GetGdiInterop failed for TTF (%08lx), cannot use DirectWrite\n", hr);
|
||||
goto fail;
|
||||
}
|
||||
INTERFACE_CHECK(IDWriteGdiInterop, ttf->gdiInterop);
|
||||
|
||||
hr = IDWriteFactory_CreateTextFormat(ttf->write_factory, L"milsko font", (IDWriteFontCollection*)ttf->font_collection, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, px, L"en-US", &ttf->text_format);
|
||||
if(!SUCCEEDED(hr)) {
|
||||
printf("IDWriteFactory_CreateTextFormat failed for TTF (%08lx), cannot use DirectWrite\n", hr);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
ttf->valid = MwTRUE;
|
||||
return ttf;
|
||||
|
||||
fail:
|
||||
ttf->valid = MwFALSE;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int dw_MwTextOffset(MwFLFont ttf, const char* text);
|
||||
|
||||
static int dw_MwDrawText(MwWidget handle, MwFLFont ttf, MwPoint* point, const char* text, MwLLColor color) {
|
||||
IDWriteTextLayout* text_layout;
|
||||
IDWriteBitmapRenderTarget* target = NULL;
|
||||
HRESULT hr;
|
||||
RECT rc = {0};
|
||||
HDC memoryHDC = NULL;
|
||||
DWRITE_FONT_METRICS metrics = {0};
|
||||
LONG width = 0, height = 0, offset = 0;
|
||||
WCHAR* wtext = NULL;
|
||||
CustomTextRenderer* texRenderer;
|
||||
size_t wtext_len = MultiByteToWideChar(CP_UTF8, 0, text, -1, NULL, 0);
|
||||
|
||||
wtext = malloc(wtext_len * 2); /* we get a weird buffer overflow when we try to free this later? allocate well above wtext_len then to prevent that. */
|
||||
memset(wtext, 0, wtext_len * 2);
|
||||
MultiByteToWideChar(CP_UTF8, 0, text, -1, wtext, wtext_len);
|
||||
|
||||
IDWriteFontFace_GetMetrics(ttf->font_face, &metrics);
|
||||
|
||||
GetClientRect(handle->lowlevel->gdi.hWnd, &rc);
|
||||
MapWindowPoints(handle->lowlevel->gdi.hWnd, GetParent(handle->lowlevel->gdi.hWnd), (LPPOINT)&rc, 2);
|
||||
|
||||
width = MwTextWidth(handle, ttf, text);
|
||||
height = MwTextHeight(handle, ttf, text);
|
||||
offset = dw_MwTextOffset(ttf, text);
|
||||
|
||||
hr = IDWriteFactory_CreateTextLayout(ttf->write_factory, wtext, wtext_len, ttf->text_format, width, height, &text_layout);
|
||||
|
||||
IDWriteGdiInterop_CreateBitmapRenderTarget(ttf->gdiInterop, handle->lowlevel->gdi.hDC, width, height, &target);
|
||||
|
||||
texRenderer = CustomTextRenderer_Create(ttf->write_factory, target, color);
|
||||
|
||||
memoryHDC = IDWriteBitmapRenderTarget_GetMemoryDC(target);
|
||||
|
||||
SetBkMode(handle->lowlevel->gdi.hDC, TRANSPARENT);
|
||||
BitBlt(memoryHDC, 0, 0, width, height, handle->lowlevel->gdi.hDC, point->x, point->y - (height / 2), SRCCOPY);
|
||||
|
||||
if(SUCCEEDED(hr)) {
|
||||
IDWriteTextLayout_Draw(text_layout, target, (IDWriteTextRenderer*)texRenderer, offset, 0);
|
||||
}
|
||||
|
||||
BitBlt(handle->lowlevel->gdi.hDC, point->x, point->y - (height / 2), width, height, memoryHDC, 0, 0, SRCCOPY | NOMIRRORBITMAP);
|
||||
|
||||
IDWriteBitmapRenderTarget_Release(target);
|
||||
|
||||
free(wtext);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int dw_MwTextOffset(MwFLFont ttf, const char* text) {
|
||||
IDWriteTextLayout* text_layout;
|
||||
DWRITE_FONT_METRICS metrics = {0};
|
||||
WCHAR* wtext = NULL;
|
||||
size_t wtext_len = MultiByteToWideChar(CP_UTF8, 0, text, -1, NULL, 0);
|
||||
UINT32* codepoints = malloc(wtext_len * sizeof(UINT32));
|
||||
UINT16* glyphIndices = malloc(wtext_len * sizeof(UINT16));
|
||||
int i;
|
||||
DWRITE_GLYPH_METRICS* gmetrics;
|
||||
int tw = 0;
|
||||
|
||||
wtext = malloc(wtext_len * 2); /* we get a weird buffer overflow when we try to free this later? allocate well above wtext_len then to prevent that. */
|
||||
memset(wtext, 0, wtext_len * 2);
|
||||
MultiByteToWideChar(CP_UTF8, 0, text, -1, wtext, wtext_len);
|
||||
|
||||
for(i = 0; i < wtext_len; i++) codepoints[i] = wtext[i];
|
||||
|
||||
IDWriteFontFace_GetMetrics(ttf->font_face, &metrics);
|
||||
|
||||
IDWriteFactory_CreateTextLayout(ttf->write_factory, wtext, wtext_len, ttf->text_format, 0, 0, &text_layout);
|
||||
|
||||
IDWriteFontFace_GetGlyphIndices(ttf->font_face, codepoints, wtext_len, glyphIndices);
|
||||
|
||||
gmetrics = malloc(wtext_len * sizeof(DWRITE_GLYPH_METRICS));
|
||||
|
||||
IDWriteFontFace_GetDesignGlyphMetrics(ttf->font_face, glyphIndices, wtext_len, gmetrics, FALSE);
|
||||
|
||||
for(i = 0; i < strlen(text); i++) {
|
||||
int add = (gmetrics[i].leftSideBearing) * ((float)ttf->px / (float)metrics.designUnitsPerEm);
|
||||
tw += add;
|
||||
}
|
||||
|
||||
free(wtext);
|
||||
|
||||
return tw;
|
||||
}
|
||||
|
||||
static int dw_MwTextWidth(MwFLFont ttf, const char* text) {
|
||||
IDWriteTextLayout* text_layout;
|
||||
DWRITE_FONT_METRICS metrics = {0};
|
||||
WCHAR* wtext = NULL;
|
||||
size_t wtext_len = MultiByteToWideChar(CP_UTF8, 0, text, -1, NULL, 0);
|
||||
UINT32* codepoints = malloc(wtext_len * sizeof(UINT32));
|
||||
UINT16* glyphIndices = malloc(wtext_len * sizeof(UINT16));
|
||||
int i;
|
||||
DWRITE_GLYPH_METRICS* gmetrics;
|
||||
int tw = 0;
|
||||
|
||||
wtext = malloc(wtext_len * 2); /* we get a weird buffer overflow when we try to free this later? allocate well above wtext_len then to prevent that. */
|
||||
memset(wtext, 0, wtext_len * 2);
|
||||
MultiByteToWideChar(CP_UTF8, 0, text, -1, wtext, wtext_len);
|
||||
|
||||
for(i = 0; i < wtext_len; i++) codepoints[i] = wtext[i];
|
||||
|
||||
IDWriteFontFace_GetMetrics(ttf->font_face, &metrics);
|
||||
|
||||
IDWriteFactory_CreateTextLayout(ttf->write_factory, wtext, wtext_len, ttf->text_format, 0, 0, &text_layout);
|
||||
|
||||
IDWriteFontFace_GetGlyphIndices(ttf->font_face, codepoints, wtext_len, glyphIndices);
|
||||
|
||||
gmetrics = malloc(wtext_len * sizeof(DWRITE_GLYPH_METRICS));
|
||||
|
||||
IDWriteFontFace_GetDesignGlyphMetrics(ttf->font_face, glyphIndices, wtext_len, gmetrics, FALSE);
|
||||
|
||||
for(i = 0; i < strlen(text); i++) {
|
||||
int add = (gmetrics[i].advanceWidth + gmetrics[i].leftSideBearing) * ((float)ttf->px / (float)metrics.designUnitsPerEm);
|
||||
tw += add;
|
||||
}
|
||||
|
||||
free(wtext);
|
||||
|
||||
return tw;
|
||||
}
|
||||
|
||||
static int dw_MwTextHeight(MwFLFont ttf, int count) {
|
||||
(void)count;
|
||||
return (IDWriteTextFormat2_GetFontSize(ttf->text_format) / 72.0f) * GetDeviceCaps(GetDC(NULL), LOGPIXELSY);
|
||||
}
|
||||
|
||||
static void dw_MwFontFree(void* handle) {
|
||||
MwFLFont ttf = handle;
|
||||
|
||||
free(ttf->data);
|
||||
free(ttf);
|
||||
}
|
||||
|
||||
/* ---- IUnknown ---- */
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE CTR_QueryInterface(
|
||||
IDWriteTextRenderer* iface, REFIID riid, void** ppvObject) {
|
||||
if(!ppvObject)
|
||||
return E_POINTER;
|
||||
|
||||
if(IsEqualGUID(riid, &IID_IUnknown) ||
|
||||
IsEqualGUID(riid, &IID_IDWritePixelSnapping) ||
|
||||
IsEqualGUID(riid, &IID_IDWriteTextRenderer)) {
|
||||
*ppvObject = iface;
|
||||
iface->lpVtbl->AddRef(iface);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
*ppvObject = NULL;
|
||||
return E_NOINTERFACE;
|
||||
}
|
||||
|
||||
static ULONG STDMETHODCALLTYPE CTR_AddRef(IDWriteTextRenderer* iface) {
|
||||
CustomTextRenderer* This = (CustomTextRenderer*)iface;
|
||||
return InterlockedIncrement(&This->refCount);
|
||||
}
|
||||
|
||||
static ULONG STDMETHODCALLTYPE CTR_Release(IDWriteTextRenderer* iface) {
|
||||
CustomTextRenderer* This = (CustomTextRenderer*)iface;
|
||||
LONG ref = InterlockedDecrement(&This->refCount);
|
||||
if(ref == 0)
|
||||
HeapFree(GetProcessHeap(), 0, This);
|
||||
return (ULONG)ref;
|
||||
}
|
||||
|
||||
/* ---- IDWritePixelSnapping (base interface, treated as "core") ---- */
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE CTR_IsPixelSnappingDisabled(
|
||||
IDWriteTextRenderer* iface, void* clientDrawingContext, BOOL* isDisabled) {
|
||||
(void)iface;
|
||||
(void)clientDrawingContext;
|
||||
if(!isDisabled)
|
||||
return E_POINTER;
|
||||
*isDisabled = FALSE;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE CTR_GetCurrentTransform(
|
||||
IDWriteTextRenderer* iface, void* clientDrawingContext, DWRITE_MATRIX* transform) {
|
||||
(void)iface;
|
||||
(void)clientDrawingContext;
|
||||
if(!transform)
|
||||
return E_POINTER;
|
||||
|
||||
transform->m11 = 1.0f;
|
||||
transform->m12 = 0.0f;
|
||||
transform->m21 = 0.0f;
|
||||
transform->m22 = 1.0f;
|
||||
transform->dx = 0.0f;
|
||||
transform->dy = 0.0f;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE CTR_GetPixelsPerDip(
|
||||
IDWriteTextRenderer* iface, void* clientDrawingContext, FLOAT* pixelsPerDip) {
|
||||
(void)iface;
|
||||
(void)clientDrawingContext;
|
||||
if(!pixelsPerDip)
|
||||
return E_POINTER;
|
||||
*pixelsPerDip = 1.0f;
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE CTR_DrawGlyphRun(
|
||||
IDWriteTextRenderer* iface,
|
||||
void* clientDrawingContext,
|
||||
FLOAT baselineOriginX,
|
||||
FLOAT baselineOriginY,
|
||||
DWRITE_MEASURING_MODE measuringMode,
|
||||
DWRITE_GLYPH_RUN const* glyphRun,
|
||||
DWRITE_GLYPH_RUN_DESCRIPTION const* glyphRunDescription,
|
||||
IUnknown* clientDrawingEffect) {
|
||||
IDWriteRenderingParams* params;
|
||||
CustomTextRenderer* This = (CustomTextRenderer*)iface;
|
||||
|
||||
(void)clientDrawingContext;
|
||||
(void)glyphRunDescription;
|
||||
(void)clientDrawingEffect;
|
||||
|
||||
IDWriteFactory6_CreateRenderingParams(This->write_factory, ¶ms);
|
||||
|
||||
return IDWriteBitmapRenderTarget_DrawGlyphRun(This->target, baselineOriginX, baselineOriginY, measuringMode, glyphRun, params, RGB(This->red, This->green, This->blue), NULL);
|
||||
}
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE CTR_DrawUnderline(
|
||||
IDWriteTextRenderer* iface,
|
||||
void* clientDrawingContext,
|
||||
FLOAT baselineOriginX,
|
||||
FLOAT baselineOriginY,
|
||||
DWRITE_UNDERLINE const* underline,
|
||||
IUnknown* clientDrawingEffect) {
|
||||
(void)iface;
|
||||
(void)clientDrawingContext;
|
||||
(void)baselineOriginX;
|
||||
(void)baselineOriginY;
|
||||
(void)underline;
|
||||
(void)clientDrawingEffect;
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE CTR_DrawStrikethrough(
|
||||
IDWriteTextRenderer* iface,
|
||||
void* clientDrawingContext,
|
||||
FLOAT baselineOriginX,
|
||||
FLOAT baselineOriginY,
|
||||
DWRITE_STRIKETHROUGH const* strikethrough,
|
||||
IUnknown* clientDrawingEffect) {
|
||||
(void)iface;
|
||||
(void)clientDrawingContext;
|
||||
(void)baselineOriginX;
|
||||
(void)baselineOriginY;
|
||||
(void)strikethrough;
|
||||
(void)clientDrawingEffect;
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
static HRESULT STDMETHODCALLTYPE CTR_DrawInlineObject(
|
||||
IDWriteTextRenderer* iface,
|
||||
void* clientDrawingContext,
|
||||
FLOAT originX,
|
||||
FLOAT originY,
|
||||
IDWriteInlineObject* inlineObject,
|
||||
BOOL isSideways,
|
||||
BOOL isRightToLeft,
|
||||
IUnknown* clientDrawingEffect) {
|
||||
(void)iface;
|
||||
(void)clientDrawingContext;
|
||||
(void)originX;
|
||||
(void)originY;
|
||||
(void)inlineObject;
|
||||
(void)isSideways;
|
||||
(void)isRightToLeft;
|
||||
(void)clientDrawingEffect;
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
/* ---- Vtable instance ---- */
|
||||
|
||||
static IDWriteTextRendererVtbl CTR_Vtbl = {
|
||||
CTR_QueryInterface,
|
||||
CTR_AddRef,
|
||||
CTR_Release,
|
||||
CTR_IsPixelSnappingDisabled,
|
||||
CTR_GetCurrentTransform,
|
||||
CTR_GetPixelsPerDip,
|
||||
CTR_DrawGlyphRun,
|
||||
CTR_DrawUnderline,
|
||||
CTR_DrawStrikethrough,
|
||||
CTR_DrawInlineObject};
|
||||
|
||||
/* ---- Constructor ---- */
|
||||
|
||||
static CustomTextRenderer* CustomTextRenderer_Create(IDWriteFactory6* write_factory, IDWriteBitmapRenderTarget* target, MwLLColor color) {
|
||||
CustomTextRenderer* obj =
|
||||
(CustomTextRenderer*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
|
||||
sizeof(CustomTextRenderer));
|
||||
if(!obj)
|
||||
return NULL;
|
||||
|
||||
obj->lpVtbl = &CTR_Vtbl;
|
||||
obj->refCount = 1;
|
||||
obj->write_factory = write_factory;
|
||||
obj->target = target;
|
||||
obj->red = color->common.red;
|
||||
obj->green = color->common.green;
|
||||
obj->blue = color->common.blue;
|
||||
|
||||
return obj;
|
||||
}
|
||||
|
||||
int MwFL_DWSetup(void) {
|
||||
HRESULT hr;
|
||||
HANDLE ole32lib;
|
||||
/* CoInitialize, to my knowledge, is avaliable on every Windows version we actually support. But as of writing, CI fails because a specific mingw won't link to it by default. I'm not gonna waste my time chancing that it will properly link to ole32 either. */
|
||||
HRESULT (*CoInitialize)(LPVOID pvReserved);
|
||||
|
||||
ole32lib = LoadLibrary("Ole32.dll");
|
||||
if(!ole32lib) {
|
||||
printf("ole32lib not found, cannot use DirectWrite\n");
|
||||
return 1;
|
||||
}
|
||||
CoInitialize = (HRESULT(*)(LPVOID pvReserved))GetProcAddress(ole32lib, "CoInitialize");
|
||||
if(!CoInitialize) {
|
||||
printf("CoInitialize not found, cannot use DirectWrite\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
CoInitialize(NULL);
|
||||
|
||||
/* Try and load DirectWrite. If it fails, return 1, signifying we default to bitmap drawing. */
|
||||
dw_table.d2d1_lib = LoadLibrary("D2d1.dll");
|
||||
if(!dw_table.d2d1_lib) {
|
||||
printf("D2d1.dll not found, cannot use DirectWrite\n");
|
||||
return 1;
|
||||
}
|
||||
dw_table.dwrite_lib = LoadLibrary("dwrite.dll");
|
||||
if(!dw_table.dwrite_lib) {
|
||||
printf("dwrite.dll not found, cannot use DirectWrite\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
#define D2D1_LOAD(x) \
|
||||
dw_table.x = (typeof(dw_table.x))GetProcAddress(dw_table.d2d1_lib, #x); \
|
||||
if(!dw_table.x) { \
|
||||
printf("Can't use DirectWrite, " #x " not found."); \
|
||||
return 1; \
|
||||
}
|
||||
|
||||
#define DWRITE_LOAD(x) \
|
||||
dw_table.x = (typeof(dw_table.x))GetProcAddress(dw_table.dwrite_lib, #x); \
|
||||
if(!dw_table.x) { \
|
||||
printf("Can't use DirectWrite, " #x " not found."); \
|
||||
return 1; \
|
||||
}
|
||||
|
||||
D2D1_LOAD(D2D1CreateFactory);
|
||||
DWRITE_LOAD(DWriteCreateFactory);
|
||||
|
||||
MwFLDrawText = dw_MwDrawText;
|
||||
MwFLTextWidth = dw_MwTextWidth;
|
||||
MwFLTextHeight = dw_MwTextHeight;
|
||||
MwFLFontLoad = dw_MwFontLoad;
|
||||
MwFLFontFree = dw_MwFontFree;
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
5398
src/text/dwrite.h
5398
src/text/dwrite.h
File diff suppressed because it is too large
Load diff
3252
src/text/dwrite_2.h
3252
src/text/dwrite_2.h
File diff suppressed because it is too large
Load diff
15009
src/text/dwrite_3.h
15009
src/text/dwrite_3.h
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,6 @@
|
|||
#include <Mw/Milsko.h>
|
||||
|
||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_DIRECTWRITE)
|
||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_GDI_TEXT)
|
||||
unsigned char MwBoldMonospaceTTFData[] = {
|
||||
0x00, 0x01, 0x00, 0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x04, 0x00, 0x10,
|
||||
0x46, 0x46, 0x54, 0x4d, 0xac, 0x0d, 0xe4, 0x44, 0x00, 0x00, 0x8d, 0x3c,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include <Mw/Milsko.h>
|
||||
|
||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_DIRECTWRITE)
|
||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_GDI_TEXT)
|
||||
unsigned char MwBoldTTFData[] = {
|
||||
0x00, 0x01, 0x00, 0x00, 0x00, 0x12, 0x01, 0x00, 0x00, 0x04, 0x00, 0x20,
|
||||
0x46, 0x46, 0x54, 0x4d, 0x94, 0x9f, 0x60, 0x18, 0x00, 0x00, 0x8e, 0xa8,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include <Mw/Milsko.h>
|
||||
|
||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_DIRECTWRITE)
|
||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_GDI_TEXT)
|
||||
unsigned char MwMonospaceTTFData[] = {
|
||||
0x00, 0x01, 0x00, 0x00, 0x00, 0x11, 0x01, 0x00, 0x00, 0x04, 0x00, 0x10,
|
||||
0x46, 0x46, 0x54, 0x4d, 0xac, 0x0d, 0xe4, 0x23, 0x00, 0x00, 0x8d, 0x3c,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include <Mw/Milsko.h>
|
||||
|
||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_DIRECTWRITE)
|
||||
#if defined(USE_STB_TRUETYPE) || defined(USE_FREETYPE2) || defined(USE_GDI_TEXT)
|
||||
unsigned char MwTTFData[] = {
|
||||
0x00, 0x01, 0x00, 0x00, 0x00, 0x12, 0x01, 0x00, 0x00, 0x04, 0x00, 0x20,
|
||||
0x46, 0x46, 0x54, 0x4d, 0x94, 0x92, 0x79, 0xd4, 0x00, 0x00, 0x89, 0xa4,
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ int (*MwFLTextHeightWithText)(MwFLFont ttf, const char* text) = NULL;
|
|||
void* (*MwFLFontLoad)(unsigned char* data, unsigned int size, int px) = NULL;
|
||||
void (*MwFLFontFree)(void* handle) = NULL;
|
||||
|
||||
#if defined(USE_FREETYPE2) || defined(USE_STB_TRUETYPE) || defined(USE_DIRECTWRITE)
|
||||
#if defined(USE_FREETYPE2) || defined(USE_STB_TRUETYPE) || defined(USE_GDI_TEXT)
|
||||
#define TTF
|
||||
#endif
|
||||
|
||||
|
|
@ -303,9 +303,6 @@ void MwFLSetup(void) {
|
|||
#ifdef USE_GDI_TEXT
|
||||
MwFL_GDISetup,
|
||||
#endif
|
||||
#ifdef USE_DIRECTWRITE
|
||||
MwFL_DWSetup,
|
||||
#endif
|
||||
#ifdef USE_FREETYPE2
|
||||
MwFL_FT2Setup,
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue