drop pugixml

Author: eagleoflqj

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "webview"]
 	path = webview
 	url = https://github.com/fcitx-contrib/webview
-[submodule "pugixml"]
-	path = pugixml
-	url = https://github.com/zeux/pugixml

CMakeLists.txt

@@ -33,8 +33,6 @@ elseif(EMSCRIPTEN)
     set(LIBS nlohmann_json::nlohmann_json)
 endif()
 
-include_directories(pugixml/src)
-
 if(NOT "${WKWEBVIEW_PROTOCOL}" STREQUAL "")
     add_definitions(-DWKWEBVIEW_PROTOCOL="${WKWEBVIEW_PROTOCOL}")
     add_definitions(-DWEBVIEW_WWW_PATH="${WEBVIEW_WWW_PATH}")

README.md

@@ -32,7 +32,7 @@ Execute the following JavaScript code to show candidates and more:
 fcitx.setCandidates([
   { text: "虚假的", label: "1", comment: "comment", actions: [{ "id": 1, "text": "删词" }] },
   { text: "🀄", label: "2", comment: "", actions: [] },
-  { text: "candidates", label: "3", comment: "", actions: [] }], 0, "",
+  { text: "candidates", label: "3", comment: "", actions: [] }], 0,
   true, false, true, 0, false, false)
 
 // Set writing mode. 0=horizontal-tb, 1=vertical-rl, 2=vertical-lr.
@@ -43,7 +43,7 @@ fcitx.setLayout(1)
 
 // Show aux-up.
 fcitx.setCandidates([], -1)
-fcitx.updateInputPanel("", "A", "")
+fcitx.updateInputPanel([], false, [], [["A", 0]], [])
 
 // Set theme to 0=system (default), 1=light or 2=dark.
 fcitx.setTheme(1)

include/utility.hpp

@@ -49,5 +49,4 @@ template <typename T> function_traits<T> make_function_traits(const T &) {
     return function_traits<T>();
 }
 
-std::string escape_html(const std::string &content);
 std::string base64(const std::string &s);

include/webview_candidate_window.hpp

@@ -30,7 +30,7 @@ enum format_t {
     Italic = (1 << 8),
 };
 
-template <typename T> using formatted = std::vector<std::pair<T, int>>;
+using formatted = std::vector<std::pair<std::string, int>>;
 
 enum class blur_t { none = 0, system = 1, blur = 2, liquid_glass = 3 };
 
