Improved the Modifier KeyPress by counting bits.

Clancey · Feb 25, 2011 · 63f2545 · 63f2545
1 parent a9a13d8
commit 63f2545
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/MonoMac.Windows.Forms/CocoaHelpers/TextBoxHelper.cs b/MonoMac.Windows.Forms/CocoaHelpers/TextBoxHelper.cs
@@ -104,19 +104,15 @@ public override void KeyDown (NSEvent theEvent)
 		public override void FlagsChanged (NSEvent theEvent)
 		{
 			var theKey = (NSEventModifierMask)Enum.ToObject(typeof(NSEventModifierMask),(uint)theEvent.ModifierFlags  & 0xFFFF0000);
-			int count = 0;
-			foreach(NSEventModifierMask key in Enum.GetValues(typeof(NSEventModifierMask)))
-			{
-				count += theKey.HasFlag(key) ? 1 : 0;
-			}
 
+			int count = Util.NumberOfSetBits((int)theKey) ;
 			//Console.WriteLine(count);
 			if(theKey == 0 || lastKeyCount > count){
-			   Host.Host.onKeyUp(new KeyEventArgs(theEvent));
+			   Host.onKeyUp(new KeyEventArgs(theEvent));
 				//Console.WriteLine("keyUp");
 			}
 			else {
-				Host.Host.onKeyDown(new KeyEventArgs(theEvent));
+				Host.onKeyDown(new KeyEventArgs(theEvent));
 				//Console.WriteLine("keyDown");
 			}
 			lastKeyCount = count;

diff --git a/MonoMac.Windows.Forms/System.Windows.Forms/Form.cocoa.cs b/MonoMac.Windows.Forms/System.Windows.Forms/Form.cocoa.cs
@@ -45,15 +45,11 @@ public override void KeyUp (NSEvent theEvent)
 		public override void FlagsChanged (NSEvent theEvent)
 		{
 			var theKey = (NSEventModifierMask)Enum.ToObject(typeof(NSEventModifierMask),(uint)theEvent.ModifierFlags  & 0xFFFF0000);
-			int count = 0;
-			foreach(NSEventModifierMask key in Enum.GetValues(typeof(NSEventModifierMask)))
-			{
-				count += theKey.HasFlag(key) ? 1 : 0;
-			}
 
+			int count = Util.NumberOfSetBits((int)theKey) ;
 			//Console.WriteLine(count);
 			if(theKey == 0 || lastKeyCount > count){
-			   Host.onKeyUp(new KeyEventArgs(theEvent));
+				Host.onKeyUp(new KeyEventArgs(theEvent));
 				//Console.WriteLine("keyUp");
 			}
 			else {

diff --git a/MonoMac.Windows.Forms/Utils/Util.cs b/MonoMac.Windows.Forms/Utils/Util.cs
@@ -28,6 +28,13 @@ public static object GetPropertyValue(object inObject, string propertyName)
 					return prop.GetValue(inObject,null).ToString();
 			return null;
 		}
+
+		public static int NumberOfSetBits(int i)
+		{
+		    i = i - ((i >> 1) & 0x55555555);
+		    i = (i & 0x33333333) + ((i >> 2) & 0x33333333);
+		    return ((i + (i >> 4) & 0xF0F0F0F) * 0x1010101) >> 24;
+		}
 
 		public static SizeF MeasureString(string inString, Font font)//, SizeF size)
 		{