diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-07-30 15:21:17 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:09:42 +0200 |
commit | 0f3c1a1669aa133efd8701f25b8b8093517b81a7 (patch) | |
tree | 964e3be6ecd36c0c4eeafbab0f65e74eac9ee80b | |
parent | d1359f8b0c2b8fcffc2112d2e29d530ac1ab7c9a (diff) |
Rename QWaylandSurfaceView to QWaylandView
and rename QWaylandSurfaceItem to QWaylandQuickView
Change-Id: I989b482eb79df06e9f265bc2b0ef6b3dce7509d6
49 files changed, 293 insertions, 267 deletions
diff --git a/examples/wayland/qml-compositor/main.cpp b/examples/wayland/qml-compositor/main.cpp index 49a6e1f1d..bea503d14 100644 --- a/examples/wayland/qml-compositor/main.cpp +++ b/examples/wayland/qml-compositor/main.cpp @@ -42,7 +42,7 @@ #include "qwaylandquickcompositor.h" #include "qwaylandquicksurface.h" -#include <QtCompositor/qwaylandsurfaceitem.h> +#include <QtCompositor/qwaylandquickview.h> #include <QtCompositor/qwaylandoutput.h> #include <QtCompositor/qwaylandoutputspace.h> @@ -84,9 +84,9 @@ public: return m_fullscreenSurface; } - Q_INVOKABLE QWaylandSurfaceItem *item(QWaylandSurface *surf) + Q_INVOKABLE QWaylandQuickView *item(QWaylandSurface *surf) { - return static_cast<QWaylandSurfaceItem *>(surf->views().first()); + return static_cast<QWaylandQuickView *>(surf->views().first()); } signals: diff --git a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp index ca271ce60..8cfea2ae2 100644 --- a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp +++ b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp @@ -55,7 +55,7 @@ #include <QtCompositor/qwaylandinput.h> #include <QtCompositor/qwaylandbufferref.h> -#include <QtCompositor/qwaylandsurfaceview.h> +#include <QtCompositor/qwaylandview.h> #include <QtCompositor/qwaylandoutput.h> #include <QtCompositor/qwaylandoutputspace.h> @@ -64,11 +64,11 @@ QT_BEGIN_NAMESPACE -class SurfaceView : public QWaylandSurfaceView +class SurfaceView : public QWaylandView { public: SurfaceView() - : QWaylandSurfaceView() + : QWaylandView() , m_texture(0) {} @@ -179,7 +179,7 @@ void QWindowCompositor::surfaceDestroyed() void QWindowCompositor::surfaceMapped() { QWaylandSurface *surface = qobject_cast<QWaylandSurface *>(sender()); - QtWayland::ShellSurface *shellSurface = QtWayland::ShellSurface::get(surface); + QtWayland::ShellSurface *shellSurface = QtWayland::ShellSurface::findIn(surface); QPoint pos; if (!m_surfaces.contains(surface)) { if (!shellSurface || (shellSurface->surfaceType() != QtWayland::ShellSurface::Popup)) { @@ -190,7 +190,7 @@ void QWindowCompositor::surfaceMapped() py = 1 + (qrand() % (m_window->height() - surface->size().height() - 2)); } pos = QPoint(px, py); - QWaylandSurfaceView *view = surface->views().first(); + QWaylandView *view = surface->views().first(); view->setRequestedPosition(pos); } } else { @@ -198,7 +198,7 @@ void QWindowCompositor::surfaceMapped() } if (shellSurface && shellSurface->surfaceType() == QtWayland::ShellSurface::Popup) { - QWaylandSurfaceView *view = surface->views().first(); + QWaylandView *view = surface->views().first(); view->setRequestedPosition(shellSurface->transientParent()->views().first()->pos() + shellSurface->transientOffset()); } @@ -218,7 +218,7 @@ void QWindowCompositor::surfaceUnmapped() m_renderScheduler.start(0); } -QWaylandSurfaceView *QWindowCompositor::createView() +QWaylandView *QWindowCompositor::createView() { return new SurfaceView(); } @@ -253,7 +253,7 @@ void QWindowCompositor::onSurfaceCreated(QWaylandSurface *surface) void QWindowCompositor::sendExpose() { QWaylandSurface *surface = qobject_cast<QWaylandSurface *>(sender()); - QtWayland::ExtendedSurface *extendedSurface = QtWayland::ExtendedSurface::get(surface); + QtWayland::ExtendedSurface *extendedSurface = QtWayland::ExtendedSurface::findIn(surface); if (extendedSurface) extendedSurface->sendOnScreenVisibilityChange(true); } @@ -278,7 +278,7 @@ void QWindowCompositor::updateCursor(bool hasBuffer) } } -QPointF QWindowCompositor::toView(QWaylandSurfaceView *view, const QPointF &pos) const +QPointF QWindowCompositor::toView(QWaylandView *view, const QPointF &pos) const { return pos - view->pos(); } @@ -297,11 +297,11 @@ void QWindowCompositor::adjustCursorSurface(QWaylandSurface *surface, int hotspo m_cursorHotspotY = hotspotY; } -QWaylandSurfaceView *QWindowCompositor::viewAt(const QPointF &point, QPointF *local) +QWaylandView *QWindowCompositor::viewAt(const QPointF &point, QPointF *local) { for (int i = m_surfaces.size() - 1; i >= 0; --i) { QWaylandSurface *surface = m_surfaces.at(i); - foreach (QWaylandSurfaceView *view, surface->views()) { + foreach (QWaylandView *view, surface->views()) { QRectF geo(view->pos(), surface->size()); if (geo.contains(point)) { if (local) @@ -385,7 +385,7 @@ bool QWindowCompositor::eventFilter(QObject *obj, QEvent *event) case QEvent::MouseButtonPress: { QPointF local; QMouseEvent *me = static_cast<QMouseEvent *>(event); - QWaylandSurfaceView *target = viewAt(me->localPos(), &local); + QWaylandView *target = viewAt(me->localPos(), &local); if (m_dragKeyIsPressed && target) { m_draggingWindow = target; m_drag_diff = local; @@ -401,7 +401,7 @@ bool QWindowCompositor::eventFilter(QObject *obj, QEvent *event) return true; } case QEvent::MouseButtonRelease: { - QWaylandSurfaceView *target = input->mouseFocus(); + QWaylandView *target = input->mouseFocus(); if (m_draggingWindow) { m_draggingWindow = 0; m_drag_diff = QPointF(); @@ -421,7 +421,7 @@ bool QWindowCompositor::eventFilter(QObject *obj, QEvent *event) m_renderScheduler.start(0); } else { QPointF local; - QWaylandSurfaceView *target = viewAt(me->localPos(), &local); + QWaylandView *target = viewAt(me->localPos(), &local); input->sendMouseMoveEvent(target, local, me->localPos()); } break; @@ -457,7 +457,7 @@ bool QWindowCompositor::eventFilter(QObject *obj, QEvent *event) case QEvent::TouchUpdate: case QEvent::TouchEnd: { - QWaylandSurfaceView *target = 0; + QWaylandView *target = 0; QTouchEvent *te = static_cast<QTouchEvent *>(event); QList<QTouchEvent::TouchPoint> points = te->touchPoints(); QPoint pointPos; diff --git a/examples/wayland/qwindow-compositor/qwindowcompositor.h b/examples/wayland/qwindow-compositor/qwindowcompositor.h index dd1527134..db7f9129a 100644 --- a/examples/wayland/qwindow-compositor/qwindowcompositor.h +++ b/examples/wayland/qwindow-compositor/qwindowcompositor.h @@ -43,7 +43,7 @@ #include <QtCompositor/QWaylandCompositor> #include <QtCompositor/QWaylandSurface> -#include <QtCompositor/QWaylandSurfaceView> +#include <QtCompositor/QWaylandView> #include "textureblitter.h" #include "compositorwindow.h" @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -class QWaylandSurfaceView; +class QWaylandView; class QOpenGLTexture; class QWindowCompositor : public QWaylandCompositor @@ -74,13 +74,13 @@ private slots: void render(); void onSurfaceCreated(QWaylandSurface *surface); protected: - QWaylandSurfaceView *createView() Q_DECL_OVERRIDE; + QWaylandView *createView() Q_DECL_OVERRIDE; void surfaceCommitted(QWaylandSurface *surface); - QWaylandSurfaceView* viewAt(const QPointF &point, QPointF *local = 0); + QWaylandView* viewAt(const QPointF &point, QPointF *local = 0); bool eventFilter(QObject *obj, QEvent *event); - QPointF toView(QWaylandSurfaceView *view, const QPointF &pos) const; + QPointF toView(QWaylandView *view, const QPointF &pos) const; void adjustCursorSurface(QWaylandSurface *surface, int hotspotX, int hotspotY); @@ -103,12 +103,12 @@ private: QTimer m_renderScheduler; //Dragging windows around - QWaylandSurfaceView *m_draggingWindow; + QWaylandView *m_draggingWindow; bool m_dragKeyIsPressed; QPointF m_drag_diff; //Cursor - QWaylandSurfaceView m_cursorView; + QWaylandView m_cursorView; int m_cursorHotspotX; int m_cursorHotspotY; diff --git a/examples/wayland/server-buffer/compositor/main.cpp b/examples/wayland/server-buffer/compositor/main.cpp index 22bce42e8..287c0cfe1 100644 --- a/examples/wayland/server-buffer/compositor/main.cpp +++ b/examples/wayland/server-buffer/compositor/main.cpp @@ -41,7 +41,7 @@ #include "qwaylandquickcompositor.h" #include "qwaylandsurface.h" -#include "qwaylandsurfaceitem.h" +#include "qwaylandquickview.h" #include "qwaylandoutputspace.h" #include <QGuiApplication> @@ -108,9 +108,9 @@ public: m_view.show(); } - Q_INVOKABLE QWaylandSurfaceItem *item(QWaylandSurface *surf) + Q_INVOKABLE QWaylandQuickView *item(QWaylandSurface *surf) { - return static_cast<QWaylandSurfaceItem *>(surf->views().first()); + return static_cast<QWaylandQuickView *>(surf->views().first()); } signals: diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri index 2da46ae76..a40292f8b 100644 --- a/src/compositor/compositor_api/compositor_api.pri +++ b/src/compositor/compositor_api/compositor_api.pri @@ -13,12 +13,12 @@ HEADERS += \ compositor_api/qwaylandoutput.h \ compositor_api/qwaylanddrag.h \ compositor_api/qwaylandbufferref.h \ - compositor_api/qwaylandsurfaceview.h \ - compositor_api/qwaylandsurfaceview_p.h \ compositor_api/qwaylandoutputspace.h \ compositor_api/qwaylandoutputspace_p.h \ compositor_api/qwaylanddestroylistener.h \ compositor_api/qwaylanddestroylistener_p.h \ + compositor_api/qwaylandview.h \ + compositor_api/qwaylandview_p.h SOURCES += \ @@ -33,9 +33,9 @@ SOURCES += \ compositor_api/qwaylandoutput.cpp \ compositor_api/qwaylanddrag.cpp \ compositor_api/qwaylandbufferref.cpp \ - compositor_api/qwaylandsurfaceview.cpp \ compositor_api/qwaylandoutputspace.cpp \ compositor_api/qwaylanddestroylistener.cpp \ + compositor_api/qwaylandview.cpp QT += core-private @@ -44,13 +44,13 @@ qtHaveModule(quick) { compositor_api/qwaylandquickcompositor.cpp \ compositor_api/qwaylandquicksurface.cpp \ compositor_api/qwaylandquickoutput.cpp \ - compositor_api/qwaylandsurfaceitem.cpp + compositor_api/qwaylandquickview.cpp HEADERS += \ compositor_api/qwaylandquickcompositor.h \ compositor_api/qwaylandquicksurface.h \ compositor_api/qwaylandquickoutput.h \ - compositor_api/qwaylandsurfaceitem.h + compositor_api/qwaylandquickview.h QT += qml quick } diff --git a/src/compositor/compositor_api/qwaylandcompositor.cpp b/src/compositor/compositor_api/qwaylandcompositor.cpp index ff4a12ab4..6cf3adf45 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandcompositor.cpp @@ -40,7 +40,7 @@ #include "qwaylandclient.h" #include "qwaylandinput.h" #include "qwaylandoutput.h" -#include "qwaylandsurfaceview.h" +#include "qwaylandview.h" #include "qwaylandclient.h" #include "qwaylandkeyboard.h" #include "qwaylandpointer.h" @@ -201,9 +201,9 @@ void QWaylandCompositor::cleanupGraphicsResources() m_compositor->cleanupGraphicsResources(); } -QWaylandSurfaceView *QWaylandCompositor::createView() +QWaylandView *QWaylandCompositor::createView() { - return new QWaylandSurfaceView(); + return new QWaylandView(); } QWaylandInputDevice *QWaylandCompositor::createInputDevice() @@ -346,9 +346,9 @@ void QWaylandCompositor::setCursorSurface(QWaylandSurface *surface, int hotspotX } #endif -QWaylandSurfaceView *QWaylandCompositor::createSurfaceView(QWaylandSurface *surface) +QWaylandView *QWaylandCompositor::createSurfaceView(QWaylandSurface *surface) { - QWaylandSurfaceView *view = createView(); + QWaylandView *view = createView(); view->setSurface(surface); return view; } diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h index e2990a6a1..a58562dc6 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.h +++ b/src/compositor/compositor_api/qwaylandcompositor.h @@ -58,7 +58,7 @@ class QWaylandSurface; class QWaylandInputDevice; class QWaylandDrag; class QWaylandGlobalInterface; -class QWaylandSurfaceView; +class QWaylandView; class QWaylandOutput; class QWaylandOutputSpace; class QWaylandPointer; @@ -155,7 +155,7 @@ public: void cleanupGraphicsResources(); - QWaylandSurfaceView *createSurfaceView(QWaylandSurface *surface); + QWaylandView *createSurfaceView(QWaylandSurface *surface); QWaylandInputDevice *inputDeviceFor(QInputEvent *inputEvent); @@ -181,7 +181,7 @@ protected: const QString &manufacturer, const QString &model); virtual QWaylandSurface *createSurface(QWaylandClient *client, quint32 id, int version); - virtual QWaylandSurfaceView *createView(); + virtual QWaylandView *createView(); virtual QWaylandInputDevice *createInputDevice(); friend class QtWayland::Compositor; diff --git a/src/compositor/compositor_api/qwaylanddrag.cpp b/src/compositor/compositor_api/qwaylanddrag.cpp index d3bae5a72..007e54a04 100644 --- a/src/compositor/compositor_api/qwaylanddrag.cpp +++ b/src/compositor/compositor_api/qwaylanddrag.cpp @@ -42,7 +42,7 @@ #include "qwlinputdevice_p.h" #include "qwldatadevice_p.h" #include "qwlsurface_p.h" -#include "qwaylandsurfaceview.h" +#include "qwaylandview.h" QT_BEGIN_NAMESPACE @@ -63,7 +63,7 @@ QWaylandDrag::QWaylandDrag(QWaylandInputDevice *inputDevice) { } -QWaylandSurfaceView *QWaylandDrag::icon() const +QWaylandView *QWaylandDrag::icon() const { Q_D(const QWaylandDrag); diff --git a/src/compositor/compositor_api/qwaylanddrag.h b/src/compositor/compositor_api/qwaylanddrag.h index e4b7e8bfe..2455c6837 100644 --- a/src/compositor/compositor_api/qwaylanddrag.h +++ b/src/compositor/compositor_api/qwaylanddrag.h @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE class QWaylandDragPrivate; class QWaylandSurface; -class QWaylandSurfaceView; +class QWaylandView; class QWaylandInputDevice; class Q_COMPOSITOR_EXPORT QWaylandDrag : public QObject @@ -53,13 +53,13 @@ class Q_COMPOSITOR_EXPORT QWaylandDrag : public QObject Q_OBJECT Q_DECLARE_PRIVATE(QWaylandDrag) - Q_PROPERTY(QWaylandSurfaceView* icon READ icon NOTIFY iconChanged) + Q_PROPERTY(QWaylandView* icon READ icon NOTIFY iconChanged) Q_PROPERTY(bool visible READ visible NOTIFY iconChanged) public: explicit QWaylandDrag(QWaylandInputDevice *inputDevice); - QWaylandSurfaceView *icon() const; + QWaylandView *icon() const; bool visible() const; Q_SIGNALS: diff --git a/src/compositor/compositor_api/qwaylandinput.cpp b/src/compositor/compositor_api/qwaylandinput.cpp index b16ae8d4b..8064faf3f 100644 --- a/src/compositor/compositor_api/qwaylandinput.cpp +++ b/src/compositor/compositor_api/qwaylandinput.cpp @@ -41,7 +41,7 @@ #include "qwaylandcompositor.h" #include "qwlsurface_p.h" #include "qwlcompositor_p.h" -#include "qwaylandsurfaceview.h" +#include "qwaylandview.h" QT_BEGIN_NAMESPACE @@ -81,7 +81,7 @@ void QWaylandInputDevice::sendMouseReleaseEvent(Qt::MouseButton button) /** Convenience function that will set the mouse focus to the surface, then send the mouse move event. * If the mouse focus is the same surface as the surface passed in, then only the move event is sent **/ -void QWaylandInputDevice::sendMouseMoveEvent(QWaylandSurfaceView *surface, const QPointF &localPos, const QPointF &globalPos) +void QWaylandInputDevice::sendMouseMoveEvent(QWaylandView *surface, const QPointF &localPos, const QPointF &globalPos) { Q_D(QWaylandInputDevice); d->sendMouseMoveEvent(surface,localPos,globalPos); @@ -164,13 +164,13 @@ void QWaylandInputDevice::setKeymap(const QWaylandKeymap &keymap) keyboard()->setKeymap(keymap); } -QWaylandSurfaceView *QWaylandInputDevice::mouseFocus() const +QWaylandView *QWaylandInputDevice::mouseFocus() const { Q_D(const QWaylandInputDevice); return d->mouseFocus(); } -void QWaylandInputDevice::setMouseFocus(QWaylandSurfaceView *view) +void QWaylandInputDevice::setMouseFocus(QWaylandView *view) { Q_D(QWaylandInputDevice); d->setMouseFocus(view); diff --git a/src/compositor/compositor_api/qwaylandinput.h b/src/compositor/compositor_api/qwaylandinput.h index 786eeb46f..e35724fd8 100644 --- a/src/compositor/compositor_api/qwaylandinput.h +++ b/src/compositor/compositor_api/qwaylandinput.h @@ -51,7 +51,7 @@ class QWaylandCompositor; class QWaylandSurface; class QKeyEvent; class QTouchEvent; -class QWaylandSurfaceView; +class QWaylandView; class QInputEvent; class QWaylandOutputSpace; class QWaylandInputDevicePrivate; @@ -104,7 +104,7 @@ public: void sendMousePressEvent(Qt::MouseButton button); void sendMouseReleaseEvent(Qt::MouseButton button); - void sendMouseMoveEvent(QWaylandSurfaceView *surface , const QPointF &localPos, const QPointF &globalPos = QPointF()); + void sendMouseMoveEvent(QWaylandView *surface , const QPointF &localPos, const QPointF &globalPos = QPointF()); void sendMouseWheelEvent(Qt::Orientation orientation, int delta); void sendKeyPressEvent(uint code); @@ -123,8 +123,8 @@ public: //Normally set by the mouse device, //But can be set manually for use with touch or can reset unset the current mouse focus; - QWaylandSurfaceView *mouseFocus() const; - void setMouseFocus(QWaylandSurfaceView *view); + QWaylandView *mouseFocus() const; + void setMouseFocus(QWaylandView *view); QWaylandKeyboard *keyboard() const; QWaylandSurface *keyboardFocus() const; @@ -145,7 +145,7 @@ public: virtual bool isOwner(QInputEvent *inputEvent) const; Q_SIGNALS: - void mouseFocusChanged(QWaylandSurfaceView *newFocus, QWaylandSurfaceView *oldFocus); + void mouseFocusChanged(QWaylandView *newFocus, QWaylandView *oldFocus); }; Q_DECLARE_OPERATORS_FOR_FLAGS(QWaylandInputDevice::CapabilityFlags) diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp index 6cc7efbce..9b8b252ba 100644 --- a/src/compositor/compositor_api/qwaylandoutput.cpp +++ b/src/compositor/compositor_api/qwaylandoutput.cpp @@ -38,7 +38,7 @@ #include "qwaylandoutput.h" #include "qwaylandcompositor.h" -#include "qwaylandsurfaceview.h" +#include "qwaylandview.h" #include <QtCore/QCoreApplication> #include <QtCore/QtMath> @@ -277,12 +277,12 @@ QtWayland::Output *QWaylandOutput::handle() const return d_ptr.data(); } -QWaylandSurfaceView *QWaylandOutput::pickView(const QPointF &outputPosition) const +QWaylandView *QWaylandOutput::pickView(const QPointF &outputPosition) const { const QVector<QtWayland::SurfaceViewMapper> surfaceViewMappers = d_ptr->surfaceMappers(); for (int nSurface = 0; surfaceViewMappers.size(); nSurface++) { const QWaylandSurface *surface = surfaceViewMappers.at(nSurface).surface; - const QVector<QWaylandSurfaceView *> views = surfaceViewMappers.at(nSurface).views; + const QVector<QWaylandView *> views = surfaceViewMappers.at(nSurface).views; for (int nView = 0; views.size(); nView++) { if (QRectF(views.at(nView)->requestedPosition(), surface->size()).contains(outputPosition)) return views.at(nView); @@ -291,7 +291,7 @@ QWaylandSurfaceView *QWaylandOutput::pickView(const QPointF &outputPosition) con return Q_NULLPTR; } -QPointF QWaylandOutput::mapToView(QWaylandSurfaceView *view, const QPointF &outputPosition) const +QPointF QWaylandOutput::mapToView(QWaylandView *view, const QPointF &outputPosition) const { return outputPosition - view->requestedPosition(); } diff --git a/src/compositor/compositor_api/qwaylandoutput.h b/src/compositor/compositor_api/qwaylandoutput.h index acc09897c..3250aa7fe 100644 --- a/src/compositor/compositor_api/qwaylandoutput.h +++ b/src/compositor/compositor_api/qwaylandoutput.h @@ -51,7 +51,7 @@ struct wl_resource; class QWaylandCompositor; class QWindow; class QWaylandSurface; -class QWaylandSurfaceView; +class QWaylandView; class QWaylandClient; class QWaylandOutputSpace; @@ -161,8 +161,8 @@ public: 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_INVOKABLE virtual QWaylandView *pickView(const QPointF &outputPosition) const; + Q_INVOKABLE virtual QPointF mapToView(QWaylandView *view, const QPointF &surfacePosition) const; Q_INVOKABLE QPointF mapToOutputSpace(const QPointF &point); diff --git a/src/compositor/compositor_api/qwaylandoutputspace.cpp b/src/compositor/compositor_api/qwaylandoutputspace.cpp index 65497644d..458d18d6d 100644 --- a/src/compositor/compositor_api/qwaylandoutputspace.cpp +++ b/src/compositor/compositor_api/qwaylandoutputspace.cpp @@ -37,7 +37,7 @@ #include "qwaylandoutputspace.h" #include "qwaylandoutputspace_p.h" #include "qwaylandcompositor.h" -#include <QtCompositor/QWaylandSurfaceView> +#include <QtCompositor/QWaylandView> #include <QtCompositor/QWaylandOutput> QT_BEGIN_NAMESPACE @@ -171,7 +171,7 @@ QList<QWaylandOutput *>QWaylandOutputSpace::outputs(const QPoint &point) const return retOutputs; } -QWaylandSurfaceView *QWaylandOutputSpace::pickView(const QPointF &globalPosition) const +QWaylandView *QWaylandOutputSpace::pickView(const QPointF &globalPosition) const { Q_D(const QWaylandOutputSpace); foreach (QWaylandOutput *output, d->outputs) { @@ -183,12 +183,12 @@ QWaylandSurfaceView *QWaylandOutputSpace::pickView(const QPointF &globalPosition return 0; } -QPointF QWaylandOutputSpace::mapToView(QWaylandSurfaceView *view, const QPointF &globalPosition) const +QPointF QWaylandOutputSpace::mapToView(QWaylandView *view, const QPointF &globalPosition) const { return globalPosition - (view->requestedPosition() + view->output()->geometry().topLeft()); } -QPointF QWaylandOutputSpace::mapToSpace(QWaylandSurfaceView *view, const QPointF &local) const +QPointF QWaylandOutputSpace::mapToSpace(QWaylandView *view, const QPointF &local) const { return local + view->requestedPosition() + view->output()->geometry().topLeft(); } diff --git a/src/compositor/compositor_api/qwaylandoutputspace.h b/src/compositor/compositor_api/qwaylandoutputspace.h index 8b1046bf1..fdb64930d 100644 --- a/src/compositor/compositor_api/qwaylandoutputspace.h +++ b/src/compositor/compositor_api/qwaylandoutputspace.h @@ -85,9 +85,9 @@ public: Q_INVOKABLE QList<QWaylandOutput *>outputs() const; Q_INVOKABLE QList<QWaylandOutput *>outputs(const QPoint &point) const; - Q_INVOKABLE QWaylandSurfaceView *pickView(const QPointF &globalPosition) const; - Q_INVOKABLE QPointF mapToView(QWaylandSurfaceView *view, const QPointF &spacePoint) const; - Q_INVOKABLE QPointF mapToSpace(QWaylandSurfaceView *view, const QPointF &local) const; + Q_INVOKABLE QWaylandView *pickView(const QPointF &globalPosition) const; + Q_INVOKABLE QPointF mapToView(QWaylandView *view, const QPointF &spacePoint) const; + Q_INVOKABLE QPointF mapToSpace(QWaylandView *view, const QPointF &local) const; Q_SIGNALS: void surfaceRequestedPositionChanged(QWaylandSurface *surface, const QPointF &point); diff --git a/src/compositor/compositor_api/qwaylandpointer.cpp b/src/compositor/compositor_api/qwaylandpointer.cpp index 1f914552b..eb2899c24 100644 --- a/src/compositor/compositor_api/qwaylandpointer.cpp +++ b/src/compositor/compositor_api/qwaylandpointer.cpp @@ -149,7 +149,7 @@ void QWaylandPointer::sendMouseReleaseEvent(Qt::MouseButton button) Q_D(QWaylandPointer); d->sendMouseReleaseEvent(button); } -void QWaylandPointer::sendMouseMoveEvent(QWaylandSurfaceView *view, const QPointF &localPos, const QPointF &outputSpacePos) +void QWaylandPointer::sendMouseMoveEvent(QWaylandView *view, const QPointF &localPos, const QPointF &outputSpacePos) { Q_D(QWaylandPointer); d->sendMouseMoveEvent(view, localPos, outputSpacePos); @@ -161,7 +161,7 @@ void QWaylandPointer::sendMouseWheelEvent(Qt::Orientation orientation, int delta d->sendMouseWheelEvent(orientation, delta); } -QWaylandSurfaceView *QWaylandPointer::mouseFocus() const +QWaylandView *QWaylandPointer::mouseFocus() const { Q_D(const QWaylandPointer); return d->mouseFocus(); @@ -251,7 +251,7 @@ void QWaylandPointer::focusDestroyed(void *data) endGrab(); } -void QWaylandPointer::pointerFocusChanged(QWaylandSurfaceView *newFocus, QWaylandSurfaceView *oldFocus) +void QWaylandPointer::pointerFocusChanged(QWaylandView *newFocus, QWaylandView *oldFocus) { Q_UNUSED(newFocus); Q_D(QWaylandPointer); diff --git a/src/compositor/compositor_api/qwaylandpointer.h b/src/compositor/compositor_api/qwaylandpointer.h index bd8198f61..2d06f6434 100644 --- a/src/compositor/compositor_api/qwaylandpointer.h +++ b/src/compositor/compositor_api/qwaylandpointer.h @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE class QWaylandPointer; class QWaylandPointerPrivate; class QWaylandInputDevice; -class QWaylandSurfaceView; +class QWaylandView; class QWaylandOutput; class QWaylandClient; @@ -101,10 +101,10 @@ public: virtual void sendMousePressEvent(Qt::MouseButton button); virtual void sendMouseReleaseEvent(Qt::MouseButton button); - virtual void sendMouseMoveEvent(QWaylandSurfaceView *view, const QPointF &localPos, const QPointF &outputSpacePos); + virtual void sendMouseMoveEvent(QWaylandView *view, const QPointF &localPos, const QPointF &outputSpacePos); virtual void sendMouseWheelEvent(Qt::Orientation orientation, int delta); - QWaylandSurfaceView *mouseFocus() const; + QWaylandView *mouseFocus() const; QPointF currentLocalPosition() const; QPointF currentSpacePosition() const; @@ -122,7 +122,7 @@ Q_SIGNALS: private: void focusDestroyed(void *data); - void pointerFocusChanged(QWaylandSurfaceView *newFocus, QWaylandSurfaceView *oldFocus); + void pointerFocusChanged(QWaylandView *newFocus, QWaylandView *oldFocus); }; QT_END_NAMESPACE diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp index 75027299b..f9c6e5341 100644 --- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp +++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp @@ -43,8 +43,8 @@ #include "qwaylandclient.h" #include "qwaylandquickcompositor.h" #include "qwaylandquicksurface.h" -#include "qwaylandsurfaceitem.h" #include "qwaylandquickoutput.h" +#include "qwaylandquickview.h" QT_BEGIN_NAMESPACE @@ -72,7 +72,7 @@ void QWaylandQuickCompositor::registerLegacyQmlNames() { static bool initialized = false; if (!initialized) { - qmlRegisterUncreatableType<QWaylandSurfaceItem>("QtCompositor", 1, 0, "WaylandSurfaceItem", QObject::tr("Cannot create instance of WaylandSurfaceItem")); + qmlRegisterUncreatableType<QWaylandQuickView>("QtCompositor", 1, 0, "WaylandSurfaceItem", QObject::tr("Cannot create instance of WaylandSurfaceItem")); qmlRegisterUncreatableType<QWaylandQuickSurface>("QtCompositor", 1, 0, "WaylandQuickSurface", QObject::tr("Cannot create instance of WaylandQuickSurface")); qmlRegisterUncreatableType<QWaylandClient>("QtCompositor", 1, 0, "WaylandClient", QObject::tr("Cannot create instance of WaylandClient")); qmlRegisterUncreatableType<QWaylandOutput>("QtCompositor", 1, 0, "WaylandOutput", QObject::tr("Cannot create instance of WaylandOutput")); @@ -120,9 +120,9 @@ QWaylandOutput *QWaylandQuickCompositor::createOutput(QWaylandOutputSpace *outpu return output; } -QWaylandSurfaceView *QWaylandQuickCompositor::createView() +QWaylandView *QWaylandQuickCompositor::createView() { - QWaylandSurfaceItem *view = new QWaylandSurfaceItem(); + QWaylandQuickView *view = new QWaylandQuickView(); QQmlEngine::setObjectOwnership(view, QQmlEngine::JavaScriptOwnership); return view; } diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.h b/src/compositor/compositor_api/qwaylandquickcompositor.h index defb04984..018d12cc3 100644 --- a/src/compositor/compositor_api/qwaylandquickcompositor.h +++ b/src/compositor/compositor_api/qwaylandquickcompositor.h @@ -42,6 +42,10 @@ QT_BEGIN_NAMESPACE +class QQuickWindow; +class QWaylandQuickCompositorPrivate; +class QWaylandView; + class Q_COMPOSITOR_EXPORT QWaylandQuickCompositor : public QWaylandCompositor, public QQmlParserStatus { Q_INTERFACES(QQmlParserStatus) @@ -63,7 +67,7 @@ public: QWindow *window, const QString &manufacturer, const QString &model) Q_DECL_OVERRIDE; - QWaylandSurfaceView *createView() Q_DECL_OVERRIDE; + QWaylandView *createView() Q_DECL_OVERRIDE; QWaylandSurface *createSurface(QWaylandClient *client, quint32 id, int version) Q_DECL_OVERRIDE; protected: diff --git a/src/compositor/compositor_api/qwaylandquicksurface.cpp b/src/compositor/compositor_api/qwaylandquicksurface.cpp index 8168147df..a1611b3c3 100644 --- a/src/compositor/compositor_api/qwaylandquicksurface.cpp +++ b/src/compositor/compositor_api/qwaylandquicksurface.cpp @@ -41,8 +41,8 @@ #include "qwaylandquicksurface.h" #include "qwaylandquickcompositor.h" -#include "qwaylandsurfaceitem.h" #include "qwaylandoutput.h" +#include "qwaylandquickview.h" #include <QtCompositor/qwaylandbufferref.h> #include <QtCompositor/private/qwaylandsurface_p.h> diff --git a/src/compositor/compositor_api/qwaylandquicksurface.h b/src/compositor/compositor_api/qwaylandquicksurface.h index 03d889e72..f2ba6507a 100644 --- a/src/compositor/compositor_api/qwaylandquicksurface.h +++ b/src/compositor/compositor_api/qwaylandquicksurface.h @@ -43,7 +43,7 @@ struct wl_client; QT_BEGIN_NAMESPACE -class QWaylandSurfaceItem; +class QWaylandQuickView; class QWaylandQuickSurfacePrivate; class QWaylandQuickCompositor; diff --git a/src/compositor/compositor_api/qwaylandsurfaceitem.cpp b/src/compositor/compositor_api/qwaylandquickview.cpp index 8f32019ef..78b5858af 100644 --- a/src/compositor/compositor_api/qwaylandsurfaceitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickview.cpp @@ -34,7 +34,7 @@ ** ****************************************************************************/ -#include "qwaylandsurfaceitem.h" +#include "qwaylandquickview.h" #include "qwaylandquicksurface.h" #include <QtCompositor/qwaylandcompositor.h> #include <QtCompositor/qwaylandinput.h> @@ -56,7 +56,7 @@ #include <QThread> QT_BEGIN_NAMESPACE -QMutex *QWaylandSurfaceItem::mutex = 0; +QMutex *QWaylandQuickView::mutex = 0; class QWaylandSurfaceTextureProvider : public QSGTextureProvider { @@ -73,7 +73,7 @@ public: m_sgTex->deleteLater(); } - void setBufferRef(QWaylandSurfaceItem *surfaceItem, const QWaylandBufferRef &buffer) + void setBufferRef(QWaylandQuickView *surfaceItem, const QWaylandBufferRef &buffer) { Q_ASSERT(QThread::currentThread() == thread()); m_ref = buffer; @@ -119,9 +119,9 @@ private: QWaylandBufferRef m_ref; }; -QWaylandSurfaceItem::QWaylandSurfaceItem(QQuickItem *parent) +QWaylandQuickView::QWaylandQuickView(QQuickItem *parent) : QQuickItem(parent) - , QWaylandSurfaceView() + , QWaylandView() , m_provider(Q_NULLPTR) , m_paintEnabled(true) , m_touchEventsEnabled(false) @@ -149,37 +149,37 @@ QWaylandSurfaceItem::QWaylandSurfaceItem(QQuickItem *parent) Qt::ExtraButton12 | Qt::ExtraButton13); setAcceptHoverEvents(true); - connect(this, &QQuickItem::windowChanged, this, &QWaylandSurfaceItem::updateWindow); + connect(this, &QQuickItem::windowChanged, this, &QWaylandQuickView::updateWindow); } -QWaylandSurfaceItem::~QWaylandSurfaceItem() +QWaylandQuickView::~QWaylandQuickView() { QMutexLocker locker(mutex); if (m_provider) m_provider->deleteLater(); } -QWaylandQuickSurface *QWaylandSurfaceItem::surface() const +QWaylandQuickSurface *QWaylandQuickView::surface() const { - return static_cast<QWaylandQuickSurface *>(QWaylandSurfaceView::surface()); + return static_cast<QWaylandQuickSurface *>(QWaylandView::surface()); } -void QWaylandSurfaceItem::setSurface(QWaylandQuickSurface *surface) +void QWaylandQuickView::setSurface(QWaylandQuickSurface *surface) { - QWaylandSurfaceView::setSurface(surface); + QWaylandView::setSurface(surface); } -QWaylandSurface::Origin QWaylandSurfaceItem::origin() const +QWaylandSurface::Origin QWaylandQuickView::origin() const { return m_origin; } -QSGTextureProvider *QWaylandSurfaceItem::textureProvider() const +QSGTextureProvider *QWaylandQuickView::textureProvider() const { return m_provider; } -void QWaylandSurfaceItem::mousePressEvent(QMouseEvent *event) +void QWaylandQuickView::mousePressEvent(QMouseEvent *event) { if (!shouldSendInputEvents()) { event->ignore(); @@ -195,7 +195,7 @@ void QWaylandSurfaceItem::mousePressEvent(QMouseEvent *event) inputDevice->sendMousePressEvent(event->button()); } -void QWaylandSurfaceItem::mouseMoveEvent(QMouseEvent *event) +void QWaylandQuickView::mouseMoveEvent(QMouseEvent *event) { if (shouldSendInputEvents()) { QWaylandInputDevice *inputDevice = compositor()->inputDeviceFor(event); @@ -205,7 +205,7 @@ void QWaylandSurfaceItem::mouseMoveEvent(QMouseEvent *event) } } -void QWaylandSurfaceItem::mouseReleaseEvent(QMouseEvent *event) +void QWaylandQuickView::mouseReleaseEvent(QMouseEvent *event) { if (shouldSendInputEvents()) { QWaylandInputDevice *inputDevice = compositor()->inputDeviceFor(event); @@ -215,7 +215,7 @@ void QWaylandSurfaceItem::mouseReleaseEvent(QMouseEvent *event) } } -void QWaylandSurfaceItem::hoverEnterEvent(QHoverEvent *event) +void QWaylandQuickView::hoverEnterEvent(QHoverEvent *event) { if (surface()) { if (!surface()->inputRegionContains(event->pos())) { @@ -230,7 +230,7 @@ void QWaylandSurfaceItem::hoverEnterEvent(QHoverEvent *event) } } -void QWaylandSurfaceItem::hoverMoveEvent(QHoverEvent *event) +void QWaylandQuickView::hoverMoveEvent(QHoverEvent *event) { if (surface()) { if (!surface()->inputRegionContains(event->pos())) { @@ -245,7 +245,7 @@ void QWaylandSurfaceItem::hoverMoveEvent(QHoverEvent *event) } } -void QWaylandSurfaceItem::hoverLeaveEvent(QHoverEvent *event) +void QWaylandQuickView::hoverLeaveEvent(QHoverEvent *event) { if (shouldSendInputEvents()) { QWaylandInputDevice *inputDevice = compositor()->inputDeviceFor(event); @@ -255,7 +255,7 @@ void QWaylandSurfaceItem::hoverLeaveEvent(QHoverEvent *event) } } -void QWaylandSurfaceItem::wheelEvent(QWheelEvent *event) +void QWaylandQuickView::wheelEvent(QWheelEvent *event) { if (shouldSendInputEvents()) { if (!surface()->inputRegionContains(event->pos())) { @@ -270,7 +270,7 @@ void QWaylandSurfaceItem::wheelEvent(QWheelEvent *event) } } -void QWaylandSurfaceItem::keyPressEvent(QKeyEvent *event) +void QWaylandQuickView::keyPressEvent(QKeyEvent *event) { if (shouldSendInputEvents()) { QWaylandInputDevice *inputDevice = compositor()->inputDeviceFor(event); @@ -280,7 +280,7 @@ void QWaylandSurfaceItem::keyPressEvent(QKeyEvent *event) } } -void QWaylandSurfaceItem::keyReleaseEvent(QKeyEvent *event) +void QWaylandQuickView::keyReleaseEvent(QKeyEvent *event) { if (shouldSendInputEvents() && hasFocus()) { QWaylandInputDevice *inputDevice = compositor()->inputDeviceFor(event); @@ -290,7 +290,7 @@ void QWaylandSurfaceItem::keyReleaseEvent(QKeyEvent *event) } } -void QWaylandSurfaceItem::touchEvent(QTouchEvent *event) +void QWaylandQuickView::touchEvent(QTouchEvent *event) { if (shouldSendInputEvents() && m_touchEventsEnabled) { QWaylandInputDevice *inputDevice = compositor()->inputDeviceFor(event); @@ -329,23 +329,23 @@ void QWaylandSurfaceItem::mouseUngrabEvent() } } -void QWaylandSurfaceItem::waylandSurfaceChanged(QWaylandSurface *newSurface, QWaylandSurface *oldSurface) +void QWaylandQuickView::waylandSurfaceChanged(QWaylandSurface *newSurface, QWaylandSurface *oldSurface) { - QWaylandSurfaceView::waylandSurfaceChanged(newSurface, oldSurface); + QWaylandView::waylandSurfaceChanged(newSurface, oldSurface); if (oldSurface) { - disconnect(oldSurface, &QWaylandSurface::mapped, this, &QWaylandSurfaceItem::surfaceMapped); - disconnect(oldSurface, &QWaylandSurface::unmapped, this, &QWaylandSurfaceItem::surfaceUnmapped); - disconnect(oldSurface, &QWaylandSurface::parentChanged, this, &QWaylandSurfaceItem::parentChanged); - disconnect(oldSurface, &QWaylandSurface::sizeChanged, this, &QWaylandSurfaceItem::updateSize); - disconnect(oldSurface, &QWaylandSurface::configure, this, &QWaylandSurfaceItem::updateBuffer); + disconnect(oldSurface, &QWaylandSurface::mapped, this, &QWaylandQuickView::surfaceMapped); + disconnect(oldSurface, &QWaylandSurface::unmapped, this, &QWaylandQuickView::surfaceUnmapped); + disconnect(oldSurface, &QWaylandSurface::parentChanged, this, &QWaylandQuickView::parentChanged); + disconnect(oldSurface, &QWaylandSurface::sizeChanged, this, &QWaylandQuickView::updateSize); + disconnect(oldSurface, &QWaylandSurface::configure, this, &QWaylandQuickView::updateBuffer); disconnect(oldSurface, &QWaylandSurface::redraw, this, &QQuickItem::update); } if (newSurface) { - connect(newSurface, &QWaylandSurface::mapped, this, &QWaylandSurfaceItem::surfaceMapped); - connect(newSurface, &QWaylandSurface::unmapped, this, &QWaylandSurfaceItem::surfaceUnmapped); - connect(newSurface, &QWaylandSurface::parentChanged, this, &QWaylandSurfaceItem::parentChanged); - connect(newSurface, &QWaylandSurface::sizeChanged, this, &QWaylandSurfaceItem::updateSize); - connect(newSurface, &QWaylandSurface::configure, this, &QWaylandSurfaceItem::updateBuffer); + connect(newSurface, &QWaylandSurface::mapped, this, &QWaylandQuickView::surfaceMapped); + connect(newSurface, &QWaylandSurface::unmapped, this, &QWaylandQuickView::surfaceUnmapped); + connect(newSurface, &QWaylandSurface::parentChanged, this, &QWaylandQuickView::parentChanged); + connect(newSurface, &QWaylandSurface::sizeChanged, this, &QWaylandQuickView::updateSize); + connect(newSurface, &QWaylandSurface::configure, this, &QWaylandQuickView::updateBuffer); connect(newSurface, &QWaylandSurface::redraw, this, &QQuickItem::update); setWidth(surface()->size().width()); setHeight(surface()->size().height()); @@ -358,12 +358,12 @@ void QWaylandSurfaceItem::waylandSurfaceChanged(QWaylandSurface *newSurface, QWa emit surfaceChanged(); } -void QWaylandSurfaceItem::waylandSurfaceDestroyed() +void QWaylandQuickView::waylandSurfaceDestroyed() { emit surfaceDestroyed(); } -void QWaylandSurfaceItem::takeFocus(QWaylandInputDevice *device) +void QWaylandQuickView::takeFocus(QWaylandInputDevice *device) { setFocus(true); @@ -377,17 +377,17 @@ void QWaylandSurfaceItem::takeFocus(QWaylandInputDevice *device) target->setKeyboardFocus(surface()); } -void QWaylandSurfaceItem::surfaceMapped() +void QWaylandQuickView::surfaceMapped() { update(); } -void QWaylandSurfaceItem::surfaceUnmapped() +void QWaylandQuickView::surfaceUnmapped() { update(); } -void QWaylandSurfaceItem::parentChanged(QWaylandSurface *newParent, QWaylandSurface *oldParent) +void QWaylandQuickView::parentChanged(QWaylandSurface *newParent, QWaylandSurface *oldParent) { Q_UNUSED(oldParent); @@ -399,18 +399,18 @@ void QWaylandSurfaceItem::parentChanged(QWaylandSurface *newParent, QWaylandSurf } } -void QWaylandSurfaceItem::updateSize() +void QWaylandQuickView::updateSize() { if (surface()) { setSize(surface()->size()); } } -void QWaylandSurfaceItem::setRequestedPosition(const QPointF &pos) +void QWaylandQuickView::setRequestedPosition(const QPointF &pos) { bool xChanged = pos.x() != requestedPosition().x(); bool yChanged = pos.y() != requestedPosition().y(); - QWaylandSurfaceView::setRequestedPosition(pos); + QWaylandView::setRequestedPosition(pos); if (xChanged) emit requestedXPositionChanged(); if (yChanged) @@ -419,18 +419,18 @@ void QWaylandSurfaceItem::setRequestedPosition(const QPointF &pos) setPosition(pos); } -QPointF QWaylandSurfaceItem::pos() const +QPointF QWaylandQuickView::pos() const { return position(); } -bool QWaylandSurfaceItem::followRequestedPosition() const +bool QWaylandQuickView::followRequestedPosition() const { return m_followRequestedPos; } -void QWaylandSurfaceItem::setFollowRequestedPosition(bool follow) +void QWaylandQuickView::setFollowRequestedPosition(bool follow) { if (m_followRequestedPos != follow) { m_followRequestedPos = follow; @@ -438,44 +438,44 @@ void QWaylandSurfaceItem::setFollowRequestedPosition(bool follow) } } -qreal QWaylandSurfaceItem::requestedXPosition() const +qreal QWaylandQuickView::requestedXPosition() const { return requestedPosition().x(); } -void QWaylandSurfaceItem::setRequestedXPosition(qreal xPos) +void QWaylandQuickView::setRequestedXPosition(qreal xPos) { QPointF reqPos = requestedPosition(); reqPos.setX(xPos); setRequestedPosition(reqPos); } -qreal QWaylandSurfaceItem::requestedYPosition() const +qreal QWaylandQuickView::requestedYPosition() const { return requestedPosition().y(); } -void QWaylandSurfaceItem::setRequestedYPosition(qreal yPos) +void QWaylandQuickView::setRequestedYPosition(qreal yPos) { QPointF reqPos = requestedPosition(); reqPos.setY(yPos); setRequestedPosition(reqPos); } -void QWaylandSurfaceItem::syncGraphicsState() +void QWaylandQuickView::syncGraphicsState() { } -bool QWaylandSurfaceItem::lockedBuffer() const +bool QWaylandQuickView::lockedBuffer() const { - return QWaylandSurfaceView::lockedBuffer(); + return QWaylandView::lockedBuffer(); } -void QWaylandSurfaceItem::setLockedBuffer(bool locked) +void QWaylandQuickView::setLockedBuffer(bool locked) { if (locked != lockedBuffer()) { - QWaylandSurfaceView::setLockedBuffer(locked); + QWaylandView::setLockedBuffer(locked); lockedBufferChanged(); } } @@ -488,18 +488,18 @@ void QWaylandSurfaceItem::setLockedBuffer(bool locked) setting \l{Item::visible}{visible} to false, setting this property to true will not prevent mouse or keyboard input from reaching \l item. */ -bool QWaylandSurfaceItem::paintEnabled() const +bool QWaylandQuickView::paintEnabled() const { return m_paintEnabled; } -void QWaylandSurfaceItem::setPaintEnabled(bool enabled) +void QWaylandQuickView::setPaintEnabled(bool enabled) { m_paintEnabled = enabled; update(); } -void QWaylandSurfaceItem::updateBuffer(bool hasBuffer) +void QWaylandQuickView::updateBuffer(bool hasBuffer) { Q_UNUSED(hasBuffer); if (m_origin != surface()->origin()) { @@ -508,16 +508,16 @@ void QWaylandSurfaceItem::updateBuffer(bool hasBuffer) } } -void QWaylandSurfaceItem::updateWindow() +void QWaylandQuickView::updateWindow() { if (m_connectedWindow) { - disconnect(m_connectedWindow, &QQuickWindow::beforeSynchronizing, this, &QWaylandSurfaceItem::beforeSync); + disconnect(m_connectedWindow, &QQuickWindow::beforeSynchronizing, this, &QWaylandQuickView::beforeSync); } m_connectedWindow = window(); if (m_connectedWindow) { - connect(m_connectedWindow, &QQuickWindow::beforeSynchronizing, this, &QWaylandSurfaceItem::beforeSync, Qt::DirectConnection); + connect(m_connectedWindow, &QQuickWindow::beforeSynchronizing, this, &QWaylandQuickView::beforeSync, Qt::DirectConnection); } if (compositor() && m_connectedWindow) { @@ -527,7 +527,7 @@ void QWaylandSurfaceItem::updateWindow() } } -void QWaylandSurfaceItem::beforeSync() +void QWaylandQuickView::beforeSync() { if (advance()) { m_newTexture = true; @@ -535,7 +535,7 @@ void QWaylandSurfaceItem::beforeSync() } } -QSGNode *QWaylandSurfaceItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) +QSGNode *QWaylandQuickView::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) { bool mapped = (surface() && surface()->isMapped() && currentBuffer().hasBuffer()) || (lockedBuffer() && m_provider); @@ -570,7 +570,7 @@ QSGNode *QWaylandSurfaceItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeD return node; } -void QWaylandSurfaceItem::setTouchEventsEnabled(bool enabled) +void QWaylandQuickView::setTouchEventsEnabled(bool enabled) { if (m_touchEventsEnabled != enabled) { m_touchEventsEnabled = enabled; @@ -578,7 +578,7 @@ void QWaylandSurfaceItem::setTouchEventsEnabled(bool enabled) } } -void QWaylandSurfaceItem::setResizeSurfaceToItem(bool enabled) +void QWaylandQuickView::setResizeSurfaceToItem(bool enabled) { if (m_resizeSurfaceToItem != enabled) { m_resizeSurfaceToItem = enabled; @@ -586,7 +586,7 @@ void QWaylandSurfaceItem::setResizeSurfaceToItem(bool enabled) } } -void QWaylandSurfaceItem::setInputEventsEnabled(bool enabled) +void QWaylandQuickView::setInputEventsEnabled(bool enabled) { if (m_inputEventsEnabled != enabled) { m_inputEventsEnabled = enabled; diff --git a/src/compositor/compositor_api/qwaylandsurfaceitem.h b/src/compositor/compositor_api/qwaylandquickview.h index a06f4534c..c75ad6e9d 100644 --- a/src/compositor/compositor_api/qwaylandsurfaceitem.h +++ b/src/compositor/compositor_api/qwaylandquickview.h @@ -44,7 +44,7 @@ #include <QtQuick/qsgtextureprovider.h> -#include <QtCompositor/qwaylandsurfaceview.h> +#include <QtCompositor/qwaylandview.h> #include <QtCompositor/qwaylandquicksurface.h> Q_DECLARE_METATYPE(QWaylandQuickSurface*) @@ -55,7 +55,7 @@ class QWaylandSurfaceTextureProvider; class QMutex; class QWaylandInputDevice; -class Q_COMPOSITOR_EXPORT QWaylandSurfaceItem : public QQuickItem, public QWaylandSurfaceView +class Q_COMPOSITOR_EXPORT QWaylandQuickView : public QQuickItem, public QWaylandView { Q_OBJECT Q_PROPERTY(QWaylandQuickSurface* surface READ surface WRITE setSurface NOTIFY surfaceChanged) @@ -70,8 +70,8 @@ class Q_COMPOSITOR_EXPORT QWaylandSurfaceItem : public QQuickItem, public QWayla Q_PROPERTY(bool lockedBuffer READ lockedBuffer WRITE setLockedBuffer NOTIFY lockedBufferChanged) public: - QWaylandSurfaceItem(QQuickItem *parent = 0); - ~QWaylandSurfaceItem(); + QWaylandQuickView(QQuickItem *parent = 0); + ~QWaylandQuickView(); QWaylandQuickSurface *surface() const; void setSurface(QWaylandQuickSurface *surface); diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index 81ad89529..da7963994 100644 --- a/src/compositor/compositor_api/qwaylandsurface.cpp +++ b/src/compositor/compositor_api/qwaylandsurface.cpp @@ -328,7 +328,7 @@ void QWaylandSurface::setMapped(bool mapped) d->setMapped(mapped); } -QList<QWaylandSurfaceView *> QWaylandSurface::views() const +QList<QWaylandView *> QWaylandSurface::views() const { Q_D(const QWaylandSurface); return d->views; @@ -371,7 +371,7 @@ void QWaylandSurfacePrivate::setClassName(const QString &className) } } -void QWaylandSurfacePrivate::refView(QWaylandSurfaceView *view) +void QWaylandSurfacePrivate::refView(QWaylandView *view) { if (views.contains(view)) return; @@ -380,7 +380,7 @@ void QWaylandSurfacePrivate::refView(QWaylandSurfaceView *view) waylandSurface()->ref(); } -void QWaylandSurfacePrivate::derefView(QWaylandSurfaceView *view) +void QWaylandSurfacePrivate::derefView(QWaylandView *view) { int nViews = views.removeAll(view); diff --git a/src/compositor/compositor_api/qwaylandsurface.h b/src/compositor/compositor_api/qwaylandsurface.h index 8ed5db398..c4d0857fc 100644 --- a/src/compositor/compositor_api/qwaylandsurface.h +++ b/src/compositor/compositor_api/qwaylandsurface.h @@ -56,7 +56,7 @@ class QWaylandClient; class QWaylandSurfacePrivate; class QWaylandCompositor; class QWaylandBufferRef; -class QWaylandSurfaceView; +class QWaylandView; class QWaylandSurfaceOp; class QWaylandOutput; @@ -158,7 +158,7 @@ public: void deref(); void setMapped(bool mapped); - QList<QWaylandSurfaceView *> views() const; + QList<QWaylandView *> views() const; static QWaylandSurface *fromResource(::wl_resource *resource); struct wl_resource *resource() const; diff --git a/src/compositor/compositor_api/qwaylandsurface_p.h b/src/compositor/compositor_api/qwaylandsurface_p.h index 683c50654..60a94afcf 100644 --- a/src/compositor/compositor_api/qwaylandsurface_p.h +++ b/src/compositor/compositor_api/qwaylandsurface_p.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE class QWaylandCompositor; class QWaylandSurface; -class QWaylandSurfaceView; +class QWaylandView; class QWaylandSurfaceInterface; class Q_COMPOSITOR_EXPORT QWaylandSurfacePrivate : public QObjectPrivate, public QtWayland::Surface @@ -58,15 +58,15 @@ public: QWaylandSurfacePrivate(wl_client *wlClient, quint32 id, int version, QWaylandCompositor *compositor, QWaylandSurface *surface); void setTitle(const QString &title); void setClassName(const QString &className); - void refView(QWaylandSurfaceView *view); - void derefView(QWaylandSurfaceView *view); + void refView(QWaylandView *view); + void derefView(QWaylandView *view); bool closing; int refCount; QWaylandClient *client; - QList<QWaylandSurfaceView *> views; + QList<QWaylandView *> views; }; QT_END_NAMESPACE diff --git a/src/compositor/compositor_api/qwaylandtouch.cpp b/src/compositor/compositor_api/qwaylandtouch.cpp index f1cb9de6b..b00706323 100644 --- a/src/compositor/compositor_api/qwaylandtouch.cpp +++ b/src/compositor/compositor_api/qwaylandtouch.cpp @@ -38,7 +38,7 @@ #include <QtCompositor/QWaylandCompositor> #include <QtCompositor/QWaylandInputDevice> -#include <QtCompositor/QWaylandSurfaceView> +#include <QtCompositor/QWaylandView> #include <QtCompositor/QWaylandClient> #include "qwltouch_p.h" @@ -156,7 +156,7 @@ struct wl_resource *QWaylandTouch::focusResource() const return d->focusResource()->handle; } -QWaylandSurfaceView *QWaylandTouch::mouseFocus() const +QWaylandView *QWaylandTouch::mouseFocus() const { Q_D(const QWaylandTouch); return d->m_seat->mouseFocus(); @@ -169,7 +169,7 @@ void QWaylandTouch::focusDestroyed(void *data) d->resetFocusState(); } -void QWaylandTouch::mouseFocusChanged(QWaylandSurfaceView *newFocus, QWaylandSurfaceView *oldFocus) +void QWaylandTouch::mouseFocusChanged(QWaylandView *newFocus, QWaylandView *oldFocus) { Q_UNUSED(newFocus); Q_UNUSED(oldFocus); diff --git a/src/compositor/compositor_api/qwaylandtouch.h b/src/compositor/compositor_api/qwaylandtouch.h index fa5563a49..572eb2d62 100644 --- a/src/compositor/compositor_api/qwaylandtouch.h +++ b/src/compositor/compositor_api/qwaylandtouch.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE class QWaylandTouch; class QWaylandTouchPrivate; class QWaylandInputDevice; -class QWaylandSurfaceView; +class QWaylandView; class QWaylandClient; class Q_COMPOSITOR_EXPORT QWaylandTouchGrabber { @@ -95,10 +95,10 @@ public: struct wl_resource *focusResource() const; - QWaylandSurfaceView *mouseFocus() const; + QWaylandView *mouseFocus() const; private: void focusDestroyed(void *data); - void mouseFocusChanged(QWaylandSurfaceView *newFocus, QWaylandSurfaceView *oldFocus); + void mouseFocusChanged(QWaylandView *newFocus, QWaylandView *oldFocus); }; QT_END_NAMESPACE diff --git a/src/compositor/compositor_api/qwaylandsurfaceview.cpp b/src/compositor/compositor_api/qwaylandview.cpp index 545532590..e9faafbbc 100644 --- a/src/compositor/compositor_api/qwaylandsurfaceview.cpp +++ b/src/compositor/compositor_api/qwaylandview.cpp @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#include "qwaylandsurfaceview.h" -#include "qwaylandsurfaceview_p.h" +#include "qwaylandview.h" +#include "qwaylandview_p.h" #include "qwaylandsurface.h" #include "qwaylandsurface_p.h" @@ -43,26 +43,28 @@ QT_BEGIN_NAMESPACE -QWaylandSurfaceViewPrivate *QWaylandSurfaceViewPrivate::get(QWaylandSurfaceView *view) +QWaylandViewPrivate *QWaylandViewPrivate::get(QWaylandView *view) { - return view->d; + return view->d_func(); } -void QWaylandSurfaceViewPrivate::markSurfaceAsDestroyed(QWaylandSurface *surface) +void QWaylandViewPrivate::markSurfaceAsDestroyed(QWaylandSurface *surface) { + Q_Q(QWaylandView); Q_ASSERT(surface == this->surface); - q_ptr->waylandSurfaceDestroyed(); - q_ptr->setSurface(Q_NULLPTR); + q->waylandSurfaceDestroyed(); + q->setSurface(Q_NULLPTR); } -QWaylandSurfaceView::QWaylandSurfaceView() - : d(new QWaylandSurfaceViewPrivate(this)) +QWaylandView::QWaylandView() + : d_ptr(new QWaylandViewPrivate(this)) { } -QWaylandSurfaceView::~QWaylandSurfaceView() +QWaylandView::~QWaylandView() { + Q_D(QWaylandView); if (d->output) d->output->handle()->removeView(this); if (d->surface) { @@ -76,13 +78,15 @@ QWaylandSurfaceView::~QWaylandSurfaceView() delete d; } -QWaylandSurface *QWaylandSurfaceView::surface() const +QWaylandSurface *QWaylandView::surface() const { + Q_D(const QWaylandView); return d->surface; } -void QWaylandSurfaceView::setSurface(QWaylandSurface *newSurface) +void QWaylandView::setSurface(QWaylandSurface *newSurface) { + Q_D(QWaylandView); QWaylandSurface *oldSurface = d->surface; d->surface = newSurface; @@ -99,13 +103,15 @@ void QWaylandSurfaceView::setSurface(QWaylandSurface *newSurface) d->nextBuffer = QWaylandBufferRef(); } -QWaylandOutput *QWaylandSurfaceView::output() const +QWaylandOutput *QWaylandView::output() const { + Q_D(const QWaylandView); return d->output; } -void QWaylandSurfaceView::setOutput(QWaylandOutput *newOutput) +void QWaylandView::setOutput(QWaylandOutput *newOutput) { + Q_D(QWaylandView); if (d->output == newOutput) return; @@ -115,13 +121,15 @@ void QWaylandSurfaceView::setOutput(QWaylandOutput *newOutput) waylandOutputChanged(newOutput, oldOutput); } -QWaylandCompositor *QWaylandSurfaceView::compositor() const +QWaylandCompositor *QWaylandView::compositor() const { + Q_D(const QWaylandView); return d->surface ? d->surface->compositor() : 0; } -void QWaylandSurfaceView::setRequestedPosition(const QPointF &pos) +void QWaylandView::setRequestedPosition(const QPointF &pos) { + Q_D(QWaylandView); d->requestedPos = pos; if (d->shouldBroadcastRequestedPositionChanged()) { Q_ASSERT(d->output->outputSpace()); @@ -130,24 +138,28 @@ void QWaylandSurfaceView::setRequestedPosition(const QPointF &pos) } } -QPointF QWaylandSurfaceView::requestedPosition() const +QPointF QWaylandView::requestedPosition() const { + Q_D(const QWaylandView); return d->requestedPos; } -QPointF QWaylandSurfaceView::pos() const +QPointF QWaylandView::pos() const { + Q_D(const QWaylandView); return d->requestedPos; } -void QWaylandSurfaceView::attach(const QWaylandBufferRef &ref) +void QWaylandView::attach(const QWaylandBufferRef &ref) { + Q_D(QWaylandView); QMutexLocker locker(&d->bufferMutex); d->nextBuffer = ref; } -bool QWaylandSurfaceView::advance() +bool QWaylandView::advance() { + Q_D(QWaylandView); if (d->currentBuffer == d->nextBuffer) return false; @@ -159,50 +171,57 @@ bool QWaylandSurfaceView::advance() return true; } -QWaylandBufferRef QWaylandSurfaceView::currentBuffer() +QWaylandBufferRef QWaylandView::currentBuffer() { + Q_D(QWaylandView); QMutexLocker locker(&d->bufferMutex); return d->currentBuffer; } -bool QWaylandSurfaceView::lockedBuffer() const +bool QWaylandView::lockedBuffer() const { + Q_D(const QWaylandView); return d->lockedBuffer; } -void QWaylandSurfaceView::setLockedBuffer(bool locked) +void QWaylandView::setLockedBuffer(bool locked) { + Q_D(QWaylandView); d->lockedBuffer = locked; } -bool QWaylandSurfaceView::broadcastRequestedPositionChanged() const +bool QWaylandView::broadcastRequestedPositionChanged() const { + Q_D(const QWaylandView); return d->broadcastRequestedPositionChanged; } -void QWaylandSurfaceView::setBroadcastRequestedPositionChanged(bool broadcast) +void QWaylandView::setBroadcastRequestedPositionChanged(bool broadcast) { + Q_D(QWaylandView); d->broadcastRequestedPositionChanged = broadcast; } -struct wl_resource *QWaylandSurfaceView::surfaceResource() const +struct wl_resource *QWaylandView::surfaceResource() const { + Q_D(const QWaylandView); if (!d->surface) return Q_NULLPTR; return d->surface->resource(); } -void QWaylandSurfaceView::waylandSurfaceChanged(QWaylandSurface *newSurface, QWaylandSurface *oldSurface) +void QWaylandView::waylandSurfaceChanged(QWaylandSurface *newSurface, QWaylandSurface *oldSurface) { + Q_D(QWaylandView); if (d->output) d->output->handle()->updateSurfaceForView(this, newSurface, oldSurface); } -void QWaylandSurfaceView::waylandSurfaceDestroyed() +void QWaylandView::waylandSurfaceDestroyed() { } -void QWaylandSurfaceView::waylandOutputChanged(QWaylandOutput *newOutput, QWaylandOutput *oldOutput) +void QWaylandView::waylandOutputChanged(QWaylandOutput *newOutput, QWaylandOutput *oldOutput) { if (oldOutput) oldOutput->handle()->removeView(this); diff --git a/src/compositor/compositor_api/qwaylandsurfaceview.h b/src/compositor/compositor_api/qwaylandview.h index 231244454..3e69e9b8a 100644 --- a/src/compositor/compositor_api/qwaylandsurfaceview.h +++ b/src/compositor/compositor_api/qwaylandview.h @@ -46,12 +46,14 @@ QT_BEGIN_NAMESPACE class QWaylandSurface; class QWaylandCompositor; +class QWaylandViewPrivate; -class Q_COMPOSITOR_EXPORT QWaylandSurfaceView +class Q_COMPOSITOR_EXPORT QWaylandView { + Q_DECLARE_PRIVATE(QWaylandView) public: - QWaylandSurfaceView(); - virtual ~QWaylandSurfaceView(); + QWaylandView(); + virtual ~QWaylandView(); QWaylandCompositor *compositor() const; @@ -82,8 +84,7 @@ protected: virtual void waylandOutputChanged(QWaylandOutput *newOutput, QWaylandOutput *oldOutput); private: - class QWaylandSurfaceViewPrivate *const d; - friend class QWaylandSurfaceViewPrivate; + QScopedPointer<QWaylandViewPrivate> d_ptr; }; QT_END_NAMESPACE diff --git a/src/compositor/compositor_api/qwaylandsurfaceview_p.h b/src/compositor/compositor_api/qwaylandview_p.h index 3537ad679..c805e78df 100644 --- a/src/compositor/compositor_api/qwaylandsurfaceview_p.h +++ b/src/compositor/compositor_api/qwaylandview_p.h @@ -47,12 +47,13 @@ QT_BEGIN_NAMESPACE class QWaylandSurface; class QWaylandOutput; -class QWaylandSurfaceViewPrivate +class QWaylandViewPrivate { + Q_DECLARE_PUBLIC(QWaylandView) public: - static QWaylandSurfaceViewPrivate *get(QWaylandSurfaceView *view); + static QWaylandViewPrivate *get(QWaylandView *view); - QWaylandSurfaceViewPrivate(QWaylandSurfaceView *view) + QWaylandViewPrivate(QWaylandView *view) : q_ptr(view) , surface(Q_NULLPTR) , output(Q_NULLPTR) @@ -66,7 +67,7 @@ public: return broadcastRequestedPositionChanged && output && surface && surface->primaryOutput() == output; } - QWaylandSurfaceView *q_ptr; + QWaylandView *q_ptr; QWaylandSurface *surface; QWaylandOutput *output; QPointF requestedPos; diff --git a/src/compositor/extensions/qwlqttouch.cpp b/src/compositor/extensions/qwlqttouch.cpp index 57de3965c..19f5b3936 100644 --- a/src/compositor/extensions/qwlqttouch.cpp +++ b/src/compositor/extensions/qwlqttouch.cpp @@ -36,7 +36,7 @@ #include "qwlqttouch_p.h" #include "qwlsurface_p.h" -#include "qwaylandsurfaceview.h" +#include "qwaylandview.h" #include <QTouchEvent> #include <QWindow> @@ -65,7 +65,7 @@ static inline int toFixed(qreal f) return int(f * 10000); } -bool TouchExtensionGlobal::postTouchEvent(QTouchEvent *event, QWaylandSurfaceView *view) +bool TouchExtensionGlobal::postTouchEvent(QTouchEvent *event, QWaylandView *view) { const QList<QTouchEvent::TouchPoint> points = event->touchPoints(); const int pointCount = points.count(); diff --git a/src/compositor/extensions/qwlqttouch_p.h b/src/compositor/extensions/qwlqttouch_p.h index 42d35433b..e7860343b 100644 --- a/src/compositor/extensions/qwlqttouch_p.h +++ b/src/compositor/extensions/qwlqttouch_p.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE class Compositor; class Surface; class QTouchEvent; -class QWaylandSurfaceView; +class QWaylandView; namespace QtWayland { @@ -65,7 +65,7 @@ public: TouchExtensionGlobal(Compositor *compositor); ~TouchExtensionGlobal(); - bool postTouchEvent(QTouchEvent *event, QWaylandSurfaceView *view); + bool postTouchEvent(QTouchEvent *event, QWaylandView *view); void setBehviorFlags(BehaviorFlags flags); BehaviorFlags behaviorFlags() const { return m_flags; } diff --git a/src/compositor/extensions/qwlshellsurface.cpp b/src/compositor/extensions/qwlshellsurface.cpp index da6f06622..61b713d1e 100644 --- a/src/compositor/extensions/qwlshellsurface.cpp +++ b/src/compositor/extensions/qwlshellsurface.cpp @@ -45,8 +45,9 @@ #include "qwlpointer_p.h" #include "qwlextendedsurface_p.h" +#include "qwaylandview.h" #include "qwaylandoutput.h" -#include "qwaylandsurfaceview.h" +#include "qwaylandview.h" #include <QtCore/qglobal.h> #include <QtCore/QDebug> @@ -456,7 +457,7 @@ void ShellSurfaceMoveGrabber::motion(uint32_t time) QPointF pos(pointer->currentSpacePosition() - m_offset); shell_surface->m_view->setRequestedPosition(pos); if (shell_surface->transientParent()) { - QWaylandSurfaceView *view = shell_surface->transientParent()->views().first(); + QWaylandView *view = shell_surface->transientParent()->views().first(); if (view) shell_surface->setOffset(pos - view->requestedPosition()); } diff --git a/src/compositor/extensions/qwlshellsurface_p.h b/src/compositor/extensions/qwlshellsurface_p.h index 3161fc6ef..7f568bf56 100644 --- a/src/compositor/extensions/qwlshellsurface_p.h +++ b/src/compositor/extensions/qwlshellsurface_p.h @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE -class QWaylandSurfaceView; +class QWaylandView; namespace QtWayland { @@ -105,7 +105,7 @@ public: Q_INVOKABLE void ping(); void ping(uint32_t serial); - QWaylandSurfaceView *view() { return m_view; } + QWaylandView *view() { return m_view; } void setSurfaceType(SurfaceType type); SurfaceType surfaceType() const; @@ -128,7 +128,7 @@ private Q_SLOTS: private: Shell *m_shell; Surface *m_surface; - QWaylandSurfaceView *m_view; + QWaylandView *m_view; ShellSurfaceResizeGrabber *m_resizeGrabber; ShellSurfaceMoveGrabber *m_moveGrabber; diff --git a/src/compositor/extensions/qwlsubsurface.cpp b/src/compositor/extensions/qwlsubsurface.cpp index a9e6183c5..4baa81106 100644 --- a/src/compositor/extensions/qwlsubsurface.cpp +++ b/src/compositor/extensions/qwlsubsurface.cpp @@ -38,7 +38,7 @@ #include "qwlcompositor_p.h" #include "qwaylandsurface.h" -#include "qwaylandsurfaceview.h" +#include "qwaylandview.h" QT_BEGIN_NAMESPACE @@ -84,7 +84,7 @@ void SubSurface::setSubSurface(SubSurface *subSurface, int x, int y) m_sub_surfaces.append(subSurface->m_surface); subSurface->setParent(this); } - foreach (QWaylandSurfaceView *view, subSurface->m_surface->views()) + foreach (QWaylandView *view, subSurface->m_surface->views()) view->setRequestedPosition(QPointF(x,y)); } diff --git a/src/compositor/wayland_wrapper/qwlcompositor.cpp b/src/compositor/wayland_wrapper/qwlcompositor.cpp index 7951ee065..d9b0e1207 100644 --- a/src/compositor/wayland_wrapper/qwlcompositor.cpp +++ b/src/compositor/wayland_wrapper/qwlcompositor.cpp @@ -55,7 +55,7 @@ #include "qwlpointer_p.h" #include "qwltextinputmanager_p.h" #include <QtCompositor/QWaylandInputPanel> -#include "qwaylandsurfaceview.h" +#include "qwaylandview.h" #include "qwaylandshmformathelper.h" #include "qwaylandoutput.h" #include "qwlkeyboard_p.h" @@ -208,7 +208,7 @@ void Compositor::init() qRegisterMetaType<SurfaceBuffer*>("SurfaceBuffer*"); qRegisterMetaType<QWaylandClient*>("WaylandClient*"); qRegisterMetaType<QWaylandSurface*>("WaylandSurface*"); - qRegisterMetaType<QWaylandSurfaceView*>("WaylandSurfaceView*"); + qRegisterMetaType<QWaylandView*>("WaylandSurfaceView*"); //initialize distancefieldglyphcache here initializeHardwareIntegration(); diff --git a/src/compositor/wayland_wrapper/qwldatadevice.cpp b/src/compositor/wayland_wrapper/qwldatadevice.cpp index d783223de..0b3fee393 100644 --- a/src/compositor/wayland_wrapper/qwldatadevice.cpp +++ b/src/compositor/wayland_wrapper/qwldatadevice.cpp @@ -47,7 +47,7 @@ #include "qwldatadevicemanager_p.h" #include "qwaylanddrag.h" -#include "qwaylandsurfaceview.h" +#include "qwaylandview.h" #include <QtCompositor/QWaylandClient> #include <QDebug> @@ -85,7 +85,7 @@ void DataDevice::setFocus(QWaylandClient *focusClient) } } -void DataDevice::setDragFocus(QWaylandSurfaceView *focus, const QPointF &localPosition) +void DataDevice::setDragFocus(QWaylandView *focus, const QPointF &localPosition) { if (m_dragFocusResource) { send_leave(m_dragFocusResource->handle); @@ -119,7 +119,7 @@ void DataDevice::setDragFocus(QWaylandSurfaceView *focus, const QPointF &localPo m_dragFocusResource = resource; } -QWaylandSurfaceView *DataDevice::dragIcon() const +QWaylandView *DataDevice::dragIcon() const { return m_dragIcon; } @@ -132,7 +132,7 @@ void DataDevice::sourceDestroyed(DataSource *source) void DataDevice::focus() { - QWaylandSurfaceView *focus = pointer->mouseFocus(); + QWaylandView *focus = pointer->mouseFocus(); if (focus != m_dragFocus) { setDragFocus(focus, pointer->currentLocalPosition()); } diff --git a/src/compositor/wayland_wrapper/qwldatadevice_p.h b/src/compositor/wayland_wrapper/qwldatadevice_p.h index a2facc111..69688580c 100644 --- a/src/compositor/wayland_wrapper/qwldatadevice_p.h +++ b/src/compositor/wayland_wrapper/qwldatadevice_p.h @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -class QWaylandSurfaceView; +class QWaylandView; namespace QtWayland { @@ -61,9 +61,9 @@ public: void setFocus(QWaylandClient *client); - void setDragFocus(QWaylandSurfaceView *focus, const QPointF &localPosition); + void setDragFocus(QWaylandView *focus, const QPointF &localPosition); - QWaylandSurfaceView *dragIcon() const; + QWaylandView *dragIcon() const; void sourceDestroyed(DataSource *source); @@ -84,10 +84,10 @@ private: struct ::wl_client *m_dragClient; DataSource *m_dragDataSource; - QWaylandSurfaceView *m_dragFocus; + QWaylandView *m_dragFocus; Resource *m_dragFocusResource; - QWaylandSurfaceView *m_dragIcon; + QWaylandView *m_dragIcon; }; } diff --git a/src/compositor/wayland_wrapper/qwlinputdevice.cpp b/src/compositor/wayland_wrapper/qwlinputdevice.cpp index 52060f194..2a93edbb8 100644 --- a/src/compositor/wayland_wrapper/qwlinputdevice.cpp +++ b/src/compositor/wayland_wrapper/qwlinputdevice.cpp @@ -48,7 +48,7 @@ #include "qwlkeyboard_p.h" #include "qwltouch_p.h" #include "qwlshellsurface_p.h" -#include "qwaylandsurfaceview.h" +#include "qwaylandview.h" #include <QtCompositor/QWaylandClient> #include <QtGui/QTouchEvent> @@ -161,7 +161,7 @@ void QWaylandInputDevicePrivate::sendMouseReleaseEvent(Qt::MouseButton button) pointerDevice()->sendMouseReleaseEvent(button); } -void QWaylandInputDevicePrivate::sendMouseMoveEvent(QWaylandSurfaceView *surface, const QPointF &localPos, const QPointF &globalPos) +void QWaylandInputDevicePrivate::sendMouseMoveEvent(QWaylandView *surface, const QPointF &localPos, const QPointF &globalPos) { pointerDevice()->sendMouseMoveEvent(surface, localPos,globalPos); } @@ -256,18 +256,18 @@ bool QWaylandInputDevicePrivate::setKeyboardFocus(QWaylandSurface *surface) return false; } -QWaylandSurfaceView *QWaylandInputDevicePrivate::mouseFocus() const +QWaylandView *QWaylandInputDevicePrivate::mouseFocus() const { return m_mouseFocus; } -void QWaylandInputDevicePrivate::setMouseFocus(QWaylandSurfaceView *focus) +void QWaylandInputDevicePrivate::setMouseFocus(QWaylandView *focus) { Q_Q(QWaylandInputDevice); if (focus == m_mouseFocus) return; - QWaylandSurfaceView *oldFocus = m_mouseFocus; + QWaylandView *oldFocus = m_mouseFocus; m_mouseFocus = focus; q->mouseFocusChanged(m_mouseFocus, oldFocus); } diff --git a/src/compositor/wayland_wrapper/qwlinputdevice_p.h b/src/compositor/wayland_wrapper/qwlinputdevice_p.h index 08cc96c2e..1ed8593ac 100644 --- a/src/compositor/wayland_wrapper/qwlinputdevice_p.h +++ b/src/compositor/wayland_wrapper/qwlinputdevice_p.h @@ -59,7 +59,7 @@ class QKeyEvent; class QTouchEvent; class QWaylandInputDevice; class QWaylandDrag; -class QWaylandSurfaceView; +class QWaylandView; namespace QtWayland { @@ -84,7 +84,7 @@ public: void sendMousePressEvent(Qt::MouseButton button); void sendMouseReleaseEvent(Qt::MouseButton button); - void sendMouseMoveEvent(QWaylandSurfaceView *surface, const QPointF &localPos, const QPointF &spacePos = QPointF()); + void sendMouseMoveEvent(QWaylandView *surface, const QPointF &localPos, const QPointF &spacePos = QPointF()); void sendMouseWheelEvent(Qt::Orientation orientation, int delta); void sendTouchPointEvent(int id, const QPointF &point, Qt::TouchPointState state); @@ -99,8 +99,8 @@ public: QWaylandSurface *keyboardFocus() const; bool setKeyboardFocus(QWaylandSurface *surface); - QWaylandSurfaceView *mouseFocus() const; - void setMouseFocus(QWaylandSurfaceView *focus); + QWaylandView *mouseFocus() const; + void setMouseFocus(QWaylandView *focus); void clientRequestedDataDevice(QtWayland::DataDeviceManager *dndSelection, struct wl_client *client, uint32_t id); const QtWayland::DataDevice *dataDevice() const; @@ -129,7 +129,7 @@ private: QScopedPointer<QWaylandDrag> m_dragHandle; QWaylandCompositor *m_compositor; QWaylandOutputSpace *m_outputSpace; - QWaylandSurfaceView *m_mouseFocus; + QWaylandView *m_mouseFocus; QWaylandInputDevice::CapabilityFlags m_capabilities; QScopedPointer<QWaylandPointer> m_pointer; diff --git a/src/compositor/wayland_wrapper/qwloutput.cpp b/src/compositor/wayland_wrapper/qwloutput.cpp index 813e6e0d8..15f644966 100644 --- a/src/compositor/wayland_wrapper/qwloutput.cpp +++ b/src/compositor/wayland_wrapper/qwloutput.cpp @@ -46,7 +46,8 @@ #include <QtCompositor/QWaylandSurface> #include <QtCompositor/QWaylandClient> -#include <QtCompositor/QWaylandSurfaceView> +#include <QtCompositor/QWaylandView> +#include <QtCompositor/QWaylandOutput> QT_BEGIN_NAMESPACE @@ -348,12 +349,12 @@ void Output::sendFrameCallbacks() wl_display_flush_clients(compositor()->waylandDisplay()); } -void Output::addView(QWaylandSurfaceView *view) +void Output::addView(QWaylandView *view) { addView(view, view->surface()); } -void Output::addView(QWaylandSurfaceView *view, QWaylandSurface *surface) +void Output::addView(QWaylandView *view, QWaylandSurface *surface) { for (int i = 0; i < m_surfaceViews.size(); i++) { if (surface == m_surfaceViews.at(i).surface) { @@ -372,12 +373,12 @@ void Output::addView(QWaylandSurfaceView *view, QWaylandSurface *surface) surface->enter(waylandOutput()); } -void Output::removeView(QWaylandSurfaceView *view) +void Output::removeView(QWaylandView *view) { removeView(view, view->surface()); } -void Output::removeView(QWaylandSurfaceView *view, QWaylandSurface *surface) +void Output::removeView(QWaylandView *view, QWaylandSurface *surface) { for (int i = 0; i < m_surfaceViews.size(); i++) { if (surface == m_surfaceViews.at(i).surface) { @@ -393,7 +394,7 @@ void Output::removeView(QWaylandSurfaceView *view, QWaylandSurface *surface) qWarning("%s Could not find view %p for surface %p to remove. Possible invalid state", Q_FUNC_INFO, view, surface); } -void Output::updateSurfaceForView(QWaylandSurfaceView *view, QWaylandSurface *newSurface, QWaylandSurface *oldSurface) +void Output::updateSurfaceForView(QWaylandView *view, QWaylandSurface *newSurface, QWaylandSurface *oldSurface) { removeView(view, oldSurface); addView(view, newSurface); diff --git a/src/compositor/wayland_wrapper/qwloutput_p.h b/src/compositor/wayland_wrapper/qwloutput_p.h index 1a261241b..8005ed26d 100644 --- a/src/compositor/wayland_wrapper/qwloutput_p.h +++ b/src/compositor/wayland_wrapper/qwloutput_p.h @@ -65,7 +65,7 @@ struct SurfaceViewMapper {} QWaylandSurface *surface; - QVector<QWaylandSurfaceView *> views; + QVector<QWaylandView *> views; }; //Just for naming convenience @@ -124,11 +124,11 @@ public: void frameStarted(); void sendFrameCallbacks(); - void addView(QWaylandSurfaceView *view); - void addView(QWaylandSurfaceView *view, QWaylandSurface *surface); - void removeView(QWaylandSurfaceView *view); - void removeView(QWaylandSurfaceView *view, QWaylandSurface *surface); - void updateSurfaceForView(QWaylandSurfaceView *view, QWaylandSurface *newSurface, QWaylandSurface *oldSurface); + void addView(QWaylandView *view); + void addView(QWaylandView *view, QWaylandSurface *surface); + void removeView(QWaylandView *view); + void removeView(QWaylandView *view, QWaylandSurface *surface); + void updateSurfaceForView(QWaylandView *view, QWaylandSurface *newSurface, QWaylandSurface *oldSurface); QWindow *window() const { return m_window; } diff --git a/src/compositor/wayland_wrapper/qwlpointer.cpp b/src/compositor/wayland_wrapper/qwlpointer.cpp index d987829e9..cf02d003c 100644 --- a/src/compositor/wayland_wrapper/qwlpointer.cpp +++ b/src/compositor/wayland_wrapper/qwlpointer.cpp @@ -42,7 +42,7 @@ #include "qwlkeyboard_p.h" #include "qwlsurface_p.h" #include "qwaylandcompositor.h" -#include "qwaylandsurfaceview.h" +#include "qwaylandview.h" QT_BEGIN_NAMESPACE @@ -144,7 +144,7 @@ void QWaylandPointerPrivate::sendMouseReleaseEvent(Qt::MouseButton button) q->buttonPressedChanged(); } -void QWaylandPointerPrivate::sendMouseMoveEvent(QWaylandSurfaceView *view, const QPointF &localPos, const QPointF &outputSpacePos) +void QWaylandPointerPrivate::sendMouseMoveEvent(QWaylandView *view, const QPointF &localPos, const QPointF &outputSpacePos) { Q_Q(QWaylandPointer); m_seat->setMouseFocus(view); diff --git a/src/compositor/wayland_wrapper/qwlpointer_p.h b/src/compositor/wayland_wrapper/qwlpointer_p.h index cc0c0341e..1feeb1933 100644 --- a/src/compositor/wayland_wrapper/qwlpointer_p.h +++ b/src/compositor/wayland_wrapper/qwlpointer_p.h @@ -48,7 +48,7 @@ #include <QtCore/private/qobject_p.h> #include <QtCompositor/private/qwayland-server-wayland.h> -#include <QtCompositor/QWaylandSurfaceView> +#include <QtCompositor/QWaylandView> #include <QtCompositor/QWaylandSurface> #include <QtCompositor/QWaylandInputDevice> @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE -class QWaylandSurfaceView; +class QWaylandView; namespace QtWayland { @@ -91,11 +91,11 @@ public: void sendMousePressEvent(Qt::MouseButton button); void sendMouseReleaseEvent(Qt::MouseButton button); - void sendMouseMoveEvent(QWaylandSurfaceView *view, const QPointF &localPos, const QPointF &outputSpacePos); + void sendMouseMoveEvent(QWaylandView *view, const QPointF &localPos, const QPointF &outputSpacePos); void sendMouseWheelEvent(Qt::Orientation orientation, int delta); Resource *focusResource() const { return m_focusResource; } - QWaylandSurfaceView *mouseFocus() const { return m_seat->mouseFocus(); } + QWaylandView *mouseFocus() const { return m_seat->mouseFocus(); } bool buttonPressed() const; diff --git a/src/compositor/wayland_wrapper/qwlsurface.cpp b/src/compositor/wayland_wrapper/qwlsurface.cpp index dd2e8aafb..10400fa74 100644 --- a/src/compositor/wayland_wrapper/qwlsurface.cpp +++ b/src/compositor/wayland_wrapper/qwlsurface.cpp @@ -38,7 +38,8 @@ #include "qwaylandsurface.h" #include "qwaylandsurface_p.h" -#include "qwaylandsurfaceview_p.h" +#include "qwaylandview.h" +#include "qwaylandview_p.h" #include "qwaylandoutput.h" #include "qwlcompositor_p.h" #include "qwlinputdevice_p.h" @@ -46,9 +47,7 @@ #include "qwlregion_p.h" #include "qwlsubsurface_p.h" #include "qwlsurfacebuffer_p.h" -#include "qwaylandsurfaceview.h" #include "qwaylandoutput.h" - #include "qwaylandsurface_p.h" #include <QtCore/QDebug> @@ -350,8 +349,8 @@ Qt::ScreenOrientation Surface::contentOrientation() const void Surface::notifyViewsAboutDestruction() { - foreach (QWaylandSurfaceView *view, m_waylandSurface->views()) { - QWaylandSurfaceViewPrivate::get(view)->markSurfaceAsDestroyed(m_waylandSurface); + foreach (QWaylandView *view, m_waylandSurface->views()) { + QWaylandViewPrivate::get(view)->markSurfaceAsDestroyed(m_waylandSurface); } } diff --git a/src/compositor/wayland_wrapper/qwltouch.cpp b/src/compositor/wayland_wrapper/qwltouch.cpp index 77464d81d..a0676b180 100644 --- a/src/compositor/wayland_wrapper/qwltouch.cpp +++ b/src/compositor/wayland_wrapper/qwltouch.cpp @@ -39,7 +39,7 @@ #include "qwlcompositor_p.h" #include "qwlsurface_p.h" -#include "qwaylandsurfaceview.h" +#include "qwaylandview.h" #include "qwlqttouch_p.h" QT_BEGIN_NAMESPACE diff --git a/src/compositor/wayland_wrapper/qwltouch_p.h b/src/compositor/wayland_wrapper/qwltouch_p.h index a0f9273b7..52beb81a6 100644 --- a/src/compositor/wayland_wrapper/qwltouch_p.h +++ b/src/compositor/wayland_wrapper/qwltouch_p.h @@ -43,7 +43,7 @@ #include <QtCompositor/QWaylandTouch> #include <QtCompositor/QWaylandInputDevice> #include <QtCompositor/QWaylandClient> -#include <QtCompositor/QWaylandSurfaceView> +#include <QtCompositor/QWaylandView> #include <QtCore/QPoint> #include <QtCore/private/qobject_p.h> @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -class QWaylandSurfaceView; +class QWaylandView; class QWaylandCompositor; class Q_COMPOSITOR_EXPORT QWaylandTouchPrivate : public QObjectPrivate, public QtWaylandServer::wl_touch @@ -83,7 +83,7 @@ public: if (m_focusResource) return; - QWaylandSurfaceView *mouseFocus = m_seat->mouseFocus(); + QWaylandView *mouseFocus = m_seat->mouseFocus(); if (!mouseFocus || !mouseFocus->surface()) return; diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp index 1ed4c1392..ac2aa5c22 100644 --- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp +++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp @@ -40,7 +40,7 @@ #include <QtQuick/QQuickItem> #include <QtCompositor/QWaylandQuickCompositor> -#include <QtCompositor/QWaylandSurfaceItem> +#include <QtCompositor/QWaylandQuickView> #include <QtCompositor/QWaylandQuickSurface> #include <QtCompositor/QWaylandClient> #include <QtCompositor/QWaylandOutput> @@ -149,7 +149,7 @@ public: static void defineModule(const char *uri) { qmlRegisterType<QWaylandQuickCompositorImpl>(uri, 1, 0, "WaylandCompositor"); - qmlRegisterType<QWaylandSurfaceItem>(uri, 1, 0, "WaylandSurfaceView"); + qmlRegisterType<QWaylandQuickView>(uri, 1, 0, "WaylandView"); qmlRegisterType<QWaylandMouseTracker>(uri, 1, 0, "WaylandMouseTracker"); qmlRegisterUncreatableType<QWaylandQuickSurface>(uri, 1, 0, "WaylandQuickSurface", QObject::tr("Cannot create instance of WaylandQuickSurface")); qmlRegisterUncreatableType<QWaylandClient>(uri, 1, 0, "WaylandClient", QObject::tr("Cannot create instance of WaylandClient")); |