Changeset 350

Timestamp:

11/02/07 02:35:34 (14 months ago)

Author:

tomoyo

Message:

KeyUp? イベントを作った。

Location:

Apple Wireless Keyboard Helper/trunk/Misuzilla.Applications.AppleWirelessKeyboardHelper

Files:

• Helper.cs (modified) (3 diffs)
• Program.cs (modified) (1 diff)

Apple Wireless Keyboard Helper/trunk/Misuzilla.Applications.AppleWirelessKeyboardHelper/Helper.cs

@@ -13 +13 @@
         public event EventHandler<AppleKeyboardEventArgs> FnKeyCombinationDown;
         public event EventHandler<AppleKeyboardEventArgs> KeyDown;
+        public event EventHandler<AppleKeyboardEventArgs> KeyUp;
         public event EventHandler<KeyEventArgs> SpecialKeyDown;
 
@@ -126 +127 @@
         }
         
+        private Boolean OnKeyUp(AppleKeyboardKeys appleKeyState, Keys key, Win32.KeyboardHookEventStruct keyEventStruct)
+        {
+            if (KeyUp != null)
+            {
+                AppleKeyboardEventArgs eArgs = new AppleKeyboardEventArgs(appleKeyState, key, keyEventStruct);
+                KeyUp(this, eArgs);
+                return eArgs.Handled;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
         private IntPtr KeyboardHookProc(int nCode, IntPtr wParam, IntPtr lParam)
         {
@@ -148 +163 @@
                 switch ((Int32) wParam)
                 {
-                    //case Win32.WM_KEYUP:
-                    //    handled = OnKeyUp(CurrentKeyState, Keys.None, keyEventStruct);
-                    //    break;
+                    case Win32.WM_KEYUP:
+                        handled = OnKeyUp(CurrentKeyState, Keys.None, keyEventStruct);
+                        break;
                     case Win32.WM_KEYDOWN:
                         handled = OnKeyDown(CurrentKeyState, Keys.None, keyEventStruct);

Apple Wireless Keyboard Helper/trunk/Misuzilla.Applications.AppleWirelessKeyboardHelper/Program.cs

@@ -44 +44 @@
                 };
 
-                helper.KeyDown += delegate(Object sender, AppleKeyboardEventArgs e)
+                helper.KeyUp += delegate(Object sender, AppleKeyboardEventArgs e)
                 {
                     if (e.KeyEventStruct.wScan != JISAlphaNumericKeyScanCode && e.KeyEventStruct.wScan != JISKanaKeyScanCode)
                         return;
                     
-                    StringBuilder funcName = new StringBuilder("OnDown");
+                    StringBuilder funcName = new StringBuilder("OnUp");
                     if (e.AppleKeyState == AppleKeyboardKeys.Fn)
                         funcName.Append("_Fn");