wayland/lock: support Qt 6.10

Author: outfoxxed

src/wayland/session_lock/shell_integration.cpp

@@ -10,10 +10,11 @@
 QtWaylandClient::QWaylandShellSurface*
 QSWaylandSessionLockIntegration::createShellSurface(QtWaylandClient::QWaylandWindow* window) {
 	auto* lock = LockWindowExtension::get(window->window());
-	if (lock == nullptr || lock->surface == nullptr || !lock->surface->isExposed()) {
+	if (lock == nullptr || lock->surface == nullptr) {
 		qFatal() << "Visibility canary failed. A window with a LockWindowExtension MUST be set to "
 		            "visible via LockWindowExtension::setVisible";
 	}
 
-	return lock->surface;
+	QSWaylandSessionLockSurface* surface = lock->surface; // shut up the unused include linter
+	return surface;
 }

src/wayland/session_lock/surface.cpp

@@ -48,16 +48,6 @@ void QSWaylandSessionLockSurface::applyConfigure() {
 	this->window()->resizeFromApplyConfigure(this->size);
 }
 
-bool QSWaylandSessionLockSurface::handleExpose(const QRegion& region) {
-	if (this->initBuf != nullptr) {
-		// at this point qt's next commit to the surface will have a new buffer, and we can safely delete this one.
-		delete this->initBuf;
-		this->initBuf = nullptr;
-	}
-
-	return this->QtWaylandClient::QWaylandShellSurface::handleExpose(region);
-}
-
 void QSWaylandSessionLockSurface::setExtension(LockWindowExtension* ext) {
 	if (ext == nullptr) {
 		if (this->window() != nullptr) this->window()->window()->close();
@@ -71,11 +61,6 @@ void QSWaylandSessionLockSurface::setExtension(LockWindowExtension* ext) {
 	}
 }
 
-void QSWaylandSessionLockSurface::setVisible() {
-	if (this->configured && !this->visible) this->initVisible();
-	this->visible = true;
-}
-
 void QSWaylandSessionLockSurface::ext_session_lock_surface_v1_configure(
     quint32 serial,
     quint32 width,
@@ -97,33 +82,42 @@ void QSWaylandSessionLockSurface::ext_session_lock_surface_v1_configure(
 #else
 		this->window()->updateExposure();
 #endif
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 10, 0)
 		if (this->visible) this->initVisible();
+#endif
 	} else {
 		// applyConfigureWhenPossible runs too late and causes a protocol error on reconfigure.
 		this->window()->resizeFromApplyConfigure(this->size);
 	}
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
 
-#include <private/qwaylandshmbackingstore_p.h>
+bool QSWaylandSessionLockSurface::commitSurfaceRole() const { return false; }
 
-void QSWaylandSessionLockSurface::initVisible() {
-	this->visible = true;
+void QSWaylandSessionLockSurface::setVisible() { this->window()->window()->setVisible(true); }
 
-	// qt always commits a null buffer in QWaylandWindow::initWindow.
-	// We attach a dummy buffer to satisfy ext_session_lock_v1.
-	this->initBuf = new QtWaylandClient::QWaylandShmBuffer(
-	    this->window()->display(),
-	    this->size,
-	    QImage::Format_ARGB32
-	);
+#else
 
-	this->window()->waylandSurface()->attach(this->initBuf->buffer(), 0, 0);
-	this->window()->window()->setVisible(true);
+bool QSWaylandSessionLockSurface::handleExpose(const QRegion& region) {
+	if (this->initBuf != nullptr) {
+		// at this point qt's next commit to the surface will have a new buffer, and we can safely delete this one.
+		delete this->initBuf;
+		this->initBuf = nullptr;
+	}
+
+	return this->QtWaylandClient::QWaylandShellSurface::handleExpose(region);
 }
 
-#else
+void QSWaylandSessionLockSurface::setVisible() {
+	if (this->configured && !this->visible) this->initVisible();
+	this->visible = true;
+}
+
+#endif
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 10, 0)
 
 #include <cmath>
 
@@ -190,4 +184,23 @@ void QSWaylandSessionLockSurface::initVisible() {
 	}
 }
 
+#elif QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
+
+#include <private/qwaylandshmbackingstore_p.h>
+
+void QSWaylandSessionLockSurface::initVisible() {
+	this->visible = true;
+
+	// qt always commits a null buffer in QWaylandWindow::initWindow.
+	// We attach a dummy buffer to satisfy ext_session_lock_v1.
+	this->initBuf = new QtWaylandClient::QWaylandShmBuffer(
+	    this->window()->display(),
+	    this->size,
+	    QImage::Format_ARGB32
+	);
+
+	this->window()->waylandSurface()->attach(this->initBuf->buffer(), 0, 0);
+	this->window()->window()->setVisible(true);
+}
+
 #endif

src/wayland/session_lock/surface.hpp

@@ -5,6 +5,7 @@
 #include <private/qwaylandwindow_p.h>
 #include <qregion.h>
 #include <qtclasshelpermacros.h>
+#include <qtversionchecks.h>
 #include <qtypes.h>
 #include <qwayland-ext-session-lock-v1.h>
 
@@ -20,7 +21,12 @@ class QSWaylandSessionLockSurface
 
 	[[nodiscard]] bool isExposed() const override;
 	void applyConfigure() override;
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+	[[nodiscard]] bool commitSurfaceRole() const override;
+#else
 	bool handleExpose(const QRegion& region) override;
+#endif
 
 	void setExtension(LockWindowExtension* ext);
 	void setVisible();
@@ -29,11 +35,13 @@ class QSWaylandSessionLockSurface
 	void
 	ext_session_lock_surface_v1_configure(quint32 serial, quint32 width, quint32 height) override;
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 10, 0)
 	void initVisible();
+	bool visible = false;
+#endif
 
 	LockWindowExtension* ext = nullptr;
 	QSize size;
 	bool configured = false;
-	bool visible = false;
 	QtWaylandClient::QWaylandShmBuffer* initBuf = nullptr;
 };