[Wrapper] Added UTF-8 version of Set/GetWindowTitle functions to wrap…

…pers. This adds llglSetWindowTitleUTF8() and llglGetWindowTitleUTF8() as alternative to the wide-character version.
SmartDao · Jun 2, 2024 · 3874cde · 3874cde
1 parent f2b153b
commit 3874cde
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/include/LLGL-C/Window.h b/include/LLGL-C/Window.h
@@ -51,7 +51,9 @@ LLGL_C_EXPORT void llglGetWindowPosition(LLGLWindow window, LLGLOffset2D* outPos
 LLGL_C_EXPORT void llglSetWindowSize(LLGLWindow window, const LLGLExtent2D* size, bool useClientArea);
 LLGL_C_EXPORT void llglGetWindowSize(LLGLWindow window, LLGLExtent2D* outSize, bool useClientArea);
 LLGL_C_EXPORT void llglSetWindowTitle(LLGLWindow window, const wchar_t* title);
+LLGL_C_EXPORT void llglSetWindowTitleUTF8(LLGLWindow window, const char* title);
 LLGL_C_EXPORT size_t llglGetWindowTitle(LLGLWindow window, size_t outTitleLength, wchar_t* outTitle LLGL_ANNOTATE(NULL));
+LLGL_C_EXPORT size_t llglGetWindowTitleUTF8(LLGLWindow window, size_t outTitleLength, char* outTitle LLGL_ANNOTATE(NULL));
 LLGL_C_EXPORT void llglShowWindow(LLGLWindow window, bool show);
 LLGL_C_EXPORT bool llglIsWindowShown(LLGLWindow window);
 LLGL_C_EXPORT void llglSetWindowDesc(LLGLWindow window, const LLGLWindowDescriptor* windowDesc);

diff --git a/wrapper/C99/C99Window.cpp b/wrapper/C99/C99Window.cpp
@@ -215,6 +215,11 @@ LLGL_C_EXPORT void llglSetWindowTitle(LLGLWindow window, const wchar_t* title)
     LLGL_PTR(Window, window)->SetTitle(title);
 }
 
+LLGL_C_EXPORT void llglSetWindowTitleUTF8(LLGLWindow window, const char* title)
+{
+    LLGL_PTR(Window, window)->SetTitle(title);
+}
+
 LLGL_C_EXPORT size_t llglGetWindowTitle(LLGLWindow window, size_t outTitleLength, wchar_t* outTitle)
 {
     UTF8String title = LLGL_PTR(Window, window)->GetTitle();
@@ -227,6 +232,17 @@ LLGL_C_EXPORT size_t llglGetWindowTitle(LLGLWindow window, size_t outTitleLength
     return titleUTF16.size();
 }
 
+LLGL_C_EXPORT size_t llglGetWindowTitleUTF8(LLGLWindow window, size_t outTitleLength, char* outTitle)
+{
+    UTF8String title = LLGL_PTR(Window, window)->GetTitle();
+    if (outTitle != nullptr)
+    {
+        outTitleLength = std::min(outTitleLength, title.size() + 1);
+        ::memcpy(outTitle, title.data(), outTitleLength * sizeof(char));
+    }
+    return title.size() + 1;
+}
+
 LLGL_C_EXPORT void llglShowWindow(LLGLWindow window, bool show)
 {
     LLGL_PTR(Window, window)->Show(show);

diff --git a/wrapper/CSharp/LLGLWrapper.cs b/wrapper/CSharp/LLGLWrapper.cs
@@ -4818,9 +4818,15 @@ public unsafe struct ShaderReflection
         [DllImport(DllName, EntryPoint="llglSetWindowTitle", CallingConvention=CallingConvention.Cdecl)]
         public static extern unsafe void SetWindowTitle(Window window, [MarshalAs(UnmanagedType.LPWStr)] string title);
 
+        [DllImport(DllName, EntryPoint="llglSetWindowTitleUTF8", CallingConvention=CallingConvention.Cdecl)]
+        public static extern unsafe void SetWindowTitleUTF8(Window window, [MarshalAs(UnmanagedType.LPStr)] string title);
+
         [DllImport(DllName, EntryPoint="llglGetWindowTitle", CallingConvention=CallingConvention.Cdecl)]
         public static extern unsafe IntPtr GetWindowTitle(Window window, IntPtr outTitleLength, char* outTitle);
 
+        [DllImport(DllName, EntryPoint="llglGetWindowTitleUTF8", CallingConvention=CallingConvention.Cdecl)]
+        public static extern unsafe IntPtr GetWindowTitleUTF8(Window window, IntPtr outTitleLength, byte* outTitle);
+
         [DllImport(DllName, EntryPoint="llglShowWindow", CallingConvention=CallingConvention.Cdecl)]
         public static extern unsafe void ShowWindow(Window window, [MarshalAs(UnmanagedType.I1)] bool show);