CVS: rdesktop xkeymap.c,1.68,1.69

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31980

Modified Files:
	xkeymap.c 
Log Message:
reactivate fixed caps_lock hack. ctrl-alt-delete works again


Index: xkeymap.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xkeymap.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** xkeymap.c	25 Apr 2005 05:32:23 -0000	1.68
--- xkeymap.c	27 Apr 2005 10:05:43 -0000	1.69
***************
*** 409,420 ****
  	}
  
! #if 0
! 	if (((remote_modifier_state & MapLeftCtrlMask)
! 	     || (remote_modifier_state & MapRightCtrlMask)) && get_key_state(state, XK_Caps_Lock))
  	{
  		DEBUG_KBD(("CapsLock + Ctrl pressed, releasing LeftShift\n"));
  		tr.modifiers ^= MapLeftShiftMask;
  	}
- #endif
  
  	if (tr.scancode != 0)
--- 409,419 ----
  	}
  
! 	if ((tr.modifiers & MapLeftShiftMask) && ((remote_modifier_state & MapLeftCtrlMask)
! 						  || (remote_modifier_state & MapRightCtrlMask))
! 	    && get_key_state(state, XK_Caps_Lock))
  	{
  		DEBUG_KBD(("CapsLock + Ctrl pressed, releasing LeftShift\n"));
  		tr.modifiers ^= MapLeftShiftMask;
  	}
  
  	if (tr.scancode != 0)



-------------------------------------------------------
SF.Net email is sponsored by: Tell us your software development plans!
Take this survey and enter to win a one-year sub to SourceForge.net
Plus IDC's 2005 look-ahead and a copy of this survey
Click here to start!  http://www.idcswdc.com/cgi-bin/survey?id=105hix