From 0b86feeeb58a0a5302a6811f0f51e97c562a7134 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 13 May 2021 08:16:21 +0400 Subject: [PATCH] Implement appmenu on Wayland with org_kde_kwin_appmenu protocol --- .../linux/linux_wayland_integration.cpp | 43 +++++++++++++++++++ .../linux/linux_wayland_integration.h | 4 ++ .../linux/linux_wayland_integration_dummy.cpp | 6 +++ .../platform/linux/main_window_linux.cpp | 34 ++++++++++----- 4 files changed, 77 insertions(+), 10 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp index ba521184b4..16db763d83 100644 --- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp +++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp @@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include #include +#include using namespace KWayland::Client; @@ -36,6 +37,10 @@ public: return _plasmaShell.get(); } + [[nodiscard]] AppMenuManager *appMenuManager() { + return _appMenuManager.get(); + } + [[nodiscard]] QEventLoop &interfacesLoop() { return _interfacesLoop; } @@ -51,6 +56,7 @@ private: Registry _applicationRegistry; std::unique_ptr _xdgExporter; std::unique_ptr _plasmaShell; + std::unique_ptr _appMenuManager; QEventLoop _interfacesLoop; bool _interfacesAnnounced = false; }; @@ -117,6 +123,21 @@ WaylandIntegration::Private::Private() &PlasmaShell::destroy); }); + connect( + &_applicationRegistry, + &Registry::appMenuAnnounced, + [=](uint name, uint version) { + _appMenuManager = std::unique_ptr{ + _applicationRegistry.createAppMenuManager(name, version), + }; + + connect( + _applicationConnection, + &ConnectionThread::connectionDied, + _appMenuManager.get(), + &AppMenuManager::destroy); + }); + _connection.initConnection(); } @@ -187,5 +208,27 @@ void WaylandIntegration::skipTaskbar(QWindow *window, bool skip) { plasmaSurface->setSkipTaskbar(skip); } +void WaylandIntegration::registerAppMenu( + QWindow *window, + const QString &serviceName, + const QString &objectPath) { + const auto manager = _private->appMenuManager(); + if (!manager) { + return; + } + + const auto surface = Surface::fromWindow(window); + if (!surface) { + return; + } + + const auto appMenu = manager->create(surface, surface); + if (!appMenu) { + return; + } + + appMenu->setAddress(serviceName, objectPath); +} + } // namespace internal } // namespace Platform diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.h b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.h index d762ef9f9a..dbf47fec1b 100644 --- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.h +++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.h @@ -18,6 +18,10 @@ public: QString nativeHandle(QWindow *window); bool skipTaskbarSupported(); void skipTaskbar(QWindow *window, bool skip); + void registerAppMenu( + QWindow *window, + const QString &serviceName, + const QString &objectPath); private: WaylandIntegration(); diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp index 74e6485dc2..7ab26b1e2d 100644 --- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp +++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration_dummy.cpp @@ -44,5 +44,11 @@ bool WaylandIntegration::skipTaskbarSupported() { void WaylandIntegration::skipTaskbar(QWindow *window, bool skip) { } +void WaylandIntegration::registerAppMenu( + QWindow *window, + const QString &serviceName, + const QString &objectPath) { +} + } // namespace internal } // namespace Platform diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp index 7b54cc7018..b409f15972 100644 --- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp @@ -503,7 +503,15 @@ bool IsAppMenuSupported() { // This call must be made from the same bus connection as DBusMenuExporter // So it must use QDBusConnection -void RegisterAppMenu(uint winId, const QString &menuPath) { +void RegisterAppMenu(QWindow *window, const QString &menuPath) { + if (const auto integration = WaylandIntegration::Instance()) { + integration->registerAppMenu( + window, + QDBusConnection::sessionBus().baseService(), + menuPath); + return; + } + auto message = QDBusMessage::createMethodCall( kAppMenuService.utf16(), kAppMenuObjectPath.utf16(), @@ -511,7 +519,7 @@ void RegisterAppMenu(uint winId, const QString &menuPath) { qsl("RegisterWindow")); message.setArguments({ - winId, + window->winId(), QVariant::fromValue(QDBusObjectPath(menuPath)) }); @@ -520,7 +528,11 @@ void RegisterAppMenu(uint winId, const QString &menuPath) { // This call must be made from the same bus connection as DBusMenuExporter // So it must use QDBusConnection -void UnregisterAppMenu(uint winId) { +void UnregisterAppMenu(QWindow *window) { + if (const auto integration = WaylandIntegration::Instance()) { + return; + } + auto message = QDBusMessage::createMethodCall( kAppMenuService.utf16(), kAppMenuObjectPath.utf16(), @@ -528,7 +540,7 @@ void UnregisterAppMenu(uint winId) { qsl("UnregisterWindow")); message.setArguments({ - winId + window->winId() }); QDBusConnection::sessionBus().send(message); @@ -806,9 +818,9 @@ void MainWindow::handleAppMenuOwnerChanged( } if (_appMenuSupported && _mainMenuExporter) { - RegisterAppMenu(winId(), kMainMenuObjectPath.utf16()); + RegisterAppMenu(windowHandle(), kMainMenuObjectPath.utf16()); } else { - UnregisterAppMenu(winId()); + UnregisterAppMenu(windowHandle()); } } #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION @@ -1133,7 +1145,7 @@ void MainWindow::createGlobalMenu() { psMainMenu); if (_appMenuSupported) { - RegisterAppMenu(winId(), kMainMenuObjectPath.utf16()); + RegisterAppMenu(windowHandle(), kMainMenuObjectPath.utf16()); } updateGlobalMenu(); @@ -1269,9 +1281,11 @@ void MainWindow::handleVisibleChangedHook(bool visible) { #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION if (_appMenuSupported && _mainMenuExporter) { if (visible) { - RegisterAppMenu(winId(), kMainMenuObjectPath.utf16()); + base::call_delayed(1, this, [=] { + RegisterAppMenu(windowHandle(), kMainMenuObjectPath.utf16()); + }); } else { - UnregisterAppMenu(winId()); + UnregisterAppMenu(windowHandle()); } } #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION @@ -1299,7 +1313,7 @@ MainWindow::~MainWindow() { delete _sniTrayIcon; if (_appMenuSupported) { - UnregisterAppMenu(winId()); + UnregisterAppMenu(windowHandle()); } delete _mainMenuExporter;