From c28fde3fdac19fd5a5f614bb7983080031c924b3 Mon Sep 17 00:00:00 2001
From: Gerry Boland <gerry.boland@canonical.com>
Date: Wed, 2 Nov 2016 16:46:53 +0000
Subject: Mirclient: update based on upstream development in lp:qtubuntu

This is based on revision 360 of lp:qtubuntu.

Main features/bugs fixed:
- fix QQuickWidget-based app rendering
- wire up Qt window types to Mir to enable desktop-based applications
  to function with a window manager
- use QEGLPlatformContext and QEGLPBuffer instead of custom code
- correctly populate and update list of QScreens
- support for switching keyboard layouts
- improve window resizing to fix visual glitching

Change-Id: If816a858eb10b6356275d4b80c89a72562b3c29f
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
---
 src/plugins/platforms/mirclient/qmirclientinput.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 3600ae7ece..263cb5e54e 100644
--- a/src/plugins/platforms/mirclient/qmirclientinput.h
+++ b/src/plugins/platforms/mirclient/qmirclientinput.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014-2015 Canonical, Ltd.
+** Copyright (C) 2014-2016 Canonical, Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -43,7 +43,6 @@
 
 // Qt
 #include <qpa/qwindowsysteminterface.h>
-#include <QAtomicInt>
 
 #include <mir_toolkit/mir_client_library.h>
 
@@ -63,7 +62,7 @@ public:
 
     void postEvent(QMirClientWindow* window, const MirEvent *event);
     QMirClientClientIntegration* integration() const { return mIntegration; }
-    QMirClientWindow *lastFocusedWindow() const {return mLastFocusedWindow; }
+    QMirClientWindow *lastInputWindow() const {return mLastInputWindow; }
 
 protected:
     void dispatchKeyEvent(QMirClientWindow *window, const MirInputEvent *event);
@@ -72,6 +71,8 @@ protected:
     void dispatchInputEvent(QMirClientWindow *window, const MirInputEvent *event);
 
     void dispatchOrientationEvent(QWindow* window, const MirOrientationEvent *event);
+    void handleSurfaceEvent(const QPointer<QMirClientWindow> &window, const MirSurfaceEvent *event);
+    void handleSurfaceOutputEvent(const QPointer<QMirClientWindow> &window, const MirSurfaceOutputEvent *event);
 
 private:
     QMirClientClientIntegration* mIntegration;
@@ -79,8 +80,7 @@ private:
     const QByteArray mEventFilterType;
     const QEvent::Type mEventType;
 
-    QMirClientWindow *mLastFocusedWindow;
-    QAtomicInt mPendingFocusGainedEvents;
+    QMirClientWindow *mLastInputWindow;
 };
 
 #endif // QMIRCLIENTINPUT_H
-- 
cgit v1.2.3