Mac: fix bug mentioned in kmonad#48

brttbndr · Aug 18, 2020 · 7c1c565 · 7c1c565
1 parent 6e95a3f
commit 7c1c565
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/c_src/mac/keyio_mac.cpp b/c_src/mac/keyio_mac.cpp
@@ -57,7 +57,12 @@ void input_callback(void *context, IOReturn result, void *sender, IOHIDValueRef
  uint16_t usage = IOHIDElementGetUsage(element);
  e.type = !integer_value;
  e.keycode = (usage_page << 16) | usage;
- write(fd[1], &e, sizeof(struct KeyEvent));
+ // "error" and "reserved" key events are ignored
+ // See https://opensource.apple.com/source/IOHIDFamily/IOHIDFamily-421.6/IOHIDFamily/IOHIDUsageTables.h.auto.html
+ if ((usage > kHIDUsage_KeyboardErrorUndefined && usage < 0xA5) ||
+ (usage > 0xDF && usage < 0xE8)) {
+ write(fd[1], &e, sizeof(struct KeyEvent));
+ }
 }
 
 void open_matching_devices(char *product, io_iterator_t iter) {

diff --git a/src/KMonad/Keyboard/IO/Mac/Types.hs b/src/KMonad/Keyboard/IO/Mac/Types.hs
@@ -115,13 +115,7 @@ fromMacKeyEvent (MacKeyEvent (s, c)) = case fromMacKeycode c of
 -- See https://opensource.apple.com/source/IOHIDFamily/IOHIDFamily-700/IOHIDFamily/AppleHIDUsageTables.h.auto.html
 kcMap :: M.HashMap MacKeycode Keycode
 kcMap = M.fromList $
- [ (0x00070000, KeyError) -- There's no documentation on this error code, but
- -- I've seen it sent when the rollover is exceeded on
- -- my macbook internal keyboard
- , (0x00070001, KeyError) -- kHIDUsage_KeyErrorRollOver
- , (0x00070002, KeyError) -- kHIDUsage_KeyPOSTFail
- , (0x00070003, KeyError) -- kHIDUsage_Undefined
- , (0x00070004, KeyA)
+ [ (0x00070004, KeyA)
  , (0x00070005, KeyB)
  , (0x00070006, KeyC)
  , (0x00070007, KeyD)
@@ -292,7 +286,6 @@ kcMap = M.fromList $
  , (0x000700E6, KeyRightAlt)
  , (0x000700E7, KeyRightMeta)
  -- /* 0x000700E8-0x0007FFFF Reserved */
- , (0x0007FFFF, KeyReserved)
  , (0x000C00B5, KeyNextSong)
  , (0x000C00B6, KeyPreviousSong)
  , (0x000C00CD, KeyPlayPause)

diff --git a/src/KMonad/Keyboard/Keycode.hs b/src/KMonad/Keyboard/Keycode.hs
@@ -307,7 +307,6 @@ data Keycode
  | KeyMissionCtrl
  | KeyBacklightDown
  | KeyBacklightUp
- | KeyError
 #endif
  deriving (Eq, Show, Bounded, Enum, Ord, Generic, Hashable)