Rémi Bernon : winex11.drv: Map coordinates before calling send_mouse_input.
Alexandre Julliard
julliard at winehq.org
Tue Apr 6 15:50:14 CDT 2021
Module: wine
Branch: master
Commit: a358a25edad7b7ef8b326270d4a66086deb8c1a3
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a358a25edad7b7ef8b326270d4a66086deb8c1a3
Author: Rémi Bernon <rbernon at codeweavers.com>
Date: Tue Apr 6 17:47:40 2021 +0200
winex11.drv: Map coordinates before calling send_mouse_input.
Based on a patch from Gabriel Ivăncescu <gabrielopcode at gmail.com>.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46309
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winex11.drv/mouse.c | 44 +++++++++++++++++++++++++++++---------------
1 file changed, 29 insertions(+), 15 deletions(-)
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
index e567a03c61c..25b0b742fe3 100644
--- a/dlls/winex11.drv/mouse.c
+++ b/dlls/winex11.drv/mouse.c
@@ -592,24 +592,38 @@ static BOOL is_old_motion_event( unsigned long serial )
*
* Map the input event coordinates so they're relative to the desktop.
*/
-static void map_event_coords( HWND hwnd, Window window, struct x11drv_win_data *data, INPUT *input )
+static void map_event_coords( HWND hwnd, Window window, INPUT *input )
{
+ struct x11drv_thread_data *thread_data;
+ struct x11drv_win_data *data;
POINT pt = { input->u.mi.dx, input->u.mi.dy };
- TRACE( "hwnd %p, window %lx, data %p, input %p\n", hwnd, window, data, input );
+ TRACE( "hwnd %p, window %lx, input %p\n", hwnd, window, input );
- if (window == root_window) pt = root_to_virtual_screen( pt.x, pt.y );
- else
+ if (!hwnd)
+ {
+ thread_data = x11drv_thread_data();
+ if (!thread_data->clip_hwnd) return;
+ if (thread_data->clip_window != window) return;
+ pt.x += clip_rect.left;
+ pt.y += clip_rect.top;
+ }
+ else if ((data = get_win_data( hwnd )))
{
- if (window == data->whole_window)
+ if (window == root_window) pt = root_to_virtual_screen( pt.x, pt.y );
+ else
{
- pt.x += data->whole_rect.left - data->client_rect.left;
- pt.y += data->whole_rect.top - data->client_rect.top;
- }
+ if (window == data->whole_window)
+ {
+ pt.x += data->whole_rect.left - data->client_rect.left;
+ pt.y += data->whole_rect.top - data->client_rect.top;
+ }
- if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL)
- pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x;
- MapWindowPoints( hwnd, 0, &pt, 1 );
+ if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL)
+ pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x;
+ MapWindowPoints( hwnd, 0, &pt, 1 );
+ }
+ release_win_data( data );
}
TRACE( "mapped %s to %s\n", wine_dbgstr_point( (POINT *)&input->u.mi.dx ), wine_dbgstr_point( &pt ) );
@@ -643,15 +657,11 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU
sync_window_cursor( window );
last_cursor_change = input->u.mi.time;
}
- input->u.mi.dx += clip_rect.left;
- input->u.mi.dy += clip_rect.top;
__wine_send_input( hwnd, input );
return;
}
if (!(data = get_win_data( hwnd ))) return;
- map_event_coords( hwnd, window, data, input );
-
if (InterlockedExchangePointer( (void **)&cursor_window, hwnd ) != hwnd ||
input->u.mi.time - last_cursor_change > 100)
{
@@ -1699,6 +1709,7 @@ BOOL X11DRV_ButtonPress( HWND hwnd, XEvent *xev )
input.u.mi.dwExtraInfo = 0;
update_user_time( event->time );
+ map_event_coords( hwnd, event->window, &input );
send_mouse_input( hwnd, event->window, event->state, &input );
return TRUE;
}
@@ -1724,6 +1735,7 @@ BOOL X11DRV_ButtonRelease( HWND hwnd, XEvent *xev )
input.u.mi.time = EVENT_x11_time_to_win32_time( event->time );
input.u.mi.dwExtraInfo = 0;
+ map_event_coords( hwnd, event->window, &input );
send_mouse_input( hwnd, event->window, event->state, &input );
return TRUE;
}
@@ -1752,6 +1764,7 @@ BOOL X11DRV_MotionNotify( HWND hwnd, XEvent *xev )
TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial );
return FALSE;
}
+ map_event_coords( hwnd, event->window, &input );
send_mouse_input( hwnd, event->window, event->state, &input );
return TRUE;
}
@@ -1783,6 +1796,7 @@ BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *xev )
TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial );
return FALSE;
}
+ map_event_coords( hwnd, event->window, &input );
send_mouse_input( hwnd, event->window, event->state, &input );
return TRUE;
}
More information about the wine-cvs
mailing list