From 8266a15ac4bb949955455b5088da706af2fea823 Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Mon, 21 Aug 2023 00:50:45 +0300
Subject: [PATCH 01/20] Version up

---
 CHANGELOG                        | 3 +++
 include/lsp-plug.in/ws/version.h | 2 +-
 project.mk                       | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8dac056..20393ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 * RECENT CHANGES
 *******************************************************************************
 
+=== 1.0.14 ===
+
+
 === 1.0.13 ===
 * Updated build scripts.
 * Updated module versions in dependencies.
diff --git a/include/lsp-plug.in/ws/version.h b/include/lsp-plug.in/ws/version.h
index ad94e6e..cfeb3e5 100644
--- a/include/lsp-plug.in/ws/version.h
+++ b/include/lsp-plug.in/ws/version.h
@@ -24,7 +24,7 @@
 
 #define LSP_WS_LIB_MAJOR            1
 #define LSP_WS_LIB_MINOR            0
-#define LSP_WS_LIB_MICRO            13
+#define LSP_WS_LIB_MICRO            14
 
 #if defined(LSP_WS_LIB_PUBLISHER)
     #define LSP_WS_LIB_PUBLIC               LSP_EXPORT_MODIFIER
diff --git a/project.mk b/project.mk
index ca3a60a..3d23cb1 100644
--- a/project.mk
+++ b/project.mk
@@ -23,5 +23,5 @@ ARTIFACT_ID                 = LSP_WS_LIB
 ARTIFACT_NAME               = lsp-ws-lib
 ARTIFACT_DESC               = LSP window subsystem core library
 ARTIFACT_HEADERS            = lsp-plug.in
-ARTIFACT_VERSION            = 1.0.13
+ARTIFACT_VERSION            = 1.0.14-devel
 

From bc6197b7d56a604a4ebff236c490d448f42bb527 Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Tue, 29 Aug 2023 01:25:14 +0300
Subject: [PATCH 02/20] Fighting with custom fonts for Windows

---
 src/main/win/WinDDSurface.cpp |  2 +-
 src/main/win/WinDisplay.cpp   | 27 +++++++++++++++------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/main/win/WinDDSurface.cpp b/src/main/win/WinDDSurface.cpp
index 230c9f1..4a0ebb1 100644
--- a/src/main/win/WinDDSurface.cpp
+++ b/src/main/win/WinDDSurface.cpp
@@ -63,7 +63,7 @@ namespace lsp
 
             size_t WinDDShared::Release()
             {
-                size_t count = nReferences--;
+                size_t count = --nReferences;
                 if (count == 0)
                     delete this;
                 return count;
diff --git a/src/main/win/WinDisplay.cpp b/src/main/win/WinDisplay.cpp
index e29c738..df37877 100644
--- a/src/main/win/WinDisplay.cpp
+++ b/src/main/win/WinDisplay.cpp
@@ -662,6 +662,7 @@ namespace lsp
                 font_t *f = vCustomFonts.get(name);
                 if (f != NULL)
                     return STATUS_ALREADY_EXISTS;
+
                 if ((f = alloc_font(name)) == NULL)
                     return STATUS_NO_MEM;
                 lsp_finally{ drop_font(f); };
@@ -673,19 +674,19 @@ namespace lsp
                     return status_t(-length);
 
                 // Create file loader
-                f->file = new WinFontFileLoader(&os);
+                f->file = safe_acquire(new WinFontFileLoader(&os));
                 if (f->file == NULL)
                     return STATUS_NO_MEM;
-                f->file->AddRef();
+
                 hr = pDWriteFactory->RegisterFontFileLoader(f->file);
                 if (FAILED(hr))
                     return STATUS_UNKNOWN_ERR;
 
                 // Create collection loader
-                f->loader = new WinFontCollectionLoader();
+                f->loader = safe_acquire(new WinFontCollectionLoader());
                 if (f->loader == NULL)
                     return STATUS_NO_MEM;
-                f->loader->AddRef();
+
                 hr = pDWriteFactory->RegisterFontCollectionLoader(f->loader);
                 if (FAILED(hr))
                     return STATUS_UNKNOWN_ERR;
@@ -699,6 +700,7 @@ namespace lsp
                 UINT32 count = f->collection->GetFontFamilyCount();
                 if (count <= 0)
                     return STATUS_UNKNOWN_ERR;
+
                 f->collection->GetFontFamily(0, &f->family);
                 if ((FAILED(hr)) || (f->family == NULL))
                     return STATUS_UNKNOWN_ERR;
@@ -708,6 +710,7 @@ namespace lsp
                 hr = f->family->GetFamilyNames(&names);
                 if ((FAILED(hr)) || (names == NULL))
                     return STATUS_UNKNOWN_ERR;
+
                 lsp_finally{ safe_release(names); };
 
                 // Enumerate all possible font family names
@@ -728,6 +731,7 @@ namespace lsp
                     // The font has been found, add it to registry and exit
                     if (!vCustomFonts.create(name, f))
                         return STATUS_UNKNOWN_ERR;
+
                 #ifdef LSP_TRACE
                     LSPString out;
                     out.set_utf16(f->wname);
@@ -1063,13 +1067,9 @@ namespace lsp
             {
                 HRESULT hr;
 
-                // Obtain the system locale
-                const WCHAR *wLocale    = _wsetlocale(LC_ALL, NULL);
-                if (wLocale == NULL)
-                    wLocale         = L"en-us";
-
                 // Create text format
                 IDWriteTextFormat *tf   = NULL;
+
                 hr = pDWriteFactory->CreateTextFormat(
                     fname,                      // Font family name
                     fc,                         // Font collection (NULL sets it to use the system font collection)
@@ -1077,7 +1077,7 @@ namespace lsp
                     (f.italic()) ? DWRITE_FONT_STYLE_ITALIC : DWRITE_FONT_STYLE_NORMAL,
                     DWRITE_FONT_STRETCH_NORMAL,
                     f.size(),
-                    wLocale,
+                    L"",
                     &tf);
                 if ((FAILED(hr)) || (tf == NULL))
                 {
@@ -1092,7 +1092,7 @@ namespace lsp
                         DWRITE_FONT_STYLE_OBLIQUE,
                         DWRITE_FONT_STRETCH_NORMAL,
                         f.size(),
-                        wLocale,
+                        L"",
                         &tf);
                     if ((FAILED(hr)) || (tf == NULL))
                         return NULL;
@@ -1211,7 +1211,9 @@ namespace lsp
 
                 // Get text layout metrics and font metrics
                 DWRITE_TEXT_METRICS tm;
-                tl->GetMetrics(&tm);
+                HRESULT hr = tl->GetMetrics(&tm);
+                if (FAILED(hr))
+                    return false;
 
                 float ratio     = f.size() / float(fm.designUnitsPerEm);
                 tp->Width       = tm.widthIncludingTrailingWhitespace;
@@ -1229,6 +1231,7 @@ namespace lsp
                 const WCHAR *pText = (text != NULL) ? reinterpret_cast<const WCHAR *>(text->get_utf16(first, last)) : NULL;
                 if (pText == NULL)
                     return false;
+
                 size_t range = text->range_length(first, last);
 
                 // Obtain the font family

From 7487eed44758d57c3991a1d9db32353703ca7a83 Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Fri, 1 Sep 2023 14:40:08 +0300
Subject: [PATCH 03/20] Updated project file

---
 .cproject | 86 +++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 77 insertions(+), 9 deletions(-)

diff --git a/.cproject b/.cproject
index cf11c93..a760ba8 100644
--- a/.cproject
+++ b/.cproject
@@ -89,9 +89,6 @@
 							</tool>
 						</toolChain>
 					</folderInfo>
-					<fileInfo id="cdt.managedbuild.config.gnu.exe.debug.1006088949.855449491" name="main.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/test/main.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1203487925.462668593">
-						<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1203487925.462668593" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1203487925"/>
-					</fileInfo>
 					<sourceEntries>
 						<entry excluding="modules/lsp-dsp-lib/src/test/main.cpp|modules/lsp-r3d-wgl-lib/src/test/main.cpp|modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-r3d-glx-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp|modules/lsp-runtime-lib/src/test/main.cpp|modules/lsp-r3d-base-lib/src/test/main.cpp|modules/lsp-lltl-lib/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
@@ -145,9 +142,6 @@
 							</tool>
 						</toolChain>
 					</folderInfo>
-					<fileInfo id="cdt.managedbuild.config.gnu.exe.release.2093466427.1267403702" name="main.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/test/main.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.675932511.2029411196">
-						<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.675932511.2029411196" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.675932511"/>
-					</fileInfo>
 					<sourceEntries>
 						<entry excluding="modules/lsp-dsp-lib/src/test/main.cpp|modules/lsp-r3d-wgl-lib/src/test/main.cpp|modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-r3d-glx-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp|modules/lsp-runtime-lib/src/test/main.cpp|modules/lsp-r3d-base-lib/src/test/main.cpp|modules/lsp-lltl-lib/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
@@ -185,6 +179,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-r3d-wgl-lib/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-runtime-lib/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-common-lib/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-dsp-lib/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-lltl-lib/include}&quot;"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.1394769691" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
@@ -204,7 +199,11 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-test-fw/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-lltl-lib/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-r3d-base-lib/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-r3d-iface/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-r3d-wgl-lib/include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-common-lib/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-dsp-lib/include}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/modules/lsp-lltl-lib/include}&quot;"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.preprocessor.def.symbols.1740830576" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="LSP_IDE_DEBUG"/>
@@ -240,8 +239,77 @@
 							</tool>
 						</toolChain>
 					</folderInfo>
-					<fileInfo id="cdt.managedbuild.config.gnu.exe.debug.1006088949.1786573548.1188655569" name="main.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/test/main.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992.993933867">
-						<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992.993933867" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992"/>
+					<fileInfo id="cdt.managedbuild.config.gnu.exe.debug.1006088949.1786573548.1973163312" name="sse3.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/main/x86/sse3.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992.1778206551">
+						<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992.1778206551" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992">
+							<option id="gnu.cpp.compiler.option.other.other.822865306" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -msse -msse2 -msse3 -mssse3" valueType="string"/>
+							<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1948661925" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+						</tool>
+						<tool customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1173142162" name="Resource Custom Build Step">
+							<inputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.inputtype.2122033903" name="Resource Custom Build Step Input Type">
+								<additionalInput kind="additionalinputdependency" paths=""/>
+							</inputType>
+							<outputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.outputtype.609511051" name="Resource Custom Build Step Output Type"/>
+						</tool>
+					</fileInfo>
+					<fileInfo id="cdt.managedbuild.config.gnu.exe.debug.1006088949.1786573548.1317540636" name="avx.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/main/x86/avx.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992.521380056">
+						<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992.521380056" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992">
+							<option id="gnu.cpp.compiler.option.other.other.906791138" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -mavx" valueType="string"/>
+							<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1351744238" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+						</tool>
+						<tool customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.359315293" name="Resource Custom Build Step">
+							<inputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.inputtype.1012684327" name="Resource Custom Build Step Input Type">
+								<additionalInput kind="additionalinputdependency" paths=""/>
+							</inputType>
+							<outputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.outputtype.569698827" name="Resource Custom Build Step Output Type"/>
+						</tool>
+					</fileInfo>
+					<fileInfo id="cdt.managedbuild.config.gnu.exe.debug.1006088949.1786573548.826603074" name="sse4.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/main/x86/sse4.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992.1492076728">
+						<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992.1492076728" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992">
+							<option id="gnu.cpp.compiler.option.other.other.104518172" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4a" valueType="string"/>
+							<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1115064533" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+						</tool>
+						<tool customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1404802796" name="Resource Custom Build Step">
+							<inputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.inputtype.2009309518" name="Resource Custom Build Step Input Type">
+								<additionalInput kind="additionalinputdependency" paths=""/>
+							</inputType>
+							<outputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.outputtype.606952725" name="Resource Custom Build Step Output Type"/>
+						</tool>
+					</fileInfo>
+					<fileInfo id="cdt.managedbuild.config.gnu.exe.debug.1006088949.1786573548.511642143" name="sse.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/main/x86/sse.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992.353846204">
+						<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992.353846204" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992">
+							<option id="gnu.cpp.compiler.option.other.other.40707639" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -msse" valueType="string"/>
+							<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.92804767" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+						</tool>
+						<tool customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.2106694089" name="Resource Custom Build Step">
+							<inputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.inputtype.581573296" name="Resource Custom Build Step Input Type">
+								<additionalInput kind="additionalinputdependency" paths=""/>
+							</inputType>
+							<outputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.outputtype.1555762383" name="Resource Custom Build Step Output Type"/>
+						</tool>
+					</fileInfo>
+					<fileInfo id="cdt.managedbuild.config.gnu.exe.debug.1006088949.1786573548.1571315291" name="sse2.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/main/x86/sse2.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992.453919574">
+						<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992.453919574" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992">
+							<option id="gnu.cpp.compiler.option.other.other.914327845" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -msse -msse2" valueType="string"/>
+							<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.2051479165" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+						</tool>
+						<tool customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.1745913994" name="Resource Custom Build Step">
+							<inputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.inputtype.752825294" name="Resource Custom Build Step Input Type">
+								<additionalInput kind="additionalinputdependency" paths=""/>
+							</inputType>
+							<outputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.outputtype.920429147" name="Resource Custom Build Step Output Type"/>
+						</tool>
+					</fileInfo>
+					<fileInfo id="cdt.managedbuild.config.gnu.exe.debug.1006088949.1786573548.1692984727" name="avx2.cpp" rcbsApplicability="disable" resourcePath="modules/lsp-dsp-lib/src/main/x86/avx2.cpp" toolsToInvoke="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992.2063164285">
+						<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992.2063164285" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.772178992">
+							<option id="gnu.cpp.compiler.option.other.other.125015310" superClass="gnu.cpp.compiler.option.other.other" useByScannerDiscovery="false" value="-c -fmessage-length=0 -mavx -mavx2" valueType="string"/>
+							<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1403254847" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+						</tool>
+						<tool customBuildStep="true" id="org.eclipse.cdt.managedbuilder.ui.rcbs.705973846" name="Resource Custom Build Step">
+							<inputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.inputtype.1984643885" name="Resource Custom Build Step Input Type">
+								<additionalInput kind="additionalinputdependency" paths=""/>
+							</inputType>
+							<outputType id="org.eclipse.cdt.managedbuilder.ui.rcbs.outputtype.652793881" name="Resource Custom Build Step Output Type"/>
+						</tool>
 					</fileInfo>
 					<sourceEntries>
 						<entry excluding="modules/lsp-dsp-lib/src/test/main.cpp|modules/lsp-r3d-wgl-lib/src/test/main.cpp|modules/lsp-r3d-iface/src/test/main.cpp|modules/lsp-r3d-glx-lib/src/test/main.cpp|modules/lsp-test-fw/src/test/main.cpp|modules/lsp-runtime-lib/src/test/main.cpp|modules/lsp-r3d-base-lib/src/test/main.cpp|modules/lsp-lltl-lib/src/test/main.cpp|modules/lsp-common-lib/src/test/main.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
