Upstream & Better glfwSetCursorPos Implementation by DanShaders

patches/0004-Key-Modifiers-Fix.patch → patches/0001-Key-Modifiers-Fix.patch

@@ -1,14 +1,14 @@
-From d16c02495d163e4f8712f57a793ab42bcc000109 Mon Sep 17 00:00:00 2001
+From c61fd441e57631196d7a486ffb52bf3b73863527 Mon Sep 17 00:00:00 2001
 From: BoyOrigin <ahmadyasinfikri@gmail.com>
 Date: Mon, 18 Sep 2023 01:39:37 +0700
 Subject: [PATCH] Key Modifiers Fix
 
 
 diff --git a/src/wl_window.c b/src/wl_window.c
-index 28006424..fbb243f3 100644
+index 5b491ffb..31fe9c14 100644
 --- a/src/wl_window.c
 +++ b/src/wl_window.c
-@@ -1088,7 +1088,9 @@ static void inputText(_GLFWwindow* window, uint32_t scancode)
+@@ -1197,7 +1197,9 @@ static void inputText(_GLFWwindow* window, uint32_t scancode)
          {
              const int mods = _glfw.wl.xkb.modifiers;
              const int plain = !(mods & (GLFW_MOD_CONTROL | GLFW_MOD_ALT));
@@ -20,5 +20,5 @@ index 28006424..fbb243f3 100644
      }
  }
 -- 
-2.42.0
+2.43.0
 

patches/0006-Fix-duplicate-pointer-scroll-events.patch → patches/0002-Fix-duplicate-pointer-scroll-events.patch

@@ -1,27 +1,27 @@
-From 9105e5e907f98fa966d91e1725cb00a2c71030f5 Mon Sep 17 00:00:00 2001
+From fb39b826d4b087ee8653767bb4ac189adc46c249 Mon Sep 17 00:00:00 2001
 From: BoyOrigin <ahmadyasinfikri@gmail.com>
 Date: Tue, 19 Sep 2023 03:31:57 +0700
 Subject: [PATCH] Fix duplicate pointer scroll events
 
 
 diff --git a/src/wl_platform.h b/src/wl_platform.h
-index e9dd0b4a..ea50dd55 100644
+index 149cd241..b17fa722 100644
 --- a/src/wl_platform.h
 +++ b/src/wl_platform.h
-@@ -412,6 +412,8 @@ typedef struct _GLFWwindowWayland
-         _GLFWdecorationWayland             top, left, right, bottom;
-         _GLFWdecorationSideWayland         focus;
-     } decorations;
+@@ -413,6 +413,8 @@ typedef struct _GLFWwindowWayland
+         _GLFWfallbackEdgeWayland    top, left, right, bottom;
+         struct wl_surface*          focus;
+     } fallback;
 +
 +    uint32_t                    pointerAxisTime;
  } _GLFWwindowWayland;
 
  // Wayland-specific global data
 diff --git a/src/wl_window.c b/src/wl_window.c
-index 602981b9..34564e21 100644
+index 31fe9c14..aab79d01 100644
 --- a/src/wl_window.c
 +++ b/src/wl_window.c
