Move the output from QWaylandSurface to the QWaylandSurfaceView

and add a property called primaryOutput on the QWaylandSurface.
Also add some bookkeeping in QtWayland::Output so it knows what surfaces
and views it currently holds, sending the enter and leave events
automatically.

Change-Id: Ib6efbc6f8157657fb4451b751bba1cb5345b7906

1 files changed, 5 insertions, 4 deletions

diff --git a/src/compositor/compositor_api/qwaylandoutput.h b/src/compositor/compositor_api/qwaylandoutput.h
index 2b5c6ad69..bc92fe5a4 100644
--- a/src/compositor/compositor_api/qwaylandoutput.h
+++ b/src/compositor/compositor_api/qwaylandoutput.h
@@ -51,6 +51,7 @@ struct wl_resource;
 class QWaylandCompositor;
 class QWindow;
 class QWaylandSurface;
+class QWaylandSurfaceView;
 class QWaylandClient;
 
 namespace QtWayland {
@@ -151,15 +152,15 @@ public:
     void setPhysicalSizeFollowsSize(bool follow);
 
     void frameStarted();
-    void sendFrameCallbacks(QList<QWaylandSurface *> visibleSurfaces);
+    void sendFrameCallbacks();
 
-    QList<QWaylandSurface *> surfaces() const;
     QList<QWaylandSurface *> surfacesForClient(QWaylandClient *client) const;
-    void addSurface(QWaylandSurface *surface);
-    void removeSurface(QWaylandSurface *surface);
 
     QtWayland::Output *handle() const;
 
+    Q_INVOKABLE virtual QWaylandSurfaceView *pickView(const QPointF &outputPosition) const;
+    Q_INVOKABLE virtual QPointF mapToView(QWaylandSurfaceView *view, const QPointF &surfacePosition) const;
+
 Q_SIGNALS:
     void positionChanged();
     void geometryChanged();