From bfd367c6ec37c9d883c51316a149447b63005011 Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Thu, 10 Dec 2015 11:01:29 +0100 Subject: Mirclient: update with upstream changes Merge in the changes up to revision 306 of the lp:qtubuntu repo. Change-Id: I55dcb9e06e0a3503d6abe4b0894d5ef5a785b6bb Reviewed-by: Christian Stromme --- src/plugins/platforms/mirclient/qmirclientinput.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/plugins/platforms/mirclient/qmirclientinput.h') diff --git a/src/plugins/platforms/mirclient/qmirclientinput.h b/src/plugins/platforms/mirclient/qmirclientinput.h index c987d18c12..3ed887419e 100644 --- a/src/plugins/platforms/mirclient/qmirclientinput.h +++ b/src/plugins/platforms/mirclient/qmirclientinput.h @@ -40,6 +40,7 @@ // Qt #include +#include #include @@ -59,12 +60,13 @@ public: void postEvent(QMirClientWindow* window, const MirEvent *event); QMirClientClientIntegration* integration() const { return mIntegration; } + QMirClientWindow *lastFocusedWindow() const {return mLastFocusedWindow; } protected: - void dispatchKeyEvent(QWindow *window, const MirInputEvent *event); - void dispatchPointerEvent(QWindow *window, const MirInputEvent *event); - void dispatchTouchEvent(QWindow *window, const MirInputEvent *event); - void dispatchInputEvent(QWindow *window, const MirInputEvent *event); + void dispatchKeyEvent(QMirClientWindow *window, const MirInputEvent *event); + void dispatchPointerEvent(QMirClientWindow *window, const MirInputEvent *event); + void dispatchTouchEvent(QMirClientWindow *window, const MirInputEvent *event); + void dispatchInputEvent(QMirClientWindow *window, const MirInputEvent *event); void dispatchOrientationEvent(QWindow* window, const MirOrientationEvent *event); @@ -73,6 +75,9 @@ private: QTouchDevice* mTouchDevice; const QByteArray mEventFilterType; const QEvent::Type mEventType; + + QMirClientWindow *mLastFocusedWindow; + QAtomicInt mPendingFocusGainedEvents; }; #endif // QMIRCLIENTINPUT_H -- cgit v1.2.3