demos: fix cursor position on glfw high dpi

In particular, macOS.
haasn · Nov 18, 2021 · 93d05c4 · 93d05c4
1 parent d01f97c
commit 93d05c4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/demos/meson.build b/demos/meson.build
@@ -43,7 +43,7 @@ if glfw.found()
   if comps.has('vulkan')
     conf_demos.set('HAVE_GLFW_VULKAN', true)
     apis += static_library('glfw-vk',
-      dependencies: [libplacebo, glfw, vulkan_headers],
+      dependencies: [libplacebo, libm, glfw, vulkan_headers],
       sources: 'window_glfw.c',
       c_args: '-DUSE_VK',
     )

diff --git a/demos/window_glfw.c b/demos/window_glfw.c
@@ -5,6 +5,7 @@
 #endif
 
 #include <string.h>
+#include <math.h>
 
 #include "common.h"
 #include "window.h"
@@ -377,9 +378,12 @@ static void glfw_get_cursor(const struct window *window, int *x, int *y)
 {
     struct priv *p = (struct priv *) window;
     double dx, dy;
+    int fw, fh, ww, wh;
     glfwGetCursorPos(p->win, &dx, &dy);
-    *x = dx;
-    *y = dy;
+    glfwGetFramebufferSize(p->win, &fw, &fh);
+    glfwGetWindowSize(p->win, &ww, &wh);
+    *x = floor(dx * fw / ww);
+    *y = floor(dy * fh / wh);
 }
 
 static bool glfw_get_button(const struct window *window, enum button btn)