@@ -286,4 +354,4 @@
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-</cproject>
\ No newline at end of file
+</cproject>

From c086d40a76a0ffe49551dbe321c0419deb0d9710 Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Fri, 1 Sep 2023 16:12:49 +0300
Subject: [PATCH 04/20] WIP

---
 include/private/win/WinDisplay.h |  4 +-
 src/main/win/WinDisplay.cpp      | 84 ++++++++++++++++++++++++--------
 src/test/mtest/display/font2.cpp |  9 +++-
 src/test/mtest/display/rtext.cpp |  4 ++
 4 files changed, 77 insertions(+), 24 deletions(-)

diff --git a/include/private/win/WinDisplay.h b/include/private/win/WinDisplay.h
index 5883c8a..d7c2253 100644
--- a/include/private/win/WinDisplay.h
+++ b/include/private/win/WinDisplay.h
@@ -126,12 +126,14 @@ namespace lsp
                     IDWriteTextLayout          *create_text_layout(const Font &f, const WCHAR *fname, IDWriteFontCollection *fc, IDWriteFontFamily *ff, const WCHAR *string, size_t length);
                     IDWriteFontFamily          *get_font_family(const Font &f, LSPString *name, font_t **custom);
                     bool                        get_font_metrics(const Font &f, IDWriteFontFamily *ff, DWRITE_FONT_METRICS *metrics);
+                    IDWriteFont                *get_font(const Font &f, IDWriteFontFamily *ff);
+                    IDWriteFontFace            *get_font_face(const Font &f, IDWriteFontFamily *ff);
                     static void                 drop_font_cache(font_cache_t *cache);
                     bool                        create_font_cache();
                     void                        drop_font(font_t *f);
                     static font_t              *alloc_font(const char *name);
                     font_t                     *get_custom_font_collection(const char *name);
-                    bool                        try_get_text_parameters(const Font &f, const WCHAR *fname, IDWriteFontCollection *fc, IDWriteFontFamily *ff, text_parameters_t *tp, const WCHAR *text, ssize_t length);
+                    bool                        try_get_text_parameters(const Font &f, const WCHAR *fname, IDWriteFontCollection *fc, IDWriteFontFamily *ff, text_parameters_t *tp, const UINT32 *text, size_t length);
 
                     status_t                    install_windows_hooks();
                     status_t                    uninstall_windows_hooks();
diff --git a/src/main/win/WinDisplay.cpp b/src/main/win/WinDisplay.cpp
index df37877..2b1d906 100644
--- a/src/main/win/WinDisplay.cpp
+++ b/src/main/win/WinDisplay.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
- *           (C) 2020 Vladimir Sadovnikov <sadko4u@gmail.com>
+ * Copyright (C) 2023 Linux Studio Plugins Project <https://lsp-plug.in/>
+ *           (C) 2023 Vladimir Sadovnikov <sadko4u@gmail.com>
  *
  * This file is part of lsp-ws-lib
  * Created on: 1 июл. 2022 г.
@@ -1136,30 +1136,49 @@ namespace lsp
                 }
             }
 
-            bool WinDisplay::get_font_metrics(const Font &f, IDWriteFontFamily *ff, DWRITE_FONT_METRICS *metrics)
+            IDWriteFont *WinDisplay::get_font(const Font &f, IDWriteFontFamily *ff)
             {
-                HRESULT hr;
-
-                // Find the matching font
                 DWRITE_FONT_WEIGHT fWeight  = (f.bold())   ? DWRITE_FONT_WEIGHT_BOLD  : DWRITE_FONT_WEIGHT_REGULAR;
                 DWRITE_FONT_STYLE fStyle    = (f.italic()) ? DWRITE_FONT_STYLE_ITALIC : DWRITE_FONT_STYLE_NORMAL;
                 DWRITE_FONT_STRETCH fStretch= DWRITE_FONT_STRETCH_NORMAL;
-
                 IDWriteFont* font = NULL;
-                hr = ff->GetFirstMatchingFont(fWeight, fStretch, fStyle, &font);
+
+                HRESULT hr = ff->GetFirstMatchingFont(fWeight, fStretch, fStyle, &font);
                 if ((FAILED(hr)) || (font == NULL))
                 {
                     if (!f.italic())
-                        return false;
+                        return NULL;
                     hr = ff->GetFirstMatchingFont(fWeight, fStretch, DWRITE_FONT_STYLE_OBLIQUE, &font);
                     if ((FAILED(hr)) || (font == NULL))
-                        return false;
+                        return NULL;
                 }
-                lsp_finally{ safe_release(font); };
+
+                return font;
+            }
+
+            IDWriteFontFace *WinDisplay::get_font_face(const Font &f, IDWriteFontFamily *ff)
+            {
+                // Find the matching font
+                IDWriteFont* font = get_font(f, ff);
+                if (font == NULL)
+                    return false;
+                lsp_finally { safe_release(font); };
+
+                IDWriteFontFace *face = NULL;
+                HRESULT hr = font->CreateFontFace(&face);
+                return ((FAILED(hr)) || (face == NULL)) ? NULL : face;
+            }
+
+            bool WinDisplay::get_font_metrics(const Font &f, IDWriteFontFamily *ff, DWRITE_FONT_METRICS *metrics)
+            {
+                // Find the matching font
+                IDWriteFont* font = get_font(f, ff);
+                if (font == NULL)
+                    return false;
+                lsp_finally { safe_release(font); };
 
                 // Get font metrics
                 font->GetMetrics(metrics);
-
                 return true;
             }
 
@@ -1195,15 +1214,38 @@ namespace lsp
                 IDWriteFontCollection *fc,
                 IDWriteFontFamily *ff,
                 text_parameters_t *tp,
-                const WCHAR *text,
-                ssize_t length)
+                const UINT32 *text,
+                size_t length)
             {
+                HRESULT hr;
+
                 // Obtain font metrics
                 DWRITE_FONT_METRICS fm;
                 if (!get_font_metrics(f, ff, &fm))
                     return false;
 
-                // Create text layout
+                // Get font face
+                IDWriteFontFace *face = get_font_face(f, ff);
+                if (face == NULL)
+                    return false;
+                lsp_finally { safe_release(face); };
+
+                // Allocate space for glyphs and glyph indices
+                UINT16 *glyphIndices = malloc(length * sizeof(UINT16));
+                if (glyphIndices == NULL)
+                    return false;
+                lsp_finally { free(glyphIndices); };
+
+                // Get glyph indices
+                hr = face->GetGlyphIndices(text, length, glyphIndices);
+                if (FAILED(hr))
+                    return false;
+
+
+
+                face->GetGlyphIndices();
+
+/*                // Create text layout
                 IDWriteTextLayout *tl   = create_text_layout(f, fname, fc, ff, text, length);
                 if (tl == NULL)
                     return false;
@@ -1221,18 +1263,18 @@ namespace lsp
                 tp->XAdvance    = tm.widthIncludingTrailingWhitespace;
                 tp->YAdvance    = tp->Height;
                 tp->XBearing    = (f.italic()) ? sinf(0.033f * M_PI) * tp->Height : 0.0f;
-                tp->YBearing    = - fm.capHeight * ratio;
+                tp->YBearing    = - fm.capHeight * ratio;*/
 
                 return true;
             }
 
             bool WinDisplay::get_text_parameters(const Font &f, text_parameters_t *tp, const LSPString *text, ssize_t first, ssize_t last)
             {
-                const WCHAR *pText = (text != NULL) ? reinterpret_cast<const WCHAR *>(text->get_utf16(first, last)) : NULL;
-                if (pText == NULL)
+                if ((first < 0) || (last < 0) || (last < first))
                     return false;
 
-                size_t range = text->range_length(first, last);
+                size_t range    = last - first;
+                const lsp_wchar_t *data = text->characters();
 
                 // Obtain the font family
                 LSPString family_name;
@@ -1243,9 +1285,9 @@ namespace lsp
                 // Process custom font first
                 bool found = false;
                 if (custom != NULL)
-                    found = try_get_text_parameters(f, custom->wname, custom->collection, custom->family, tp, pText, range);
+                    found = try_get_text_parameters(f, custom->wname, custom->collection, custom->family, tp, &data[first], range);
                 if ((!found) && (ff != NULL))
-                    found = try_get_text_parameters(f, family_name.get_utf16(), NULL, ff, tp, pText, range);
+                    found = try_get_text_parameters(f, family_name.get_utf16(), NULL, ff, tp, &data[first], range);
 
                 return found;
             }
diff --git a/src/test/mtest/display/font2.cpp b/src/test/mtest/display/font2.cpp
index 144f976..b5dc7f8 100644
--- a/src/test/mtest/display/font2.cpp
+++ b/src/test/mtest/display/font2.cpp
@@ -24,6 +24,9 @@
 #include <lsp-plug.in/stdlib/math.h>
 #include <lsp-plug.in/test-fw/mtest.h>
 
+#include <locale.h>
+#include <wchar.h>
+
 MTEST_BEGIN("ws.display", font2)
 
     class Handler: public ws::IEventHandler
@@ -74,7 +77,7 @@ MTEST_BEGIN("ws.display", font2)
 
                             s->get_font_parameters(f, &fp);
                             s->get_text_parameters(f, &tp1, "Text");
-                            s->get_text_parameters(f, &tp2, " Text");
+                            s->get_text_parameters(f, &tp2, " Текст");
 
                             // Text bar 1
                             c.alpha(0.0f);
@@ -121,7 +124,7 @@ MTEST_BEGIN("ws.display", font2)
                             // Output text
                             c.set_rgb24(0x000000);
                             c.alpha(0.25f);
-                            s->out_text(f, c, x, y, " Text");
+                            s->out_text(f, c, x, y, " Текст");
                         }
 
                         s->end();
