CVS: rdesktop xkeymap.c,1.90,1.91

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

Modified Files:
	xkeymap.c 
Log Message:
Using MASK_ macros in a few more places.


Index: xkeymap.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xkeymap.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** xkeymap.c	7 Apr 2006 22:17:14 -0000	1.90
--- xkeymap.c	7 Apr 2006 22:20:43 -0000	1.91
***************
*** 613,617 ****
  		if (tr.seq_keysym == 0)	/* Normal scancode translation */
  		{
! 			if (tr.modifiers & MapInhibitMask)
  			{
  				DEBUG_KBD(("Inhibiting key\n"));
--- 613,617 ----
  		if (tr.seq_keysym == 0)	/* Normal scancode translation */
  		{
! 			if (MASK_HAS_BITS(tr.modifiers, MapInhibitMask))
  			{
  				DEBUG_KBD(("Inhibiting key\n"));
***************
*** 620,628 ****
  			}
  
! 			if (tr.modifiers & MapLocalStateMask)
  			{
  				/* The modifiers to send for this key should be obtained
  				   from the local state. Currently, only shift is implemented. */
! 				if (state & ShiftMask)
  				{
  					tr.modifiers = MapLeftShiftMask;
--- 620,628 ----
  			}
  
! 			if (MASK_HAS_BITS(tr.modifiers, MapLocalStateMask))
  			{
  				/* The modifiers to send for this key should be obtained
  				   from the local state. Currently, only shift is implemented. */
! 				if (MASK_HAS_BITS(state, ShiftMask))
  				{
  					tr.modifiers = MapLeftShiftMask;
***************
*** 662,666 ****
  			   obtained from the local state. Currently, only
  			   shift is implemented. */
! 			if (state & ShiftMask)
  			{
  				tr.modifiers = MapLeftShiftMask;
--- 662,666 ----
  			   obtained from the local state. Currently, only
  			   shift is implemented. */
! 			if (MASK_HAS_BITS(state, ShiftMask))
  			{
  				tr.modifiers = MapLeftShiftMask;



-------------------------------------------------------
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