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

winex11drv: Return cached cursor_pos in GetCursorPos().

This commit is contained in:
Vitaliy Margolen 2006-12-18 13:26:35 -07:00 committed by Alexandre Julliard
parent 84f0a03556
commit 7de64a3ab8
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/user32/tests/win.c
View File

@ -2501,6 +2501,15 @@ static void test_mouse_input(HWND hwnd)
GetCursorPos(&pt); GetCursorPos(&pt);
ok(x == pt.x && y == pt.y, "wrong cursor pos (%d,%d), expected (%d,%d)\n", pt.x, pt.y, x, y); ok(x == pt.x && y == pt.y, "wrong cursor pos (%d,%d), expected (%d,%d)\n", pt.x, pt.y, x, y);
while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg);
/* Check that setting the same position will generate WM_MOUSEMOVE */
SetCursorPos(x, y);
msg.message = 0;
ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n");
ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message);
ok(msg.pt.x == x && msg.pt.y == y, "wrong message coords (%d,%d)/(%d,%d)\n", x, y, msg.pt.x, msg.pt.y);
/* force the system to update its internal queue mouse position, /* force the system to update its internal queue mouse position,
* otherwise it won't generate relative mouse movements below. * otherwise it won't generate relative mouse movements below.
*/ */

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

@ -70,6 +70,7 @@ static const UINT button_up_flags[NB_BUTTONS] =
}; };
POINT cursor_pos; POINT cursor_pos;
static DWORD last_time_modified;
BOOL X11DRV_SetCursorPos( INT x, INT y ); BOOL X11DRV_SetCursorPos( INT x, INT y );
@ -190,6 +191,7 @@ static void queue_raw_mouse_message( UINT message, HWND hwnd, DWORD x, DWORD y,
hook.time = time; hook.time = time;
hook.dwExtraInfo = extra_info; hook.dwExtraInfo = extra_info;
last_time_modified = GetTickCount();
if (HOOK_CallHooks( WH_MOUSE_LL, HC_ACTION, message, (LPARAM)&hook, TRUE )) return; if (HOOK_CallHooks( WH_MOUSE_LL, HC_ACTION, message, (LPARAM)&hook, TRUE )) return;
SERVER_START_REQ( send_hardware_message ) SERVER_START_REQ( send_hardware_message )
@ -685,6 +687,14 @@ BOOL X11DRV_SetCursorPos( INT x, INT y )
TRACE( "warping to (%d,%d)\n", x, y ); TRACE( "warping to (%d,%d)\n", x, y );
wine_tsx11_lock(); wine_tsx11_lock();
if (cursor_pos.x == x && cursor_pos.y == y)
{
wine_tsx11_unlock();
/* We still need to generate WM_MOUSEMOVE */
queue_raw_mouse_message( WM_MOUSEMOVE, NULL, x, y, 0, GetCurrentTime(), 0, 0 );
return TRUE;
}
XWarpPointer( display, root_window, root_window, 0, 0, 0, 0, XWarpPointer( display, root_window, root_window, 0, 0, 0, 0,
x - virtual_screen_rect.left, y - virtual_screen_rect.top ); x - virtual_screen_rect.left, y - virtual_screen_rect.top );
XFlush( display ); /* avoids bad mouse lag in games that do their own mouse warping */ XFlush( display ); /* avoids bad mouse lag in games that do their own mouse warping */
@ -705,7 +715,8 @@ BOOL X11DRV_GetCursorPos(LPPOINT pos)
unsigned int xstate; unsigned int xstate;
wine_tsx11_lock(); wine_tsx11_lock();
if (XQueryPointer( display, root_window, &root, &child, if ((GetTickCount() - last_time_modified > 100) &&
XQueryPointer( display, root_window, &root, &child,
&rootX, &rootY, &winX, &winY, &xstate )) &rootX, &rootY, &winX, &winY, &xstate ))
{ {
update_button_state( xstate ); update_button_state( xstate );