show the current input method name in the tray icon

Author: hantengc

src/modules/notificationitem/notificationitem.cpp

@@ -72,6 +72,14 @@ class StatusNotifierItem : public dbus::ObjectVTable<StatusNotifierItem> {
 
     std::string label() { return ""; }
 
+    std::string title() {
+        const InputMethodEntry *imEntry = nullptr;
+        if (auto *ic = parent_->menu()->lastRelevantIc()) {
+            imEntry = parent_->instance()->inputMethodEntry(ic);
+        }
+        return imEntry == nullptr ? _("Input Method") : imEntry->name();
+    }
+
     static dbus::DBusStruct<
         std::string,
         std::vector<dbus::DBusStruct<int32_t, int32_t, std::vector<uint8_t>>>,
@@ -104,6 +112,15 @@ class StatusNotifierItem : public dbus::ObjectVTable<StatusNotifierItem> {
         lastLabel_ = std::move(label);
     }
 
+    void notifyNewTitle() {
+        std::string currentTitle = title();
+        if (currentTitle.empty() || lastTitle_ == currentTitle) {
+            return;
+        }
+        newTitle();
+        lastTitle_ = std::move(currentTitle);
+    }
+
     void reset() {
         releaseSlot();
         lastIconName_.clear();
@@ -138,8 +155,7 @@ class StatusNotifierItem : public dbus::ObjectVTable<StatusNotifierItem> {
     FCITX_OBJECT_VTABLE_PROPERTY(category, "Category", "s",
                                  []() { return "SystemServices"; });
     FCITX_OBJECT_VTABLE_PROPERTY(id, "Id", "s", []() { return "Fcitx"; });
-    FCITX_OBJECT_VTABLE_PROPERTY(title, "Title", "s",
-                                 []() { return _("Input Method"); });
+    FCITX_OBJECT_VTABLE_PROPERTY(title, "Title", "s", [this]() { return title(); });
     FCITX_OBJECT_VTABLE_PROPERTY(status, "Status", "s",
                                  []() { return "Active"; });
     FCITX_OBJECT_VTABLE_PROPERTY(windowId, "WindowId", "i", []() { return 0; });
@@ -238,6 +254,7 @@ class StatusNotifierItem : public dbus::ObjectVTable<StatusNotifierItem> {
     std::string cachedLabel_;
     std::vector<dbus::DBusStruct<int, int, std::vector<uint8_t>>>
         cachedLabelIcon_;
+    std::string lastTitle_;
 };
 
 NotificationItem::NotificationItem(Instance *instance)
@@ -302,6 +319,16 @@ void NotificationItem::setRegistered(bool registered) {
                     updateIcon(event);
                 }
             }));
+        eventHandlers_.emplace_back(instance_->watchEvent(
+            EventType::InputContextSwitchInputMethod,
+            EventWatcherPhase::Default, [this](Event &event) {
+                if (auto *ic = dynamic_cast<InputContextEvent &>(event)
+                                   .inputContext()) {
+                    if (ic->hasFocus()) {
+                        newTitle();
+                    }
+                }
+            }));
     }
 
     for (auto &handler : handlers_.view()) {
@@ -406,6 +433,13 @@ void NotificationItem::newIcon() {
     // sni_->xayatanaNewLabel(sni_->label(), sni_->label());
 }
 
+void NotificationItem::newTitle() {
+    if (!sni_->isRegistered()) {
+        return;
+    }
+    sni_->notifyNewTitle();
+}
+
 class NotificationItemFactory : public AddonFactory {
     AddonInstance *create(AddonManager *manager) override {
         return new NotificationItem(manager->instance());

src/modules/notificationitem/notificationitem.h

@@ -49,6 +49,7 @@ class NotificationItem : public AddonInstance {
 
     void maybeScheduleRegister();
     void cleanUp();
+    void newTitle();
 
     Instance *instance_;
     std::unique_ptr<dbus::ServiceWatcher> watcher_;