From ce58545b220a49354533a27ef79cdbc8d50186cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@theqtcompany.com>
Date: Thu, 30 Jul 2015 14:53:35 +0200
Subject: Rework how we manage extensions

Change-Id: If2cbf096e7419bc1bda007d5167ce39d1a5d50ae
---
 src/compositor/compositor_api/qwaylandcompositor.h | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'src/compositor/compositor_api/qwaylandcompositor.h')

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
 
-- 
cgit v1.2.3