Detect global menu at runtime

Telegram/SourceFiles/platform/linux/main_window_linux.cpp

@@ -65,6 +65,7 @@ QIcon TrayIcon;
 QString TrayIconThemeName, TrayIconName;
 
 bool SNIAvailable = false;
+bool AppMenuSupported = false;
 
 QString GetPanelIconName(int counter, bool muted) {
 	return (counter > 0)
@@ -341,18 +342,14 @@ quint32 djbStringHash(QString string) {
 }
 
 #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
-bool AppMenuSupported() {
+bool IsAppMenuSupported() {
-	static const auto Available = []() -> bool {
+	const auto interface = QDBusConnection::sessionBus().interface();
-		const auto interface = QDBusConnection::sessionBus().interface();
 
-		if (!interface) {
+	if (!interface) {
-			return false;
+		return false;
-		}
+	}
 
-		return interface->isServiceRegistered(kAppMenuService.utf16());
+	return interface->isServiceRegistered(kAppMenuService.utf16());
-	}();
-
-	return Available;
 }
 
 void RegisterAppMenu(uint winId, const QDBusObjectPath &menuPath) {
@@ -438,13 +435,27 @@ void MainWindow::initHook() {
 		this,
 		&MainWindow::onSNIOwnerChanged);
 
+	AppMenuSupported = IsAppMenuSupported();
+
+	auto appMenuWatcher = new QDBusServiceWatcher(
+		kAppMenuService.utf16(),
+		QDBusConnection::sessionBus(),
+		QDBusServiceWatcher::WatchForOwnerChange,
+		this);
+
+	connect(
+		appMenuWatcher,
+		&QDBusServiceWatcher::serviceOwnerChanged,
+		this,
+		&MainWindow::onAppMenuOwnerChanged);
+
 	connect(
 		windowHandle(),
 		&QWindow::visibleChanged,
 		this,
 		&MainWindow::onVisibleChanged);
 
-	if (AppMenuSupported()) {
+	if (AppMenuSupported) {
 		LOG(("Using D-Bus global menu."));
 	} else {
 		LOG(("Not using D-Bus global menu."));
@@ -580,6 +591,25 @@ void MainWindow::onSNIOwnerChanged(
 		LOG(("System tray is not available."));
 	}
 }
+
+void MainWindow::onAppMenuOwnerChanged(
+		const QString &service,
+		const QString &oldOwner,
+		const QString &newOwner) {
+	if (oldOwner.isEmpty() && !newOwner.isEmpty()) {
+		AppMenuSupported = true;
+		LOG(("Using D-Bus global menu."));
+	} else if (!oldOwner.isEmpty() && newOwner.isEmpty()) {
+		AppMenuSupported = false;
+		LOG(("Not using D-Bus global menu."));
+	}
+
+	if (AppMenuSupported && !_mainMenuPath.path().isEmpty()) {
+		RegisterAppMenu(winId(), _mainMenuPath);
+	} else {
+		UnregisterAppMenu(winId());
+	}
+}
 #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
 
 void MainWindow::psSetupTrayIcon() {
@@ -717,8 +747,6 @@ void MainWindow::updateGlobalMenuHook() {
 #else // TDESKTOP_DISABLE_DBUS_INTEGRATION
 
 void MainWindow::createGlobalMenu() {
-	if (!AppMenuSupported()) return;
-
 	psMainMenu = new QMenu(this);
 
 	auto file = psMainMenu->addMenu(tr::lng_mac_menu_file(tr::now));
@@ -897,7 +925,9 @@ void MainWindow::createGlobalMenu() {
 		_mainMenuPath.path(),
 		psMainMenu);
 
-	RegisterAppMenu(winId(), _mainMenuPath);
+	if (AppMenuSupported) {
+		RegisterAppMenu(winId(), _mainMenuPath);
+	}
 
 	updateGlobalMenu();
 }
@@ -955,7 +985,7 @@ void MainWindow::psLinuxClearFormat() {
 }
 
 void MainWindow::updateGlobalMenuHook() {
-	if (!AppMenuSupported() || !App::wnd() || !positionInited()) return;
+	if (!App::wnd() || !positionInited()) return;
 
 	const auto focused = QApplication::focusWidget();
 	auto canUndo = false;
@@ -1017,7 +1047,7 @@ void MainWindow::updateGlobalMenuHook() {
 }
 
 void MainWindow::onVisibleChanged(bool visible) {
-	if (AppMenuSupported() && !_mainMenuPath.path().isEmpty()) {
+	if (AppMenuSupported && !_mainMenuPath.path().isEmpty()) {
 		if (visible) {
 			RegisterAppMenu(winId(), _mainMenuPath);
 		} else {
@@ -1032,11 +1062,12 @@ MainWindow::~MainWindow() {
 #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
 	delete _sniTrayIcon;
 
-	if (AppMenuSupported()) {
+	if (AppMenuSupported) {
 		UnregisterAppMenu(winId());
-		delete _mainMenuExporter;
-		delete psMainMenu;
 	}
+
+	delete _mainMenuExporter;
+	delete psMainMenu;
 #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
 
 	delete _trayIconMenuXEmbed;

Telegram/SourceFiles/platform/linux/main_window_linux.h

@@ -46,6 +46,11 @@ public slots:
 		const QString &oldOwner,
 		const QString &newOwner);
 
+	void onAppMenuOwnerChanged(
+		const QString &service,
+		const QString &oldOwner,
+		const QString &newOwner);
+
 	void psLinuxUndo();
 	void psLinuxRedo();
 	void psLinuxCut();