MNT: Cleanup the logic in macosx keypress handling

greglucas · greglucas · commit 3ff87cf84769 · 2021-11-25T20:24:12.000-07:00
This removes half of the else-if blocks and combines the
keypress/keyrelease for each key into a single statement with negation
for whether it was a press or release being handled.
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -1914,73 +1914,51 @@ - (BOOL)acceptsFirstResponder
 // so we need to handle both cases here
 - (void)flagsChanged:(NSEvent *)event
 {
-    bool keypress = false;
-    bool keyrelease = false;
-    if (([event modifierFlags] & NSEventModifierFlagCommand) && !lastCommand) {
-        // Command pressed
-        lastCommand = true;
+    bool isPress = false; // true if key is pressed, false is released
+    if ((([event modifierFlags] & NSEventModifierFlagCommand) && !lastCommand) ||
+        (!([event modifierFlags] & NSEventModifierFlagCommand) && lastCommand)) {
+        // Command pressed/released
+        lastCommand = !lastCommand;
         keyChangeCommand = true;
-        keypress = true;
+        isPress = lastCommand;
     }
-    else if (!([event modifierFlags] & NSEventModifierFlagCommand) && lastCommand) {
-        // Command released
-        lastCommand = false;
-        keyChangeCommand = true;
-        keyrelease = true;
-    }
-    else if (([event modifierFlags] & NSEventModifierFlagControl) && !lastControl) {
-        // Control pressed
-        lastControl = true;
+    else if ((([event modifierFlags] & NSEventModifierFlagControl) && !lastControl) ||
+             (!([event modifierFlags] & NSEventModifierFlagControl) && lastControl)) {
+        // Control pressed/released
+        lastControl = !lastControl;
         keyChangeControl = true;
-        keypress = true;
-    }
-    else if (!([event modifierFlags] & NSEventModifierFlagControl) && lastControl) {
-        // Control released
-        lastControl = false;
-        keyChangeControl = true;
-        keyrelease = true;
-    }
-    else if (([event modifierFlags] & NSEventModifierFlagShift) && !lastShift) {
-        // Shift pressed
-        lastShift = true;
-        keyChangeShift = true;
-        keypress = true;
+        isPress = lastControl;
     }
-    else if (!([event modifierFlags] & NSEventModifierFlagShift) && lastShift) {
-        // Shift released
-        lastShift = false;
+    else if ((([event modifierFlags] & NSEventModifierFlagShift) && !lastShift) ||
+             (!([event modifierFlags] & NSEventModifierFlagShift) && lastShift)) {
+        // Shift pressed/released
+        lastShift = !lastShift;
         keyChangeShift = true;
-        keyrelease = true;
-    }
-    else if (([event modifierFlags] & NSEventModifierFlagOption) && !lastOption) {
-        // Option pressed
-        lastOption = true;
-        keyChangeOption = true;
-        keypress = true;
+        isPress = lastShift;
     }
-    else if (!([event modifierFlags] & NSEventModifierFlagOption) && lastOption) {
-        // Option released
-        lastOption = false;
+    else if ((([event modifierFlags] & NSEventModifierFlagOption) && !lastOption) ||
+             (!([event modifierFlags] & NSEventModifierFlagOption) && lastOption)) {
+        // Option pressed/released
+        lastOption = !lastOption;
         keyChangeOption = true;
-        keyrelease = true;
+        isPress = lastOption;
     }
-    else if (([event modifierFlags] & NSEventModifierFlagCapsLock) && !lastCapsLock) {
-        // Capslock pressed
-        lastCapsLock = true;
+    else if ((([event modifierFlags] & NSEventModifierFlagCapsLock) && !lastCapsLock) ||
+             (!([event modifierFlags] & NSEventModifierFlagCapsLock) && lastCapsLock)) {
+        // Capslock pressed/released
+        lastCapsLock = !lastCapsLock;
         keyChangeCapsLock = true;
-        keypress = true;
+        isPress = lastCapsLock;
     }
-    else if (!([event modifierFlags] & NSEventModifierFlagCapsLock) && lastCapsLock) {
-        // Capslock released
-        lastCapsLock = false;
-        keyChangeCapsLock = true;
-        keyrelease = true;
+    else{
+        // flag we don't handle
+        return;
     }
 
-    if (keypress) {
+    if (isPress) {
         [self keyDown: event];
     }
-    else if (keyrelease) {
+    else {
         [self keyUp: event];
     }
 
