diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-07-30 14:53:35 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:09:42 +0200 |
| commit | ce58545b220a49354533a27ef79cdbc8d50186cd (patch) | |
| tree | 660232f61bc971d68c29b37acfa9c709f617c697 /src/compositor/compositor_api/qwaylandcompositor.h | |
| parent | 5edaac978e01ead8648aad91f0d050748f7a8915 (diff) | |
Rework how we manage extensions
Change-Id: If2cbf096e7419bc1bda007d5167ce39d1a5d50ae
Diffstat (limited to 'src/compositor/compositor_api/qwaylandcompositor.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandcompositor.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/compositor/compositor_api/qwaylandcompositor.h b/src/compositor/compositor_api/qwaylandcompositor.h index 462f381c6..984624383 100644 --- a/src/compositor/compositor_api/qwaylandcompositor.h +++ b/src/compositor/compositor_api/qwaylandcompositor.h @@ -38,6 +38,7 @@ #define QWAYLANDCOMPOSITOR_H #include <QtCompositor/qwaylandexport.h> +#include <QtCompositor/qwaylandextension.h> #include <QObject> #include <QImage> @@ -55,7 +56,6 @@ class QOpenGLContext; class QWaylandClient; class QWaylandSurface; class QWaylandInputDevice; -class QWaylandInputPanel; class QWaylandDrag; class QWaylandGlobalInterface; class QWaylandSurfaceView; @@ -67,7 +67,7 @@ namespace QtWayland class Compositor; } -class Q_COMPOSITOR_EXPORT QWaylandCompositor : public QObject +class Q_COMPOSITOR_EXPORT QWaylandCompositor : public QObject, public QWaylandExtensionContainer { Q_OBJECT Q_PROPERTY(QByteArray socketName READ socketName WRITE setSocketName) @@ -85,6 +85,7 @@ public: SubSurfaceExtension = 0x10, TextInputExtension = 0x20, HardwareIntegrationExtension = 0x40, + DefaultShellExtension = 0x80, DefaultExtensions = WindowManagerExtension | SurfaceExtension | QtKeyExtension | TouchExtension | HardwareIntegrationExtension }; @@ -102,9 +103,6 @@ public: void setExtensionFlags(ExtensionFlags flags); ExtensionFlags extensionFlags() const; - void addGlobalInterface(QWaylandGlobalInterface *interface); - void addDefaultShell(); - ::wl_display *waylandDisplay() const; Q_INVOKABLE void destroyClientForSurface(QWaylandSurface *surface); @@ -143,7 +141,6 @@ public: QWaylandInputDevice *defaultInputDevice() const; - QWaylandInputPanel *inputPanel() const; QWaylandDrag *drag() const; bool isDragging() const; @@ -156,12 +153,6 @@ public: void cleanupGraphicsResources(); - enum TouchExtensionFlag { - TouchExtMouseFromTouch = 0x01 - }; - Q_DECLARE_FLAGS(TouchExtensionFlags, TouchExtensionFlag) - void configureTouchExtension(TouchExtensionFlags flags); - QWaylandSurfaceView *createSurfaceView(QWaylandSurface *surface); QWaylandInputDevice *inputDeviceFor(QInputEvent *inputEvent); @@ -192,7 +183,6 @@ protected: }; Q_DECLARE_OPERATORS_FOR_FLAGS(QWaylandCompositor::ExtensionFlags) -Q_DECLARE_OPERATORS_FOR_FLAGS(QWaylandCompositor::TouchExtensionFlags) QT_END_NAMESPACE |