Wayland: Fix a regression in the previous release that caused mouse cursor animation and keyboard repeat to stop working when switching seats

Fixes #5188
This commit is contained in:
Kovid Goyal
2022-06-10 21:38:30 +05:30
parent 9184de1997
commit 646bdbd002
2 changed files with 5 additions and 8 deletions

10
glfw/wl_init.c vendored
View File

@@ -573,10 +573,7 @@ static void seatHandleCapabilities(void* data UNUSED,
{
wl_pointer_destroy(_glfw.wl.pointer);
_glfw.wl.pointer = NULL;
if (_glfw.wl.cursorAnimationTimer) {
removeTimer(&_glfw.wl.eventLoopData, _glfw.wl.cursorAnimationTimer);
_glfw.wl.cursorAnimationTimer = 0;
}
if (_glfw.wl.cursorAnimationTimer) toggleTimer(&_glfw.wl.eventLoopData, _glfw.wl.cursorAnimationTimer, 0);
}
if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && !_glfw.wl.keyboard)
@@ -589,10 +586,7 @@ static void seatHandleCapabilities(void* data UNUSED,
wl_keyboard_destroy(_glfw.wl.keyboard);
_glfw.wl.keyboard = NULL;
_glfw.wl.keyboardFocusId = 0;
if (_glfw.wl.keyRepeatInfo.keyRepeatTimer) {
removeTimer(&_glfw.wl.eventLoopData, _glfw.wl.keyRepeatInfo.keyRepeatTimer);
_glfw.wl.keyRepeatInfo.keyRepeatTimer = 0;
}
if (_glfw.wl.keyRepeatInfo.keyRepeatTimer) toggleTimer(&_glfw.wl.eventLoopData, _glfw.wl.keyRepeatInfo.keyRepeatTimer, 0);
}
}