Merge branch 'fcitx:master' into master

mokapsing · Feb 14, 2024 · 3d0d5c7 · 3d0d5c7
2 parents 7492614 + b09efbb
commit 3d0d5c7
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/src/rimeengine.cpp b/src/rimeengine.cpp
@@ -829,7 +829,7 @@ void RimeEngine::updateSchemaMenu() {
         schemActions_.back().connect<SimpleAction::Activated>(
             [this](InputContext *ic) {
                 auto state = ic->propertyFor(&factory_);
-                state->setLatinMode(true);
+                state->toggleLatinMode();
                 imAction_->update(ic);
             });
         instance_->userInterfaceManager().registerAction(&schemActions_.back());

diff --git a/src/rimeengine.h b/src/rimeengine.h
@@ -58,7 +58,8 @@ FCITX_CONFIGURATION(
         this, "InputState", _("Shared Input State"), SharedStatePolicy::All};
     Option<bool> preeditCursorPositionAtBeginning{
         this, "PreeditCursorPositionAtBeginning",
-        _("Fix embedded preedit cursor at the beginning of the preedit"), !isAndroid()};
+        _("Fix embedded preedit cursor at the beginning of the preedit"),
+        !isAndroid()};
     Option<bool> commitWhenDeactivate{
         this, "Commit when deactivate",
         _("Commit current text when deactivating"), true};

diff --git a/src/rimestate.cpp b/src/rimestate.cpp
@@ -92,6 +92,16 @@ std::string RimeState::subModeLabel() {
     return result;
 }
 
+void RimeState::toggleLatinMode() {
+    auto api = engine_->api();
+    if (api->is_maintenance_mode()) {
+        return;
+    }
+
+    Bool oldValue = api->get_option(session(), RIME_ASCII_MODE);
+    api->set_option(session(), RIME_ASCII_MODE, !oldValue);
+}
+
 void RimeState::setLatinMode(bool latin) {
     auto api = engine_->api();
     if (api->is_maintenance_mode()) {
@@ -190,7 +200,8 @@ bool RimeState::getStatus(
     return true;
 }
 
-Text preeditFromRimeContext(const RimeContext &context, TextFormatFlags flag) {
+Text preeditFromRimeContext(const RimeContext &context, TextFormatFlags flag,
+                            TextFormatFlags highlightFlag) {
     Text preedit;
 
     do {
@@ -218,7 +229,7 @@ Text preeditFromRimeContext(const RimeContext &context, TextFormatFlags flag) {
                 std::string(
                     &context.composition.preedit[context.composition.sel_start],
                     &context.composition.preedit[context.composition.sel_end]),
-                flag | TextFormatFlag::HighLight);
+                flag | highlightFlag);
         }
 
         /* remaining input to convert */
@@ -243,12 +254,12 @@ void RimeState::updatePreedit(InputContext *ic, const RimeContext &context) {
 
     switch (mode) {
     case PreeditMode::No:
-        ic->inputPanel().setPreedit(
-            preeditFromRimeContext(context, TextFormatFlag::NoFlag));
+        ic->inputPanel().setPreedit(preeditFromRimeContext(
+            context, TextFormatFlag::NoFlag, TextFormatFlag::NoFlag));
         break;
     case PreeditMode::CommitPreview: {
-        ic->inputPanel().setPreedit(
-            preeditFromRimeContext(context, TextFormatFlag::NoFlag));
+        ic->inputPanel().setPreedit(preeditFromRimeContext(
+            context, TextFormatFlag::NoFlag, TextFormatFlag::NoFlag));
         if (context.commit_text_preview) {
             Text clientPreedit;
             clientPreedit.append(context.commit_text_preview,
@@ -262,8 +273,12 @@ void RimeState::updatePreedit(InputContext *ic, const RimeContext &context) {
         }
     } break;
     case PreeditMode::ComposingText: {
-        Text clientPreedit =
-            preeditFromRimeContext(context, TextFormatFlag::Underline);
+        const TextFormatFlag highlightFlag =
+            *engine_->config().preeditCursorPositionAtBeginning
+                ? TextFormatFlag::HighLight
+                : TextFormatFlag::NoFlag;
+        Text clientPreedit = preeditFromRimeContext(
+            context, TextFormatFlag::Underline, highlightFlag);
         if (*engine_->config().preeditCursorPositionAtBeginning) {
             clientPreedit.setCursor(0);
         }

diff --git a/src/rimestate.h b/src/rimestate.h
@@ -37,6 +37,7 @@ class RimeState : public InputContextProperty {
     void commitPreedit(InputContext *ic);
     std::string subMode();
     std::string subModeLabel();
+    void toggleLatinMode();
     void setLatinMode(bool latin);
     void selectSchema(const std::string &schemaId);
     RimeSessionId session(bool requestNewSession = true);