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

winex11.drv: Reset focus if application does not want to be activated.

This commit is contained in:
Lei Zhang 2007-06-21 15:38:00 -07:00 committed by Alexandre Julliard
parent e28da99e4c
commit e20625e5c9
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -445,17 +445,18 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event )
LRESULT ma = SendMessageW( hwnd, WM_MOUSEACTIVATE, LRESULT ma = SendMessageW( hwnd, WM_MOUSEACTIVATE,
(WPARAM)GetAncestor( hwnd, GA_ROOT ), (WPARAM)GetAncestor( hwnd, GA_ROOT ),
MAKELONG(HTCAPTION,WM_LBUTTONDOWN) ); MAKELONG(HTCAPTION,WM_LBUTTONDOWN) );
if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) set_focus( hwnd, event_time ); if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE)
else TRACE( "not setting focus to %p (%lx), ma=%ld\n", hwnd, event->window, ma ); {
} set_focus( hwnd, event_time );
else return;
{ }
hwnd = GetFocus();
if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT );
if (!hwnd) hwnd = GetActiveWindow();
if (!hwnd) hwnd = last_focus;
if (hwnd && can_activate_window(hwnd)) set_focus( hwnd, event_time );
} }
/* try to find some other window to give the focus to */
hwnd = GetFocus();
if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT );
if (!hwnd) hwnd = GetActiveWindow();
if (!hwnd) hwnd = last_focus;
if (hwnd && can_activate_window(hwnd)) set_focus( hwnd, event_time );
} }
else if (protocol == x11drv_atom(_NET_WM_PING)) else if (protocol == x11drv_atom(_NET_WM_PING))
{ {