@@ -157,6 +160,8 @@ MTEST_BEGIN("ws.display", font2)
             delete wnd;
         };
 
+        _wsetlocale(LC_ALL, L"en_US");
+
         io::Path font;
         MTEST_ASSERT(font.fmt("%s/font/NotoSansDisplay-Regular.ttf", resources()));
         MTEST_ASSERT(dpy->add_font("noto-sans", &font) == STATUS_OK);
diff --git a/src/test/mtest/display/rtext.cpp b/src/test/mtest/display/rtext.cpp
index f64e46b..4391165 100644
--- a/src/test/mtest/display/rtext.cpp
+++ b/src/test/mtest/display/rtext.cpp
@@ -23,6 +23,8 @@
 #include <lsp-plug.in/ws/IEventHandler.h>
 #include <lsp-plug.in/stdlib/math.h>
 #include <lsp-plug.in/test-fw/mtest.h>
+#include <locale.h>
+#include <wchar.h>
 
 MTEST_BEGIN("ws.display", rtext)
 
@@ -117,6 +119,8 @@ MTEST_BEGIN("ws.display", rtext)
             delete wnd;
         };
 
+        _wsetlocale(LC_ALL, L"en_US");
+
         MTEST_ASSERT(wnd->init() == STATUS_OK);
         MTEST_ASSERT(wnd->set_caption("Test relative text") == STATUS_OK);
         MTEST_ASSERT(wnd->set_window_actions(ws::WA_MOVE | ws::WA_CLOSE) == STATUS_OK);

From 7a5cc620a0cc1d98af820b13d022bb5a13867713 Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Fri, 1 Sep 2023 23:52:55 +0300
Subject: [PATCH 05/20] Migrated to glyph runs instead of IDWriteTextLayout

---
 include/private/win/WinDDSurface.h |   8 +-
 include/private/win/WinDisplay.h   |   7 +-
 include/private/win/fonts.h        |  20 +++-
 src/main/win/WinDDSurface.cpp      | 169 +++++++++++++++++++++--------
 src/main/win/WinDisplay.cpp        | 114 +++++++++++++++++--
 src/main/win/fonts.cpp             |  48 +++++++-
 6 files changed, 300 insertions(+), 66 deletions(-)

diff --git a/include/private/win/WinDDSurface.h b/include/private/win/WinDDSurface.h
index 091ff70..9b441ac 100644
--- a/include/private/win/WinDDSurface.h
+++ b/include/private/win/WinDDSurface.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
- *           (C) 2020 Vladimir Sadovnikov <sadko4u@gmail.com>
+ * Copyright (C) 2023 Linux Studio Plugins Project <https://lsp-plug.in/>
+ *           (C) 2023 Vladimir Sadovnikov <sadko4u@gmail.com>
  *
  * This file is part of lsp-ws-lib
  * Created on: 5 июл. 2022 г.
@@ -89,8 +89,8 @@ namespace lsp
                     void    draw_negative_arc(ID2D1Brush *brush, float x0, float y0, float x1, float y1, float x2, float y2);
                     void    draw_polygon(ID2D1Brush *brush, const float *x, const float *y, size_t n, float width);
 
-                    bool    try_out_text(IDWriteFontCollection *fc, IDWriteFontFamily *ff, const WCHAR *family, const Font &f, const Color &color, float x, float y, const WCHAR *text, size_t length);
-                    bool    try_out_text_relative(IDWriteFontCollection *fc, IDWriteFontFamily *ff, const WCHAR *family, const Font &f, const Color &color, float x, float y, float dx, float dy, const WCHAR *text, size_t length);
+                    bool    try_out_text(IDWriteFontCollection *fc, IDWriteFontFamily *ff, const WCHAR *family, const Font &f, const Color &color, float x, float y, const lsp_wchar_t *text, size_t length);
+                    bool    try_out_text_relative(IDWriteFontCollection *fc, IDWriteFontFamily *ff, const WCHAR *family, const Font &f, const Color &color, float x, float y, float dx, float dy, const lsp_wchar_t *text, size_t length);
 
                 public:
                     virtual IDisplay *display() override;
diff --git a/include/private/win/WinDisplay.h b/include/private/win/WinDisplay.h
index d7c2253..b3cd4a2 100644
--- a/include/private/win/WinDisplay.h
+++ b/include/private/win/WinDisplay.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
- *           (C) 2020 Vladimir Sadovnikov <sadko4u@gmail.com>
+ * Copyright (C) 2023 Linux Studio Plugins Project <https://lsp-plug.in/>
+ *           (C) 2023 Vladimir Sadovnikov <sadko4u@gmail.com>
  *
  * This file is part of lsp-ws-lib
  * Created on: 1 июл. 2022 г.
@@ -39,6 +39,8 @@
 #include <d2d1.h>
 #include <dwrite.h>
 
+#include <private/win/fonts.h>
+
 //-----------------------------------------------------------------------------
 // Some specific definitions
 #ifndef WM_MOUSEHWHEEL
@@ -134,6 +136,7 @@ namespace lsp
                     static font_t              *alloc_font(const char *name);
                     font_t                     *get_custom_font_collection(const char *name);
                     bool                        try_get_text_parameters(const Font &f, const WCHAR *fname, IDWriteFontCollection *fc, IDWriteFontFamily *ff, text_parameters_t *tp, const UINT32 *text, size_t length);
+                    win::glyph_run_t           *make_glyph_run(const Font &f, IDWriteFontFace *face, const DWRITE_FONT_METRICS *fm, const UINT32 *text, size_t length);
 
                     status_t                    install_windows_hooks();
                     status_t                    uninstall_windows_hooks();
diff --git a/include/private/win/fonts.h b/include/private/win/fonts.h
index 8d5931f..6b29ae8 100644
--- a/include/private/win/fonts.h
+++ b/include/private/win/fonts.h
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
- *           (C) 2020 Vladimir Sadovnikov <sadko4u@gmail.com>
+ * Copyright (C) 2023 Linux Studio Plugins Project <https://lsp-plug.in/>
+ *           (C) 2023 Vladimir Sadovnikov <sadko4u@gmail.com>
  *
  * This file is part of lsp-ws-lib
  * Created on: 13 июл. 2022 г.
@@ -28,7 +28,10 @@
 
 #include <lsp-plug.in/common/status.h>
 #include <lsp-plug.in/io/IInStream.h>
+#include <lsp-plug.in/io/OutMemoryStream.h>
 #include <lsp-plug.in/lltl/darray.h>
+#include <lsp-plug.in/ws/Font.h>
+#include <lsp-plug.in/ws/types.h>
 
 #include <private/win/com.h>
 
@@ -45,6 +48,12 @@ namespace lsp
             class WinFontFileEnumerator;
             class WinFontCollectionLoader;
 
+            typedef struct glyph_run_t
+            {
+                const DWRITE_GLYPH_RUN        *run;
+                const DWRITE_GLYPH_METRICS    *metrics;
+            } glyph_run_t;
+
             /**
              * Custom implementation of IDWriteFontFileStream interface for collections
              * of fonts embedded in the application as resources. The font collection
@@ -146,6 +155,13 @@ namespace lsp
                         IDWriteFontFileEnumerator **fontFileEnumerator) override;
             };
 
+            void calc_text_metrics(
+                const Font &f,
+                text_parameters_t *tp,
+                const DWRITE_FONT_METRICS *fm,
+                const DWRITE_GLYPH_METRICS *metrics,
+                size_t length);
+
         } /* namespace win */
     } /* namespace ws */
 } /* namespace lsp */
diff --git a/src/main/win/WinDDSurface.cpp b/src/main/win/WinDDSurface.cpp
index 4a0ebb1..3d8ec27 100644
--- a/src/main/win/WinDDSurface.cpp
+++ b/src/main/win/WinDDSurface.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
- *           (C) 2020 Vladimir Sadovnikov <sadko4u@gmail.com>
+ * Copyright (C) 2023 Linux Studio Plugins Project <https://lsp-plug.in/>
+ *           (C) 2023 Vladimir Sadovnikov <sadko4u@gmail.com>
  *
  * This file is part of lsp-ws-lib
  * Created on: 5 июл. 2022 г.
@@ -1489,13 +1489,31 @@ namespace lsp
                     out_text(f, color, x, y, &tmp, 0, tmp.length());
             }
 
-            bool WinDDSurface::try_out_text(IDWriteFontCollection *fc, IDWriteFontFamily *ff, const WCHAR *family, const Font &f, const Color &color, float x, float y, const WCHAR *text, size_t length)
+            bool WinDDSurface::try_out_text(IDWriteFontCollection *fc, IDWriteFontFamily *ff, const WCHAR *family, const Font &f, const Color &color, float x, float y, const lsp_wchar_t *text, size_t length)
             {
-                // Create text layout
-                IDWriteTextLayout *tl   = pShared->pDisplay->create_text_layout(f, family, fc, ff, text, length);
-                if (tl == NULL)
+//                HRESULT hr;
+
+                // Get font face
+                IDWriteFontFace *face   = pShared->pDisplay->get_font_face(f, ff);
+                if (face == NULL)
+                    return false;
+                lsp_finally { safe_release(face); };
+
+                // Obtain font metrics
+                DWRITE_FONT_METRICS fm;
+                face->GetMetrics(&fm);
+
+                // Create glyph run
+                win::glyph_run_t *run   = pShared->pDisplay->make_glyph_run(f, face, &fm, text, length);
+                if (run == NULL)
                     return false;
-                lsp_finally{ safe_release(tl); };
+                lsp_finally { free(run); };
+
+//                // Create text layout
+//                IDWriteTextLayout *tl   = pShared->pDisplay->create_text_layout(f, family, fc, ff, text, length);
+//                if (tl == NULL)
+//                    return false;
+//                lsp_finally{ safe_release(tl); };
 
                 // Create brush
                 ID2D1SolidColorBrush *brush = NULL;
@@ -1517,11 +1535,18 @@ namespace lsp
                     default:
                         break;
                 }
-                pDC->DrawTextLayout(
-                    D2D1::Point2F(x, y),
-                    tl,
+
+                pDC->DrawGlyphRun(
+                    D2D1_POINT_2F{x, y},
+                    run->run,
                     brush,
-                    D2D1_DRAW_TEXT_OPTIONS_NONE);
+                    DWRITE_MEASURING_MODE_NATURAL);
+
+//                pDC->DrawTextLayout(
+//                    D2D1::Point2F(x, y),
+//                    tl,
+//                    brush,
+//                    D2D1_DRAW_TEXT_OPTIONS_NONE);
                 pDC->SetTextAntialiasMode(antialias);
 
                 return true;
@@ -1531,10 +1556,11 @@ namespace lsp
             {
                 if (bad_state())
                     return;
-                const WCHAR *pText = (text != NULL) ? reinterpret_cast<const WCHAR *>(text->get_utf16(first, last)) : NULL;
-                if (pText == NULL)
+                if ((first < 0) || (last < 0) || (first >= last))
                     return;
-                size_t length = text->range_length(first, last);
+
+                size_t range    = text->range_length(first, last);
+                const lsp_wchar_t *data = text->characters();
 
                 // Obtain the font family
                 LSPString family_name;
@@ -1544,12 +1570,12 @@ namespace lsp
 
                 if (custom != NULL)
                 {
-                    if (try_out_text(custom->collection, custom->family, custom->wname, f, color, x, y, pText, length))
+                    if (try_out_text(custom->collection, custom->family, custom->wname, f, color, x, y, &data[first], range))
                         return;
                 }
                 if (ff != NULL)
                 {
-                    if (try_out_text(NULL, ff, family_name.get_utf16(), f, color, x, y, pText, length))
+                    if (try_out_text(NULL, ff, family_name.get_utf16(), f, color, x, y, &data[first], range))
                         return;
                 }
             }
@@ -1568,18 +1594,22 @@ namespace lsp
                 return out_text_relative(f, color, x, y, dx, dy, &tmp, 0, tmp.length());
             }
 
