Module: wine Branch: master Commit: 6f9e788fc0b6e83128559c775f25035c345abb12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f9e788fc0b6e83128559c775... Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 30 12:18:01 2019 +0200 winex11.drv: Do not set clipping_cursor when clip window map state changes. This flag should only indicate a successful call to XGrabPointer. If not then we could assume we have ownership of the pointer when we don't. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 59ab4ce..f79f40c 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -984,11 +984,8 @@ static BOOL X11DRV_MapNotify( HWND hwnd, XEvent *event ) { struct x11drv_win_data *data; - if (event->xany.window == x11drv_thread_data()->clip_window) - { - clipping_cursor = TRUE; - return TRUE; - } + if (event->xany.window == x11drv_thread_data()->clip_window) return TRUE; + if (!(data = get_win_data( hwnd ))) return FALSE; if (!data->managed && !data->embedded && data->mapped) @@ -1007,8 +1004,6 @@ static BOOL X11DRV_MapNotify( HWND hwnd, XEvent *event ) */ static BOOL X11DRV_UnmapNotify( HWND hwnd, XEvent *event ) { - if (event->xany.window == x11drv_thread_data()->clip_window) - clipping_cursor = FALSE; return TRUE; }