@@ -116,9 +116,8 @@ class WebviewCandidateWindow {
 #endif
 
     // Below are allowed to be called from any thread.
-    void update_input_panel(const formatted<std::string> &preedit, int caret,
-                            const formatted<std::string> &auxUp,
-                            const formatted<std::string> &auxDown);
+    void update_input_panel(formatted preedit, int caret, formatted auxUp,
+                            formatted auxDown);
     void set_candidates(std::vector<Candidate> candidates, int highlighted,
                         scroll_state_t scroll_state, bool scroll_start,
                         bool scroll_end);
@@ -133,8 +132,6 @@ class WebviewCandidateWindow {
         highlight_callback = callback;
     }
 
-    void set_caret_text(const std::string &text) { caret_text_ = text; }
-
     void set_page_callback(std::function<void(bool)> callback) {
         page_callback = callback;
     }
@@ -178,9 +175,11 @@ class WebviewCandidateWindow {
     std::string app_accent_color_ = "";
     layout_t layout_ = layout_t::horizontal;
     writing_mode_t writing_mode_ = writing_mode_t::horizontal_tb;
-    std::string preedit_;
-    std::string auxUp_;
-    std::string auxDown_;
+    formatted preeditPreCaret_;
+    bool hasCaret_ = false;
+    formatted preeditPostCaret_;
+    formatted auxUp_;
+    formatted auxDown_;
     std::vector<Candidate> candidates_;
     int highlighted_ = -1;
     scroll_state_t scroll_state_;
@@ -196,7 +195,6 @@ class WebviewCandidateWindow {
     std::function<void(int, int)> scroll_callback = [](int, int) {};
     std::function<void(int index)> ask_actions_callback = [](int) {};
     std::function<void(int index, int id)> action_callback = [](int, int) {};
-    std::string caret_text_ = "";
     std::string system_ = "";
     int version_ = 0;
     bool pageable_ = false;

page/customize.ts

@@ -1,6 +1,6 @@
 import { distribution } from './distribution'
 import { fixGhostStripe } from './ghost-stripe'
-import { setHighlightMarkText } from './panel'
+import { setCaretText, setHighlightMarkText } from './panel'
 import { setAnimation, setScrollParams } from './scroll'
 import { theme } from './selector'
 import {
@@ -247,6 +247,7 @@ export function setStyle(style: string) {
 
   // Caret
   setBlink(j.Caret.Style === 'Blink')
+  setCaretText(j.Caret.Style === 'Text' ? j.Caret.Text : '')
 
   // Highlight
   setHoverBehavior(j.Highlight.HoverBehavior)

page/global.d.ts

@@ -72,6 +72,7 @@ declare global {
     }
     Caret: {
       Style: 'Blink' | 'Static' | 'Text'
+      Text: string
     }
     Highlight: {
       MarkStyle: 'None' | 'Bar' | 'Text'
@@ -143,7 +144,7 @@ declare global {
     setHost: (system: string, version: number) => void
     setCandidates: (cands: Candidate[], highlighted: number, pageable: boolean, hasPrev: boolean, hasNext: boolean, scrollState: SCROLL_STATE, scrollStart: boolean, scrollEnd: boolean) => void
     setLayout: (layout: LAYOUT) => void
-    updateInputPanel: (preeditHTML: string, auxUpHTML: string, auxDownHTML: string) => void
+    updateInputPanel: (preCaret: [string, number][], hasCaret: boolean, postCaret: [string, number][], auxUp: [string, number][], auxDown: [string, number][]) => void
     hidePanel: () => void
     resize: (new_epoch: number, dx: number, dy: number, dragging: boolean, hasContextmenu: boolean) => void
     setTheme: (theme: 0 | 1 | 2) => void

page/index.html

@@ -36,7 +36,11 @@
             <div class="fcitx-panel-blur">
               <div class="fcitx-header">
                 <div class="fcitx-aux-up fcitx-hidden"></div>
-                <div class="fcitx-preedit fcitx-hidden"></div>
+                <div class="fcitx-preedit fcitx-hidden">
+                  <div class="fcitx-pre-caret"></div>
+                  <div class="fcitx-caret"></div>
+                  <div class="fcitx-post-caret"></div>
+                </div>
               </div>
               <div class="fcitx-aux-down fcitx-hidden"></div>
               <div class="fcitx-hoverables fcitx-horizontal"></div>

page/panel.ts

@@ -31,6 +31,11 @@ export function setHighlightMarkText(text: string) {
   markText = text
 }
 
+let caretText = ''
+export function setCaretText(text: string) {
+  caretText = text
+}
+
 export function moveHighlight(from: Element | null, to: Element | null) {
   from?.classList.remove('fcitx-highlighted')
   to?.classList.add('fcitx-highlighted')
@@ -204,28 +209,55 @@ export function setCandidates(cands: Candidate[], highlighted: number, pageable:
   }
 }
 
-function updateElement(element: Element, innerHTML: string) {
-  if (innerHTML === '') {
+function updateElement(element: Element, formatted: [string, number][]) {
+  element.innerHTML = ''
+  if (formatted.length === 0) {
     element.classList.add('fcitx-hidden')
   }
   else {
-    element.innerHTML = innerHTML
+    for (const [text, _] of formatted) { // Ignore format for now.
+      const child = div()
+      child.textContent = text
+      element.appendChild(child)
+    }
     element.classList.remove('fcitx-hidden')
   }
 }
 
-export function updateInputPanel(preeditHTML: string, auxUpHTML: string, auxDownHTML: string) {
-  if (preeditHTML || auxUpHTML || auxDownHTML) {
+export function updateInputPanel(formattedPreCaret: [string, number][], hasCaret: boolean, formattedPostCaret: [string, number][], formattedAuxUp: [string, number][], formattedAuxDown: [string, number][]) {
+  const hasPreedit = formattedPreCaret.length || formattedPostCaret.length
+  if (hasPreedit || formattedAuxUp.length || formattedAuxDown.length) {
     theme.classList.remove('fcitx-hidden')
   }
   hideContextmenu()
-  updateElement(preedit, preeditHTML)
-  updateElement(auxUp, auxUpHTML)
-  updateElement(auxDown, auxDownHTML)
+
+  const preCaret = preedit.querySelector('.fcitx-pre-caret') as HTMLElement
+  const caret = preedit.querySelector('.fcitx-caret') as HTMLElement
+  const postCaret = preedit.querySelector('.fcitx-post-caret') as HTMLElement
+
+  updateElement(preCaret, formattedPreCaret)
+  if (hasCaret) {
+    caret.textContent = caretText
+    if (caretText) {
+      caret.classList.remove('fcitx-no-text')
+    }
+    else {
+      caret.classList.add('fcitx-no-text')
+    }
+  }
+  updateElement(postCaret, formattedPostCaret)
+  if (hasPreedit) {
+    preedit.classList.remove('fcitx-hidden')
+  }
+  else {
+    preedit.classList.add('fcitx-hidden')
+  }
+  updateElement(auxUp, formattedAuxUp)
+  updateElement(auxDown, formattedAuxDown)
 }
 
 export function hidePanel() {
-  updateInputPanel('', '', '')
+  updateInputPanel([], false, [], [], [])
   setCandidates([], -1, false, false, false, SCROLL_NONE, false, false)
   theme.classList.add('fcitx-hidden')
 }