compatible with predictor && cleanup codes

Info.plist

@@ -5,37 +5,38 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>Squirrel</string>
+	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
 	<string>RimeIcon.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>Squirrel</string>
+	<string>${PRODUCT_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${MARKETING_VERSION}</string>
 	<key>ComponentInputModeDict</key>
 	<dict>
 		<key>tsInputModeListKey</key>
 		<dict>
 			<key>im.rime.inputmethod.Squirrel.Hant</key>
 			<dict>
 				<key>TISInputSourceID</key>
-				<string>im.rime.inputmethod.Squirrel.Hant</string>
+				<string>${PRODUCT_BUNDLE_IDENTIFIER}.Hant</string>
 				<key>TISIntendedLanguage</key>
 				<string>zh-Hant</string>
 				<key>TISIconIsTemplate</key>
 				<true/>
 				<key>tsInputModeCharacterRepertoireKey</key>
 				<array>
-					<string>Hant</string>
-					<string>Hans</string>
+					<string>Hani</string>
 				</array>
 				<key>tsInputModeDefaultStateKey</key>
 				<true/>
@@ -55,15 +56,14 @@
 			<key>im.rime.inputmethod.Squirrel.Hans</key>
 			<dict>
 				<key>TISInputSourceID</key>
-				<string>im.rime.inputmethod.Squirrel.Hans</string>
+				<string>${PRODUCT_BUNDLE_IDENTIFIER}.Hans</string>
 				<key>TISIntendedLanguage</key>
 				<string>zh-Hans</string>
 				<key>TISIconIsTemplate</key>
 				<true/>
 				<key>tsInputModeCharacterRepertoireKey</key>
 				<array>
-					<string>Hans</string>
-					<string>Hant</string>
+					<string>Hani</string>
 				</array>
 				<key>tsInputModeDefaultStateKey</key>
 				<true/>
@@ -83,15 +83,14 @@
 			<key>im.rime.inputmethod.Squirrel.Cant</key>
 			<dict>
 				<key>TISInputSourceID</key>
-				<string>im.rime.inputmethod.Squirrel.Cant</string>
+				<string>${PRODUCT_BUNDLE_IDENTIFIER}.Cant</string>
 				<key>TISIntendedLanguage</key>
 				<string>yue-Hant</string>
 				<key>TISIconIsTemplate</key>
 				<true/>
 				<key>tsInputModeCharacterRepertoireKey</key>
 				<array>
-					<string>Hant</string>
-					<string>Hans</string>
+					<string>Hani</string>
 				</array>
 				<key>tsInputModeDefaultStateKey</key>
 				<true/>
@@ -117,7 +116,7 @@
 		</array>
 	</dict>
 	<key>InputMethodConnectionName</key>
-	<string>Squirrel_1_Connection</string>
+	<string>${PRODUCT_NAME}_1_Connection</string>
 	<key>InputMethodServerControllerClass</key>
 	<string>SquirrelInputController</string>
 	<key>InputMethodServerDelegateClass</key>
@@ -142,6 +141,10 @@
 	<true/>
 	<key>TISIconIsTemplate</key>
 	<true/>
+	<key>tsInputMethodCharacterRepertoireKey</key>
+	<array>
+		<string>Hani</string>
+	</array>
 	<key>tsInputMethodIconFileKey</key>
 	<string>rime</string>
 	<key>tsInputMethodAlternateMenuIconFileKey</key>

SquirrelApplicationDelegate.m

@@ -4,7 +4,7 @@
 #import "SquirrelConfig.h"
 #import "SquirrelPanel.h"
 
-static NSString *const kRimeWikiURL = @"https://github.com/rime/home/wiki";
+static NSString *kRimeWikiURL = @"https://github.com/rime/home/wiki";
 
 @implementation SquirrelApplicationDelegate
 
@@ -148,8 +148,8 @@ - (void)loadSettings {
 
   _enableNotifications =
     ![[_config getString:@"show_notifications_when"] isEqualToString:@"never"];
-  [self.panel loadConfig:_config forDarkMode:NO];
-  [self.panel loadConfig:_config forDarkMode:YES];
+  [self.panel loadConfig:_config forAppearance:defaultAppear];
+  [self.panel loadConfig:_config forAppearance:darkAppear];
 }
 
 - (void)loadSchemaSpecificSettings:(NSString *)schemaId {
@@ -159,11 +159,11 @@ - (void)loadSchemaSpecificSettings:(NSString *)schemaId {
   SquirrelConfig *schema = [[SquirrelConfig alloc] init];
   if ([schema openWithSchemaId:schemaId baseConfig:self.config] &&
       [schema hasSection:@"style"]) {
-    [self.panel loadConfig:schema forDarkMode:NO];
-    [self.panel loadConfig:schema forDarkMode:YES];
+    [self.panel loadConfig:schema forAppearance:defaultAppear];
+    [self.panel loadConfig:schema forAppearance:darkAppear];
   } else {
-    [self.panel loadConfig:self.config forDarkMode:NO];
-    [self.panel loadConfig:self.config forDarkMode:YES];
+    [self.panel loadConfig:self.config forAppearance:defaultAppear];
+    [self.panel loadConfig:self.config forAppearance:darkAppear];
   }
   [schema close];
 }

SquirrelConfig.m

@@ -274,8 +274,8 @@ - (SquirrelOptionSwitcher *)getOptionSwitcher {
       }
       RimeConfigEnd(&optionIter);
       if (hasStyleSection) {
-        for (NSUInteger i = 0; i < optionGroup.count; ++i) {
-          switcher[optionGroup[i]] = optionGroup[reset];
+        for (size_t i = 0; i < optionGroup.count; ++i) {
+          switcher[optionGroup[i]] = optionGroup[(size_t)reset];
           optionGroups[optionGroup[i]] = optionGroup;
         }
       }

SquirrelInputController.h

@@ -3,10 +3,22 @@
 
 @interface SquirrelInputController : IMKInputController
 
-- (BOOL)perform:(NSUInteger)action onIndex:(NSUInteger)index;
+typedef enum {
+  kSELECT = 1, // accepts indices in both digits and selection keys
+  kDELETE = 2, // only accepts indices in digits, e.g. (int) 1
+  kCHOOSE = 3 // only accepts indices in selection keys, e.g. (char) '1' / 'A'
+} rimeAction;
 
-@end
+typedef enum {
+  // 0 ... 9 are ordinal digits, used as (int) index
+  // 0x21 ... 0x7e are ASCII chars (as selection keys)
+  // other rime keycodes (as function keys), for paging etc.
+  kPageUp = 0xff55, // XK_Page_Up
+  kPageDown = 0xff56, // XK_Page_Down
+  kVoidSymbol = 0xffffff // XK_VoidSymbol
+} rimeIndex;
+
+- (void)perform:(rimeAction)action 
+        onIndex:(rimeIndex)index;
 
-#define kSELECT 0x1
-#define kDELETE 0x2
-#define kCHOOSE 0x3
+@end