-            bool WinDDSurface::try_out_text_relative(IDWriteFontCollection *fc, IDWriteFontFamily *ff, const WCHAR *family, const Font &f, const Color &color, float x, float y, float dx, float dy, const WCHAR *text, size_t length)
+            bool WinDDSurface::try_out_text_relative(IDWriteFontCollection *fc, IDWriteFontFamily *ff, const WCHAR *family, const Font &f, const Color &color, float x, float y, float dx, float dy, const lsp_wchar_t *text, size_t length)
             {
+                IDWriteFontFace *face   = pShared->pDisplay->get_font_face(f, ff);
+                if (face == NULL)
+                    return false;
+                lsp_finally { safe_release(face); };
+
                 // Obtain font metrics
                 DWRITE_FONT_METRICS fm;
-                if (!pShared->pDisplay->get_font_metrics(f, ff, &fm))
-                    return false;
+                face->GetMetrics(&fm);
 
-                // Create text layout
-                IDWriteTextLayout *tl   = pShared->pDisplay->create_text_layout(f, family, fc, ff, text, length);
-                if (tl == NULL)
+                // Create glyph run
+                win::glyph_run_t *run   = pShared->pDisplay->make_glyph_run(f, face, &fm, text, length);
+                if (run == NULL)
                     return false;
-                lsp_finally{ safe_release(tl); };
+                lsp_finally { free(run); };
 
                 // Create brush
                 ID2D1SolidColorBrush *brush = NULL;
@@ -1587,19 +1617,6 @@ namespace lsp
                     return false;
                 lsp_finally{ safe_release(brush); };
 
-                // Get text layout metrics and font metrics
-                DWRITE_TEXT_METRICS tm;
-                tl->GetMetrics(&tm);
-
-                // Compute the text position
-                float ratio     = f.size() / float(fm.designUnitsPerEm);
-                float height    = (fm.ascent + fm.descent + fm.lineGap) * ratio;
-                float xbearing  = (f.italic()) ? sinf(0.033f * M_PI) * height : 0.0f;
-                float r_w       = tm.width;
-                float r_h       = fm.capHeight * ratio;
-                float fx        = x - xbearing - r_w * 0.5f + (r_w + 4.0f) * 0.5f * dx;
-                float fy        = y + r_h * 0.5f - (r_h + 4.0f) * 0.5f * dy;
-
                 // Draw the text
                 D2D1_TEXT_ANTIALIAS_MODE antialias = pDC->GetTextAntialiasMode();
                 switch (f.antialias())
@@ -1615,13 +1632,74 @@ namespace lsp
                         break;
                 }
 
-                pDC->DrawTextLayout(
-                    D2D1::Point2F(fx, fy),
-                    tl,
+                ws::text_parameters_t tp;
+                calc_text_metrics(f, &tp, &fm, run->metrics, length);
+
+                float r_w       = tp.Width;
+                float r_h       = tp.Height;
+                float fx        = x - tp.XBearing - r_w * 0.5f + (r_w + 4.0f) * 0.5f * dx;
+                float fy        = y + r_h * 0.5f - (r_h + 4.0f) * 0.5f * dy;
+
+                pDC->DrawGlyphRun(
+                    D2D1_POINT_2F{fx, fy},
+                    run->run,
                     brush,
-                    D2D1_DRAW_TEXT_OPTIONS_NONE);
+                    DWRITE_MEASURING_MODE_NATURAL);
+
                 pDC->SetTextAntialiasMode(antialias);
 
+                // Obtain font metrics
+//                DWRITE_FONT_METRICS fm;
+//                if (!pShared->pDisplay->get_font_metrics(f, ff, &fm))
+//                    return false;
+//
+//                // Create text layout
+//                IDWriteTextLayout *tl   = pShared->pDisplay->create_text_layout(f, family, fc, ff, text, length);
+//                if (tl == NULL)
+//                    return false;
+//                lsp_finally{ safe_release(tl); };
+//
+//                // Create brush
+//                ID2D1SolidColorBrush *brush = NULL;
+//                if (FAILED(pDC->CreateSolidColorBrush(d2d_color(color), &brush)))
+//                    return false;
+//                lsp_finally{ safe_release(brush); };
+//
+//                // Get text layout metrics and font metrics
+//                DWRITE_TEXT_METRICS tm;
+//                tl->GetMetrics(&tm);
+//
+//                // Compute the text position
+//                float ratio     = f.size() / float(fm.designUnitsPerEm);
+//                float height    = (fm.ascent + fm.descent + fm.lineGap) * ratio;
+//                float xbearing  = (f.italic()) ? sinf(0.033f * M_PI) * height : 0.0f;
+//                float r_w       = tm.width;
+//                float r_h       = fm.capHeight * ratio;
+//                float fx        = x - xbearing - r_w * 0.5f + (r_w + 4.0f) * 0.5f * dx;
+//                float fy        = y + r_h * 0.5f - (r_h + 4.0f) * 0.5f * dy;
+//
+//                // Draw the text
+//                D2D1_TEXT_ANTIALIAS_MODE antialias = pDC->GetTextAntialiasMode();
+//                switch (f.antialias())
+//                {
+//                    case FA_DISABLED:
+//                        pDC->SetTextAntialiasMode(D2D1_TEXT_ANTIALIAS_MODE_ALIASED);
+//                        break;
+//                    case FA_ENABLED:
+//                        pDC->SetTextAntialiasMode(D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE);
+//                        break;
+//                    case FA_DEFAULT:
+//                    default:
+//                        break;
+//                }
+//
+//                pDC->DrawTextLayout(
+//                    D2D1::Point2F(fx, fy),
+//                    tl,
+//                    brush,
+//                    D2D1_DRAW_TEXT_OPTIONS_NONE);
+//                pDC->SetTextAntialiasMode(antialias);
+
                 return true;
             }
 
@@ -1629,10 +1707,11 @@ namespace lsp
             {
                 if (bad_state())
                     return;
-                const WCHAR *pText = (text != NULL) ? reinterpret_cast<const WCHAR *>(text->get_utf16(first, last)) : NULL;
-                if (pText == NULL)
+                if ((first < 0) || (last < 0) || (first >= last))
                     return;
-                size_t length = text->range_length(first, last);
+
+                size_t range    = text->range_length(first, last);
+                const lsp_wchar_t *data = text->characters();
 
                 // Obtain the font family
                 LSPString family_name;
@@ -1643,12 +1722,12 @@ namespace lsp
 
                 if (custom != NULL)
                 {
-                    if (try_out_text_relative(custom->collection, custom->family, custom->wname, f, color, x, y, dx, dy, pText, length))
+                    if (try_out_text_relative(custom->collection, custom->family, custom->wname, f, color, x, y, dx, dy, &data[first], range))
                         return;
                 }
                 if (ff != NULL)
                 {
-                    if (try_out_text_relative(NULL, ff, family_name.get_utf16(), f, color, x, y, dx, dy, pText, length))
+                    if (try_out_text_relative(NULL, ff, family_name.get_utf16(), f, color, x, y, dx, dy, &data[first], range))
                         return;
                 }
             }
diff --git a/src/main/win/WinDisplay.cpp b/src/main/win/WinDisplay.cpp
index 2b1d906..8152c18 100644
--- a/src/main/win/WinDisplay.cpp
+++ b/src/main/win/WinDisplay.cpp
@@ -23,6 +23,7 @@
 
 #ifdef PLATFORM_WINDOWS
 
+#include <lsp-plug.in/common/alloc.h>
 #include <lsp-plug.in/common/debug.h>
 #include <lsp-plug.in/io/charset.h>
 #include <lsp-plug.in/io/OutMemoryStream.h>
@@ -1161,7 +1162,7 @@ namespace lsp
                 // Find the matching font
                 IDWriteFont* font = get_font(f, ff);
                 if (font == NULL)
-                    return false;
+                    return NULL;
                 lsp_finally { safe_release(font); };
 
                 IDWriteFontFace *face = NULL;
@@ -1218,11 +1219,16 @@ namespace lsp
                 size_t length)
             {
                 HRESULT hr;
-
-                // Obtain font metrics
-                DWRITE_FONT_METRICS fm;
-                if (!get_font_metrics(f, ff, &fm))
-                    return false;
+                if (length <= 0)
+                {
+                    tp->Width       = 0;
+                    tp->Height      = 0;
+                    tp->XAdvance    = 0;
+                    tp->YAdvance    = 0;
+                    tp->XBearing    = 0;
+                    tp->YBearing    = 0;
+                    return true;
+                }
 
                 // Get font face
                 IDWriteFontFace *face = get_font_face(f, ff);
@@ -1230,20 +1236,32 @@ namespace lsp
                     return false;
                 lsp_finally { safe_release(face); };
 
-                // Allocate space for glyphs and glyph indices
-                UINT16 *glyphIndices = malloc(length * sizeof(UINT16));
+                // Get glyph indices
+                UINT16 *glyphIndices = static_cast<UINT16 *>(malloc(length * sizeof(UINT16)));
                 if (glyphIndices == NULL)
                     return false;
                 lsp_finally { free(glyphIndices); };
 
-                // Get glyph indices
                 hr = face->GetGlyphIndices(text, length, glyphIndices);
                 if (FAILED(hr))
                     return false;
 
+                // Get glyph metrics
+                DWRITE_GLYPH_METRICS *glyphMetrics = static_cast<DWRITE_GLYPH_METRICS *>(malloc(length * sizeof(DWRITE_GLYPH_METRICS)));
+                if (glyphMetrics == NULL)
+                    return false;
+                lsp_finally { free(glyphMetrics); };
 
+                hr = face->GetDesignGlyphMetrics(glyphIndices, length, glyphMetrics, FALSE);
+                if (FAILED(hr))
+                    return false;
 
-                face->GetGlyphIndices();
+                // Obtain font metrics
+                DWRITE_FONT_METRICS fm;
+                face->GetMetrics(&fm);
+
+                // Compute the text metrics
+                calc_text_metrics(f, tp, &fm, glyphMetrics, length);
 
 /*                // Create text layout
                 IDWriteTextLayout *tl   = create_text_layout(f, fname, fc, ff, text, length);
@@ -1268,12 +1286,86 @@ namespace lsp
                 return true;
             }
 
+            win::glyph_run_t *WinDisplay::make_glyph_run(const Font &f, IDWriteFontFace *face, const DWRITE_FONT_METRICS *fm, const UINT32 *text, size_t length)
+            {
+                HRESULT hr;
+
+                // Allocate glyph run and supplementary data structures
+                size_t szof_res     = align_size(sizeof(glyph_run_t), DEFAULT_ALIGN);
+                size_t szof_run     = align_size(sizeof(DWRITE_GLYPH_RUN), DEFAULT_ALIGN);
+                size_t szof_indices = align_size(sizeof(UINT16) * length, DEFAULT_ALIGN);
+                size_t szof_advances= align_size(sizeof(FLOAT) * length, DEFAULT_ALIGN);
+                size_t szof_offsets = align_size(sizeof(DWRITE_GLYPH_OFFSET) * length, DEFAULT_ALIGN);
+                size_t szof_metrics = align_size(sizeof(DWRITE_GLYPH_METRICS) * length, DEFAULT_ALIGN);
+                size_t to_alloc     =
+                    szof_res +
+                    szof_run +
+                    szof_indices +
+                    szof_advances +
+                    szof_offsets +
+                    szof_metrics;
+
+                uint8_t *ptr        = static_cast<uint8_t *>(malloc(to_alloc));
+                if (ptr == NULL)
+                    return NULL;
+
+                win::glyph_run_t *res               = reinterpret_cast<win::glyph_run_t *>(ptr);
+                ptr                                += szof_res;
+                DWRITE_GLYPH_RUN *run               = reinterpret_cast<DWRITE_GLYPH_RUN *>(ptr);
+                ptr                                += szof_run;
+                UINT16 *glyphIndices                = reinterpret_cast<UINT16 *>(ptr);
+                ptr                                += szof_indices;
+                FLOAT *glyphAdvances                = reinterpret_cast<FLOAT *>(ptr);
+                ptr                                += szof_advances;
+                DWRITE_GLYPH_OFFSET *glyphOffsets   = reinterpret_cast<DWRITE_GLYPH_OFFSET *>(ptr);
+                ptr                                += szof_offsets;
+                DWRITE_GLYPH_METRICS *glyphMetrics  = reinterpret_cast<DWRITE_GLYPH_METRICS *>(ptr);
+
+                run->fontFace                       = face;
+                run->fontEmSize                     = f.size();
+                run->glyphCount                     = length;
+                run->glyphIndices                   = glyphIndices;
+                run->glyphAdvances                  = glyphAdvances;
+                run->glyphOffsets                   = glyphOffsets;
+                run->isSideways                     = FALSE;
+                run->bidiLevel                      = 0;
+
+                res->run                            = run;
+                res->metrics                        = glyphMetrics;
+
+                lsp_finally {
+                    if (res != NULL)
+                        free(res);
+                };
+
+                // Fill glyph run
+                hr = face->GetGlyphIndices(text, length, glyphIndices);
+                if (FAILED(hr))
+                    return NULL;
+
+                // Obtain glyph metrics
+                hr = face->GetDesignGlyphMetrics(glyphIndices, length, glyphMetrics, FALSE);
+                if (FAILED(hr))
+                    return NULL;
+
+                float scale                         = run->fontEmSize / fm->designUnitsPerEm;
+                for (size_t i = 0; i<length; ++i)
+                {
+                    glyphAdvances[i]                = glyphMetrics[i].advanceWidth * scale;
+                    glyphOffsets[i].advanceOffset   = 0.0f;
+                    glyphOffsets[i].ascenderOffset  = 0.0f;
+                }
+
+                // Release pointer and return result
+                return release_ptr(res);
+            }
+
             bool WinDisplay::get_text_parameters(const Font &f, text_parameters_t *tp, const LSPString *text, ssize_t first, ssize_t last)
             {
                 if ((first < 0) || (last < 0) || (last < first))
                     return false;
 
-                size_t range    = last - first;
+                size_t range    = text->range_length(first, last);
                 const lsp_wchar_t *data = text->characters();
 
                 // Obtain the font family
diff --git a/src/main/win/fonts.cpp b/src/main/win/fonts.cpp
index 167d1ef..d2fd61a 100644
--- a/src/main/win/fonts.cpp
+++ b/src/main/win/fonts.cpp
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2020 Linux Studio Plugins Project <https://lsp-plug.in/>
- *           (C) 2020 Vladimir Sadovnikov <sadko4u@gmail.com>
+ * Copyright (C) 2023 Linux Studio Plugins Project <https://lsp-plug.in/>
+ *           (C) 2023 Vladimir Sadovnikov <sadko4u@gmail.com>
  *
  * This file is part of lsp-ws-lib
  * Created on: 13 июл. 2022 г.
@@ -25,6 +25,7 @@
 
 #include <lsp-plug.in/io/OutMemoryStream.h>
 #include <lsp-plug.in/lltl/parray.h>
+#include <lsp-plug.in/stdlib/math.h>
 
 #include <private/win/fonts.h>
 
@@ -230,6 +231,49 @@ namespace lsp
                 return S_OK;
             }
 
+            //-----------------------------------------------------------------
+            void calc_text_metrics(
+                const Font &f,
+                text_parameters_t *tp,
+                const DWRITE_FONT_METRICS *fm,
+                const DWRITE_GLYPH_METRICS *metrics,
+                size_t length)
+            {
+                if (length <= 0)
+                {
+                    tp->Width           = 0.0f;
+                    tp->Height          = 0.0f;
+                    tp->XAdvance        = 0.0f;
+                    tp->YAdvance        = 0.0f;
+                    tp->XBearing        = 0.0f;
+                    tp->YBearing        = 0.0f;
+                    return;
+                }
+
+                // Compute the text metrics
+                const DWRITE_GLYPH_METRICS *glyph = &metrics[0];
+                ssize_t x_bearing   = glyph->leftSideBearing;
+                ssize_t y_bearing   = glyph->topSideBearing;
+                ssize_t x           = glyph->advanceWidth;
+
+                for (size_t i = 1; i<length; ++i)
+                {
+                    glyph               = &metrics[i];
+                    y_bearing           = lsp_max(y_bearing, glyph->topSideBearing);
+                    x                  += glyph->advanceWidth;
+                }
+
+                float ratio         = f.size() / float(fm->designUnitsPerEm);
+
+                // Output text metrics
+                tp->Width           = (x - x_bearing) * ratio;
+                tp->Height          = (fm->ascent + fm->descent + fm->lineGap) * ratio;
+                tp->XAdvance        = x * ratio;
+                tp->YAdvance        = tp->Height;
+                tp->XBearing        = (f.italic()) ? sinf(0.033f * M_PI) * tp->Height : 0.0f;
+                tp->YBearing        = - fm->capHeight * ratio;
+            }
+
         } /* namespace win */
     } /* namespace ws */
 } /* namespace lsp */

