mirror of
https://github.com/kovidgoyal/kitty.git
synced 2024-11-14 12:11:12 +03:00
Merge branch 'fix-wayland-cursor-shape' of https://github.com/jinliu/kitty
This commit is contained in:
commit
044f53b35b
2
glfw/wl_init.c
vendored
2
glfw/wl_init.c
vendored
@ -99,7 +99,7 @@ static void pointerHandleEnter(void* data UNUSED,
|
||||
return;
|
||||
}
|
||||
window->wl.decorations.focus = focus;
|
||||
_glfw.wl.serial = serial; _glfw.wl.input_serial = serial; _glfw.wl.pointer_serial = serial;
|
||||
_glfw.wl.serial = serial; _glfw.wl.input_serial = serial; _glfw.wl.pointer_serial = serial; _glfw.wl.pointer_enter_serial = serial;
|
||||
_glfw.wl.pointerFocus = window;
|
||||
|
||||
window->wl.hovered = true;
|
||||
|
2
glfw/wl_platform.h
vendored
2
glfw/wl_platform.h
vendored
@ -295,7 +295,7 @@ typedef struct _GLFWlibraryWayland
|
||||
|
||||
struct wl_surface* cursorSurface;
|
||||
GLFWCursorShape cursorPreviousShape;
|
||||
uint32_t serial, input_serial, pointer_serial, keyboard_enter_serial;
|
||||
uint32_t serial, input_serial, pointer_serial, pointer_enter_serial, keyboard_enter_serial;
|
||||
|
||||
int32_t keyboardRepeatRate;
|
||||
monotonic_t keyboardRepeatDelay;
|
||||
|
2
glfw/wl_window.c
vendored
2
glfw/wl_window.c
vendored
@ -200,7 +200,7 @@ setCursorImage(_GLFWwindow* window, bool on_theme_change) {
|
||||
if (_glfw.wl.wp_cursor_shape_device_v1) {
|
||||
int which = glfw_cursor_shape_to_wayland_cursor_shape(cursorWayland->shape);
|
||||
if (which > -1) {
|
||||
wp_cursor_shape_device_v1_set_shape(_glfw.wl.wp_cursor_shape_device_v1, _glfw.wl.serial, (uint32_t)which);
|
||||
wp_cursor_shape_device_v1_set_shape(_glfw.wl.wp_cursor_shape_device_v1, _glfw.wl.pointer_enter_serial, (uint32_t)which);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user