Remove modifier keys (ctrl, opt, cmd, shift and fn), #8

aahung · Aug 10, 2018 · afad9a4 · afad9a4
1 parent 33df92a
commit afad9a4
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 36 deletions.
diff --git a/Unshaky/PreferenceViewController.swift b/Unshaky/PreferenceViewController.swift
@@ -132,16 +132,7 @@ class PreferenceViewController: NSViewController,
                            117:    "ForwardDelete",
                            52:     "Linefeed",
                            53:     "Escape",
-                           54:     "RightCommand",
-                           55:     "Command",
-                           56:     "Shift",
                            57:     "CapsLock",
-                           58:     "Option",
-                           59:     "Control",
-                           60:     "RightShift",
-                           61:     "RightOption",
-                           62:     "RightControl",
-                           63:     "Function",
                            122:    "F1",
                            120:    "F2",
                            99:     "F3",

diff --git a/Unshaky/ShakyPressPreventer.m b/Unshaky/ShakyPressPreventer.m
@@ -58,33 +58,6 @@ - (CGEventRef)filterShakyPressEvent:(CGEventRef)event {
     // ignore unconfigured keys
     if (keyDelays[keyCode] == 0) return event;
 
-    {
-        // handle control, command, option and shift keys
-        CGEventFlags flags;
-        BOOL isModifierPressed;
-        switch (keyCode) {
-            case 54: // RightCommand
-            case 55: // Command
-            case 56: // Shift
-            case 58: // Option
-            case 59: // Control
-            case 60: // RightShift
-            case 61: // RightOption
-            case 62: // RightControl (this key does not exist on MacBook Pro's keyboard)
-            case 63: // Function
-                flags = CGEventGetFlags(event);
-                isModifierPressed = (flags & (kCGEventFlagMaskAlternate | kCGEventFlagMaskCommand | kCGEventFlagMaskControl | kCGEventFlagMaskShift | kCGEventFlagMaskSecondaryFn)) > 0;
-                if (isModifierPressed)
-                    eventType = kCGEventKeyDown;
-                else
-                    eventType = kCGEventKeyUp;
-                break;
-
-            default:
-                break;
-        }
-    }
-
     if (lastPressedTimestamps[keyCode] == 0.0) {
         lastPressedTimestamps[keyCode] = [[NSDate date] timeIntervalSince1970];
         lastPressedEventTypes[keyCode] = eventType;