From 3f28dfa821a85debe162c39ab64d1967f6029126 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 11 Nov 2022 08:21:54 +0400
Subject: [PATCH] Replace custom waitForInterfaceAnnounce with
 wl_display_roundtrip

---
 .../linux/ui_linux_wayland_integration.cpp    | 40 +------------------
 .../linux/ui_linux_wayland_integration.h      |  1 -
 .../ui_linux_wayland_integration_dummy.cpp    |  3 --
 ui/platform/linux/ui_window_linux.cpp         |  6 +--
 4 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp
index aac886c..0ad5ff3 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration.cpp
@@ -30,25 +30,15 @@ struct WlRegistryDeleter {
 	}
 };
 
-struct WlCallbackDeleter {
-	void operator()(wl_callback *value) {
-		wl_callback_destroy(value);
-	}
-};
-
 } // namespace
 
 struct WaylandIntegration::Private {
 	std::unique_ptr<wl_registry, WlRegistryDeleter> registry;
-	std::unique_ptr<wl_callback, WlCallbackDeleter> callback;
-	QEventLoop interfacesLoop;
-	bool interfacesAnnounced = false;
 	bool xdgDecorationSupported = false;
 	uint32_t xdgDecorationName = 0;
 	rpl::lifetime lifetime;
 
 	static const struct wl_registry_listener RegistryListener;
-	static const struct wl_callback_listener CallbackListener;
 };
 
 const struct wl_registry_listener WaylandIntegration::Private::RegistryListener = {
@@ -72,19 +62,6 @@ const struct wl_registry_listener WaylandIntegration::Private::RegistryListener
 	}),
 };
 
-const struct wl_callback_listener WaylandIntegration::Private::CallbackListener = {
-	decltype(wl_callback_listener::done)(+[](
-			Private *data,
-			wl_callback *callback,
-			uint32_t serial) {
-		data->interfacesAnnounced = true;
-		if (data->interfacesLoop.isRunning()) {
-			data->interfacesLoop.quit();
-		}
-		data->callback = nullptr;
-	}),
-};
-
 WaylandIntegration::WaylandIntegration()
 : _private(std::make_unique<Private>()) {
 	const auto native = QGuiApplication::platformNativeInterface();
@@ -100,26 +77,20 @@ WaylandIntegration::WaylandIntegration()
 	}
 
 	_private->registry.reset(wl_display_get_registry(display));
-	_private->callback.reset(wl_display_sync(display));
-
 	wl_registry_add_listener(
 		_private->registry.get(),
 		&Private::RegistryListener,
 		_private.get());
 
-	wl_callback_add_listener(
-		_private->callback.get(),
-		&Private::CallbackListener,
-		_private.get());
-
 	base::qt_signal_producer(
 		native,
 		&QObject::destroyed
 	) | rpl::start_with_next([=] {
 		// too late for standard destructors, just free
-		free(_private->callback.release());
 		free(_private->registry.release());
 	}, _private->lifetime);
+
+	wl_display_roundtrip(display);
 }
 
 WaylandIntegration::~WaylandIntegration() = default;
@@ -130,13 +101,6 @@ WaylandIntegration *WaylandIntegration::Instance() {
 	return &instance;
 }
 
-void WaylandIntegration::waitForInterfaceAnnounce() {
-	Expects(!_private->interfacesLoop.isRunning());
-	if (!_private->interfacesAnnounced) {
-		_private->interfacesLoop.exec();
-	}
-}
-
 bool WaylandIntegration::xdgDecorationSupported() {
 	return _private->xdgDecorationSupported;
 }
diff --git a/ui/platform/linux/ui_linux_wayland_integration.h b/ui/platform/linux/ui_linux_wayland_integration.h
index 543f871..ef089d2 100644
--- a/ui/platform/linux/ui_linux_wayland_integration.h
+++ b/ui/platform/linux/ui_linux_wayland_integration.h
@@ -16,7 +16,6 @@ class WaylandIntegration {
 public:
 	[[nodiscard]] static WaylandIntegration *Instance();
 
-	void waitForInterfaceAnnounce();
 	[[nodiscard]] bool xdgDecorationSupported();
 	[[nodiscard]] bool windowExtentsSupported();
 	void setWindowExtents(not_null<QWidget*> widget, const QMargins &extents);
diff --git a/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp b/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
index 626b689..87b6203 100644
--- a/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
+++ b/ui/platform/linux/ui_linux_wayland_integration_dummy.cpp
@@ -26,9 +26,6 @@ WaylandIntegration *WaylandIntegration::Instance() {
 	return &instance;
 }
 
-void WaylandIntegration::waitForInterfaceAnnounce() {
-}
-
 bool WaylandIntegration::xdgDecorationSupported() {
 	return false;
 }
diff --git a/ui/platform/linux/ui_window_linux.cpp b/ui/platform/linux/ui_window_linux.cpp
index 4023cc4..a0b9cad 100644
--- a/ui/platform/linux/ui_window_linux.cpp
+++ b/ui/platform/linux/ui_window_linux.cpp
@@ -17,10 +17,8 @@ std::unique_ptr<BasicWindowHelper> CreateSpecialWindowHelper(
 }
 
 bool NativeWindowFrameSupported() {
-	const auto waylandIntegration = WaylandIntegration::Instance();
-	if (waylandIntegration) {
-		waylandIntegration->waitForInterfaceAnnounce();
-		return waylandIntegration->xdgDecorationSupported();
+	if (const auto integration = WaylandIntegration::Instance()) {
+		return integration->xdgDecorationSupported();
 	}
 	return true;
 }