fix: handle function key mask since macOS 12

Cubelrti · rogerwang · commit e0bcdf472246 · 2021-06-22T03:59:29.000+08:00
diff --git a/src/api/menuitem/menuitem_mac.mm b/src/api/menuitem/menuitem_mac.mm
@@ -138,13 +138,16 @@
   if (mask != 0) {
     std::stringstream s;
     std::vector<std::string> modifiers;
-    if (mask & NSCommandKeyMask) modifiers.push_back("cmd");
-    if (mask & NSControlKeyMask) modifiers.push_back("ctrl");
-    if (mask & NSAlternateKeyMask) modifiers.push_back("alt");
-    if (mask & NSShiftKeyMask) modifiers.push_back("shift");
+    if (mask & NSEventModifierFlagCommand) modifiers.push_back("cmd");
+    if (mask & NSEventModifierFlagControl) modifiers.push_back("ctrl");
+    if (mask & NSEventModifierFlagOption) modifiers.push_back("alt");
+    if (mask & NSEventModifierFlagShift) modifiers.push_back("shift");
+    if (mask & NSEventModifierFlagFunction) modifiers.push_back("fn");
     std::copy(modifiers.begin(), modifiers.end(), std::ostream_iterator<std::string>(s, "+"));
     std::string str = s.str();
-    str.erase(str.length()-1);
+    if (str.length() > 0) {
+      str.erase(str.length()-1);
+    }
     options->SetString("modifiers", str);
   }
 
@@ -210,15 +213,17 @@
   NSUInteger mask = 0;
   NSString* nsmodifiers = [NSString stringWithUTF8String:modifiers.c_str()].lowercaseString;
   if([nsmodifiers rangeOfString:@"shift"].location != NSNotFound)
-    mask = mask|NSShiftKeyMask;
+    mask = mask|NSEventModifierFlagShift;
   if([nsmodifiers rangeOfString:@"cmd"].location != NSNotFound
     || [nsmodifiers rangeOfString:@"command"].location != NSNotFound
     || [nsmodifiers rangeOfString:@"super"].location != NSNotFound)
-    mask = mask|NSCommandKeyMask;
+    mask = mask|NSEventModifierFlagCommand;
   if([nsmodifiers rangeOfString:@"alt"].location != NSNotFound)
-    mask = mask|NSAlternateKeyMask;
+    mask = mask|NSEventModifierFlagOption;
   if([nsmodifiers rangeOfString:@"ctrl"].location != NSNotFound)
-    mask = mask|NSControlKeyMask;
+    mask = mask|NSEventModifierFlagControl;
+  if([nsmodifiers rangeOfString:@"fn"].location != NSNotFound)
+    mask = mask|NSEventModifierFlagFunction;
   [menu_item_ setKeyEquivalentModifierMask:mask];
 }
 
