ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11.drv: Update cached cursor position after calling hook.

This commit is contained in:
Vitaliy Margolen 2006-12-12 15:58:37 -07:00 committed by Alexandre Julliard
parent b13681797a
commit ff721806ca
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/winex11.drv/mouse.c
View File

@ -71,6 +71,8 @@ static const UINT button_up_flags[NB_BUTTONS] =
POINT cursor_pos; POINT cursor_pos;
BOOL X11DRV_SetCursorPos( INT x, INT y );
/*********************************************************************** /***********************************************************************
* get_coords * get_coords
* *
@ -231,9 +233,6 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y,
if (cursor_pos.x == x && cursor_pos.y == y) flags &= ~MOUSEEVENTF_MOVE; if (cursor_pos.x == x && cursor_pos.y == y) flags &= ~MOUSEEVENTF_MOVE;
wine_tsx11_unlock(); wine_tsx11_unlock();
} }
wine_tsx11_lock();
cursor_pos = pt;
wine_tsx11_unlock();
} }
else if (flags & MOUSEEVENTF_MOVE) else if (flags & MOUSEEVENTF_MOVE)
{ {
@ -262,7 +261,6 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y,
else if (pt.x >= screen_width) pt.x = screen_width - 1; else if (pt.x >= screen_width) pt.x = screen_width - 1;
if (pt.y < 0) pt.y = 0; if (pt.y < 0) pt.y = 0;
else if (pt.y >= screen_height) pt.y = screen_height - 1; else if (pt.y >= screen_height) pt.y = screen_height - 1;
cursor_pos = pt;
wine_tsx11_unlock(); wine_tsx11_unlock();
} }
else else
@ -279,10 +277,12 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y,
if ((injected_flags & LLMHF_INJECTED) && if ((injected_flags & LLMHF_INJECTED) &&
((flags & MOUSEEVENTF_ABSOLUTE) || x || y)) /* we have to actually move the cursor */ ((flags & MOUSEEVENTF_ABSOLUTE) || x || y)) /* we have to actually move the cursor */
{ {
TRACE( "warping to (%d,%d)\n", pt.x, pt.y ); X11DRV_SetCursorPos( pt.x, pt.y );
}
else
{
wine_tsx11_lock(); wine_tsx11_lock();
XWarpPointer( thread_display(), root_window, root_window, 0, 0, 0, 0, cursor_pos = pt;
pt.x - virtual_screen_rect.left, pt.y - virtual_screen_rect.top );
wine_tsx11_unlock(); wine_tsx11_unlock();
} }
} }