diff options
author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-09-15 14:39:39 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-15 13:31:31 +0000 |
commit | 0345bba55ab67249fd3cda721de12b5fa1d95c36 (patch) | |
tree | 7c3db1fb27e0ca171caac44c505048cb60fb53b9 /src/compositor/compositor_api/qwaylandpointer.h | |
parent | f5f06c709937b657c66ca4e35f4e3065ba390153 (diff) |
Remove the mouse grabber
This is no longer used for move/resize, and we are going to
introduce a new concept for drag and drop (which stopped working
several changes ago anyway). The old drag and drop code is left
commented out to assist in the new implementation.
Change-Id: I18cb41d04f09d6033d1c9e666a739793fcef494b
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandpointer.h')
-rw-r--r-- | src/compositor/compositor_api/qwaylandpointer.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/src/compositor/compositor_api/qwaylandpointer.h b/src/compositor/compositor_api/qwaylandpointer.h index 0b78460a5..0582f9d1e 100644 --- a/src/compositor/compositor_api/qwaylandpointer.h +++ b/src/compositor/compositor_api/qwaylandpointer.h @@ -48,35 +48,6 @@ class QWaylandView; class QWaylandOutput; class QWaylandClient; -class Q_COMPOSITOR_EXPORT QWaylandPointerGrabber -{ -public: - QWaylandPointerGrabber() - : pointer(Q_NULLPTR) - {} - virtual ~QWaylandPointerGrabber(); - - virtual void focus() = 0; - virtual void motion(uint32_t time) = 0; - virtual void button(uint32_t time, Qt::MouseButton button, uint32_t state) = 0; - - QWaylandPointer *pointer; -}; - -class Q_COMPOSITOR_EXPORT QWaylandDefaultPointerGrabber : public QWaylandPointerGrabber -{ -public: - QWaylandDefaultPointerGrabber() - : QWaylandPointerGrabber() - {} - QWaylandDefaultPointerGrabber(QWaylandPointer *_pointer) - : QWaylandPointerGrabber() - { this->pointer = _pointer; } - - void focus() Q_DECL_OVERRIDE; - void motion(uint32_t time) Q_DECL_OVERRIDE; - void button(uint32_t time, Qt::MouseButton button, uint32_t state) Q_DECL_OVERRIDE; -}; class Q_COMPOSITOR_EXPORT QWaylandPointer : public QObject, public QWaylandExtensionContainer { Q_OBJECT @@ -91,14 +62,6 @@ public: QWaylandOutput *output() const; void setOutput(QWaylandOutput *output); - void startGrab(QWaylandPointerGrabber *currentGrab); - void endGrab(); - QWaylandPointerGrabber *currentGrab() const; - Qt::MouseButton grabButton() const; - - uint32_t grabTime() const; - uint32_t grabSerial() const; - virtual void sendMousePressEvent(Qt::MouseButton button); virtual void sendMouseReleaseEvent(Qt::MouseButton button); virtual void sendMouseMoveEvent(QWaylandView *view, const QPointF &localPos, const QPointF &outputSpacePos); |