special key equivalents

Author: groverlynn

Base.lproj/MainMenu.xib

@@ -22,7 +22,7 @@
         <customObject id="770" userLabel="SquirrelPanel" customClass="SquirrelPanel"/>
         <menu id="773" userLabel="Menu">
             <items>
-                <menuItem title="Squirrel Switcher" allowsKeyEquivalentWhenHidden="YES" id="780">
+                <menuItem title="ㄓ⃣Squirrel Switcher" id="780">
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <connections>
                         <action selector="showSwitcher:" target="252" id="781"/>

SquirrelApplicationDelegate.mm

@@ -15,9 +15,11 @@ @implementation SquirrelApplicationDelegate {
 
 - (IBAction)showSwitcher:(id)sender {
   NSLog(@"Show Switcher");
-  RimeSessionId session = [sender unsignedLongValue];
-  rime_get_api()->process_key(session, _switcherKeyEquivalent,
-                              _switcherKeyModifierMask);
+  if (_switcherKeyEquivalent) {
+    RimeSessionId session = [sender unsignedLongValue];
+    rime_get_api()->process_key(session, _switcherKeyEquivalent,
+                                _switcherKeyModifierMask);
+  }
 }
 
 - (IBAction)deploy:(id)sender {
@@ -188,7 +190,7 @@ - (void)startRimeWithFullCheck:(BOOL)fullCheck {
   NSLog(@"Initializing la rime...");
   rime_get_api()->initialize(NULL);
   // check for configuration updates
-  if (rime_get_api()->start_maintenance((Bool)fullCheck)) {
+  if (rime_get_api()->start_maintenance(fullCheck)) {
     // update squirrel config
     rime_get_api()->deploy_config_file("squirrel.yaml", "config_version");
   }
@@ -200,32 +202,28 @@ - (void)shutdownRime {
 }
 
 - (void)loadSettings {
+  _switcherKeyModifierMask = 0;
+  _switcherKeyEquivalent = 0;
   SquirrelConfig* defaultConfig = SquirrelConfig.alloc.init;
   if ([defaultConfig openWithConfigId:@"default"]) {
-    NSString* hotKeys =
+    NSString* hotkey =
         [defaultConfig getStringForOption:@"switcher/hotkeys/@0"];
-    NSArray<NSString*>* keys = [hotKeys componentsSeparatedByString:@"+"];
-    NSEventModifierFlags modifiers = 0;
-    int rime_modifiers = 0;
-    for (NSUInteger i = 0; i < keys.count - 1; ++i) {
-      modifiers |= parse_macos_modifiers(keys[i].UTF8String);
-      rime_modifiers |= parse_rime_modifiers(keys[i].UTF8String);
+    if (hotkey) {
+      NSArray<NSString*>* keys = [hotkey componentsSeparatedByString:@"+"];
+      for (NSUInteger i = 0; i < keys.count - 1; ++i) {
+        _switcherKeyModifierMask |=
+            rime_modifiers_from_name(keys[i].UTF8String);
+      }
+      _switcherKeyEquivalent =
+          rime_keycode_from_name(keys.lastObject.UTF8String);
     }
-    int keycode = parse_keycode(keys.lastObject.UTF8String);
-    unichar keychar = keycode <= 0xFFFF ? (unichar)keycode : 0;
-    _menu.itemArray[0].keyEquivalent = [NSString stringWithCharacters:&keychar
-                                                               length:1];
-    _menu.itemArray[0].keyEquivalentModifierMask = modifiers;
-    _switcherKeyEquivalent = keycode;
-    _switcherKeyModifierMask = rime_modifiers;
   }
   [defaultConfig close];
 
   _config = SquirrelConfig.alloc.init;
   if (!_config.openBaseConfig) {
     return;
   }
-
   NSString* showNotificationsWhen =
       [_config getStringForOption:@"show_notifications_when"];
   if ([@"never" caseInsensitiveCompare:showNotificationsWhen] ==

SquirrelConfig.hh

@@ -61,7 +61,7 @@ typedef NSDictionary<NSString*, NSNumber*> SquirrelAppOptions;
 - (BOOL)setOption:(NSString* _Nonnull)option
        withString:(NSString* _Nonnull)value;
 
-- (BOOL)getBoolForOption:(NSString* _Nonnull)option;
+- (bool)getBoolForOption:(NSString* _Nonnull)option;
 - (int)getIntForOption:(NSString* _Nonnull)option;
 - (double)getDoubleForOption:(NSString* _Nonnull)option;
 - (double)getDoubleForOption:(NSString* _Nonnull)option

SquirrelConfig.mm

@@ -247,21 +247,21 @@ - (BOOL)setOption:(NSString*)option withString:(NSString*)value {
                                                   value.UTF8String));
 }
 
-- (BOOL)getBoolForOption:(NSString*)option {
-  return [self getOptionalBoolForOption:option].boolValue;
+- (bool)getBoolForOption:(NSString*)option {
+  return [self getOptionalBoolForOption:option alias:nil].boolValue;
 }
 
 - (int)getIntForOption:(NSString*)option {
-  return [self getOptionalIntForOption:option].intValue;
+  return [self getOptionalIntForOption:option alias:nil].intValue;
 }
 
 - (double)getDoubleForOption:(NSString*)option {
-  return [self getOptionalDoubleForOption:option].doubleValue;
+  return [self getOptionalDoubleForOption:option alias:nil].doubleValue;
 }
 
 - (double)getDoubleForOption:(NSString*)option
              applyConstraint:(double (*)(double param))func {
-  NSNumber* value = [self getOptionalDoubleForOption:option];
+  NSNumber* value = [self getOptionalDoubleForOption:option alias:nil];
   return func(value.doubleValue);
 }