Fix build with Qt6.8

handleExpose was removed in 20fb0e7dd5

CMakeLists.txt

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 project(layershellqt)
-set(PROJECT_VERSION "5.93.0")
+set(PROJECT_VERSION "6.0.80")
 set(PROJECT_VERSION_MAJOR 6)
 
 set(CMAKE_C_STANDARD 99)

src/interfaces/window.cpp

@@ -28,7 +28,6 @@ public:
     QString scope = QStringLiteral("window");
     Window::Anchors anchors = {Window::AnchorTop | Window::AnchorBottom | Window::AnchorLeft | Window::AnchorRight};
     int32_t exclusionZone = 0;
-    Window::Anchor exclusiveEdge = Window::AnchorNone;
     Window::KeyboardInteractivity keyboardInteractivity = Window::KeyboardInteractivityOnDemand;
     Window::Layer layer = Window::LayerTop;
     QMargins margins;
@@ -69,21 +68,6 @@ int32_t Window::exclusionZone() const
     return d->exclusionZone;
 }
 
-void Window::setExclusiveEdge(Window::Anchor edge)
-{
-    if (d->exclusiveEdge == edge) {
-        return;
-    }
-
-    d->exclusiveEdge = edge;
-    Q_EMIT exclusiveEdgeChanged();
-}
-
-Window::Anchor Window::exclusiveEdge() const
-{
-    return d->exclusiveEdge;
-}
-
 void Window::setMargins(const QMargins &margins)
 {
     if (d->margins != margins) {

src/interfaces/window.h

@@ -33,7 +33,6 @@ public:
     ~Window() override;
 
     enum Anchor {
-        AnchorNone = 0,
         AnchorTop = 1, ///< The top edge of the anchor rectangle
         AnchorBottom = 2, ///< The bottom edge of the anchor rectangle
         AnchorLeft = 4, ///< The left edge of the anchor rectangle
@@ -80,9 +79,6 @@ public:
     void setExclusiveZone(int32_t zone);
     int32_t exclusionZone() const;
 
-    void setExclusiveEdge(Window::Anchor edge);
-    Window::Anchor exclusiveEdge() const;
-
     void setMargins(const QMargins &margins);
     QMargins margins() const;
 
@@ -125,7 +121,6 @@ public:
 Q_SIGNALS:
     void anchorsChanged();
     void exclusionZoneChanged();
-    void exclusiveEdgeChanged();
     void marginsChanged();
     void keyboardInteractivityChanged();
     void layerChanged();

src/qwaylandlayershellintegration.cpp

@@ -15,7 +15,7 @@
 namespace LayerShellQt
 {
 QWaylandLayerShellIntegration::QWaylandLayerShellIntegration()
-    : QWaylandShellIntegrationTemplate<QWaylandLayerShellIntegration>(5)
+    : QWaylandShellIntegrationTemplate<QWaylandLayerShellIntegration>(4)
     , m_xdgActivation(new QWaylandXdgActivationV1)
 {
 }

src/qwaylandlayersurface.cpp

@@ -16,6 +16,31 @@
 
 #include <QGuiApplication>
 
+namespace
+{
+template<typename T>
+concept QWaylandWindowNewV6Type = requires(T t) { t.sendRecursiveExposeEvent(); };
+
+template<typename T>
+concept QWaylandWindowOldV6Type = requires(T t) { t.handleExpose(QRect()); } && !requires(T t) { t.sendRecursiveExposeEvent(); };
+
+class ExposeHelper
+{
+public:
+    template<QWaylandWindowOldV6Type T>
+    [[maybe_unused]] ExposeHelper(T *window, const QSize &pendingSize)
+    {
+        window->handleExpose(QRect(QPoint(), pendingSize));
+    }
+
+    template<QWaylandWindowNewV6Type T>
+    [[maybe_unused]] ExposeHelper(T *window, [[maybe_unused]] const QSize &pendingSize)
+    {
+        window->sendRecursiveExposeEvent();
+    }
+};
+}
+
 namespace LayerShellQt
 {
 QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell, QtWaylandClient::QWaylandWindow *window)
@@ -48,10 +73,6 @@ QWaylandLayerSurface::QWaylandLayerSurface(QWaylandLayerShellIntegration *shell,
     connect(m_interface, &Window::exclusionZoneChanged, this, [this]() {
         setExclusiveZone(m_interface->exclusionZone());
     });
-    setExclusiveEdge(m_interface->exclusiveEdge());
-    connect(m_interface, &Window::exclusiveEdgeChanged, this, [this]() {
-        setExclusiveEdge(m_interface->exclusiveEdge());
-    });
 
     setMargins(m_interface->margins());
     connect(m_interface, &Window::marginsChanged, this, [this]() {
@@ -96,7 +117,7 @@ void QWaylandLayerSurface::zwlr_layer_surface_v1_configure(uint32_t serial, uint
     if (!m_configured) {
         m_configured = true;
         window()->resizeFromApplyConfigure(m_pendingSize);
-        window()->handleExpose(QRect(QPoint(), m_pendingSize));
+        ExposeHelper helper(window(), m_pendingSize);
     } else {
         // Later configures are resizes, so we have to queue them up for a time when we
         // are not painting to the window.
@@ -131,13 +152,6 @@ void QWaylandLayerSurface::setExclusiveZone(int32_t zone)
     set_exclusive_zone(zone);
 }
 
-void QWaylandLayerSurface::setExclusiveEdge(uint32_t edge)
-{
-    if (zwlr_layer_surface_v1_get_version(object()) >= ZWLR_LAYER_SURFACE_V1_SET_EXCLUSIVE_EDGE_SINCE_VERSION) {
-        set_exclusive_edge(edge);
-    }
-}
-
 void QWaylandLayerSurface::setMargins(const QMargins &margins)
 {
     set_margin(margins.top(), margins.right(), margins.bottom(), margins.left());

src/qwaylandlayersurface_p.h

@@ -36,7 +36,6 @@ public:
 
     void setAnchor(uint32_t anchor);
     void setExclusiveZone(int32_t zone);
-    void setExclusiveEdge(uint32_t edge);
     void setMargins(const QMargins &margins);
     void setKeyboardInteractivity(uint32_t interactivity);
     void setLayer(uint32_t layer);

src/wlr-layer-shell-unstable-v1.xml

@@ -25,7 +25,7 @@
     THIS SOFTWARE.
   </copyright>
 
-  <interface name="zwlr_layer_shell_v1" version="5">
+  <interface name="zwlr_layer_shell_v1" version="4">
     <description summary="create surfaces that are layers of the desktop">
       Clients can use this interface to assign the surface_layer role to
       wl_surfaces. Such surfaces are assigned to a "layer" of the output and
@@ -100,7 +100,7 @@
     </request>
   </interface>
 
-  <interface name="zwlr_layer_surface_v1" version="5">
+  <interface name="zwlr_layer_surface_v1" version="4">
     <description summary="layer metadata interface">
       An interface that may be implemented by a wl_surface, for surfaces that
       are designed to be rendered as a layer of a stacked desktop-like
@@ -367,7 +367,6 @@
       <entry name="invalid_size" value="1" summary="size is invalid"/>
       <entry name="invalid_anchor" value="2" summary="anchor bitfield is invalid"/>
       <entry name="invalid_keyboard_interactivity" value="3" summary="keyboard interactivity is invalid"/>
-      <entry name="invalid_exclusive_edge" value="4" summary="exclusive edge is invalid given the surface anchors"/>
     </enum>
 
     <enum name="anchor" bitfield="true">
@@ -387,21 +386,5 @@
       </description>
       <arg name="layer" type="uint" enum="zwlr_layer_shell_v1.layer" summary="layer to move this surface to"/>
     </request>
-
-    <!-- Version 5 additions -->
-
-    <request name="set_exclusive_edge" since="5">
-      <description summary="set the edge the exclusive zone will be applied to">
-        Requests an edge for the exclusive zone to apply. The exclusive
-        edge will be automatically deduced from anchor points when possible,
-        but when the surface is anchored to a corner, it will be necessary
-        to set it explicitly to disambiguate, as it is not possible to deduce
-        which one of the two corner edges should be used.
-
-        The edge must be one the surface is anchored to, otherwise the
-        invalid_exclusive_edge protocol error will be raised.
-      </description>
-      <arg name="edge" type="uint"/>
-    </request>
   </interface>
 </protocol>