From 685a7238de08216e653183814c3e2f2dd1dd2c61 Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Sat, 2 Sep 2023 00:53:17 +0300
Subject: [PATCH 06/20] Playing with underline

---
 src/main/win/WinDDSurface.cpp | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/main/win/WinDDSurface.cpp b/src/main/win/WinDDSurface.cpp
index 3d8ec27..6c0df54 100644
--- a/src/main/win/WinDDSurface.cpp
+++ b/src/main/win/WinDDSurface.cpp
@@ -1491,8 +1491,6 @@ namespace lsp
 
             bool WinDDSurface::try_out_text(IDWriteFontCollection *fc, IDWriteFontFamily *ff, const WCHAR *family, const Font &f, const Color &color, float x, float y, const lsp_wchar_t *text, size_t length)
             {
-//                HRESULT hr;
-
                 // Get font face
                 IDWriteFontFace *face   = pShared->pDisplay->get_font_face(f, ff);
                 if (face == NULL)
@@ -1509,12 +1507,6 @@ namespace lsp
                     return false;
                 lsp_finally { free(run); };
 
-//                // Create text layout
-//                IDWriteTextLayout *tl   = pShared->pDisplay->create_text_layout(f, family, fc, ff, text, length);
-//                if (tl == NULL)
-//                    return false;
-//                lsp_finally{ safe_release(tl); };
-
                 // Create brush
                 ID2D1SolidColorBrush *brush = NULL;
                 if (FAILED(pDC->CreateSolidColorBrush(d2d_color(color), &brush)))
@@ -1542,11 +1534,26 @@ namespace lsp
                     brush,
                     DWRITE_MEASURING_MODE_NATURAL);
 
-//                pDC->DrawTextLayout(
-//                    D2D1::Point2F(x, y),
-//                    tl,
-//                    brush,
-//                    D2D1_DRAW_TEXT_OPTIONS_NONE);
+                if (f.is_underline())
+                {
+                    ws::text_parameters_t tp;
+                    calc_text_metrics(f, &tp, &fm, run->metrics, length);
+
+                    float scale = f.size() / float(fm.designUnitsPerEm);
+                    float k     = f.bold() ? 0.6f : 0.5f;
+                    float ypos  = y - fm.underlinePosition * scale;
+                    float thick = k * fm.underlineThickness * scale;
+
+                    pDC->FillRectangle(
+                        D2D1_RECT_F {
+                            x,
+                            ypos - thick,
+                            x + tp.Width,
+                            ypos + thick
+                        },
+                        brush);
+                }
+
                 pDC->SetTextAntialiasMode(antialias);
 
                 return true;

From 0c4973da6a0fbb6da4fc8d68547e64030e928c3c Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Sat, 2 Sep 2023 00:59:21 +0300
Subject: [PATCH 07/20] Playing with underline

---
 src/main/win/WinDDSurface.cpp | 69 +++++++++--------------------------
 1 file changed, 17 insertions(+), 52 deletions(-)

diff --git a/src/main/win/WinDDSurface.cpp b/src/main/win/WinDDSurface.cpp
index 6c0df54..011e9e0 100644
--- a/src/main/win/WinDDSurface.cpp
+++ b/src/main/win/WinDDSurface.cpp
@@ -1653,59 +1653,24 @@ namespace lsp
                     brush,
                     DWRITE_MEASURING_MODE_NATURAL);
 
-                pDC->SetTextAntialiasMode(antialias);
+                if (f.is_underline())
+                {
+                    float scale = f.size() / float(fm.designUnitsPerEm);
+                    float k     = f.bold() ? 0.6f : 0.5f;
+                    float ypos  = fy - fm.underlinePosition * scale;
+                    float thick = k * fm.underlineThickness * scale;
 
-                // Obtain font metrics
-//                DWRITE_FONT_METRICS fm;
-//                if (!pShared->pDisplay->get_font_metrics(f, ff, &fm))
-//                    return false;
-//
-//                // Create text layout
-//                IDWriteTextLayout *tl   = pShared->pDisplay->create_text_layout(f, family, fc, ff, text, length);
-//                if (tl == NULL)
-//                    return false;
-//                lsp_finally{ safe_release(tl); };
-//
-//                // Create brush
-//                ID2D1SolidColorBrush *brush = NULL;
-//                if (FAILED(pDC->CreateSolidColorBrush(d2d_color(color), &brush)))
-//                    return false;
-//                lsp_finally{ safe_release(brush); };
-//
-//                // Get text layout metrics and font metrics
-//                DWRITE_TEXT_METRICS tm;
-//                tl->GetMetrics(&tm);
-//
-//                // Compute the text position
-//                float ratio     = f.size() / float(fm.designUnitsPerEm);
-//                float height    = (fm.ascent + fm.descent + fm.lineGap) * ratio;
-//                float xbearing  = (f.italic()) ? sinf(0.033f * M_PI) * height : 0.0f;
-//                float r_w       = tm.width;
-//                float r_h       = fm.capHeight * ratio;
-//                float fx        = x - xbearing - r_w * 0.5f + (r_w + 4.0f) * 0.5f * dx;
-//                float fy        = y + r_h * 0.5f - (r_h + 4.0f) * 0.5f * dy;
-//
-//                // Draw the text
-//                D2D1_TEXT_ANTIALIAS_MODE antialias = pDC->GetTextAntialiasMode();
-//                switch (f.antialias())
-//                {
-//                    case FA_DISABLED:
-//                        pDC->SetTextAntialiasMode(D2D1_TEXT_ANTIALIAS_MODE_ALIASED);
-//                        break;
-//                    case FA_ENABLED:
-//                        pDC->SetTextAntialiasMode(D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE);
-//                        break;
-//                    case FA_DEFAULT:
-//                    default:
-//                        break;
-//                }
-//
-//                pDC->DrawTextLayout(
-//                    D2D1::Point2F(fx, fy),
-//                    tl,
-//                    brush,
-//                    D2D1_DRAW_TEXT_OPTIONS_NONE);
-//                pDC->SetTextAntialiasMode(antialias);
+                    pDC->FillRectangle(
+                        D2D1_RECT_F {
+                            fx,
+                            ypos - thick,
+                            fx + tp.Width,
+                            ypos + thick
+                        },
+                        brush);
+                }
+
+                pDC->SetTextAntialiasMode(antialias);
 
                 return true;
             }

From 050f710c828c89f599faec7f03b21509a8635654 Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Sat, 2 Sep 2023 13:15:39 +0300
Subject: [PATCH 08/20] Pixel-quantized font metrics

---
 src/main/win/WinDisplay.cpp |  4 ++--
 src/main/win/fonts.cpp      | 22 ++++++++++------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/main/win/WinDisplay.cpp b/src/main/win/WinDisplay.cpp
index 8152c18..d8a4113 100644
--- a/src/main/win/WinDisplay.cpp
+++ b/src/main/win/WinDisplay.cpp
@@ -1348,10 +1348,10 @@ namespace lsp
                 if (FAILED(hr))
                     return NULL;
 
-                float scale                         = run->fontEmSize / fm->designUnitsPerEm;
+                const float ratio                   = run->fontEmSize / fm->designUnitsPerEm;
                 for (size_t i = 0; i<length; ++i)
                 {
-                    glyphAdvances[i]                = glyphMetrics[i].advanceWidth * scale;
+                    glyphAdvances[i]                = ceilf(glyphMetrics[i].advanceWidth * ratio);
                     glyphOffsets[i].advanceOffset   = 0.0f;
                     glyphOffsets[i].ascenderOffset  = 0.0f;
                 }
diff --git a/src/main/win/fonts.cpp b/src/main/win/fonts.cpp
index d2fd61a..97994de 100644
--- a/src/main/win/fonts.cpp
+++ b/src/main/win/fonts.cpp
@@ -252,26 +252,24 @@ namespace lsp
 
                 // Compute the text metrics
                 const DWRITE_GLYPH_METRICS *glyph = &metrics[0];
