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

winex11: Synchronize the mouse cursor in update_mouse_state.

This commit is contained in:
Alexandre Julliard 2011-02-23 21:46:08 +01:00
parent f0396489e6
commit 94fb0f5935
4 changed files with 55 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/winex11.drv/event.c
View File

@ -1563,7 +1563,7 @@ UINT CDECL X11DRV_SendInput( UINT count, LPINPUT inputs, int size )
switch(inputs->type)
{
case INPUT_MOUSE:
X11DRV_send_mouse_input( 0, 0, inputs->u.mi.dwFlags, inputs->u.mi.dx, inputs->u.mi.dy,
X11DRV_send_mouse_input( 0, inputs->u.mi.dwFlags, inputs->u.mi.dx, inputs->u.mi.dy,
inputs->u.mi.mouseData, inputs->u.mi.time,
inputs->u.mi.dwExtraInfo, LLMHF_INJECTED );
break;

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

@ -186,13 +186,10 @@ static Cursor get_empty_cursor(void)
/***********************************************************************
* set_window_cursor
*/
void set_window_cursor( HWND hwnd, HCURSOR handle )
void set_window_cursor( struct x11drv_win_data *data, HCURSOR handle )
{
struct x11drv_win_data *data;
Cursor cursor, prev;
if (!(data = X11DRV_get_win_data( hwnd ))) return;
wine_tsx11_lock();
if (!handle) cursor = get_empty_cursor();
else if (!cursor_context || XFindContext( gdi_display, (XID)handle, cursor_context, (char **)&cursor ))
@ -223,6 +220,24 @@ void set_window_cursor( HWND hwnd, HCURSOR handle )
wine_tsx11_unlock();
}
/***********************************************************************
* sync_window_cursor
*/
void sync_window_cursor( struct x11drv_win_data *data )
{
HCURSOR cursor;
SERVER_START_REQ( set_cursor )
{
req->flags = 0;
wine_server_call( req );
cursor = reply->prev_count >= 0 ? wine_server_ptr_handle( reply->prev_handle ) : 0;
}
SERVER_END_REQ;
if (data->cursor != cursor) set_window_cursor( data, cursor );
}
/***********************************************************************
* update_mouse_state
*
@ -251,6 +266,7 @@ static HWND update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned
MapWindowPoints( hwnd, 0, pt, 1 );
cursor_window = hwnd;
sync_window_cursor( data );
if (hwnd != GetDesktopWindow()) hwnd = GetAncestor( hwnd, GA_ROOT );
/* update the wine server Z-order */
@ -307,11 +323,10 @@ static WORD get_key_state(void)
/***********************************************************************
* queue_raw_mouse_message
*/
static void queue_raw_mouse_message( UINT message, HWND top_hwnd, HWND cursor_hwnd, DWORD x, DWORD y,
static void queue_raw_mouse_message( UINT message, HWND hwnd, DWORD x, DWORD y,
DWORD data, DWORD time, DWORD extra_info, UINT injected_flags )
{
MSLLHOOKSTRUCT hook;
HCURSOR cursor;
hook.pt.x = x;
hook.pt.y = y;
@ -327,7 +342,7 @@ static void queue_raw_mouse_message( UINT message, HWND top_hwnd, HWND cursor_hw
SERVER_START_REQ( send_hardware_message )
{
req->id = (injected_flags & LLMHF_INJECTED) ? 0 : GetCurrentThreadId();
req->win = wine_server_user_handle( top_hwnd );
req->win = wine_server_user_handle( hwnd );
req->msg = message;
req->wparam = MAKEWPARAM( get_key_state(), data );
req->lparam = 0;
@ -336,22 +351,15 @@ static void queue_raw_mouse_message( UINT message, HWND top_hwnd, HWND cursor_hw
req->time = time;
req->info = extra_info;
wine_server_call( req );
cursor = (reply->count >= 0) ? wine_server_ptr_handle(reply->cursor) : 0;
}
SERVER_END_REQ;
if (cursor_hwnd)
{
struct x11drv_win_data *data = X11DRV_get_win_data( cursor_hwnd );
if (data && cursor != data->cursor) set_window_cursor( cursor_hwnd, cursor );
}
}
/***********************************************************************
* X11DRV_send_mouse_input
*/
void X11DRV_send_mouse_input( HWND top_hwnd, HWND cursor_hwnd, DWORD flags, DWORD x, DWORD y,
void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y,
DWORD data, DWORD time, DWORD extra_info, UINT injected_flags )
{
POINT pt;
@ -408,7 +416,7 @@ void X11DRV_send_mouse_input( HWND top_hwnd, HWND cursor_hwnd, DWORD flags, DWOR
if (flags & MOUSEEVENTF_MOVE)
{
queue_raw_mouse_message( WM_MOUSEMOVE, top_hwnd, cursor_hwnd, pt.x, pt.y, data, time,
queue_raw_mouse_message( WM_MOUSEMOVE, hwnd, pt.x, pt.y, data, time,
extra_info, injected_flags );
if ((injected_flags & LLMHF_INJECTED) &&
((flags & MOUSEEVENTF_ABSOLUTE) || x || y)) /* we have to actually move the cursor */
@ -427,57 +435,53 @@ void X11DRV_send_mouse_input( HWND top_hwnd, HWND cursor_hwnd, DWORD flags, DWOR
{
key_state_table[VK_LBUTTON] |= 0xc0;
queue_raw_mouse_message( GetSystemMetrics(SM_SWAPBUTTON) ? WM_RBUTTONDOWN : WM_LBUTTONDOWN,
top_hwnd, cursor_hwnd, pt.x, pt.y,
data, time, extra_info, injected_flags );
hwnd, pt.x, pt.y, data, time, extra_info, injected_flags );
}
if (flags & MOUSEEVENTF_LEFTUP)
{
key_state_table[VK_LBUTTON] &= ~0x80;
queue_raw_mouse_message( GetSystemMetrics(SM_SWAPBUTTON) ? WM_RBUTTONUP : WM_LBUTTONUP,
top_hwnd, cursor_hwnd, pt.x, pt.y,
data, time, extra_info, injected_flags );
hwnd, pt.x, pt.y, data, time, extra_info, injected_flags );
}
if (flags & MOUSEEVENTF_RIGHTDOWN)
{
key_state_table[VK_RBUTTON] |= 0xc0;
queue_raw_mouse_message( GetSystemMetrics(SM_SWAPBUTTON) ? WM_LBUTTONDOWN : WM_RBUTTONDOWN,
top_hwnd, cursor_hwnd, pt.x, pt.y,
data, time, extra_info, injected_flags );
hwnd, pt.x, pt.y, data, time, extra_info, injected_flags );
}
if (flags & MOUSEEVENTF_RIGHTUP)
{
key_state_table[VK_RBUTTON] &= ~0x80;
queue_raw_mouse_message( GetSystemMetrics(SM_SWAPBUTTON) ? WM_LBUTTONUP : WM_RBUTTONUP,
top_hwnd, cursor_hwnd, pt.x, pt.y,
data, time, extra_info, injected_flags );
hwnd, pt.x, pt.y, data, time, extra_info, injected_flags );
}
if (flags & MOUSEEVENTF_MIDDLEDOWN)
{
key_state_table[VK_MBUTTON] |= 0xc0;
queue_raw_mouse_message( WM_MBUTTONDOWN, top_hwnd, cursor_hwnd, pt.x, pt.y,
queue_raw_mouse_message( WM_MBUTTONDOWN, hwnd, pt.x, pt.y,
data, time, extra_info, injected_flags );
}
if (flags & MOUSEEVENTF_MIDDLEUP)
{
key_state_table[VK_MBUTTON] &= ~0x80;
queue_raw_mouse_message( WM_MBUTTONUP, top_hwnd, cursor_hwnd, pt.x, pt.y,
queue_raw_mouse_message( WM_MBUTTONUP, hwnd, pt.x, pt.y,
data, time, extra_info, injected_flags );
}
if (flags & MOUSEEVENTF_WHEEL)
{
queue_raw_mouse_message( WM_MOUSEWHEEL, top_hwnd, cursor_hwnd, pt.x, pt.y,
queue_raw_mouse_message( WM_MOUSEWHEEL, hwnd, pt.x, pt.y,
data, time, extra_info, injected_flags );
}
if (flags & MOUSEEVENTF_XDOWN)
{
key_state_table[VK_XBUTTON1 + data - 1] |= 0xc0;
queue_raw_mouse_message( WM_XBUTTONDOWN, top_hwnd, cursor_hwnd, pt.x, pt.y,
queue_raw_mouse_message( WM_XBUTTONDOWN, hwnd, pt.x, pt.y,
data, time, extra_info, injected_flags );
}
if (flags & MOUSEEVENTF_XUP)
{
key_state_table[VK_XBUTTON1 + data - 1] &= ~0x80;
queue_raw_mouse_message( WM_XBUTTONUP, top_hwnd, cursor_hwnd, pt.x, pt.y,
queue_raw_mouse_message( WM_XBUTTONUP, hwnd, pt.x, pt.y,
data, time, extra_info, injected_flags );
}
}
@ -1085,7 +1089,7 @@ BOOL CDECL X11DRV_SetCursorPos( INT x, INT y )
{
wine_tsx11_unlock();
/* We still need to generate WM_MOUSEMOVE */
queue_raw_mouse_message( WM_MOUSEMOVE, 0, 0, x, y, 0, GetCurrentTime(), 0, 0 );
queue_raw_mouse_message( WM_MOUSEMOVE, 0, x, y, 0, GetCurrentTime(), 0, 0 );
return TRUE;
}
@ -1149,7 +1153,6 @@ void X11DRV_ButtonPress( HWND hwnd, XEvent *xev )
int buttonNum = event->button - 1;
WORD wData = 0;
POINT pt;
HWND top_hwnd;
if (buttonNum >= NB_BUTTONS) return;
@ -1176,11 +1179,10 @@ void X11DRV_ButtonPress( HWND hwnd, XEvent *xev )
}
update_user_time( event->time );
top_hwnd = update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt );
if (!top_hwnd) return;
hwnd = update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt );
if (!hwnd) return;
X11DRV_send_mouse_input( top_hwnd, hwnd,
button_down_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE,
X11DRV_send_mouse_input( hwnd, button_down_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE,
pt.x, pt.y, wData, EVENT_x11_time_to_win32_time(event->time), 0, 0 );
}
@ -1194,7 +1196,6 @@ void X11DRV_ButtonRelease( HWND hwnd, XEvent *xev )
int buttonNum = event->button - 1;
WORD wData = 0;
POINT pt;
HWND top_hwnd;
if (buttonNum >= NB_BUTTONS || !button_up_flags[buttonNum]) return;
@ -1214,11 +1215,10 @@ void X11DRV_ButtonRelease( HWND hwnd, XEvent *xev )
break;
}
top_hwnd = update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt );
if (!top_hwnd) return;
hwnd = update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt );
if (!hwnd) return;
X11DRV_send_mouse_input( top_hwnd, hwnd,
button_up_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE,
X11DRV_send_mouse_input( hwnd, button_up_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE,
pt.x, pt.y, wData, EVENT_x11_time_to_win32_time(event->time), 0, 0 );
}
@ -1230,14 +1230,13 @@ void X11DRV_MotionNotify( HWND hwnd, XEvent *xev )
{
XMotionEvent *event = &xev->xmotion;
POINT pt;
HWND top_hwnd;
TRACE("hwnd %p, event->is_hint %d\n", hwnd, event->is_hint);
top_hwnd = update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt );
if (!top_hwnd) return;
hwnd = update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt );
if (!hwnd) return;
X11DRV_send_mouse_input( top_hwnd, hwnd, MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE,
X11DRV_send_mouse_input( hwnd, MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE,
pt.x, pt.y, 0, EVENT_x11_time_to_win32_time(event->time), 0, 0 );
}
@ -1249,7 +1248,6 @@ void X11DRV_EnterNotify( HWND hwnd, XEvent *xev )
{
XCrossingEvent *event = &xev->xcrossing;
POINT pt;
HWND top_hwnd;
TRACE("hwnd %p, event->detail %d\n", hwnd, event->detail);
@ -1257,9 +1255,9 @@ void X11DRV_EnterNotify( HWND hwnd, XEvent *xev )
if (event->window == x11drv_thread_data()->grab_window) return;
/* simulate a mouse motion event */
top_hwnd = update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt );
if (!top_hwnd) return;
hwnd = update_mouse_state( hwnd, event->window, event->x, event->y, event->state, &pt );
if (!hwnd) return;
X11DRV_send_mouse_input( top_hwnd, hwnd, MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE,
X11DRV_send_mouse_input( hwnd, MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE,
pt.x, pt.y, 0, EVENT_x11_time_to_win32_time(event->time), 0, 0 );
}

29
dlls/winex11.drv/window.c
View File

@ -415,29 +415,6 @@ static void sync_window_style( Display *display, struct x11drv_win_data *data )
}
/***********************************************************************
* sync_window_cursor
*/
static void sync_window_cursor( struct x11drv_win_data *data )
{
HCURSOR cursor;
SERVER_START_REQ( set_cursor )
{
req->flags = 0;
wine_server_call( req );
cursor = reply->prev_count >= 0 ? wine_server_ptr_handle( reply->prev_handle ) : 0;
}
SERVER_END_REQ;
set_window_cursor( data->hwnd, cursor );
/* setting the cursor can fail if the window isn't created yet */
/* so make sure that we try again once we receive a mouse event */
data->cursor = (HANDLE)~0u;
}
/***********************************************************************
* sync_window_region
*
@ -1744,6 +1721,10 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat
wine_tsx11_unlock();
sync_window_cursor( data );
/* setting the cursor can fail if the window isn't created yet */
/* so make sure that we try again once we receive a mouse event */
data->cursor = (HANDLE)~0u;
done:
if (win_rgn) DeleteObject( win_rgn );
return data->whole_window;
@ -2702,7 +2683,7 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )
X11DRV_resize_desktop( LOWORD(lp), HIWORD(lp) );
return 0;
case WM_X11DRV_SET_CURSOR:
set_window_cursor( hwnd, (HCURSOR)lp );
if ((data = X11DRV_get_win_data( hwnd ))) set_window_cursor( data, (HCURSOR)lp );
return 0;
default:
FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp );

5
dlls/winex11.drv/x11drv.h
View File

@ -803,12 +803,13 @@ extern int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow);
extern void X11DRV_Clipboard_Cleanup(void);
extern void X11DRV_ResetSelectionOwner(void);
extern void CDECL X11DRV_SetFocus( HWND hwnd );
extern void set_window_cursor( HWND hwnd, HCURSOR handle );
extern void set_window_cursor( struct x11drv_win_data *data, HCURSOR handle );
extern void sync_window_cursor( struct x11drv_win_data *data );
extern BOOL CDECL X11DRV_ClipCursor( LPCRECT clip );
extern void X11DRV_InitKeyboard( Display *display );
extern void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD dwFlags, DWORD time,
DWORD dwExtraInfo, UINT injected_flags );
extern void X11DRV_send_mouse_input( HWND top_hwnd, HWND cursor_hwnd, DWORD flags, DWORD x, DWORD y,
extern void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y,
DWORD data, DWORD time, DWORD extra_info, UINT injected_flags );
extern DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout,
DWORD mask, DWORD flags );