mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 13:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wayland: Ask xkbcommon whether to repeat a key

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot 2018-02-12 09:32:34 +01:00 committed by linkmauve
parent 8bc0c5c2c0
commit 84d10b32c3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wl_init.c
View File

@ -329,7 +329,7 @@ static xkb_keysym_t composeSymbol(xkb_keysym_t sym)
} }
#endif #endif
static void inputChar(_GLFWwindow* window, uint32_t key) static GLFWbool inputChar(_GLFWwindow* window, uint32_t key)
{ {
uint32_t code, numSyms; uint32_t code, numSyms;
long cp; long cp;
@ -354,6 +354,8 @@ static void inputChar(_GLFWwindow* window, uint32_t key)
_glfwInputChar(window, cp, mods, plain); _glfwInputChar(window, cp, mods, plain);
} }
} }
return xkb_keymap_key_repeats(_glfw.wl.xkb.keymap, syms[0]);
} }
static void keyboardHandleKey(void* data, static void keyboardHandleKey(void* data,
@ -366,6 +368,7 @@ static void keyboardHandleKey(void* data,
int keyCode; int keyCode;
int action; int action;
_GLFWwindow* window = _glfw.wl.keyboardFocus; _GLFWwindow* window = _glfw.wl.keyboardFocus;
GLFWbool shouldRepeat;
struct itimerspec timer = {}; struct itimerspec timer = {};
if (!window) if (!window)
@ -380,9 +383,9 @@ static void keyboardHandleKey(void* data,
if (action == GLFW_PRESS) if (action == GLFW_PRESS)
{ {
inputChar(window, key); shouldRepeat = inputChar(window, key);
if (_glfw.wl.keyboardRepeatRate > 0) if (shouldRepeat && _glfw.wl.keyboardRepeatRate > 0)
{ {
_glfw.wl.keyboardLastKey = keyCode; _glfw.wl.keyboardLastKey = keyCode;
_glfw.wl.keyboardLastScancode = key; _glfw.wl.keyboardLastScancode = key;