-                ssize_t x_bearing   = glyph->leftSideBearing;
-                ssize_t y_bearing   = glyph->topSideBearing;
-                ssize_t x           = glyph->advanceWidth;
+                const float ratio   = f.size() / float(fm->designUnitsPerEm);
+
+                ssize_t x_bearing   = ceilf(glyph->leftSideBearing * ratio);
+                ssize_t x           = ceilf(glyph->advanceWidth * ratio);
 
                 for (size_t i = 1; i<length; ++i)
                 {
                     glyph               = &metrics[i];
-                    y_bearing           = lsp_max(y_bearing, glyph->topSideBearing);
-                    x                  += glyph->advanceWidth;
+                    x                  += ceilf(glyph->advanceWidth * ratio);
                 }
 
-                float ratio         = f.size() / float(fm->designUnitsPerEm);
-
                 // Output text metrics
-                tp->Width           = (x - x_bearing) * ratio;
-                tp->Height          = (fm->ascent + fm->descent + fm->lineGap) * ratio;
-                tp->XAdvance        = x * ratio;
+                tp->Width           = x - x_bearing;
+                tp->Height          = ceilf((fm->ascent + fm->descent + fm->lineGap) * ratio);
+                tp->XAdvance        = x;
                 tp->YAdvance        = tp->Height;
-                tp->XBearing        = (f.italic()) ? sinf(0.033f * M_PI) * tp->Height : 0.0f;
-                tp->YBearing        = - fm->capHeight * ratio;
+                tp->XBearing        = ceilf((f.italic()) ? sinf(0.033f * M_PI) * tp->Height : 0.0f);
+                tp->YBearing        = ceilf( - fm->capHeight * ratio);
             }
 
         } /* namespace win */

From 721e3fa959588f163bb1ed9296e7e66899702011 Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Sat, 2 Sep 2023 13:21:00 +0300
Subject: [PATCH 09/20] Updated CHANGELOG

* Improved text rendering for Windows platform
---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 20393ba..f768137 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@
 *******************************************************************************
 
 === 1.0.14 ===
-
+* Improved text rendering for Windows platform.
 
 === 1.0.13 ===
 * Updated build scripts.

From aaae9cb7ebea6760f6baa133f127af82445d6933 Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Sat, 2 Sep 2023 13:52:07 +0300
Subject: [PATCH 10/20] Small font-related fixes

---
 src/main/win/fonts.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/win/fonts.cpp b/src/main/win/fonts.cpp
index 97994de..c1c8163 100644
--- a/src/main/win/fonts.cpp
+++ b/src/main/win/fonts.cpp
@@ -254,7 +254,7 @@ namespace lsp
                 const DWRITE_GLYPH_METRICS *glyph = &metrics[0];
                 const float ratio   = f.size() / float(fm->designUnitsPerEm);
 
-                ssize_t x_bearing   = ceilf(glyph->leftSideBearing * ratio);
+                ssize_t x_bearing   = floorf(glyph->leftSideBearing * ratio);
                 ssize_t x           = ceilf(glyph->advanceWidth * ratio);
 
                 for (size_t i = 1; i<length; ++i)
@@ -268,7 +268,7 @@ namespace lsp
                 tp->Height          = ceilf((fm->ascent + fm->descent + fm->lineGap) * ratio);
                 tp->XAdvance        = x;
                 tp->YAdvance        = tp->Height;
-                tp->XBearing        = ceilf((f.italic()) ? sinf(0.033f * M_PI) * tp->Height : 0.0f);
+                tp->XBearing        = x_bearing + ceilf((f.italic()) ? sinf(0.033f * M_PI) * tp->Height : 0.0f);
                 tp->YBearing        = ceilf( - fm->capHeight * ratio);
             }
 

From a7ec08ec896584c140744d3bc9ffb421ca3c02d7 Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Sat, 2 Sep 2023 14:22:19 +0300
Subject: [PATCH 11/20] Added limitation of WM_USER messages

---
 include/private/win/WinDisplay.h |  1 +
 src/main/win/WinDisplay.cpp      | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/include/private/win/WinDisplay.h b/include/private/win/WinDisplay.h
index b3cd4a2..b55b12c 100644
--- a/include/private/win/WinDisplay.h
+++ b/include/private/win/WinDisplay.h
@@ -117,6 +117,7 @@ namespace lsp
                     WinWindow                  *pDragWindow;                // Window which is currently acting in Drag&Drop action
                     ipc::Thread                *pPingThread;                // Pinger thread
                     volatile timestamp_t        nLastIdleCall;              // The time of last idle call
+                    volatile atomic_t           nIdlePending;               // Number of idle requests pending
                     LSPString                   sWindowClassName;           // Window class name
                     LSPString                   sClipboardClassName;        // Clipboard window class name
 
diff --git a/src/main/win/WinDisplay.cpp b/src/main/win/WinDisplay.cpp
index d8a4113..1692219 100644
--- a/src/main/win/WinDisplay.cpp
+++ b/src/main/win/WinDisplay.cpp
@@ -93,6 +93,7 @@ namespace lsp
                 pDragWindow             = NULL;
                 pPingThread             = NULL;
                 nLastIdleCall           = 0;
+                nIdlePending            = 0;
             }
 
             WinDisplay::~WinDisplay()
@@ -286,9 +287,15 @@ namespace lsp
                 while (!ipc::Thread::is_cancelled())
                 {
                     // Post message if there was no idle loop for a long time
-                    timestamp_t ts = system::get_time_millis();
-                    if (ts >= (self->nLastIdleCall + self->idle_interval()))
-                        PostMessageW(self->hClipWnd, WM_USER, 0, 0);
+                    if (self->nIdlePending <= 0)
+                    {
+                        timestamp_t ts = system::get_time_millis();
+                        if (ts >= (self->nLastIdleCall + self->idle_interval()))
+                        {
+                            atomic_add(&self->nIdlePending, 1);
+                            PostMessageW(self->hClipWnd, WM_USER, 0, 0);
+                        }
+                    }
 
                     ipc::Thread::sleep(20);
                 }
@@ -425,7 +432,7 @@ namespace lsp
                 sPendingMessage.message     = WM_NULL;
 
                 // Process all pending tasks
-                status_t res = process_pending_tasks(ts);
+                status_t res    = process_pending_tasks(ts);
                 nLastIdleCall   = ts;
 
                 return res;
@@ -1970,6 +1977,7 @@ namespace lsp
                     {
                         ws::timestamp_t ts  = system::get_time_millis();
                         dpy->process_pending_tasks(ts);
+                        atomic_add(&dpy->nIdlePending, -1);
                         return 0;
                     }
                     default:
@@ -2368,7 +2376,10 @@ namespace lsp
             void WinDisplay::task_queue_changed()
             {
                 if (hClipWnd != NULL)
+                {
+                    atomic_add(&nIdlePending, 1);
                     PostMessageW(hClipWnd, WM_USER, 0, 0);
+                }
             }
 
         } /* namespace win */

From cb013bd87419fb6234c720c1434c820a6d3b6b75 Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Sat, 2 Sep 2023 14:55:02 +0300
Subject: [PATCH 12/20] Updated ping procedure

---
 src/main/win/WinDDSurface.cpp |  6 +++---
 src/main/win/WinDisplay.cpp   | 10 +++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/main/win/WinDDSurface.cpp b/src/main/win/WinDDSurface.cpp
index 011e9e0..9def356 100644
--- a/src/main/win/WinDDSurface.cpp
+++ b/src/main/win/WinDDSurface.cpp
@@ -179,7 +179,7 @@ namespace lsp
                     prop.pixelFormat.alphaMode  = D2D1_ALPHA_MODE_PREMULTIPLIED; // D2D1_ALPHA_MODE_STRAIGHT;
                     prop.dpiX                   = dpi_x;
                     prop.dpiY                   = dpi_y;
-                    prop.usage                  = D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE;
+                    prop.usage                  = D2D1_RENDER_TARGET_USAGE_NONE;
                     prop.minLevel               = D2D1_FEATURE_LEVEL_DEFAULT;
 
                     hwndProp.hwnd               = pShared->hWindow;
@@ -1273,7 +1273,7 @@ namespace lsp
                     &desiredSize,
                     &desiredPixelSize,
                     &pixelFormat,
-                    D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_GDI_COMPATIBLE, // options
+                    D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE, // options
                     &dc);
                 if (FAILED(hr))
                     return NULL;
@@ -1307,7 +1307,7 @@ namespace lsp
                     &desiredSize,
                     &desiredPixelSize,
                     &pixelFormat,
-                    D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_GDI_COMPATIBLE,
+                    D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE,
                     &dc);
                 if (FAILED(hr))
                     return NULL;
diff --git a/src/main/win/WinDisplay.cpp b/src/main/win/WinDisplay.cpp
index 1692219..aac2586 100644
--- a/src/main/win/WinDisplay.cpp
+++ b/src/main/win/WinDisplay.cpp
@@ -287,14 +287,10 @@ namespace lsp
                 while (!ipc::Thread::is_cancelled())
                 {
                     // Post message if there was no idle loop for a long time
-                    if (self->nIdlePending <= 0)
+                    if (self->nIdlePending < 2)
                     {
-                        timestamp_t ts = system::get_time_millis();
-                        if (ts >= (self->nLastIdleCall + self->idle_interval()))
-                        {
-                            atomic_add(&self->nIdlePending, 1);
-                            PostMessageW(self->hClipWnd, WM_USER, 0, 0);
-                        }
+                        atomic_add(&self->nIdlePending, 1);
+                        PostMessageW(self->hClipWnd, WM_USER, 0, 0);
                     }
 
                     ipc::Thread::sleep(20);

From 8f75680fbad65d77020bbc34a205ec1876a63eaf Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Sat, 2 Sep 2023 15:16:56 +0300
Subject: [PATCH 13/20] Significant improvements related to rectangle area
 clipping for Windows platform

---
 CHANGELOG                     |  1 +
 src/main/win/WinDDSurface.cpp | 16 ++++------------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f768137..d738633 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 
 === 1.0.14 ===
 * Improved text rendering for Windows platform.
+* Significant improvements related to rectangle area clipping for Windows platform.
 
 === 1.0.13 ===
 * Updated build scripts.
diff --git a/src/main/win/WinDDSurface.cpp b/src/main/win/WinDDSurface.cpp
index 9def356..419939f 100644
--- a/src/main/win/WinDDSurface.cpp
+++ b/src/main/win/WinDDSurface.cpp
@@ -1218,17 +1218,9 @@ namespace lsp
                 if (bad_state())
                     return;
 
-                // Create the clipping layer
-                ID2D1Layer *layer   = NULL;
-                HRESULT hr          = pDC->CreateLayer(NULL, &layer);
-                if ((FAILED(hr)) || (layer == NULL))
-                    return;
-                lsp_finally{ safe_release(layer); };
-
-                // Apply the layer
-                pDC->PushLayer(
-                    D2D1::LayerParameters(D2D1::RectF(x, y, x+w, y+h)),
-                    layer);
+                pDC->PushAxisAlignedClip(
+                    D2D1::RectF(x, y, x+w, y+h),
+                    D2D1_ANTIALIAS_MODE_PER_PRIMITIVE);
 
                 #ifdef LSP_DEBUG
                 ++ nClipping;
@@ -1249,7 +1241,7 @@ namespace lsp
                 -- nClipping;
             #endif /* LSP_DEBUG */
 
-                pDC->PopLayer();
+                pDC->PopAxisAlignedClip();
             }
 
             IDisplay *WinDDSurface::display()

From 34073a839fc35962d5ecd304dbb317b7a0f13454 Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Sat, 2 Sep 2023 18:22:07 +0300
Subject: [PATCH 14/20] Several improvements against grabbing events for
 Windows

---
 CHANGELOG                        |  1 +
 include/private/win/WinDisplay.h |  1 +
 src/main/win/WinDisplay.cpp      | 39 ++++++++++++++++++++++++--------
 src/main/win/WinWindow.cpp       | 20 +++++++++++++++-
 4 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d738633..58d49be 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
 === 1.0.14 ===
 * Improved text rendering for Windows platform.
 * Significant improvements related to rectangle area clipping for Windows platform.
+* Several improvements against grabbing events for Windows.
 
 === 1.0.13 ===
 * Updated build scripts.
diff --git a/include/private/win/WinDisplay.h b/include/private/win/WinDisplay.h
index b55b12c..0d9d3ee 100644
--- a/include/private/win/WinDisplay.h
+++ b/include/private/win/WinDisplay.h
@@ -104,6 +104,7 @@ namespace lsp
                     ATOM                        hClipClass;                 // Window class for the clipboard
                     LSPString                   sDflFontFamily;             // Default font family name
                     MSG                         sPendingMessage;            // Currently pending message
