Working IME

doc22940 · Nov 27, 2019 · a507592 · a507592
1 parent 2e628b8
commit a507592
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 5 deletions.
diff --git a/Blink/SmarterKeys/SmarterTermInput.swift b/Blink/SmarterKeys/SmarterTermInput.swift
@@ -256,6 +256,40 @@ class SmarterTermInput: KBWebView {
 //    }
   }
 
+  override func onIME(_ event: String, data: String) {
+    if event == "compositionstart" && data.isEmpty {
+    } else if event == "compositionend" {
+      device?.view?.setIme("", completionHandler: nil)
+    } else {
+      device?.view?.setIme(data) {  (data, error) in
+        guard
+          error == nil,
+          let resp = data as? [String: Any],
+          let markedRect = resp["markedRect"] as? String
+        else {
+          return
+        }
+        var rect = NSCoder.cgRect(for: markedRect)
+        let suggestionsHeight: CGFloat = 44
+        let maxY = rect.maxY
+        let minY = rect.minY
+        if maxY - suggestionsHeight < 0 {
+          rect.origin.y = maxY
+        } else {
+          rect.origin.y = minY
+        }
+
+        debugPrint(rect)
+        rect.size.height = 0
+        rect.size.width = 0
+
+        if let r = self.device?.view?.convert(rect, to: self.superview) {
+          self.frame = r
+        }
+      }
+    }
+  }
+
   override func resignFirstResponder() -> Bool {
     let res = super.resignFirstResponder()
     if res {

diff --git a/Blink/TermJS.h b/Blink/TermJS.h
@@ -163,7 +163,8 @@ NSString *term_modifySelection(NSString *direction, NSString *granularity)
 
 NSString *term_setIme(NSString *imeText)
 {
-  return [NSString stringWithFormat:@"term_setIme(%@[0]);", _encodeString(imeText)];
+  NSString *str = _encodeString(imeText);
+  return [NSString stringWithFormat:@"term_setIme(%@[0]);", str];
 }
 
 NSString *term_modifySideSelection()

diff --git a/KB/Native/Model/KeyConfig.swift b/KB/Native/Model/KeyConfig.swift
@@ -94,7 +94,7 @@ class KeyConfig: ObservableObject, Codable {
   }
 
   static var capsLock: KeyConfig {
-    KeyConfig(code: .capsLock, up: .none, down: .escape, mod: .none)
+    KeyConfig(code: .capsLock, up: .none, down: .none, mod: .none)
   }
 
   // - MARK: Codable

diff --git a/KB/Native/Views/KBWebViewBase.h b/KB/Native/Views/KBWebViewBase.h
@@ -39,6 +39,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)report:(NSString *)cmd arg:(NSObject *)arg;
 - (void)ready;
 - (void)onOut:(NSString *)data;
+- (void)onIME:(NSString *)event data:(NSString *)data;
 
 @end
 

diff --git a/KB/Native/Views/KBWebViewBase.m b/KB/Native/Views/KBWebViewBase.m
@@ -168,7 +168,7 @@ - (BOOL)canPerformAction:(SEL)action withSender:(id)sender {
   return _keyCommands;
 }
 
-- (void)_onIME:(NSString *)event data:(NSString *)data {
+- (void)onIME:(NSString *)event data:(NSString *)data {
 
 }
 
@@ -226,9 +226,9 @@ - (void)userContentController:(WKUserContentController *)userContentController
     }
     [self _rebuildKeyCommands];
   } else if ([@"ime" isEqual:op]) {
-    NSString *event = body[@"event"];
+    NSString *event = body[@"type"];
     NSString *data = body[@"data"];
-    [self _onIME:event data: data];
+    [self onIME:event data: data];
   } else if ([@"guard-ime-on" isEqual:op]) {
     if (_activeIMEGuardCommands == nil) {
       _activeIMEGuardCommands = _imeGuardCommands;