From be0dfe1354ccc62c68d5674cb2d0d68a8731f3f8 Mon Sep 17 00:00:00 2001
From: liulinsong <liulinsong@kylinos.cn>
Date: Sun, 23 Apr 2023 10:55:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5fcitx=E4=B8=8A=E6=B8=B8?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=BA=94=E7=94=A8=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E8=99=9A=E6=8B=9F=E9=94=AE=E7=9B=98=E5=8F=AF?=
 =?UTF-8?q?=E8=A7=81=E6=80=A7=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 将客户端应用程序控制虚拟键盘可见性的dbus接口改为与fcitx上游一致

2. 需要确保使用旧的dbus接口的fcitx5-frontend-qt5不能与新的fcitx共存
---
 debian/control                             |  1 +
 src/frontend/dbusfrontend/dbusfrontend.cpp | 29 ----------------------
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/debian/control b/debian/control
index feb3714b..f2424830 100644
--- a/debian/control
+++ b/debian/control
@@ -209,6 +209,7 @@ Breaks:
  fcitx5-module-fcitx4 (<< 5.0.4-2),
  fcitx5-module-ibus (<< 5.0.4-2),
  fcitx5-module-kimpanel (<< 5.0.4-2),
+ fcitx5-frontend-qt5 (<= 5.0.14-0ok3kylin0k0.1tablet5),
 Replaces:
  fcitx5-module-dbus (<< 5.0.4-2),
  fcitx5-module-fcitx4 (<< 5.0.4-2),
diff --git a/src/frontend/dbusfrontend/dbusfrontend.cpp b/src/frontend/dbusfrontend/dbusfrontend.cpp
index 944647e0..35be539e 100644
--- a/src/frontend/dbusfrontend/dbusfrontend.cpp
+++ b/src/frontend/dbusfrontend/dbusfrontend.cpp
@@ -85,13 +85,6 @@ public:
     dbus::Bus *bus() { return bus_; }
     Instance *instance() { return module_->instance(); }
 
-private:
-    static bool checkUseDefaultFocusBehavior(
-        std::unordered_map<std::string, std::string> &strMap,
-        const std::string &defaultFocusBehaviorName);
-    static void updateUseDefaultFocusBehavior(
-        InputContext &ic, std::unordered_map<std::string, std::string> &strMap);
-
 private:
     FCITX_OBJECT_VTABLE_METHOD(createInputContext, "CreateInputContext",
                                "a(ss)", "oay");
@@ -498,28 +491,6 @@ InputMethod1::createInputContext(
         ic->path(), std::vector<uint8_t>(ic->uuid().begin(), ic->uuid().end()));
 }
 
-// static
-bool InputMethod1::checkUseDefaultFocusBehavior(
-    std::unordered_map<std::string, std::string> &strMap,
-    const std::string &defaultFocusBehaviorName) {
-    const std::string *useDefaultFocusBehavior =
-        findValue(strMap, defaultFocusBehaviorName);
-    return useDefaultFocusBehavior == nullptr ||
-           *useDefaultFocusBehavior != "false";
-}
-
-// static
-void InputMethod1::updateUseDefaultFocusBehavior(
-    InputContext &ic, std::unordered_map<std::string, std::string> &strMap) {
-    bool useDefaultFocusInBehavior =
-        checkUseDefaultFocusBehavior(strMap, "useDefaultFocusInBehavior");
-    ic.setUseDefaultFocusInBehavior(useDefaultFocusInBehavior);
-
-    bool useDefaultFocusOutBehavior =
-        checkUseDefaultFocusBehavior(strMap, "useDefaultFocusOutBehavior");
-    ic.setUseDefaultFocusOutBehavior(useDefaultFocusOutBehavior);
-}
-
 std::tuple<std::vector<DBusBlockedEvent>, bool>
 DBusInputContext1::processKeyEventBatch(uint32_t keyval, uint32_t keycode,
                                         uint32_t state, bool isRelease,