+                    MSG                         sLastMouseMove;             // Last mouse move message
                     HCURSOR                     vCursors[__MP_COUNT];       // Cursor handles (cached)
                     lltl::darray<MonitorInfo>   vMonitors;                  // Monitor information
                     font_cache_t                vFontCache;                 // Font cache
diff --git a/src/main/win/WinDisplay.cpp b/src/main/win/WinDisplay.cpp
index aac2586..ecda5d3 100644
--- a/src/main/win/WinDisplay.cpp
+++ b/src/main/win/WinDisplay.cpp
@@ -84,6 +84,9 @@ namespace lsp
                 bzero(&sPendingMessage, sizeof(sPendingMessage));
                 sPendingMessage.message     = WM_NULL;
 
+                bzero(&sLastMouseMove, sizeof(sLastMouseMove));
+                sLastMouseMove.message      = WM_NULL;
+
                 for (size_t i=0; i<__MP_COUNT; ++i)
                     vCursors[i]     = NULL;
 
@@ -328,6 +331,16 @@ namespace lsp
                     }
                 }
 
+                // Check spurious WM_MOUSEMOVE message
+                if (uMsg == WM_MOUSEMOVE)
+                {
+                    MSG *mouse              = &self->sLastMouseMove;
+                    if ((mouse->wParam == wParam) && (mouse->lParam == lParam))
+                        return 0;
+                    mouse->wParam           = wParam;
+                    mouse->lParam           = lParam;
+                }
+
 //                // Debug
 //                switch (uMsg)
 //                {
@@ -382,6 +395,8 @@ namespace lsp
                         // Here we perform a check that there is some message in the queue
                         if (!PeekMessageW(&sPendingMessage, NULL, 0, 0, PM_REMOVE))
                         {
+                            sPendingMessage.message     = WM_NULL;
+
                             UINT_PTR timerId    = SetTimer(NULL, 0, wtime, NULL);
                             BOOL res            = GetMessageW(&sPendingMessage, NULL, 0, 0);
                             KillTimer(NULL, timerId);
@@ -419,14 +434,12 @@ namespace lsp
                     {
                         TranslateMessage(&sPendingMessage);
                         DispatchMessageW(&sPendingMessage);
+                        sPendingMessage.message     = WM_NULL;
                     }
                     if ((limit++) >= 0x20)
                         break;
                 } while (PeekMessageW(&sPendingMessage, NULL, 0, 0, PM_REMOVE));
 
-                // At this moment, we don't have any pending messages for processing
-                sPendingMessage.message     = WM_NULL;
-
                 // Process all pending tasks
                 status_t res    = process_pending_tasks(ts);
                 nLastIdleCall   = ts;
@@ -1472,6 +1485,8 @@ namespace lsp
                 if (!vGrab[group].add(wnd))
                     return STATUS_NO_MEM;
 
+                lsp_trace("Added HWND=%p to grab group %d", wnd->win_handle(), int(group));
+
                 // Obtain a grab if necessary
                 if (count > 0)
                     return STATUS_OK;
@@ -1490,7 +1505,10 @@ namespace lsp
                 {
                     lltl::parray<WinWindow> &g = vGrab[i];
                     if (g.premove(wnd))
+                    {
+                        lsp_trace("Removed HWND=%p from grab group %d", wnd->win_handle(), int(i));
                         found = true;
+                    }
                     count      += g.size();
                 }
 
@@ -1748,17 +1766,18 @@ namespace lsp
                      * @param pt The x- and y-coordinates of the cursor, in per-monitor-aware screen coordinates.
                      */
                     POINT pt    = mou->pt;
-                    RECT rect;
                     if (!ScreenToClient(wnd->hWindow, &pt))
                         continue;
-                    if (!GetClientRect(wnd->hWindow, &rect))
-                        continue;
 
-                    // Skip events that are inside of client area of the window. Process them as usual.
-                    if ((pt.x >= rect.left) && (pt.x <= rect.right) &&
-                        (pt.y >= rect.top) && (pt.y <= rect.bottom))
-                        continue;
+//                    // Skip events that are inside of client area of the window. Process them as usual.
+//                    RECT rect;
+//                    if (!GetClientRect(wnd->hWindow, &rect))
+//                        continue;
+//                    if ((pt.x >= rect.left) && (pt.x <= rect.right) &&
+//                        (pt.y >= rect.top) && (pt.y <= rect.bottom))
+//                        continue;
 
+                    // Send the message
                     lParam      = MAKELONG(pt.x, pt.y);
                     PostMessageW(wnd->hWindow, uMsg, wParam, lParam);
                 }
diff --git a/src/main/win/WinWindow.cpp b/src/main/win/WinWindow.cpp
index 0d15088..c69f7c7 100644
--- a/src/main/win/WinWindow.cpp
+++ b/src/main/win/WinWindow.cpp
@@ -612,16 +612,34 @@ namespace lsp
                         if ((hTransientFor == NULL) || (hTransientFor == HWND_TOP))
                             break;
 
-                        HWND hPrev          = GetTopWindow(GetDesktopWindow());
+//                        WCHAR caption[256];
+//                        LSPString tmp;
+//
+//                        lsp_trace("Order for hWnd = %p, hTransientFor = %p:", hWindow, hTransientFor);
+//                        HWND hIter  = GetWindow(hWindow, GW_HWNDFIRST);
+//                        while (hIter != NULL)
+//                        {
+//                            caption[0] = 0;
+//                            GetWindowTextW(hIter, caption, sizeof(caption)/sizeof(WCHAR));
+//                            tmp.set_utf16(caption);
+//                            lsp_trace("  hWnd=%p (%s)", hIter, tmp.get_native());
+//
+//                            hIter   = GetWindow(hIter, GW_HWNDNEXT);
+//                        }
+
+                        HWND hPrev          = GetWindow(hWindow, GW_HWNDFIRST);
+//                        lsp_trace("hPrev = %p", hPrev);
                         while (hPrev != NULL)
                         {
                             HWND hCurr              = GetWindow(hPrev, GW_HWNDNEXT);
+//                            lsp_trace("hCurr = %p", hCurr);
 
                             // We are already at the top?
                             if (hCurr == hWindow)
                                 break;
                             if (hCurr == hTransientFor)
                             {
+//                                lsp_trace("overriding hwndInsertAfter with %p", hPrev);
                                 WINDOWPOS *p            = reinterpret_cast<WINDOWPOS *>(lParam);
                                 p->hwndInsertAfter      = hPrev;
                                 p->flags               &= ~SWP_NOZORDER;

From ca39f47dcf381a277a4a9debbfe378379e264c5f Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Sat, 2 Sep 2023 19:29:05 +0300
Subject: [PATCH 15/20] Fixed test

---
 src/test/mtest/display/font2.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/test/mtest/display/font2.cpp b/src/test/mtest/display/font2.cpp
index b5dc7f8..09d6280 100644
--- a/src/test/mtest/display/font2.cpp
+++ b/src/test/mtest/display/font2.cpp
@@ -24,9 +24,6 @@
 #include <lsp-plug.in/stdlib/math.h>
 #include <lsp-plug.in/test-fw/mtest.h>
 
-#include <locale.h>
-#include <wchar.h>
-
 MTEST_BEGIN("ws.display", font2)
 
     class Handler: public ws::IEventHandler
@@ -160,8 +157,6 @@ MTEST_BEGIN("ws.display", font2)
             delete wnd;
         };
 
-        _wsetlocale(LC_ALL, L"en_US");
-
         io::Path font;
         MTEST_ASSERT(font.fmt("%s/font/NotoSansDisplay-Regular.ttf", resources()));
         MTEST_ASSERT(dpy->add_font("noto-sans", &font) == STATUS_OK);

From dd43430820c648680df7ce7587e2f1bcb78f5e3c Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Sat, 2 Sep 2023 20:23:29 +0300
Subject: [PATCH 16/20] Fixed test regression

---
 src/test/mtest/display/rtext.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/test/mtest/display/rtext.cpp b/src/test/mtest/display/rtext.cpp
index 4391165..f64e46b 100644
--- a/src/test/mtest/display/rtext.cpp
+++ b/src/test/mtest/display/rtext.cpp
@@ -23,8 +23,6 @@
 #include <lsp-plug.in/ws/IEventHandler.h>
 #include <lsp-plug.in/stdlib/math.h>
 #include <lsp-plug.in/test-fw/mtest.h>
-#include <locale.h>
-#include <wchar.h>
 
 MTEST_BEGIN("ws.display", rtext)
 
@@ -119,8 +117,6 @@ MTEST_BEGIN("ws.display", rtext)
             delete wnd;
         };
 
-        _wsetlocale(LC_ALL, L"en_US");
-
         MTEST_ASSERT(wnd->init() == STATUS_OK);
         MTEST_ASSERT(wnd->set_caption("Test relative text") == STATUS_OK);
         MTEST_ASSERT(wnd->set_window_actions(ws::WA_MOVE | ws::WA_CLOSE) == STATUS_OK);

From 0dcf46d2a533f930ab32f3a16ef2b6ce69847bd9 Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Thu, 7 Sep 2023 22:01:06 +0300
Subject: [PATCH 17/20] Fixed some issues reported by PVS Studio

---
 src/main/IDataSource.cpp         | 19 +++++++++++--------
 src/main/freetype/FontManger.cpp | 19 ++++++++++++-------
 src/main/freetype/GlyphCache.cpp |  9 ++++-----
 src/main/freetype/face.cpp       |  2 ++
 src/main/x11/X11Display.cpp      | 25 +++++++++----------------
 src/main/x11/X11Window.cpp       | 10 ++++++++--
 src/main/x11/decode.cpp          |  2 +-
 7 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/src/main/IDataSource.cpp b/src/main/IDataSource.cpp
index db75540..e10022e 100644
--- a/src/main/IDataSource.cpp
+++ b/src/main/IDataSource.cpp
@@ -36,14 +36,17 @@ namespace lsp
                 ++n;
 
             vMimes          = reinterpret_cast<char **>(::malloc(sizeof(char *) * (n+1)));
-            for (size_t i=0; i<(n+1); ++i)
-                vMimes[i]       = NULL;
-
-            for (size_t i=0, j=0; i<n; ++i)
+            if (vMimes != NULL)
             {
-                vMimes[j]   = ::strdup(mimes[i]);
-                if (vMimes[j])
-                    ++j;
+                for (size_t i=0; i<(n+1); ++i)
+                    vMimes[i]       = NULL;
+
+                for (size_t i=0, j=0; i<n; ++i)
+                {
+                    vMimes[j]   = ::strdup(mimes[i]);
+                    if (vMimes[j])
+                        ++j;
+                }
             }
         }
         
@@ -77,5 +80,5 @@ namespace lsp
             return refs;
         }
     
-    } /* namespace ctl */
+    } /* namespace ws */
 } /* namespace lsp */
diff --git a/src/main/freetype/FontManger.cpp b/src/main/freetype/FontManger.cpp
index f659989..34829ce 100644
--- a/src/main/freetype/FontManger.cpp
+++ b/src/main/freetype/FontManger.cpp
@@ -675,14 +675,19 @@ namespace lsp
             {
                 if ((text == NULL) || (first > last))
                     return false;
-                else if (first == last)
+
+                if (first == last)
                 {
-                    tp->x_bearing       = 0;
-                    tp->y_bearing       = 0;
-                    tp->width           = 0;
-                    tp->height          = 0;
-                    tp->x_advance       = 0;
-                    tp->y_advance       = 0;
+                    if (tp != NULL)
+                    {
+                        tp->x_bearing       = 0;
+                        tp->y_bearing       = 0;
+                        tp->width           = 0;
+                        tp->height          = 0;
+                        tp->x_advance       = 0;
+                        tp->y_advance       = 0;
+                    }
+
                     return true;
                 }
 
diff --git a/src/main/freetype/GlyphCache.cpp b/src/main/freetype/GlyphCache.cpp
index b9abf57..507f0af 100644
--- a/src/main/freetype/GlyphCache.cpp
+++ b/src/main/freetype/GlyphCache.cpp
@@ -141,11 +141,10 @@ namespace lsp
                 // Cleanup all data
                 nSize       = 0;
                 nCap        = 0;
-                if (vBins != NULL)
-                {
-                    free(vBins);
-                    vBins       = NULL;
-                }
+
+                // Cleanup bins
+                free(vBins);
+                vBins       = NULL;
 
                 return root;
             }
