コミット: a2cd2b640e4a16710e53798556a03281640b0f7d - ibus-cp-decorator (git)

コミットメタ情報

• リビジョン: a2cd2b640e4a16710e53798556a03281640b0f7d (tree)
• 日時: 2020-10-03 19:11:44
• 作者: dyknon <dyknon@user...>
• コミッター: dyknon

ログメッセージ

カーソルが見える。

変更サマリ

• modified: extroot/extension.js

差分

--- a/extroot/extension.js
+++ b/extroot/extension.js
@@ -28,12 +28,31 @@ const IBusManager = imports.misc.ibusManager;
 
 const {IBus, Pango, St} = imports.gi;
 
+var _cursor_letter = "|"; //"\u20ed";
+var _cursor_combining = false;
+var _cursor_utf8_cnt;
+
 var _style_pango_attributes;
 var _preedit_handle_id = void 0;
 var _style_handle_id = void 0;
 const _disablers = [];
 
+function utf8_len(c){
+  if(c < 0x80){
+    return 1;
+  }else if(c < 0x800){
+    return 2;
+  }else if(c < 0x10000){
+    return 3;
+  }else{
+    return 4;
+  }
+}
+
 function init(){
+  if(_cursor_letter !== void 0){
+    _cursor_utf8_cnt = utf8_len(_cursor_letter.codePointAt(0))
+  }
 }
 
 function enable(){
@@ -119,45 +138,48 @@ function connect_signals(candidate_popup){
       // text.get_text(): Javascript string object.
       //                  Its indexes are based on UTF-16 code units.
       const text_string = text.get_text();
+      let newstring = text_string;
       const attrs = text.get_attributes();
-      const chars = [];
-      const codes = [];
-      { // split chars
+      const utf8i = [0];
+      {
+        let unicode_count = 0;
         let utf16_count = 0;
+        let utf8_count = 0;
         while(utf16_count < text_string.length){
-          const code = text_string.charCodeAt(utf16_count);
-          if(0xd800 <= code && code <= 0xdbff){
-            const lo = text_string.charCodeAt(utf16_count+1);
-            if(0xdc00 <= lo && lo <= 0xdfff){
-              utf16_count += 2;
-              chars.push(String.fromCharCode(code, lo));
-              codes.push(((code&0x3ff) << 10 | lo&0x3ff) + 0x10000);
-              continue;
+          if(_cursor_letter !== void 0 && cursorPosition == unicode_count){
+            if(!_cursor_combining || unicode_count){
+              newstring = "";
+              newstring += text_string.substring(0, utf16_count);
+              newstring += _cursor_letter;
+              newstring += text_string.substring(utf16_count);
+              utf8_count += _cursor_utf8_cnt;
             }
           }
-          utf16_count += 1;
-          chars.push(String.fromCharCode(code));
-          codes.push(code);
-        }
-      }
-      const utf8i = [0];
-      { // generate byte index list of utf-8 representation
-        let i = 0;
-        for(const c of codes){
-          if(c < 0x80){
-            i += 1;
-          }else if(c < 0x800){
-            i += 2;
-          }else if(c < 0x10000){
-            i += 3;
+
+          const code = text_string.codePointAt(utf16_count);
+          if(code > 0xffff){
+            utf16_count += 2;
           }else{
-            i += 4;
+            utf16_count += 1;
+          }
+
+          utf8_count += utf8_len(code);
+          unicode_count++;
+
+          utf8i.push(utf8_count);
+        }
+        if(_cursor_letter !== void 0 && cursorPosition == unicode_count){
+          if(!_cursor_combining || unicode_count){
+            newstring = "";
+            newstring += text_string.substring(0, utf16_count);
+            newstring += _cursor_letter;
+            newstring += text_string.substring(utf16_count);
+            utf8_count += _cursor_utf8_cnt;
           }
-          utf8i.push(i);
         }
       }
 
-      candidate_popup._preeditText.text = text_string;
+      candidate_popup._preeditText.text = newstring;
       const pango_attrs = _style_pango_attributes.copy();
       { // Translate iBus attributes to Pango one.
         let attr;