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

winex11: Only update the fullscreen pointer grab when something has changed.

This commit is contained in:
Alexandre Julliard 2011-05-12 16:24:58 +02:00
parent 16d13f24a0
commit b081ee452d
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,7 +200,7 @@ static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam
DefaultScreen(display), mask, &changes ); DefaultScreen(display), mask, &changes );
wine_tsx11_unlock(); wine_tsx11_unlock();
} }
if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd ); if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd, TRUE );
return TRUE; return TRUE;
} }

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

@ -716,7 +716,7 @@ static void X11DRV_FocusIn( HWND hwnd, XEvent *xev )
} }
if (use_take_focus) if (use_take_focus)
{ {
if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd ); if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd, FALSE );
return; return;
} }

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

@ -419,11 +419,11 @@ static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput )
if (msg_hwnd) DestroyWindow( msg_hwnd ); if (msg_hwnd) DestroyWindow( msg_hwnd );
return FALSE; return FALSE;
} }
clip_rect = *clip;
if (msg_hwnd) if (msg_hwnd)
{ {
data->clip_hwnd = msg_hwnd; data->clip_hwnd = msg_hwnd;
sync_window_cursor( clip_window ); sync_window_cursor( clip_window );
clip_rect = *clip;
SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, (LPARAM)msg_hwnd ); SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, (LPARAM)msg_hwnd );
} }
return TRUE; return TRUE;
@ -502,9 +502,10 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd )
* *
* Turn on clipping if the active window is fullscreen. * Turn on clipping if the active window is fullscreen.
*/ */
BOOL clip_fullscreen_window( HWND hwnd ) BOOL clip_fullscreen_window( HWND hwnd, BOOL reset )
{ {
struct x11drv_win_data *data; struct x11drv_win_data *data;
struct x11drv_thread_data *thread_data;
RECT rect; RECT rect;
DWORD style; DWORD style;
@ -516,7 +517,9 @@ BOOL clip_fullscreen_window( HWND hwnd )
/* maximized windows don't count as full screen */ /* maximized windows don't count as full screen */
if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) return FALSE; if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) return FALSE;
if (!is_window_rect_fullscreen( &data->whole_rect )) return FALSE; if (!is_window_rect_fullscreen( &data->whole_rect )) return FALSE;
if (GetTickCount() - x11drv_thread_data()->clip_reset < 1000) return FALSE; if (!(thread_data = x11drv_thread_data())) return FALSE;
if (GetTickCount() - thread_data->clip_reset < 1000) return FALSE;
if (!reset && thread_data->clip_hwnd) return FALSE; /* already clipping */
SetRect( &rect, 0, 0, screen_width, screen_height ); SetRect( &rect, 0, 0, screen_width, screen_height );
if (!grab_fullscreen) if (!grab_fullscreen)
{ {
@ -576,7 +579,7 @@ static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPU
{ {
hwnd = GetAncestor( hwnd, GA_ROOT ); hwnd = GetAncestor( hwnd, GA_ROOT );
if ((input->u.mi.dwFlags & (MOUSEEVENTF_LEFTDOWN|MOUSEEVENTF_RIGHTDOWN)) && hwnd == GetForegroundWindow()) if ((input->u.mi.dwFlags & (MOUSEEVENTF_LEFTDOWN|MOUSEEVENTF_RIGHTDOWN)) && hwnd == GetForegroundWindow())
clip_fullscreen_window( hwnd ); clip_fullscreen_window( hwnd, FALSE );
} }
/* update the wine server Z-order */ /* update the wine server Z-order */
@ -1280,7 +1283,11 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip )
else /* if currently clipping, check if we should switch to fullscreen clipping */ else /* if currently clipping, check if we should switch to fullscreen clipping */
{ {
struct x11drv_thread_data *data = x11drv_thread_data(); struct x11drv_thread_data *data = x11drv_thread_data();
if (data && data->clip_hwnd && clip_fullscreen_window( foreground )) return TRUE; if (data && data->clip_hwnd)
{
if (EqualRect( clip, &clip_rect ) || clip_fullscreen_window( foreground, TRUE ))
return TRUE;
}
} }
} }
ungrab_clipping_window(); ungrab_clipping_window();

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

@ -846,7 +846,7 @@ extern void sync_window_cursor( Window window );
extern LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ); extern LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd );
extern void ungrab_clipping_window(void); extern void ungrab_clipping_window(void);
extern void reset_clipping_window(void); extern void reset_clipping_window(void);
extern BOOL clip_fullscreen_window( HWND hwnd ); extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset );
extern void X11DRV_InitKeyboard( Display *display ); extern void X11DRV_InitKeyboard( Display *display );
extern DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, extern DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout,
DWORD mask, DWORD flags ); DWORD mask, DWORD flags );