feat(chord): Tab, BackSpace, Return can be used as chording keys

lotem · lotem · commit 997f15396615 · 2016-12-26T01:38:09.000+08:00
diff --git a/SquirrelInputController.m b/SquirrelInputController.m
@@ -176,9 +176,13 @@ -(BOOL)processKey:(int)rime_keycode modifiers:(int)rime_modifiers
 
   // Simulate key-ups for every interesting key-down for chord-typing.
   if (handled) {
-    bool is_basic_latin =
-        rime_keycode >= XK_space && rime_keycode <= XK_asciitilde && rime_modifiers == 0;
-    if (is_basic_latin && rime_get_api()->get_option(_session, "_chord_typing")) {
+    bool is_chording_key = rime_modifiers == 0 &&
+        ((rime_keycode >= XK_space && rime_keycode <= XK_asciitilde) ||
+         rime_keycode == XK_Tab ||
+         rime_keycode == XK_BackSpace ||
+         rime_keycode == XK_Return);
+    if (is_chording_key &&
+        rime_get_api()->get_option(_session, "_chord_typing")) {
       [self updateChord:rime_keycode];
     }
     else {
@@ -189,20 +193,47 @@ -(BOOL)processKey:(int)rime_keycode modifiers:(int)rime_modifiers
   return handled;
 }
 
+static char keycode_to_char(int keycode) {
+  switch (keycode) {
+    case XK_Tab:
+      return '\t';
+    case XK_BackSpace:
+      return'\b';
+    case XK_Return:
+      return '\n';
+    default:
+      return (char)keycode;
+  }
+}
+
+static int char_to_keycode(char ch) {
+  switch (ch) {
+    case '\t':
+      return XK_Tab;
+    case '\b':
+      return XK_BackSpace;
+    case '\n':
+      return XK_Return;
+    default:
+      return ch;
+  }
+}
+
 -(void)onChordTimer:(NSTimer *)timer
 {
   if (_chord[0] && _session) {
     // simulate key-ups
     for (char *p = _chord; *p; ++p) {
-      rime_get_api()->process_key(_session, *p, kReleaseMask);
+      rime_get_api()->process_key(_session, char_to_keycode(*p), kReleaseMask);
     }
     [self rimeUpdate];
   }
   [self clearChord];
 }
 
--(void)updateChord:(int)ch
+-(void)updateChord:(int)keycode
 {
+  char ch = keycode_to_char(keycode);
   char *p = strchr(_chord, ch);
   if (p != NULL) {
     // just repeating
diff --git a/librime b/librime
@@ -1 +1 @@
-Subproject commit e7bb7579f2f510e03036fcf743b1c4729ba241b2
+Subproject commit ceead598d258a09a2df93ba81d6dcf5fa3b57fa5
