Add surface roles back

Task-number: QTBUG-49809
Change-Id: Id62ddea68c89b6999b66d3df8eeeffd858ae844f
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>

1 files changed, 26 insertions, 0 deletions

diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index ed028824f..3ea2bc87c 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -123,6 +123,7 @@ QWaylandSurfacePrivate::QWaylandSurfacePrivate()
     , refCount(1)
     , client(Q_NULLPTR)
     , buffer(0)
+    , role(0)
     , inputPanelSurface(0)
     , inputRegion(infiniteRegion())
     , isCursorSurface(false)
@@ -742,6 +743,31 @@ struct wl_resource *QWaylandSurface::resource() const
     return d->resource()->handle;
 }
 
+/*!
+ * Sets a role on the surface. A role defines how a surface will be mapped on screen, without a role
+ * a surface is supposed to be hidden. Only one role at all times can be set on a surface. Attempting
+ * to change the role of a surface will trigger a protocol error to the client, while setting the same
+ * role many times is allowed.
+ *
+ * \param errorResource The resource the error will be sent to if the role is being changed.
+ * \param errorCode The error code that will be sent to the client.
+ */
+bool QWaylandSurface::setRole(QWaylandSurfaceRole *role, wl_resource *errorResource, uint32_t errorCode)
+{
+    Q_D(QWaylandSurface);
+
+    if (d->role && d->role != role) {
+            wl_resource_post_error(errorResource, errorCode,
+                                   "Cannot assign role %s to wl_surface@%d, already has role %s\n",
+                                   role->name().constData(), wl_resource_get_id(resource()),
+                                   d->role->name().constData());
+            return false;
+    }
+
+    d->role = role;
+    return true;
+}
+
 QWaylandSurfacePrivate *QWaylandSurfacePrivate::get(QWaylandSurface *surface)
 {
     return surface ? surface->d_func() : Q_NULLPTR;