MNT: Add modifier key press handling to macosx backend

greglucas · greglucas · commit fc77052c9ccd · 2021-11-20T07:10:33.000-07:00
The flagsChanged event handles single presses of modifier keys,
so we need to send the corresponding string to our key press handlers
from within that routine. Modifier + second key is handled within
the KeyUp/KeyDown routines already, so leave those alone.
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -264,7 +264,7 @@ - (void)keyDown:(NSEvent*)event;
 - (void)keyUp:(NSEvent*)event;
 - (void)scrollWheel:(NSEvent *)event;
 - (BOOL)acceptsFirstResponder;
-//- (void)flagsChanged:(NSEvent*)event;
+- (void)flagsChanged:(NSEvent*)event;
 @end
 
 /* ---------------------------- Python classes ---------------------------- */
@@ -2066,29 +2066,31 @@ - (BOOL)acceptsFirstResponder
     return YES;
 }
 
-/* This is all wrong. Address of pointer is being passed instead of pointer, keynames don't
-   match up with what the front-end and does the front-end even handle modifier keys by themselves?
-
+// flagsChanged gets called on single modifier keypresses
+// The modifier + second key gets handled in convertKeyEvent in KeyUp/KeyDown
 - (void)flagsChanged:(NSEvent*)event
 {
-    const char *s = NULL;
-    if (([event modifierFlags] & NSControlKeyMask) == NSControlKeyMask)
+    const char* s = NULL;
+    if ([event modifierFlags] & NSEventModifierFlagControl)
         s = "control";
-    else if (([event modifierFlags] & NSShiftKeyMask) == NSShiftKeyMask)
+    else if ([event modifierFlags] & NSEventModifierFlagShift)
         s = "shift";
-    else if (([event modifierFlags] & NSAlternateKeyMask) == NSAlternateKeyMask)
+    else if ([event modifierFlags] & NSEventModifierFlagOption)
         s = "alt";
+    else if ([event modifierFlags] & NSEventModifierFlagCommand)
+        s = "cmd";
+    else if ([event modifierFlags] & NSEventModifierFlagCapsLock)
+        s = "caps_lock";
     else return;
     PyGILState_STATE gstate = PyGILState_Ensure();
-    PyObject* result = PyObject_CallMethod(canvas, "key_press_event", "s", &s);
+    PyObject* result = PyObject_CallMethod(canvas, "key_press_event", "s", s);
     if(result)
         Py_DECREF(result);
     else
         PyErr_Print();
 
     PyGILState_Release(gstate);
 }
- */
 @end
 
 static PyObject*
