From f59094e033fafc28664700061e2726be70a1568c Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Thu, 20 Jun 2019 16:00:12 +0200
Subject: OpenGL: disable vsync, atleast under Windows

---
 src/libui_sdl/libui/windows/gl.cpp | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'src/libui_sdl/libui/windows')

diff --git a/src/libui_sdl/libui/windows/gl.cpp b/src/libui_sdl/libui/windows/gl.cpp
index c621721..07ef19b 100644
--- a/src/libui_sdl/libui/windows/gl.cpp
+++ b/src/libui_sdl/libui/windows/gl.cpp
@@ -3,6 +3,7 @@
 #include "area.hpp"
 
 #include <GL/gl.h>
+#include <GL/glext.h>
 #include <GL/wglext.h>
 
 struct uiGLContext
@@ -159,3 +160,37 @@ float uiGLGetFramebufferScale(uiGLContext* ctx)
     // TODO
     return 1;
 }
+
+void uiGLSetVSync(int sync)
+{
+	static PFNWGLSWAPINTERVALEXTPROC _wglSwapIntervalEXT = NULL;
+	static bool symloaded = false;
+
+	if (!symloaded)
+    {
+        PFNGLGETSTRINGIPROC _glGetStringi = (PFNGLGETSTRINGIPROC)wglGetProcAddress("glGetStringi");
+        if (_glGetStringi == NULL) return;
+
+        GLint numext;
+        glGetIntegerv(GL_NUM_EXTENSIONS, &numext);
+
+        bool hasswapctrl = false;
+        for (GLint i = 0; i < numext; i++)
+        {
+            const char* ext = (const char*)_glGetStringi(GL_EXTENSIONS, i);
+            if (!stricmp(ext, "WGL_EXT_swap_control"))
+            {
+                hasswapctrl = true;
+                break;
+            }
+        }
+
+        if (hasswapctrl)
+            _wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)wglGetProcAddress("wglSwapIntervalEXT");
+
+        symloaded = true;
+    }
+
+    if (_wglSwapIntervalEXT)
+        _wglSwapIntervalEXT(sync);
+}
-- 
cgit v1.2.3


From 58575f82b7453c16616333e043651a57ea713eb6 Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Tue, 25 Jun 2019 12:29:56 +0200
Subject: libui/windows: backport fix for #471

---
 src/libui_sdl/libui/windows/window.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libui_sdl/libui/windows')

diff --git a/src/libui_sdl/libui/windows/window.cpp b/src/libui_sdl/libui/windows/window.cpp
index 18d1171..a8f7f23 100644
--- a/src/libui_sdl/libui/windows/window.cpp
+++ b/src/libui_sdl/libui/windows/window.cpp
@@ -95,7 +95,7 @@ static LRESULT CALLBACK windowWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA
 		// not a menu
 		if (lParam != 0)
 			break;
-		if (HIWORD(wParam) != 0)
+		if (HIWORD(wParam) != 0 || LOWORD(wParam) <= IDCANCEL)
 			break;
 		runMenuEvent(LOWORD(wParam), uiWindow(w));
 		return 0;
-- 
cgit v1.2.3


From 7cb8112984172d1886d6bd7b12f0afffd1fa7229 Mon Sep 17 00:00:00 2001
From: Zapeth <steami@live.at>
Date: Sun, 25 Aug 2019 18:28:54 +0200
Subject: Fix MinGW resource file compilation issues

---
 src/libui_sdl/CMakeLists.txt               | 4 ++++
 src/libui_sdl/libui/windows/CMakeLists.txt | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/libui_sdl/libui/windows')

diff --git a/src/libui_sdl/CMakeLists.txt b/src/libui_sdl/CMakeLists.txt
index 63e9f48..b5d29d8 100644
--- a/src/libui_sdl/CMakeLists.txt
+++ b/src/libui_sdl/CMakeLists.txt
@@ -14,6 +14,10 @@ SET(SOURCES_LIBUI
 	OSD.cpp
 )
 
+if (WIN32)
+	set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> -o <OBJECT>")
+endif()
+
 option(BUILD_SHARED_LIBS "Whether to build libui as a shared library or a static library" ON)
 set(BUILD_SHARED_LIBS OFF)
 add_subdirectory(libui)
diff --git a/src/libui_sdl/libui/windows/CMakeLists.txt b/src/libui_sdl/libui/windows/CMakeLists.txt
index 9d5313a..24d4ad9 100644
--- a/src/libui_sdl/libui/windows/CMakeLists.txt
+++ b/src/libui_sdl/libui/windows/CMakeLists.txt
@@ -73,7 +73,7 @@ macro(_handle_static)
 	add_custom_command(
 		TARGET libui POST_BUILD
 		COMMAND
-			${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:libui,BINARY_DIR>/CMakeFiles/libui.dir/windows/resources.rc.* ${_LIBUI_STATIC_RES}
+			${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:libui,BINARY_DIR>/CMakeFiles/libui.dir/windows/resources.rc.obj ${_LIBUI_STATIC_RES}
 		COMMENT "Copying libui.res")
 endmacro()
 
-- 
cgit v1.2.3