Define tunnel variables for bypassing fcitx limitations

src/CMakeLists.txt

@@ -12,6 +12,7 @@ file(GLOB CONFIG_UI_FILES CONFIGURE_DEPENDS config/*.swift)
 
 add_library(Fcitx5Objs STATIC
     fcitx.cpp
+    tunnel.cpp
     config/config.cpp
     controller.swift
     ${CONFIG_UI_FILES}

src/controller.swift

@@ -73,7 +73,7 @@ class FcitxInputController: IMKInputController {
   }
 
   override func handle(_ event: NSEvent!, client sender: Any!) -> Bool {
-    guard let event = event, let _ = sender as? IMKTextInput else {
+    guard let event = event, sender as? IMKTextInput != nil else {
       return false
     }
 

src/fcitx-public.h

@@ -44,4 +44,7 @@ std::string getAddons() noexcept;
 std::string getActions() noexcept;
 void activateActionById(int id) noexcept;
 
+// Tunnel variables
+#include "tunnel.h"
+
 #endif

src/tunnel.cpp

@@ -0,0 +1,5 @@
+#include "tunnel.h"
+
+bool f5m_is_linear_layout = false;
+bool f5m_is_vertical_rl = false;
+bool f5m_is_vertical_lr = false;

src/tunnel.h

@@ -0,0 +1,5 @@
+#pragma once
+
+extern bool f5m_is_linear_layout;
+extern bool f5m_is_vertical_lr;
+extern bool f5m_is_vertical_rl;

webpanel/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(webpanel STATIC webpanel.cpp)
+add_library(webpanel STATIC webpanel.cpp tunnel.cpp)
 target_link_libraries(webpanel Fcitx5::Core)
 target_include_directories(webpanel PRIVATE "${PROJECT_SOURCE_DIR}/src")
 

webpanel/tunnel.cpp

@@ -0,0 +1,4 @@
+// Weak definitions for tunnel variables used in webpanel.
+__attribute__((weak)) bool f5m_is_linear_layout = false;
+__attribute__((weak)) bool f5m_is_vertical_rl = false;
+__attribute__((weak)) bool f5m_is_vertical_lr = false;

webpanel/webpanel.cpp

@@ -332,8 +332,14 @@ void WebPanel::update(UserInterfaceComponent component,
         std::vector<candidate_window::Candidate> candidates;
         int size = 0;
         candidate_window::layout_t layout = config_.typography->layout.value();
+        f5m_is_linear_layout =
+            (layout == candidate_window::layout_t::horizontal);
         candidate_window::writing_mode_t writingMode =
             config_.typography->writingMode.value();
+        f5m_is_vertical_rl =
+            (writingMode == candidate_window::writing_mode_t::vertical_rl);
+        f5m_is_vertical_lr =
+            (writingMode == candidate_window::writing_mode_t::vertical_lr);
         if (const auto &list = inputPanel.candidateList()) {
             switch (list->layoutHint()) {
             case CandidateLayoutHint::Vertical: