fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-03 21:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'enterNotify' into 'master'

Browse source 
xwayland: correct mouse coordinates in Xwayland enter events

See merge request xorg/xserver!2113
This commit is contained in:
Tsic 2025-12-18 17:42:28 +08:00
commit 7ef7ef6341
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hw/xwayland/xwayland-input.c
View file

@ -528,6 +528,7 @@ pointer_handle_enter(void *data, struct wl_pointer *pointer,
int dx, dy; int dx, dy;
ScreenPtr pScreen = xwl_screen->screen; ScreenPtr pScreen = xwl_screen->screen;
ValuatorMask mask; ValuatorMask mask;
DeviceEvent enter;
/* There's a race here where if we create and then immediately /* There's a race here where if we create and then immediately
* destroy a surface, we might end up in a state where the Wayland * destroy a surface, we might end up in a state where the Wayland
@ -558,8 +559,10 @@ pointer_handle_enter(void *data, struct wl_pointer *pointer,
(*pScreen->SetCursorPosition) (dev, pScreen, dx + sx, dy + sy, TRUE); (*pScreen->SetCursorPosition) (dev, pScreen, dx + sx, dy + sy, TRUE);
miPointerInvalidateSprite(master); miPointerInvalidateSprite(master);
init_device_event(&enter, dev, currentTime.milliseconds, EVENT_SOURCE_FOCUS);
enter.type = ET_Enter;
CheckMotion(NULL, master); CheckMotion(&enter, master);
/* Ideally, X clients shouldn't see these button releases. When /* Ideally, X clients shouldn't see these button releases. When
* the pointer leaves a window with buttons down, it means that * the pointer leaves a window with buttons down, it means that