diff --git a/src/main/freetype/face.cpp b/src/main/freetype/face.cpp
index dec52e0..5c1468b 100644
--- a/src/main/freetype/face.cpp
+++ b/src/main/freetype/face.cpp
@@ -182,6 +182,8 @@ namespace lsp
                 FT_Error error;
 
                 // Reference the freetype face
+                if (src == NULL)
+                    return NULL;
                 if ((error = FT_Reference_Face(src->ft_face)) != FT_Err_Ok)
                     return NULL;
                 lsp_finally {
diff --git a/src/main/x11/X11Display.cpp b/src/main/x11/X11Display.cpp
index 84305af..f066ddc 100644
--- a/src/main/x11/X11Display.cpp
+++ b/src/main/x11/X11Display.cpp
@@ -163,6 +163,8 @@ namespace lsp
                 for (size_t i=0; i<__MP_COUNT; ++i)
                     vCursors[i]     = None;
 
+                bzero(&sAtoms, sizeof(sAtoms));
+
                 sTranslateReq.hSrcW     = None;
                 sTranslateReq.hDstW     = None;
                 sTranslateReq.bSuccess  = false;
@@ -929,9 +931,7 @@ namespace lsp
                             if ((task->cb_send.hProperty == ev->atom) &&
                                 (task->cb_send.hRequestor == ev->window))
                             {
-                                status_t result = handle_property_notify(&task->cb_send, ev);
-                                if (task->result == STATUS_OK)
-                                    task->result    = result;
+                                task->result = update_status(task->result, handle_property_notify(&task->cb_send, ev));
                             }
                             break;
                         default:
@@ -2130,7 +2130,7 @@ namespace lsp
                     // Test for support of XDnD protocol
                     status_t res    = read_property(child, sAtoms.X11_XdndAware, sAtoms.X11_XA_ATOM, &data, &size, &xtype);
                     lsp_trace("xDndAware res=%d, xtype=%d, size=%d", int(res), int(xtype), int(size));
-                    if ((res != STATUS_OK) || (xtype == None) || (size < 1) || (data[0] < 1))
+                    if ((res != STATUS_OK) || (xtype == None) || (size < 1) || (data == NULL) || (data[0] < 1))
                     {
                         lsp_trace("Window %lx does not support XDnD Protocol", long(child));
                         parent = child;
@@ -2346,8 +2346,6 @@ namespace lsp
 
                 Atom type;
                 size_t bytes;
-                uint8_t *data = NULL;
-
                 drop_mime_types(&vDndMimeTypes);
 
                 // Find target window
@@ -2367,11 +2365,7 @@ namespace lsp
                     {
                         // Create task
                         if ((task = sAsync.add()) == NULL)
-                        {
-                            if (data != NULL)
-                                ::free(data);
                             return STATUS_NO_MEM;
-                        }
 
                         lsp_trace("Created new XDnD proxy task");
 
@@ -2388,9 +2382,6 @@ namespace lsp
                         dnd->enter[1]       = ev->data.l[2];
                         dnd->enter[2]       = ev->data.l[3];
                         dnd->enter[3]       = ev->data.l[4];
-
-                        if (data != NULL)
-                            ::free(data);
                     }
 
                     return STATUS_OK;
@@ -2400,6 +2391,7 @@ namespace lsp
                 if (ev->data.l[1] & 1)
                 {
                     // Fetch all MIME types as additional property
+                    uint8_t *data   = NULL;
                     status_t res = read_property(ev->data.l[0],
                             sAtoms.X11_XdndTypeList, sAtoms.X11_XA_ATOM,
                             &data, &bytes, &type);
@@ -2408,11 +2400,12 @@ namespace lsp
                         lsp_trace("Could not read proprty XdndTypeList");
                         return res;
                     }
-                    else if (type != sAtoms.X11_XA_ATOM)
+                    else if ((data == NULL) || (type != sAtoms.X11_XA_ATOM))
                     {
                         lsp_trace("Could proprty XdndTypeList is not of XA_ATOM type");
                         return STATUS_BAD_TYPE;
                     }
+                    lsp_finally { free(data); };
 
                     // Decode MIME types
                     uint32_t *atoms = reinterpret_cast<uint32_t *>(data);
@@ -3638,8 +3631,8 @@ namespace lsp
                 ev->data.l[1]       = 1 | ((r != NULL) ? (1 << 1) : 0);
                 if (r != NULL)
                 {
-                    ev->data.l[2]       = (x << 16) | y;
-                    ev->data.l[3]       = (r->nWidth << 16) | r->nHeight;
+                    ev->data.l[2]       = (long(x) << 16) | long(y);
+                    ev->data.l[3]       = (long(r->nWidth) << 16) | long(r->nHeight);
                 }
                 else
                 {
diff --git a/src/main/x11/X11Window.cpp b/src/main/x11/X11Window.cpp
index 7603a31..930833f 100644
--- a/src/main/x11/X11Window.cpp
+++ b/src/main/x11/X11Window.cpp
@@ -65,6 +65,13 @@ namespace lsp
                 nScreen                 = screen;
                 pSurface                = NULL;
                 enBorderStyle           = BS_SIZEABLE;
+
+                sMotif.flags            = 0;
+                sMotif.functions        = 0;
+                sMotif.decorations      = 0;
+                sMotif.input_mode       = 0;
+                sMotif.status           = 0;
+
                 nActions                = WA_SINGLE;
                 nFlags                  = 0;
                 enPointer               = MP_DEFAULT;
@@ -824,8 +831,7 @@ namespace lsp
                 }
 
                 // Enable constraints back
-                if (result == STATUS_OK)
-                    result = do_update_constraints(false);
+                result = do_update_constraints(false);
                 pX11Display->flush();
 
                 return result;
diff --git a/src/main/x11/decode.cpp b/src/main/x11/decode.cpp
index ca2d2a5..045e579 100644
--- a/src/main/x11/decode.cpp
+++ b/src/main/x11/decode.cpp
@@ -1025,7 +1025,7 @@ namespace lsp
                 {
                     if ((code >= 0x20) && (code <= 0x7e))
                         return code;
-                    else if ((code >= 0xa0) && (code <= 0x00ff))
+                    else if (code >= 0xa0)
                         return code;
                 }
                 else if (code & 0xff000000)

From d83bfea39993a535f4935aa92f858a384df2012a Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Fri, 8 Sep 2023 19:14:17 +0300
Subject: [PATCH 18/20] Updated CHANGELOG

* Improved code base by using PVS Studio static code analyzer
---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 58d49be..d8fcb79 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 *******************************************************************************
 
 === 1.0.14 ===
+* Improved code base by using PVS Studio static code analyzer.
 * Improved text rendering for Windows platform.
 * Significant improvements related to rectangle area clipping for Windows platform.
 * Several improvements against grabbing events for Windows.

From 5f15aaf558042cf4d2ccfee1924b9a18498e25c7 Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Sat, 9 Sep 2023 23:39:33 +0300
Subject: [PATCH 19/20] Updated module versions in dependencies

---
 CHANGELOG  |  1 +
 modules.mk | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d8fcb79..53f10e2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,7 @@
 * Improved text rendering for Windows platform.
 * Significant improvements related to rectangle area clipping for Windows platform.
 * Several improvements against grabbing events for Windows.
+* Updated module versions in dependencies.
 
 === 1.0.13 ===
 * Updated build scripts.
diff --git a/modules.mk b/modules.mk
index dbcc205..a5d75ba 100644
--- a/modules.mk
+++ b/modules.mk
@@ -20,49 +20,49 @@
 
 #------------------------------------------------------------------------------
 # Variables that describe source code dependencies
-LSP_COMMON_LIB_VERSION     := 1.0.30
+LSP_COMMON_LIB_VERSION     := 1.0.31
 LSP_COMMON_LIB_NAME        := lsp-common-lib
 LSP_COMMON_LIB_TYPE        := src
 LSP_COMMON_LIB_URL_RO      := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git
 LSP_COMMON_LIB_URL_RW      := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
 
-LSP_DSP_LIB_VERSION        := 1.0.14
+LSP_DSP_LIB_VERSION        := 1.0.15
 LSP_DSP_LIB_NAME           := lsp-dsp-lib
 LSP_DSP_LIB_TYPE           := src
 LSP_DSP_LIB_URL_RO         := https://github.com/lsp-plugins/$(LSP_DSP_LIB_NAME).git
 LSP_DSP_LIB_URL_RW         := git@github.com:lsp-plugins/$(LSP_DSP_LIB_NAME).git
 
-LSP_LLTL_LIB_VERSION       := 1.0.13
+LSP_LLTL_LIB_VERSION       := 1.0.14
 LSP_LLTL_LIB_NAME          := lsp-lltl-lib
 LSP_LLTL_LIB_TYPE          := src
 LSP_LLTL_LIB_URL_RO        := https://github.com/lsp-plugins/$(LSP_LLTL_LIB_NAME).git
 LSP_LLTL_LIB_URL_RW        := git@github.com:lsp-plugins/$(LSP_LLTL_LIB_NAME).git
 
-LSP_R3D_BASE_LIB_VERSION   := 1.0.13
+LSP_R3D_BASE_LIB_VERSION   := 1.0.14
 LSP_R3D_BASE_LIB_NAME      := lsp-r3d-base-lib
 LSP_R3D_BASE_LIB_TYPE      := src
 LSP_R3D_BASE_LIB_URL_RO    := https://github.com/lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git
 LSP_R3D_BASE_LIB_URL_RW    := git@github.com:lsp-plugins/$(LSP_R3D_BASE_LIB_NAME).git
 
-LSP_R3D_GLX_LIB_VERSION    := 1.0.13
+LSP_R3D_GLX_LIB_VERSION    := 1.0.14
 LSP_R3D_GLX_LIB_NAME       := lsp-r3d-glx-lib
 LSP_R3D_GLX_LIB_TYPE       := src
 LSP_R3D_GLX_LIB_URL_RO     := https://github.com/lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git
 LSP_R3D_GLX_LIB_URL_RW     := git@github.com:lsp-plugins/$(LSP_R3D_GLX_LIB_NAME).git
 
-LSP_R3D_IFACE_VERSION      := 1.0.13
+LSP_R3D_IFACE_VERSION      := 1.0.14
 LSP_R3D_IFACE_NAME         := lsp-r3d-iface
 LSP_R3D_IFACE_TYPE         := src
 LSP_R3D_IFACE_URL_RO       := https://github.com/lsp-plugins/$(LSP_R3D_IFACE_NAME).git
 LSP_R3D_IFACE_URL_RW       := git@github.com:lsp-plugins/$(LSP_R3D_IFACE_NAME).git
 
-LSP_R3D_WGL_LIB_VERSION    := 1.0.8
+LSP_R3D_WGL_LIB_VERSION    := 1.0.9
 LSP_R3D_WGL_LIB_NAME       := lsp-r3d-wgl-lib
 LSP_R3D_WGL_LIB_TYPE       := src
 LSP_R3D_WGL_LIB_URL_RO     := https://github.com/lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git
 LSP_R3D_WGL_LIB_URL_RW     := git@github.com:lsp-plugins/$(LSP_R3D_WGL_LIB_NAME).git
 
-LSP_RUNTIME_LIB_VERSION    := 1.0.16
+LSP_RUNTIME_LIB_VERSION    := 1.0.17
 LSP_RUNTIME_LIB_NAME       := lsp-runtime-lib
 LSP_RUNTIME_LIB_TYPE       := src
 LSP_RUNTIME_LIB_URL_RO     := https://github.com/lsp-plugins/$(LSP_RUNTIME_LIB_NAME).git

From e9e55d7b147cb68761cc37a3a98a668f4ee4dec5 Mon Sep 17 00:00:00 2001
From: Vladimir Sadovnikov <sadko4u@gmail.com>
Date: Sat, 9 Sep 2023 23:39:33 +0300
Subject: [PATCH 20/20] Preparing for release

---
 project.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.mk b/project.mk
index 3d23cb1..9744aca 100644
--- a/project.mk
+++ b/project.mk
@@ -23,5 +23,5 @@ ARTIFACT_ID                 = LSP_WS_LIB
 ARTIFACT_NAME               = lsp-ws-lib
 ARTIFACT_DESC               = LSP window subsystem core library
 ARTIFACT_HEADERS            = lsp-plug.in
-ARTIFACT_VERSION            = 1.0.14-devel
+ARTIFACT_VERSION            = 1.0.14