Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions src/modules/notificationitem/notificationitem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>>>,
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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; });
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -406,6 +423,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());
Expand Down
3 changes: 2 additions & 1 deletion src/modules/notificationitem/notificationitem.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ class NotificationItem : public AddonInstance {
bool registered() const { return registered_; }
std::unique_ptr<HandlerTableEntry<NotificationItemCallback>>
watch(NotificationItemCallback callback);
void newIcon();
FCITX_ADDON_DEPENDENCY_LOADER(classicui, instance_->addonManager());
DBusMenu *menu() { return menu_.get(); }

Expand All @@ -49,6 +48,8 @@ class NotificationItem : public AddonInstance {

void maybeScheduleRegister();
void cleanUp();
void newIcon();
void newTitle();

Instance *instance_;
std::unique_ptr<dbus::ServiceWatcher> watcher_;
Expand Down
Loading