From e155c19f8efa111a8456d4436f941ba5db25fcd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Camilla=20L=C3=B6wy?= <elmindreda@elmindreda.org>
Date: Thu, 30 Dec 2021 21:09:23 +0100
Subject: [PATCH] Wayland: Fix text input not following key repeat

The manual key repeat implementation did not call text input.

(cherry picked from commit 1a7da42e6ebaa4e8eeffb693c32c8d36d54ddf6b)
---
 README.md         | 1 +
 src/wl_init.c     | 4 ++--
 src/wl_platform.h | 1 +
 src/wl_window.c   | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1aa6f6c8..84c9ed05 100644
--- a/README.md
+++ b/README.md
@@ -133,6 +133,7 @@ information on what to include when reporting a bug.
  - [Wayland] Bugfix: Showing a hidden window did not emit a window refresh event
  - [Wayland] Bugfix: Full screen window creation did not ignore `GLFW_VISIBLE`
  - [Wayland] Bugfix: Some keys were reported as wrong key or `GLFW_KEY_UNKNOWN`
+ - [Wayland] Bugfix: Text input did not repeat along with key repeat
 
 
 ## Contact
diff --git a/src/wl_init.c b/src/wl_init.c
index 4d0f2bf0..3e31f9e5 100644
--- a/src/wl_init.c
+++ b/src/wl_init.c
@@ -531,7 +531,7 @@ static xkb_keysym_t composeSymbol(xkb_keysym_t sym)
     }
 }
 
-static GLFWbool inputChar(_GLFWwindow* window, uint32_t scancode)
+GLFWbool _glfwInputTextWayland(_GLFWwindow* window, uint32_t scancode)
 {
     const xkb_keysym_t* keysyms;
     const xkb_keycode_t keycode = scancode + 8;
@@ -573,7 +573,7 @@ static void keyboardHandleKey(void* data,
 
     if (action == GLFW_PRESS)
     {
-        const GLFWbool shouldRepeat = inputChar(window, scancode);
+        const GLFWbool shouldRepeat = _glfwInputTextWayland(window, scancode);
 
         if (shouldRepeat && _glfw.wl.keyboardRepeatRate > 0)
         {
diff --git a/src/wl_platform.h b/src/wl_platform.h
index f26bec28..dab4c0a5 100644
--- a/src/wl_platform.h
+++ b/src/wl_platform.h
@@ -350,4 +350,5 @@ typedef struct _GLFWcursorWayland
 
 
 void _glfwAddOutputWayland(uint32_t name, uint32_t version);
+GLFWbool _glfwInputTextWayland(_GLFWwindow* window, uint32_t scancode);
 
diff --git a/src/wl_window.c b/src/wl_window.c
index f0e878eb..50e701cd 100644
--- a/src/wl_window.c
+++ b/src/wl_window.c
@@ -883,6 +883,8 @@ static void handleEvents(int timeout)
                                   _glfw.wl.keyboardLastScancode,
                                   GLFW_PRESS,
                                   _glfw.wl.xkb.modifiers);
+                    _glfwInputTextWayland(_glfw.wl.keyboardFocus,
+                                          _glfw.wl.keyboardLastScancode);
                 }
             }
         }