CVS: seamlessrdp/ServerExe/HookDll hookdll.c,1.33,1.34

Pierre Ossman <[email protected]> Wed, 22 Mar 2006 03:52:09 -0800
Newsgroups gmane.network.rdesktop.cvs
Message-ID <[email protected]>
Update of /cvsroot/rdesktop/seamlessrdp/ServerExe/HookDll
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7389/ServerExe/HookDll

Modified Files:
	hookdll.c 
Log Message:
SetActiveWindow() only does what we want when the window is owned by the
same process as the currently active. SetForegroundWindow() does what we want
under all circumstances.


Index: hookdll.c
===================================================================
RCS file: /cvsroot/rdesktop/seamlessrdp/ServerExe/HookDll/hookdll.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** hookdll.c	21 Mar 2006 14:58:29 -0000	1.33
--- hookdll.c	22 Mar 2006 11:52:07 -0000	1.34
***************
*** 349,356 ****
  	if (msg == g_wm_seamless_focus)
  	{
! 		/* FIXME: SetActiveWindow() kills menus. Need to find a clean
! 		   way to solve this. */
! 		if ((GetActiveWindow() != hwnd) && !parent)
! 			SetActiveWindow(hwnd);
  
  		vchannel_write("ACK", "%u", g_blocked_focus_serial);
--- 349,356 ----
  	if (msg == g_wm_seamless_focus)
  	{
! 		/* FIXME: SetForegroundWindow() kills menus. Need to find a
! 		   clean way to solve this. */
! 		if ((GetForegroundWindow() != hwnd) && !parent)
! 			SetForegroundWindow(hwnd);
  
  		vchannel_write("ACK", "%u", g_blocked_focus_serial);



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642