diff --git a/src/server/pointer_interface.cpp b/src/server/pointer_interface.cpp
index 6512f63..d175ac1 100644
--- a/src/server/pointer_interface.cpp
+++ b/src/server/pointer_interface.cpp
@@ -1,432 +1,432 @@
 /********************************************************************
 Copyright 2014  Martin Gräßlin <mgraesslin@kde.org>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
 License as published by the Free Software Foundation; either
 version 2.1 of the License, or (at your option) version 3, or any
 later version accepted by the membership of KDE e.V. (or its
 successor approved by the membership of KDE e.V.), which shall
 act as a proxy defined in Section 6 of version 3 of the license.
 
 This library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "pointer_interface.h"
 #include "pointer_interface_p.h"
 #include "pointerconstraints_interface.h"
 #include "pointergestures_interface_p.h"
 #include "resource_p.h"
 #include "relativepointer_interface_p.h"
 #include "seat_interface.h"
 #include "display.h"
 #include "subcompositor_interface.h"
 #include "surface_interface.h"
 // Wayland
 #include <wayland-server.h>
 
 namespace KWayland
 {
 
 namespace Server
 {
 
 class Cursor::Private
 {
 public:
     Private(Cursor *q, PointerInterface *pointer);
     PointerInterface *pointer;
     quint32 enteredSerial = 0;
     QPoint hotspot;
     QPointer<SurfaceInterface> surface;
 
     void update(const QPointer<SurfaceInterface> &surface, quint32 serial, const QPoint &hotspot);
 
 private:
     Cursor *q;
 };
 
 PointerInterface::Private::Private(SeatInterface *parent, wl_resource *parentResource, PointerInterface *q)
     : Resource::Private(q, parent, parentResource, &wl_pointer_interface, &s_interface)
     , seat(parent)
 {
 }
 
 void PointerInterface::Private::setCursor(quint32 serial, SurfaceInterface *surface, const QPoint &hotspot)
 {
     if (!cursor) {
         Q_Q(PointerInterface);
         cursor = new Cursor(q);
         cursor->d->update(QPointer<SurfaceInterface>(surface), serial, hotspot);
         QObject::connect(cursor, &Cursor::changed, q, &PointerInterface::cursorChanged);
         emit q->cursorChanged();
     } else {
         cursor->d->update(QPointer<SurfaceInterface>(surface), serial, hotspot);
     }
 }
 
 void PointerInterface::Private::sendLeave(SurfaceInterface *surface, quint32 serial)
 {
     if (!surface) {
         return;
     }
     if (resource && surface->resource()) {
         wl_pointer_send_leave(resource, serial, surface->resource());
     }
 }
 
 void PointerInterface::Private::registerRelativePointer(RelativePointerInterface *relativePointer)
 {
     relativePointers << relativePointer;
     QObject::connect(relativePointer, &QObject::destroyed, q,
         [this, relativePointer] {
             relativePointers.removeOne(relativePointer);
         }
     );
 }
 
 
 void PointerInterface::Private::registerSwipeGesture(PointerSwipeGestureInterface *gesture)
 {
     swipeGestures << gesture;
     QObject::connect(gesture, &QObject::destroyed, q,
         [this, gesture] {
             swipeGestures.removeOne(gesture);
         }
     );
 }
 
 void PointerInterface::Private::registerPinchGesture(PointerPinchGestureInterface *gesture)
 {
     pinchGestures << gesture;
     QObject::connect(gesture, &QObject::destroyed, q,
         [this, gesture] {
             pinchGestures.removeOne(gesture);
         }
     );
 }
 
 namespace {
 static QPointF surfacePosition(SurfaceInterface *surface) {
     if (surface && surface->subSurface()) {
         return surface->subSurface()->position() + surfacePosition(surface->subSurface()->parentSurface().data());
     }
     return QPointF();
 }
 }
 
 void PointerInterface::Private::sendEnter(SurfaceInterface *surface, const QPointF &parentSurfacePosition, quint32 serial)
 {
     if (!surface || !surface->resource()) {
         return;
     }
     const QPointF adjustedPos = parentSurfacePosition - surfacePosition(surface);
     wl_pointer_send_enter(resource, serial,
                           surface->resource(),
                           wl_fixed_from_double(adjustedPos.x()), wl_fixed_from_double(adjustedPos.y()));
 }
 
 void PointerInterface::Private::startSwipeGesture(quint32 serial, quint32 fingerCount)
 {
     if (swipeGestures.isEmpty()) {
         return;
     }
     for (auto it = swipeGestures.constBegin(), end = swipeGestures.constEnd(); it != end; it++) {
         (*it)->start(serial, fingerCount);
     }
 }
 
 void PointerInterface::Private::updateSwipeGesture(const QSizeF &delta)
 {
     if (swipeGestures.isEmpty()) {
         return;
     }
     for (auto it = swipeGestures.constBegin(), end = swipeGestures.constEnd(); it != end; it++) {
         (*it)->update(delta);
     }
 }
 
 void PointerInterface::Private::endSwipeGesture(quint32 serial)
 {
     if (swipeGestures.isEmpty()) {
         return;
     }
     for (auto it = swipeGestures.constBegin(), end = swipeGestures.constEnd(); it != end; it++) {
         (*it)->end(serial);
     }
 }
 
 void PointerInterface::Private::cancelSwipeGesture(quint32 serial)
 {
     if (swipeGestures.isEmpty()) {
         return;
     }
     for (auto it = swipeGestures.constBegin(), end = swipeGestures.constEnd(); it != end; it++) {
         (*it)->cancel(serial);
     }
 }
 
 void PointerInterface::Private::startPinchGesture(quint32 serial, quint32 fingerCount)
 {
     if (pinchGestures.isEmpty()) {
         return;
     }
     for (auto it = pinchGestures.constBegin(), end = pinchGestures.constEnd(); it != end; it++) {
         (*it)->start(serial, fingerCount);
     }
 }
 
 void PointerInterface::Private::updatePinchGesture(const QSizeF &delta, qreal scale, qreal rotation)
 {
     if (pinchGestures.isEmpty()) {
         return;
     }
     for (auto it = pinchGestures.constBegin(), end = pinchGestures.constEnd(); it != end; it++) {
         (*it)->update(delta, scale, rotation);
     }
 }
 
 void PointerInterface::Private::endPinchGesture(quint32 serial)
 {
     if (pinchGestures.isEmpty()) {
         return;
     }
     for (auto it = pinchGestures.constBegin(), end = pinchGestures.constEnd(); it != end; it++) {
         (*it)->end(serial);
     }
 }
 
 void PointerInterface::Private::cancelPinchGesture(quint32 serial)
 {
     if (pinchGestures.isEmpty()) {
         return;
     }
     for (auto it = pinchGestures.constBegin(), end = pinchGestures.constEnd(); it != end; it++) {
         (*it)->cancel(serial);
     }
 }
 
 void PointerInterface::Private::sendFrame()
 {
     if (!resource || wl_resource_get_version(resource) < WL_POINTER_FRAME_SINCE_VERSION) {
         return;
     }
     wl_pointer_send_frame(resource);
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 const struct wl_pointer_interface PointerInterface::Private::s_interface = {
     setCursorCallback,
     resourceDestroyedCallback
 };
 #endif
 
 PointerInterface::PointerInterface(SeatInterface *parent, wl_resource *parentResource)
     : Resource(new Private(parent, parentResource, this))
 {
     // TODO: handle touch
     connect(parent, &SeatInterface::pointerPosChanged, this, [this] {
         Q_D();
         if (d->seat->isDragPointer()) {
             // handled by DataDevice
             return;
         }
         if (d->focusedSurface && d->resource) {
             if (!d->focusedSurface->lockedPointer().isNull() && d->focusedSurface->lockedPointer()->isLocked()) {
                 return;
             }
             const QPointF pos = d->seat->focusedPointerSurfaceTransformation().map(d->seat->pointerPos());
-            auto targetSurface = d->focusedSurface->surfaceAt(pos);
+            auto targetSurface = d->focusedSurface->inputSurfaceAt(pos);
             if (!targetSurface) {
                 targetSurface = d->focusedSurface;
             }
             if (targetSurface != d->focusedChildSurface.data()) {
                 const quint32 serial = d->seat->display()->nextSerial();
                 d->sendLeave(d->focusedChildSurface.data(), serial);
                 d->focusedChildSurface = QPointer<SurfaceInterface>(targetSurface);
                 d->sendEnter(targetSurface, pos, serial);
                 d->sendFrame();
                 d->client->flush();
             } else {
                 const QPointF adjustedPos = pos - surfacePosition(d->focusedChildSurface);
                 wl_pointer_send_motion(d->resource, d->seat->timestamp(),
                                        wl_fixed_from_double(adjustedPos.x()), wl_fixed_from_double(adjustedPos.y()));
                 d->sendFrame();
             }
         }
     });
 }
 
 PointerInterface::~PointerInterface() = default;
 
 void PointerInterface::setFocusedSurface(SurfaceInterface *surface, quint32 serial)
 {
     Q_D();
     d->sendLeave(d->focusedChildSurface.data(), serial);
     disconnect(d->destroyConnection);
     if (!surface) {
         d->focusedSurface = nullptr;
         d->focusedChildSurface.clear();
         return;
     }
     d->focusedSurface = surface;
     d->destroyConnection = connect(d->focusedSurface, &Resource::aboutToBeUnbound, this,
         [this] {
             Q_D();
             d->sendLeave(d->focusedChildSurface.data(), d->global->display()->nextSerial());
             d->sendFrame();
             d->focusedSurface = nullptr;
             d->focusedChildSurface.clear();
         }
     );
 
     const QPointF pos = d->seat->focusedPointerSurfaceTransformation().map(d->seat->pointerPos());
-    d->focusedChildSurface = QPointer<SurfaceInterface>(d->focusedSurface->surfaceAt(pos));
+    d->focusedChildSurface = QPointer<SurfaceInterface>(d->focusedSurface->inputSurfaceAt(pos));
     if (!d->focusedChildSurface) {
         d->focusedChildSurface = QPointer<SurfaceInterface>(d->focusedSurface);
     }
     d->sendEnter(d->focusedChildSurface.data(), pos, serial);
     d->client->flush();
 }
 
 void PointerInterface::buttonPressed(quint32 button, quint32 serial)
 {
     Q_D();
     Q_ASSERT(d->focusedSurface);
     if (!d->resource) {
         return;
     }
     wl_pointer_send_button(d->resource, serial, d->seat->timestamp(), button, WL_POINTER_BUTTON_STATE_PRESSED);
     d->sendFrame();
 }
 
 void PointerInterface::buttonReleased(quint32 button, quint32 serial)
 {
     Q_D();
     Q_ASSERT(d->focusedSurface);
     if (!d->resource) {
         return;
     }
     wl_pointer_send_button(d->resource, serial, d->seat->timestamp(), button, WL_POINTER_BUTTON_STATE_RELEASED);
     d->sendFrame();
 }
 
 void PointerInterface::axis(Qt::Orientation orientation, quint32 delta)
 {
     Q_D();
     Q_ASSERT(d->focusedSurface);
     if (!d->resource) {
         return;
     }
     wl_pointer_send_axis(d->resource, d->seat->timestamp(),
                          (orientation == Qt::Vertical) ? WL_POINTER_AXIS_VERTICAL_SCROLL : WL_POINTER_AXIS_HORIZONTAL_SCROLL,
                          wl_fixed_from_int(delta));
     d->sendFrame();
 }
 
 void PointerInterface::Private::setCursorCallback(wl_client *client, wl_resource *resource, uint32_t serial,
                                          wl_resource *surface, int32_t hotspot_x, int32_t hotspot_y)
 {
     auto p = cast<Private>(resource);
     Q_ASSERT(p->client->client() == client);
     p->setCursor(serial, SurfaceInterface::get(surface), QPoint(hotspot_x, hotspot_y));
 }
 
 Cursor *PointerInterface::cursor() const
 {
     Q_D();
     return d->cursor;
 }
 
 void PointerInterface::relativeMotion(const QSizeF &delta, const QSizeF &deltaNonAccelerated, quint64 microseconds)
 {
     Q_D();
     if (d->relativePointers.isEmpty()) {
         return;
     }
     for (auto it = d->relativePointers.constBegin(), end = d->relativePointers.constEnd(); it != end; it++) {
         (*it)->relativeMotion(delta, deltaNonAccelerated, microseconds);
     }
     d->sendFrame();
 }
 
 PointerInterface::Private *PointerInterface::d_func() const
 {
     return reinterpret_cast<Private*>(d.data());
 }
 
 PointerInterface *PointerInterface::get(wl_resource *native)
 {
     return Private::get<PointerInterface>(native);
 }
 
 Cursor::Private::Private(Cursor *q, PointerInterface *pointer)
     : pointer(pointer)
     , q(q)
 {
 }
 
 void Cursor::Private::update(const QPointer< SurfaceInterface > &s, quint32 serial, const QPoint &p)
 {
     bool emitChanged = false;
     if (enteredSerial != serial) {
         enteredSerial = serial;
         emitChanged = true;
         emit q->enteredSerialChanged();
     }
     if (hotspot != p) {
         hotspot = p;
         emitChanged = true;
         emit q->hotspotChanged();
     }
     if (surface != s) {
         if (!surface.isNull()) {
             QObject::disconnect(surface.data(), &SurfaceInterface::damaged, q, &Cursor::changed);
         }
         surface = s;
         if (!surface.isNull()) {
             QObject::connect(surface.data(), &SurfaceInterface::damaged, q, &Cursor::changed);
         }
         emitChanged = true;
         emit q->surfaceChanged();
     }
     if (emitChanged) {
         emit q->changed();
     }
 }
 
 Cursor::Cursor(PointerInterface *parent)
     : QObject(parent)
     , d(new Private(this, parent))
 {
 }
 
 Cursor::~Cursor() = default;
 
 quint32 Cursor::enteredSerial() const
 {
     return d->enteredSerial;
 }
 
 QPoint Cursor::hotspot() const
 {
     return d->hotspot;
 }
 
 PointerInterface *Cursor::pointer() const
 {
     return d->pointer;
 }
 
 QPointer< SurfaceInterface > Cursor::surface() const
 {
     return d->surface;
 }
 
 }
 }
diff --git a/src/server/surface_interface.cpp b/src/server/surface_interface.cpp
index 1ced256..5b62268 100644
--- a/src/server/surface_interface.cpp
+++ b/src/server/surface_interface.cpp
@@ -1,883 +1,912 @@
 /********************************************************************
 Copyright 2014  Martin Gräßlin <mgraesslin@kde.org>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
 License as published by the Free Software Foundation; either
 version 2.1 of the License, or (at your option) version 3, or any
 later version accepted by the membership of KDE e.V. (or its
 successor approved by the membership of KDE e.V.), which shall
 act as a proxy defined in Section 6 of version 3 of the license.
 
 This library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #include "surface_interface.h"
 #include "surface_interface_p.h"
 #include "buffer_interface.h"
 #include "clientconnection.h"
 #include "compositor_interface.h"
 #include "idleinhibit_interface_p.h"
 #include "pointerconstraints_interface_p.h"
 #include "region_interface.h"
 #include "subcompositor_interface.h"
 #include "subsurface_interface_p.h"
 // Qt
 #include <QListIterator>
 // Wayland
 #include <wayland-server.h>
 // std
 #include <algorithm>
 
 namespace KWayland
 {
 namespace Server
 {
 
 SurfaceInterface::Private::Private(SurfaceInterface *q, CompositorInterface *c, wl_resource *parentResource)
     : Resource::Private(q, c, parentResource, &wl_surface_interface, &s_interface)
 {
 }
 
 SurfaceInterface::Private::~Private()
 {
     destroy();
 }
 
 void SurfaceInterface::Private::addChild(QPointer< SubSurfaceInterface > child)
 {
     // protocol is not precise on how to handle the addition of new sub surfaces
     pending.children.append(child);
     subSurfacePending.children.append(child);
     current.children.append(child);
     Q_Q(SurfaceInterface);
     emit q->subSurfaceTreeChanged();
     QObject::connect(child.data(), &SubSurfaceInterface::positionChanged, q, &SurfaceInterface::subSurfaceTreeChanged);
     QObject::connect(child->surface().data(), &SurfaceInterface::damaged, q, &SurfaceInterface::subSurfaceTreeChanged);
     QObject::connect(child->surface().data(), &SurfaceInterface::unmapped, q, &SurfaceInterface::subSurfaceTreeChanged);
     QObject::connect(child->surface().data(), &SurfaceInterface::subSurfaceTreeChanged, q, &SurfaceInterface::subSurfaceTreeChanged);
 }
 
 void SurfaceInterface::Private::removeChild(QPointer< SubSurfaceInterface > child)
 {
     // protocol is not precise on how to handle the addition of new sub surfaces
     pending.children.removeAll(child);
     subSurfacePending.children.removeAll(child);
     current.children.removeAll(child);
     Q_Q(SurfaceInterface);
     emit q->subSurfaceTreeChanged();
     QObject::disconnect(child.data(), &SubSurfaceInterface::positionChanged, q, &SurfaceInterface::subSurfaceTreeChanged);
     if (!child->surface().isNull()) {
         QObject::disconnect(child->surface().data(), &SurfaceInterface::damaged, q, &SurfaceInterface::subSurfaceTreeChanged);
         QObject::disconnect(child->surface().data(), &SurfaceInterface::unmapped, q, &SurfaceInterface::subSurfaceTreeChanged);
         QObject::disconnect(child->surface().data(), &SurfaceInterface::subSurfaceTreeChanged, q, &SurfaceInterface::subSurfaceTreeChanged);
     }
 }
 
 bool SurfaceInterface::Private::raiseChild(QPointer<SubSurfaceInterface> subsurface, SurfaceInterface *sibling)
 {
     Q_Q(SurfaceInterface);
     auto it = std::find(pending.children.begin(), pending.children.end(), subsurface);
     if (it == pending.children.end()) {
         return false;
     }
     if (pending.children.count() == 1) {
         // nothing to do
         return true;
     }
     if (sibling == q) {
         // it's to the parent, so needs to become last item
         pending.children.append(*it);
         pending.children.erase(it);
         pending.childrenChanged = true;
         return true;
     }
     if (!sibling->subSurface()) {
         // not a sub surface
         return false;
     }
     auto siblingIt = std::find(pending.children.begin(), pending.children.end(), sibling->subSurface());
     if (siblingIt == pending.children.end() || siblingIt == it) {
         // not a sibling
         return false;
     }
     auto value = (*it);
     pending.children.erase(it);
     // find the iterator again
     siblingIt = std::find(pending.children.begin(), pending.children.end(), sibling->subSurface());
     pending.children.insert(++siblingIt, value);
     pending.childrenChanged = true;
     return true;
 }
 
 bool SurfaceInterface::Private::lowerChild(QPointer<SubSurfaceInterface> subsurface, SurfaceInterface *sibling)
 {
     Q_Q(SurfaceInterface);
     auto it = std::find(pending.children.begin(), pending.children.end(), subsurface);
     if (it == pending.children.end()) {
         return false;
     }
     if (pending.children.count() == 1) {
         // nothing to do
         return true;
     }
     if (sibling == q) {
         // it's to the parent, so needs to become first item
         auto value = *it;
         pending.children.erase(it);
         pending.children.prepend(value);
         pending.childrenChanged = true;
         return true;
     }
     if (!sibling->subSurface()) {
         // not a sub surface
         return false;
     }
     auto siblingIt = std::find(pending.children.begin(), pending.children.end(), sibling->subSurface());
     if (siblingIt == pending.children.end() || siblingIt == it) {
         // not a sibling
         return false;
     }
     auto value = (*it);
     pending.children.erase(it);
     // find the iterator again
     siblingIt = std::find(pending.children.begin(), pending.children.end(), sibling->subSurface());
     pending.children.insert(siblingIt, value);
     pending.childrenChanged = true;
     return true;
 }
 
 void SurfaceInterface::Private::setShadow(const QPointer<ShadowInterface> &shadow)
 {
     pending.shadow = shadow;
     pending.shadowIsSet = true;
 }
 
 void SurfaceInterface::Private::setBlur(const QPointer<BlurInterface> &blur)
 {
     pending.blur = blur;
     pending.blurIsSet = true;
 }
 
 void SurfaceInterface::Private::setSlide(const QPointer<SlideInterface> &slide)
 {
     pending.slide = slide;
     pending.slideIsSet = true;
 }
 
 void SurfaceInterface::Private::setContrast(const QPointer<ContrastInterface> &contrast)
 {
     pending.contrast = contrast;
     pending.contrastIsSet = true;
 }
 
 void SurfaceInterface::Private::installPointerConstraint(LockedPointerInterface *lock)
 {
     Q_ASSERT(lockedPointer.isNull());
     Q_ASSERT(confinedPointer.isNull());
     lockedPointer = QPointer<LockedPointerInterface>(lock);
 
     auto cleanUp = [this]() {
         lockedPointer.clear();
         disconnect(constrainsOneShotConnection);
         constrainsOneShotConnection = QMetaObject::Connection();
         disconnect(constrainsUnboundConnection);
         constrainsUnboundConnection = QMetaObject::Connection();
         emit q_func()->pointerConstraintsChanged();
     };
 
     if (lock->lifeTime() == LockedPointerInterface::LifeTime::OneShot) {
         constrainsOneShotConnection = QObject::connect(lock, &LockedPointerInterface::lockedChanged, q_func(),
             [this, cleanUp] {
                 if (lockedPointer.isNull() || lockedPointer->isLocked()) {
                     return;
                 }
                 cleanUp();
             }
         );
     }
     constrainsUnboundConnection = QObject::connect(lock, &LockedPointerInterface::unbound, q_func(),
         [this, cleanUp] {
             if (lockedPointer.isNull()) {
                 return;
             }
             cleanUp();
         }
     );
     emit q_func()->pointerConstraintsChanged();
 }
 
 void SurfaceInterface::Private::installPointerConstraint(ConfinedPointerInterface *confinement)
 {
     Q_ASSERT(lockedPointer.isNull());
     Q_ASSERT(confinedPointer.isNull());
     confinedPointer = QPointer<ConfinedPointerInterface>(confinement);
 
     auto cleanUp = [this]() {
         confinedPointer.clear();
         disconnect(constrainsOneShotConnection);
         constrainsOneShotConnection = QMetaObject::Connection();
         disconnect(constrainsUnboundConnection);
         constrainsUnboundConnection = QMetaObject::Connection();
         emit q_func()->pointerConstraintsChanged();
     };
 
     if (confinement->lifeTime() == ConfinedPointerInterface::LifeTime::OneShot) {
         constrainsOneShotConnection = QObject::connect(confinement, &ConfinedPointerInterface::confinedChanged, q_func(),
             [this, cleanUp] {
                 if (confinedPointer.isNull() || confinedPointer->isConfined()) {
                     return;
                 }
                 cleanUp();
             }
         );
     }
     constrainsUnboundConnection = QObject::connect(confinement, &ConfinedPointerInterface::unbound, q_func(),
         [this, cleanUp] {
             if (confinedPointer.isNull()) {
                 return;
             }
             cleanUp();
         }
     );
     emit q_func()->pointerConstraintsChanged();
 }
 
 void SurfaceInterface::Private::installIdleInhibitor(IdleInhibitorInterface *inhibitor)
 {
     idleInhibitors << inhibitor;
     QObject::connect(inhibitor, &IdleInhibitorInterface::aboutToBeUnbound, q,
         [this, inhibitor] {
             idleInhibitors.removeOne(inhibitor);
             if (idleInhibitors.isEmpty()) {
                 emit q_func()->inhibitsIdleChanged();
             }
         }
     );
     if (idleInhibitors.count() == 1) {
         emit q_func()->inhibitsIdleChanged();
     }
 }
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 const struct wl_surface_interface SurfaceInterface::Private::s_interface = {
     resourceDestroyedCallback,
     attachCallback,
     damageCallback,
     frameCallback,
     opaqueRegionCallback,
     inputRegionCallback,
     commitCallback,
     bufferTransformCallback,
     bufferScaleCallback
 };
 #endif
 
 SurfaceInterface::SurfaceInterface(CompositorInterface *parent, wl_resource *parentResource)
     : Resource(new Private(this, parent, parentResource))
 {
 }
 
 SurfaceInterface::~SurfaceInterface() = default;
 
 void SurfaceInterface::frameRendered(quint32 msec)
 {
     Q_D();
     // notify all callbacks
     const bool needsFlush = !d->current.callbacks.isEmpty();
     while (!d->current.callbacks.isEmpty()) {
         wl_resource *r = d->current.callbacks.takeFirst();
         wl_callback_send_done(r, msec);
         wl_resource_destroy(r);
     }
     for (auto it = d->current.children.constBegin(); it != d->current.children.constEnd(); ++it) {
         const auto &subSurface = *it;
         if (subSurface.isNull() || subSurface->d_func()->surface.isNull()) {
             continue;
         }
         subSurface->d_func()->surface->frameRendered(msec);
     }
     if (needsFlush)  {
         client()->flush();
     }
 }
 
 void SurfaceInterface::Private::destroy()
 {
     // copy all existing callbacks to new list and clear existing lists
     // the wl_resource_destroy on the callback resource goes into destroyFrameCallback
     // which would modify the list we are iterating on
     QList<wl_resource *> callbacksToDestroy;
     callbacksToDestroy << current.callbacks;
     current.callbacks.clear();
     callbacksToDestroy << pending.callbacks;
     pending.callbacks.clear();
     callbacksToDestroy << subSurfacePending.callbacks;
     subSurfacePending.callbacks.clear();
     for (auto it = callbacksToDestroy.constBegin(), end = callbacksToDestroy.constEnd(); it != end; it++) {
         wl_resource_destroy(*it);
     }
     if (current.buffer) {
         current.buffer->unref();
     }
 }
 
 void SurfaceInterface::Private::swapStates(State *source, State *target, bool emitChanged)
 {
     Q_Q(SurfaceInterface);
     bool bufferChanged = source->bufferIsSet;
     const bool opaqueRegionChanged = source->opaqueIsSet;
     const bool inputRegionChanged = source->inputIsSet;
     const bool scaleFactorChanged = source->scaleIsSet && (target->scale != source->scale);
     const bool transformChanged = source->transformIsSet && (target->transform != source->transform);
     const bool shadowChanged = source->shadowIsSet;
     const bool blurChanged = source->blurIsSet;
     const bool contrastChanged = source->contrastIsSet;
     const bool slideChanged = source->slideIsSet;
     const bool childrenChanged = source->childrenChanged;
     bool sizeChanged = false;
     auto buffer = target->buffer;
     if (bufferChanged) {
         // TODO: is the reffing correct for subsurfaces?
         QSize oldSize;
         if (target->buffer) {
             oldSize = target->buffer->size();
             if (emitChanged) {
                 target->buffer->unref();
                 QObject::disconnect(target->buffer, &BufferInterface::sizeChanged, q, &SurfaceInterface::sizeChanged);
             } else {
                 delete target->buffer;
                 target->buffer = nullptr;
             }
         }
         if (source->buffer) {
             if (emitChanged) {
                 source->buffer->ref();
                 QObject::connect(source->buffer, &BufferInterface::sizeChanged, q, &SurfaceInterface::sizeChanged);
             }
             const QSize newSize = source->buffer->size();
             sizeChanged = newSize.isValid() && newSize != oldSize;
         }
         if (!target->buffer && !source->buffer && emitChanged) {
             // null buffer set on a not mapped surface, don't emit unmapped
             bufferChanged = false;
         }
         buffer = source->buffer;
     }
     // copy values
     if (bufferChanged) {
         target->buffer = buffer;
         target->damage = source->damage;
         target->bufferIsSet = source->bufferIsSet;
     }
     if (childrenChanged) {
         target->childrenChanged = source->childrenChanged;
         target->children = source->children;
     }
     target->callbacks.append(source->callbacks);
 
     if (shadowChanged) {
         target->shadow = source->shadow;
         target->shadowIsSet = true;
     }
     if (blurChanged) {
         target->blur = source->blur;
         target->blurIsSet = true;
     }
     if (contrastChanged) {
         target->contrast = source->contrast;
         target->contrastIsSet = true;
     }
     if (slideChanged) {
         target->slide = source->slide;
         target->slideIsSet = true;
     }
     if (inputRegionChanged) {
         target->input = source->input;
         target->inputIsInfinite = source->inputIsInfinite;
         target->inputIsSet = true;
     }
     if (opaqueRegionChanged) {
         target->opaque = source->opaque;
         target->opaqueIsSet = true;
     }
     if (scaleFactorChanged) {
         target->scale = source->scale;
         target->scaleIsSet = true;
     }
     if (transformChanged) {
         target->transform = source->transform;
         target->transformIsSet = true;
     }
     if (!lockedPointer.isNull()) {
         lockedPointer->d_func()->commit();
     }
     if (!confinedPointer.isNull()) {
         confinedPointer->d_func()->commit();
     }
 
     *source = State{};
     source->children = target->children;
     if (opaqueRegionChanged) {
         emit q->opaqueChanged(target->opaque);
     }
     if (inputRegionChanged) {
         emit q->inputChanged(target->input);
     }
     if (scaleFactorChanged) {
         emit q->scaleChanged(target->scale);
         if (buffer && !sizeChanged) {
             emit q->sizeChanged();
         }
     }
     if (transformChanged) {
         emit q->transformChanged(target->transform);
     }
     if (bufferChanged && emitChanged) {
         if (target->buffer && !target->damage.isEmpty()) {
             const QRegion windowRegion = QRegion(0, 0, q->size().width(), q->size().height());
             if (!windowRegion.isEmpty()) {
                 target->damage = windowRegion.intersected(target->damage);
                 if (emitChanged) {
                     subSurfaceIsMapped = true;
                     trackedDamage = trackedDamage.united(target->damage);
                     emit q->damaged(target->damage);
                     // workaround for https://bugreports.qt.io/browse/QTBUG-52092
                     // if the surface is a sub-surface, but the main surface is not yet mapped, fake frame rendered
                     if (subSurface) {
                         const auto mainSurface = subSurface->mainSurface();
                         if (!mainSurface || !mainSurface->buffer()) {
                             q->frameRendered(0);
                         }
                     }
                 }
             }
         } else if (!target->buffer && emitChanged) {
             subSurfaceIsMapped = false;
             emit q->unmapped();
         }
     }
     if (!emitChanged) {
         return;
     }
     if (sizeChanged) {
         emit q->sizeChanged();
     }
     if (shadowChanged) {
         emit q->shadowChanged();
     }
     if (blurChanged) {
         emit q->blurChanged();
     }
     if (contrastChanged) {
         emit q->contrastChanged();
     }
     if (slideChanged) {
         emit q->slideOnShowHideChanged();
     }
     if (childrenChanged) {
         emit q->subSurfaceTreeChanged();
     }
 }
 
 void SurfaceInterface::Private::commit()
 {
     if (!subSurface.isNull() && subSurface->isSynchronized()) {
         swapStates(&pending, &subSurfacePending, false);
     } else {
         swapStates(&pending, &current, true);
         if (!subSurface.isNull()) {
             subSurface->d_func()->commit();
         }
         // commit all subSurfaces to apply position changes
         // "The cached state is applied to the sub-surface immediately after the parent surface's state is applied"
         for (auto it = current.children.constBegin(); it != current.children.constEnd(); ++it) {
             const auto &subSurface = *it;
             if (subSurface.isNull()) {
                 continue;
             }
             subSurface->d_func()->commit();
         }
     }
 }
 
 void SurfaceInterface::Private::commitSubSurface()
 {
     if (subSurface.isNull() || !subSurface->isSynchronized()) {
         return;
     }
     swapStates(&subSurfacePending, &current, true);
     // "The cached state is applied to the sub-surface immediately after the parent surface's state is applied"
     for (auto it = current.children.constBegin(); it != current.children.constEnd(); ++it) {
         const auto &subSurface = *it;
         if (subSurface.isNull() || !subSurface->isSynchronized()) {
             continue;
         }
         subSurface->d_func()->commit();
     }
 }
 
 void SurfaceInterface::Private::damage(const QRect &rect)
 {
     pending.damage = pending.damage.united(rect);
 }
 
 void SurfaceInterface::Private::setScale(qint32 scale)
 {
     pending.scale = scale;
     pending.scaleIsSet = true;
 }
 
 void SurfaceInterface::Private::setTransform(OutputInterface::Transform transform)
 {
     pending.transform = transform;
 }
 
 void SurfaceInterface::Private::addFrameCallback(uint32_t callback)
 {
     wl_resource *r = client->createResource(&wl_callback_interface, 1, callback);
     if (!r) {
         wl_resource_post_no_memory(resource);
         return;
     }
     wl_resource_set_implementation(r, nullptr, this, destroyFrameCallback);
     pending.callbacks << r;
 }
 
 void SurfaceInterface::Private::attachBuffer(wl_resource *buffer, const QPoint &offset)
 {
     pending.bufferIsSet = true;
     pending.offset = offset;
     if (pending.buffer) {
         delete pending.buffer;
     }
     if (!buffer) {
         // got a null buffer, deletes content in next frame
         pending.buffer = nullptr;
         pending.damage = QRegion();
         return;
     }
     Q_Q(SurfaceInterface);
     pending.buffer = new BufferInterface(buffer, q);
     QObject::connect(pending.buffer, &BufferInterface::aboutToBeDestroyed, q,
         [this](BufferInterface *buffer) {
             if (pending.buffer == buffer) {
                 pending.buffer = nullptr;
             }
             if (subSurfacePending.buffer == buffer) {
                 subSurfacePending.buffer = nullptr;
             }
             if (current.buffer == buffer) {
                 current.buffer->unref();
                 current.buffer = nullptr;
             }
         }
     );
 }
 
 void SurfaceInterface::Private::destroyFrameCallback(wl_resource *r)
 {
     auto s = cast<Private>(r);
     s->current.callbacks.removeAll(r);
     s->pending.callbacks.removeAll(r);
     s->subSurfacePending.callbacks.removeAll(r);
 }
 
 void SurfaceInterface::Private::attachCallback(wl_client *client, wl_resource *resource, wl_resource *buffer, int32_t sx, int32_t sy)
 {
     Q_UNUSED(client)
     cast<Private>(resource)->attachBuffer(buffer, QPoint(sx, sy));
 }
 
 void SurfaceInterface::Private::damageCallback(wl_client *client, wl_resource *resource, int32_t x, int32_t y, int32_t width, int32_t height)
 {
     Q_UNUSED(client)
     cast<Private>(resource)->damage(QRect(x, y, width, height));
 }
 
 void SurfaceInterface::Private::frameCallback(wl_client *client, wl_resource *resource, uint32_t callback)
 {
     auto s = cast<Private>(resource);
     Q_ASSERT(client == *s->client);
     s->addFrameCallback(callback);
 }
 
 void SurfaceInterface::Private::opaqueRegionCallback(wl_client *client, wl_resource *resource, wl_resource *region)
 {
     auto s = cast<Private>(resource);
     Q_ASSERT(client == *s->client);
     auto r = RegionInterface::get(region);
     s->setOpaque(r ? r->region() : QRegion());
 }
 
 void SurfaceInterface::Private::setOpaque(const QRegion &region)
 {
     pending.opaqueIsSet = true;
     pending.opaque = region;
 }
 
 void SurfaceInterface::Private::inputRegionCallback(wl_client *client, wl_resource *resource, wl_resource *region)
 {
     auto s = cast<Private>(resource);
     Q_ASSERT(client == *s->client);
     auto r = RegionInterface::get(region);
     s->setInput(r ? r->region() : QRegion(), !r);
 }
 
 void SurfaceInterface::Private::setInput(const QRegion &region, bool isInfinite)
 {
     pending.inputIsSet = true;
     pending.inputIsInfinite = isInfinite;
     pending.input = region;
 }
 
 void SurfaceInterface::Private::commitCallback(wl_client *client, wl_resource *resource)
 {
     Q_UNUSED(client)
     cast<Private>(resource)->commit();
 }
 
 void SurfaceInterface::Private::bufferTransformCallback(wl_client *client, wl_resource *resource, int32_t transform)
 {
     Q_UNUSED(client)
     cast<Private>(resource)->setTransform(OutputInterface::Transform(transform));
 }
 
 void SurfaceInterface::Private::bufferScaleCallback(wl_client *client, wl_resource *resource, int32_t scale)
 {
     Q_UNUSED(client)
     cast<Private>(resource)->setScale(scale);
 }
 
 QRegion SurfaceInterface::damage() const
 {
     Q_D();
     return d->current.damage;
 }
 
 QRegion SurfaceInterface::opaque() const
 {
     Q_D();
     return d->current.opaque;
 }
 
 QRegion SurfaceInterface::input() const
 {
     Q_D();
     return d->current.input;
 }
 
 bool SurfaceInterface::inputIsInfitine() const
 {
     return inputIsInfinite();
 }
 
 bool SurfaceInterface::inputIsInfinite() const
 {
     Q_D();
     return d->current.inputIsInfinite;
 }
 
 qint32 SurfaceInterface::scale() const
 {
     Q_D();
     return d->current.scale;
 }
 
 OutputInterface::Transform SurfaceInterface::transform() const
 {
     Q_D();
     return d->current.transform;
 }
 
 BufferInterface *SurfaceInterface::buffer()
 {
     Q_D();
     return d->current.buffer;
 }
 
 QPoint SurfaceInterface::offset() const
 {
     Q_D();
     return d->current.offset;
 }
 
 SurfaceInterface *SurfaceInterface::get(wl_resource *native)
 {
     return Private::get<SurfaceInterface>(native);
 }
 
 SurfaceInterface *SurfaceInterface::get(quint32 id, const ClientConnection *client)
 {
     return Private::get<SurfaceInterface>(id, client);
 }
 
 QList< QPointer< SubSurfaceInterface > > SurfaceInterface::childSubSurfaces() const
 {
     Q_D();
     return d->current.children;
 }
 
 QPointer< SubSurfaceInterface > SurfaceInterface::subSurface() const
 {
     Q_D();
     return d->subSurface;
 }
 
 QSize SurfaceInterface::size() const
 {
     Q_D();
     // TODO: apply transform to the buffer size
     if (d->current.buffer) {
         return d->current.buffer->size() / scale();
     }
     return QSize();
 }
 
 QPointer< ShadowInterface > SurfaceInterface::shadow() const
 {
     Q_D();
     return d->current.shadow;
 }
 
 QPointer< BlurInterface > SurfaceInterface::blur() const
 {
     Q_D();
     return d->current.blur;
 }
 
 QPointer< ContrastInterface > SurfaceInterface::contrast() const
 {
     Q_D();
     return d->current.contrast;
 }
 
 QPointer< SlideInterface > SurfaceInterface::slideOnShowHide() const
 {
     Q_D();
     return d->current.slide;
 }
 
 bool SurfaceInterface::isMapped() const
 {
     Q_D();
     if (d->subSurface) {
         // from spec:
         // "A sub-surface becomes mapped, when a non-NULL wl_buffer is applied and the parent surface is mapped."
         return d->subSurfaceIsMapped && !d->subSurface->parentSurface().isNull() && d->subSurface->parentSurface()->isMapped();
     }
     return d->current.buffer != nullptr;
 }
 
 QRegion SurfaceInterface::trackedDamage() const
 {
     Q_D();
     return d->trackedDamage;
 }
 
 void SurfaceInterface::resetTrackedDamage()
 {
     Q_D();
     d->trackedDamage = QRegion();
 }
 
 QVector<OutputInterface *> SurfaceInterface::outputs() const
 {
     Q_D();
     return d->outputs;
 }
 
 void SurfaceInterface::setOutputs(const QVector<OutputInterface *> &outputs)
 {
     Q_D();
     QVector<OutputInterface *> removedOutputs = d->outputs;
     for (auto it = outputs.constBegin(), end = outputs.constEnd(); it != end; ++it) {
         const auto o = *it;
         removedOutputs.removeOne(o);
     }
     for (auto it = removedOutputs.constBegin(), end = removedOutputs.constEnd(); it != end; ++it) {
         const auto resources = (*it)->clientResources(client());
         for (wl_resource *r : resources) {
             wl_surface_send_leave(d->resource, r);
         }
         disconnect(d->outputDestroyedConnections.take(*it));
     }
     QVector<OutputInterface *> addedOutputsOutputs = outputs;
     for (auto it = d->outputs.constBegin(), end = d->outputs.constEnd(); it != end; ++it) {
         const auto o = *it;
         addedOutputsOutputs.removeOne(o);
     }
     for (auto it = addedOutputsOutputs.constBegin(), end = addedOutputsOutputs.constEnd(); it != end; ++it) {
         const auto o = *it;
         const auto resources = o->clientResources(client());
         for (wl_resource *r : resources) {
             wl_surface_send_enter(d->resource, r);
         }
         d->outputDestroyedConnections[o] = connect(o, &Global::aboutToDestroyGlobal, this, [this, o] {
             Q_D();
             auto outputs = d->outputs;
             if (outputs.removeOne(o)) {
                 setOutputs(outputs);
             }});
     }
     // TODO: send enter when the client binds the OutputInterface another time
 
     d->outputs = outputs;
 }
 
 SurfaceInterface *SurfaceInterface::surfaceAt(const QPointF &position)
 {
     if (!isMapped()) {
         return nullptr;
     }
     Q_D();
     // go from top to bottom. Top most child is last in list
     QListIterator<QPointer<SubSurfaceInterface>> it(d->current.children);
     it.toBack();
     while (it.hasPrevious()) {
         const auto &current = it.previous();
         auto surface = current->surface();
         if (surface.isNull()) {
             continue;
         }
         if (auto s = surface->surfaceAt(position - current->position())) {
             return s;
         }
     }
     // check whether the geometry contains the pos
     if (!size().isEmpty() && QRectF(QPoint(0, 0), size()).contains(position)) {
         return this;
     }
     return nullptr;
 }
 
+SurfaceInterface *SurfaceInterface::inputSurfaceAt(const QPointF &position)
+{
+    // TODO: Most of this is very similar to SurfaceInterface::surfaceAt
+    //       Is there a way to reduce the code duplication?
+    if (!isMapped()) {
+        return nullptr;
+    }
+    Q_D();
+    // go from top to bottom. Top most child is last in list
+    QListIterator<QPointer<SubSurfaceInterface>> it(d->current.children);
+    it.toBack();
+    while (it.hasPrevious()) {
+        const auto &current = it.previous();
+        auto surface = current->surface();
+        if (surface.isNull()) {
+            continue;
+        }
+        if (auto s = surface->inputSurfaceAt(position - current->position())) {
+            return s;
+        }
+    }
+    // check whether the geometry and input region contain the pos
+    if (!size().isEmpty() && QRectF(QPoint(0, 0), size()).contains(position) &&
+            (inputIsInfinite() || input().contains(position.toPoint()))) {
+        return this;
+    }
+    return nullptr;
+}
+
 QPointer<LockedPointerInterface> SurfaceInterface::lockedPointer() const
 {
     Q_D();
     return d->lockedPointer;
 }
 
 QPointer<ConfinedPointerInterface> SurfaceInterface::confinedPointer() const
 {
     Q_D();
     return d->confinedPointer;
 }
 
 bool SurfaceInterface::inhibitsIdle() const
 {
     Q_D();
     return !d->idleInhibitors.isEmpty();
 }
 
 SurfaceInterface::Private *SurfaceInterface::d_func() const
 {
     return reinterpret_cast<Private*>(d.data());
 }
 
 }
 }
diff --git a/src/server/surface_interface.h b/src/server/surface_interface.h
index 232c38c..36acf2a 100644
--- a/src/server/surface_interface.h
+++ b/src/server/surface_interface.h
@@ -1,346 +1,361 @@
 /********************************************************************
 Copyright 2014  Martin Gräßlin <mgraesslin@kde.org>
 
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
 License as published by the Free Software Foundation; either
 version 2.1 of the License, or (at your option) version 3, or any
 later version accepted by the membership of KDE e.V. (or its
 successor approved by the membership of KDE e.V.), which shall
 act as a proxy defined in Section 6 of version 3 of the license.
 
 This library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 #ifndef WAYLAND_SERVER_SURFACE_INTERFACE_H
 #define WAYLAND_SERVER_SURFACE_INTERFACE_H
 
 #include "resource.h"
 #include "output_interface.h"
 
 #include <QObject>
 #include <QPointer>
 #include <QRegion>
 
 #include <KWayland/Server/kwaylandserver_export.h>
 
 namespace KWayland
 {
 namespace Server
 {
 class BlurManagerInterface;
 class BlurInterface;
 class BufferInterface;
 class ConfinedPointerInterface;
 class ContrastInterface;
 class ContrastManagerInterface;
 class CompositorInterface;
 class IdleInhibitManagerUnstableV1Interface;
 class LockedPointerInterface;
 class PointerConstraintsUnstableV1Interface;
 class ShadowManagerInterface;
 class ShadowInterface;
 class SlideInterface;
 class SubSurfaceInterface;
 
 /**
  * @brief Resource representing a wl_surface.
  *
  * The SurfaceInterface gets created by the CompositorInterface. A SurfaceInterface normally
  * takes up a role by being "attached" to either a ShellSurfaceInterface, a SubSurfaceInterface
  * or a Cursor.
  *
  * The implementation of the SurfaceInterface does not only wrap the features exposed by wl_surface,
  * but goes further by integrating the information added to a SurfaceInterface by other interfaces.
  * This should make interacting from the server easier, it only needs to monitor the SurfaceInterface
  * and does not need to track each specific interface.
  *
  * The SurfaceInterface takes care of reference/unreferencing the BufferInterface attached to it.
  * As long as a BufferInterface is attached, the released signal won't be sent. If the BufferInterface
  * is no longer needed by the SurfaceInterface, it will get unreferenced and might be automatically
  * deleted (if it's no longer referenced).
  *
  * @see CompositorInterface
  * @see BufferInterface
  * @see SubSurfaceInterface
  * @see BlurInterface
  * @see ContrastInterface
  * @see ShadowInterface
  * @see SlideInterface
  **/
 class KWAYLANDSERVER_EXPORT SurfaceInterface : public Resource
 {
     Q_OBJECT
     /**
      * The current damage region.
      **/
     Q_PROPERTY(QRegion damage READ damage NOTIFY damaged)
     /**
      * The opaque region for a translucent buffer.
      **/
     Q_PROPERTY(QRegion opaque READ opaque NOTIFY opaqueChanged)
     /**
      * The current input region.
      **/
     Q_PROPERTY(QRegion input READ input NOTIFY inputChanged)
     Q_PROPERTY(qint32 scale READ scale NOTIFY scaleChanged)
     Q_PROPERTY(KWayland::Server::OutputInterface::Transform transform READ transform NOTIFY transformChanged)
     Q_PROPERTY(QSize size READ size NOTIFY sizeChanged)
 public:
     virtual ~SurfaceInterface();
 
     void frameRendered(quint32 msec);
 
     QRegion damage() const;
     QRegion opaque() const;
     QRegion input() const;
     /**
      * Use Surface::inputIsInfinite instead.
      * @deprecated
      * @see inputIsInfinite
      */
     bool inputIsInfitine() const;
     /**
      * Replaces Surface::inputIsInfitine instead.
      * @since 5.5
      */
     bool inputIsInfinite() const;
     qint32 scale() const;
     OutputInterface::Transform transform() const;
     /**
      * @returns the current BufferInterface, might be @c nullptr.
      **/
     BufferInterface *buffer();
     QPoint offset() const;
     /**
      * The size of the Surface in global compositor space.
      * @see For buffer size use BufferInterface::size
      * from SurfaceInterface::buffer
      * @since 5.3
      **/
     QSize size() const;
 
     /**
      * @returns The SubSurface for this Surface in case there is one.
      **/
     QPointer<SubSurfaceInterface> subSurface() const;
     /**
      * @returns Children in stacking order from bottom (first) to top (last).
      **/
     QList<QPointer<SubSurfaceInterface>> childSubSurfaces() const;
 
     /**
      * @returns The Shadow for this Surface.
      * @since 5.4
      **/
     QPointer<ShadowInterface> shadow() const;
 
     /**
      * @returns The Blur for this Surface.
      * @since 5.5
      **/
     QPointer<BlurInterface> blur() const;
 
     /**
      * @returns The Slide for this Surface.
      * @since 5.5
      **/
     QPointer<SlideInterface> slideOnShowHide() const;
 
     /**
      * @returns The Contrast for this Surface.
      * @since 5.5
      **/
     QPointer<ContrastInterface> contrast() const;
 
     /**
      * Whether the SurfaceInterface is currently considered to be mapped.
      * A SurfaceInterface is mapped if it has a non-null BufferInterface attached.
      * If the SurfaceInterface references a SubSurfaceInterface it is only considered
      * mapped if it has a BufferInterface attached and the parent SurfaceInterface is mapped.
      *
      * @returns Whether the SurfaceInterface is currently mapped
      * @since 5.22
      **/
     bool isMapped() const;
 
     /**
      * Returns the tracked damage since the last call to  {@link resetTrackedDamage}.
      * In contrast to {@link damage} this method does not reset the damage when
      * a new BufferInterface gets committed. This allows a compositor to properly
      * track the damage over multiple commits even if it didn't render each new
      * BufferInterface.
      *
      * The damage gets reset whenever {@link resetTrackedDamage} is called.
      * This allows a compositor to properly track the change in its rendering scene
      * for this SurfaceInterface. After it updates its internal state (e.g. by creating
      * an OpenGL texture from the BufferInterface) it can invoke {@link resetTrackedDamage}
      * and the damage tracker will start to track further damage changes.
      *
      * @returns Combined damage since last call to resetTrackedDamage
      * @see damage
      * @see resetTrackedDamage
      * @since 5.22
      **/
     QRegion trackedDamage() const;
 
     /**
      * Reset the damage tracking. The compositor should invoke this method once it updated
      * it's internal state and processed the current damage.
      * @see trackedDamage
      * @since 5.22
      **/
     void resetTrackedDamage();
 
     /**
      * Finds the SurfaceInterface at the given @p position in surface-local coordinates.
      * This can be either a descendant SurfaceInterface honoring the stacking order or
      * the SurfaceInterface itself if its geometry contains the given @p position.
      *
      * If no such SurfaceInterface is found, e.g. because the SurfaceInterface is unmapped,
      * @c nullptr is returned.
      *
      * @param position The position in surface-local coordinates
      * @returns Child surface at the given @p position or surface itself at the position, might be @c nullptr
      * @since 5.22
      **/
     SurfaceInterface *surfaceAt(const QPointF &position);
 
+    /**
+     * Finds the input receiving SurfaceInterface at the given @p position in surface-local coordinates.
+     * This can be either a descendant SurfaceInterface honoring the stacking order or
+     * the SurfaceInterface itself if its geometry contains the given @p position.
+     *
+     * If no such SurfaceInterface is found, e.g. because the SurfaceInterface is unmapped or there is no
+     * input region containing the position,
+     * @c nullptr is returned.
+     *
+     * @param position The position in surface-local coordinates
+     * @returns Input receiving child surface at the given @p position or surface itself at the position, might be @c nullptr
+     * @since 5.52
+     **/
+    SurfaceInterface *inputSurfaceAt(const QPointF &position);
+
     /**
      * Sets the @p outputs this SurfaceInterface overlaps with, may be empty.
      *
      * The compositor should update whenever the SurfaceInterface becomes visible on
      * an OutputInterface by e.g. getting (un)mapped, resized, moved, etc.
      *
      * @see outputs
      * @since 5.27
      **/
     void setOutputs(const QVector<OutputInterface *> &outputs);
 
     /**
      * @returns All OutputInterfaces the SurfaceInterface is on.
      * @see setOutputs
      * @since 5.27
      **/
     QVector<OutputInterface *> outputs() const;
 
     /**
      * Pointer confinement installed on this SurfaceInterface.
      * @see pointerConstraintsChanged
      * @since 5.29
      **/
     QPointer<ConfinedPointerInterface> confinedPointer() const;
 
     /**
      * Pointer lock installed on this SurfaceInterface.
      * @see pointerConstraintsChanged
      * @since 5.29
      **/
     QPointer<LockedPointerInterface> lockedPointer() const;
 
     /**
      * @returns Whether this SurfaceInterface wants idle to be inhibited on the Output it is shown
      * @see inhibitsIdleChanged
      * @since 5.41
      **/
     bool inhibitsIdle() const;
 
     /**
      * @returns The SurfaceInterface for the @p native resource.
      **/
     static SurfaceInterface *get(wl_resource *native);
     /**
      * @returns The SurfaceInterface with given @p id for @p client, if it exists, otherwise @c nullptr.
      * @since 5.3
      **/
     static SurfaceInterface *get(quint32 id, const ClientConnection *client);
 
 Q_SIGNALS:
     /**
      * Emitted whenever the SurfaceInterface got damaged.
      * The signal is only emitted during the commit of state.
      * A damage means that a new BufferInterface got attached.
      *
      * @see buffer
      * @see damage
      **/
     void damaged(const QRegion&);
     void opaqueChanged(const QRegion&);
     void inputChanged(const QRegion&);
     void scaleChanged(qint32);
     void transformChanged(KWayland::Server::OutputInterface::Transform);
     /**
      * Emitted when the Surface removes its content
      **/
     void unmapped();
     /**
      * @since 5.3
      **/
     void sizeChanged();
     /**
      * @since 5.4
      **/
     void shadowChanged();
     /**
      * @since 5.5
      **/
     void blurChanged();
     /**
      * @since 5.5
      **/
     void slideOnShowHideChanged();
     /**
      * @since 5.5
      **/
     void contrastChanged();
     /**
      * Emitted whenever the tree of sub-surfaces changes in a way which requires a repaint.
      * @since 5.22
      **/
     void subSurfaceTreeChanged();
 
     /**
      * Emitted whenever a pointer constraint get (un)installed on this SurfaceInterface.
      *
      * The pointer constraint does not get activated, the compositor needs to activate
      * the lock/confinement.
      *
      * @see confinedPointer
      * @see lockedPointer
      * @since 5.29
      **/
     void pointerConstraintsChanged();
 
     /**
      * Emitted whenever the SurfaceInterface starts/ends to inhibit idle.
      * @see inhibitsIdle
      * @since 5.41
      **/
     void inhibitsIdleChanged();
 
 private:
     friend class CompositorInterface;
     friend class SubSurfaceInterface;
     friend class ShadowManagerInterface;
     friend class BlurManagerInterface;
     friend class SlideManagerInterface;
     friend class ContrastManagerInterface;
     friend class IdleInhibitManagerUnstableV1Interface;
     friend class PointerConstraintsUnstableV1Interface;
     explicit SurfaceInterface(CompositorInterface *parent, wl_resource *parentResource);
 
     class Private;
     Private *d_func() const;
 };
 
 }
 }
 
 Q_DECLARE_METATYPE(KWayland::Server::SurfaceInterface*)
 
 #endif