-@@ -1508,6 +1508,11 @@ static void pointerHandleAxis(void* userData,
+@@ -1617,6 +1617,11 @@ static void pointerHandleAxis(void* userData,
      if (!window)
          return;
 
@@ -30,9 +30,9 @@ index 602981b9..34564e21 100644
 +        return;
 +    window->wl.pointerAxisTime = time;
 +
-     assert(axis == WL_POINTER_AXIS_HORIZONTAL_SCROLL ||
-            axis == WL_POINTER_AXIS_VERTICAL_SCROLL);
-
+     // NOTE: 10 units of motion per mouse wheel step seems to be a common ratio
+     if (axis == WL_POINTER_AXIS_HORIZONTAL_SCROLL)
+         _glfwInputScroll(window, -wl_fixed_to_double(value) / 10.0, 0.0);
 -- 
-2.42.0
+2.43.0
 

patches/0003-Implement-glfwSetCursorPosWayland.patch

@@ -0,0 +1,54 @@
+From 70bcc32a8e60c012e91f74bab9062c1a6596b39a Mon Sep 17 00:00:00 2001
+From: FayBoy <ahmadyasinfikri@gmail.com>
+Date: Thu, 22 Feb 2024 19:30:53 +0700
+Subject: [PATCH] Implement glfwSetCursorPosWayland
+
+
+diff --git a/src/wl_platform.h b/src/wl_platform.h
+index b17fa722..7ffc7e83 100644
+--- a/src/wl_platform.h
++++ b/src/wl_platform.h
+@@ -415,6 +415,8 @@ typedef struct _GLFWwindowWayland
+     } fallback;
+
+     uint32_t                    pointerAxisTime;
++    double                      askedCursorPosX, askedCursorPosY;
++    GLFWbool                    didAskForSetCursorPos;
+ } _GLFWwindowWayland;
+
+ // Wayland-specific global data
+diff --git a/src/wl_window.c b/src/wl_window.c
+index aab79d01..b1b280a7 100644
+--- a/src/wl_window.c
++++ b/src/wl_window.c
+@@ -2674,8 +2674,9 @@ void _glfwGetCursorPosWayland(_GLFWwindow* window, double* xpos, double* ypos)
+
+ void _glfwSetCursorPosWayland(_GLFWwindow* window, double x, double y)
+ {
+-    _glfwInputError(GLFW_FEATURE_UNAVAILABLE,
+-                    "Wayland: The platform does not support setting the cursor position");
++    window->wl.didAskForSetCursorPos = true;
++    window->wl.askedCursorPosX = x;
++    window->wl.askedCursorPosY = y;
+ }
+
+ void _glfwSetCursorModeWayland(_GLFWwindow* window, int mode)
+@@ -2909,6 +2910,15 @@ static const struct zwp_relative_pointer_v1_listener relativePointerListener =
+ static void lockedPointerHandleLocked(void* userData,
+                                       struct zwp_locked_pointer_v1* lockedPointer)
+ {
++    _GLFWwindow* window = userData;
++
++    if (window->wl.didAskForSetCursorPos)
++    {
++        window->wl.didAskForSetCursorPos = false;
++        zwp_locked_pointer_v1_set_cursor_position_hint(window->wl.lockedPointer,
++                                                       wl_fixed_from_double(window->wl.askedCursorPosX),
++                                                       wl_fixed_from_double(window->wl.askedCursorPosY));
++    }
+ }
+
+ static void lockedPointerHandleUnlocked(void* userData,
+-- 
+2.43.0
+

patches/0003-Fix-Window-size-on-unset-fullscreen.patch → patches/0004-Fix-Window-size-on-unset-fullscreen.patch

@@ -1,14 +1,14 @@
-From c3a4ea19f019147ab121107fdde8d57279fbfa9a Mon Sep 17 00:00:00 2001
+From d463fb4a7694ef537279bce4e1653bc22bf260a1 Mon Sep 17 00:00:00 2001
 From: BoyOrigin <ahmadyasinfikri@gmail.com>
 Date: Mon, 18 Sep 2023 01:37:44 +0700
 Subject: [PATCH] Fix Window size on unset fullscreen
 
 
 diff --git a/src/wl_window.c b/src/wl_window.c
-index 05e7c872..28006424 100644
+index b1b280a7..9cc76c3e 100644
 --- a/src/wl_window.c
 +++ b/src/wl_window.c
-@@ -2159,6 +2159,8 @@ void _glfwSetWindowSizeWayland(_GLFWwindow* window, int width, int height)
+@@ -2282,6 +2282,8 @@ void _glfwSetWindowSizeWayland(_GLFWwindow* window, int width, int height)
              libdecor_state_free(frameState);
          }
 
@@ -18,5 +18,5 @@ index 05e7c872..28006424 100644
              _glfwInputWindowDamage(window);
      }
 -- 
-2.42.0
+2.43.0