Merge lp:~gerboland/unity-mir/add-InputArea-to-any-surface into lp:unity-mir

[Gerry Boland]

Allow any surface to have InputAreas defined, not just shell surface. Adds a "surface" property to InputArea.

Adds a "surface" property to InputArea, so can define InputArea for any MirSurface. Will be needed for OSK.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-mir-ci/23/rebuild

review: Approve (continuous-integration)

[lp:~gerboland/unity-mir/add-InputArea-to-any-surface]

45. By Gerry Boland on 2013-08-20

Small logic improvement

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:45
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/26

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-mir-ci/26/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Reworked at https://code.launchpad.net/~aacid/unity-mir/input_area_rework/+merge/180999 to make it a bit less confusing

review: Disapprove

Unmerged revisions

=== modified file 'src/modules/Unity/SurfaceManager/inputarea.cpp'
--- src/modules/Unity/SurfaceManager/inputarea.cpp	2013-08-09 13:16:13 +0000
+++ src/modules/Unity/SurfaceManager/inputarea.cpp	2013-08-20 08:39:23 +0000
@@ -34,16 +34,17 @@
 InputArea::InputArea(QQuickItem *parent)
     : QQuickItem(parent)
     , m_enabled(true)
+    , m_surface(nullptr)
 {
     DLOG("InputArea::InputArea (this=%p)", this);
 
-    m_surface = MirSurfaceManager::singleton()->shellSurface();
-    if (m_surface) {
-        registerWithSurface(m_surface);
+    m_shellSurface = MirSurfaceManager::singleton()->shellSurface();
+    if (m_shellSurface) {
+        setShellSurface(m_shellSurface);
     }
 
     QObject::connect(MirSurfaceManager::singleton(), &MirSurfaceManager::shellSurfaceChanged,
-                     this, &InputArea::registerWithSurface);
+                     this, &InputArea::setShellSurface);
 }
 
 InputArea::~InputArea()
@@ -52,20 +53,16 @@
     m_surface->removeInputArea(this);
 }
 
-void InputArea::registerWithSurface(MirSurface *surface)
+void InputArea::setShellSurface(MirSurface *surface)
 {
-    DLOG("InputArea::registerWithSurface (this=%p, surface=%p)", this, surface);
-
-    if (!surface || surface == m_surface) return;
-
-    if (m_surface) {
-        m_surface->removeInputArea(this);
-    }
-
-    m_surface = surface;
-    if (m_enabled) {
-        m_surface->installInputArea(this);
-    }
+    DLOG("InputArea::setShellSurface (this=%p, surface=%p)", this, surface);
+
+    if (!surface || surface == m_shellSurface) return;
+
+    if (!m_surface) {
+        setSurface(surface);
+    }
+    m_shellSurface = surface;
 }
 
 bool InputArea::enabled() const
@@ -75,15 +72,48 @@
 
 void InputArea::setEnabled(bool enabled)
 {
+    DLOG("InputArea::setEnabled (this=%p, enabled=%p)", this, enabled ? "yes" : "no");
+
     if (enabled != m_enabled) {
         m_enabled = enabled;
         if (m_surface) {
             m_surface->enableInputArea(this, enabled);
+        } else if (m_shellSurface) {
+            m_shellSurface->enableInputArea(this, enabled);
         }
         Q_EMIT enabledChanged();
     }
 }
 
+MirSurface *InputArea::surface() const
+{
+    return (m_surface) ? m_surface : m_shellSurface;
+}
+
+void InputArea::setSurface(MirSurface *surface)
+{
+    DLOG("InputArea::setSurface (this=%p, surface=%p)", this, surface);
+
+    if (surface == m_surface) return;
+
+    if (m_surface) {
+        m_surface->removeInputArea(this);
+    } else {
+        m_shellSurface->removeInputArea(this);
+    }
+
+    m_surface = surface;
+
+    if (m_enabled) {
+        if (m_surface) {
+            m_surface->installInputArea(this);
+        } else {
+            m_shellSurface->installInputArea(this);
+        }
+    }
+    Q_EMIT surfaceChanged();
+}
+
 void InputArea::geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry)
 {
     DLOG("InputArea::geometryChanged (this=%p)", this);

=== modified file 'src/modules/Unity/SurfaceManager/inputarea.h'
--- src/modules/Unity/SurfaceManager/inputarea.h	2013-08-09 13:16:13 +0000
+++ src/modules/Unity/SurfaceManager/inputarea.h	2013-08-20 08:39:23 +0000
@@ -34,16 +34,21 @@
 {
     Q_OBJECT
     Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged)
+    Q_PROPERTY(MirSurface* surface READ surface WRITE setSurface NOTIFY surfaceChanged) // if not defined, shell surface used
 
 public:
     explicit InputArea(QQuickItem *parent = 0);
     ~InputArea();
 
     bool enabled() const;
+    MirSurface *surface() const;
+
     void setEnabled(bool enabled);
+    void setSurface(MirSurface *surface);
 
 Q_SIGNALS:
     void enabledChanged();
+    void surfaceChanged();
 
 protected:
     virtual void geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry);
@@ -51,7 +56,7 @@
 private Q_SLOTS:
     void onAscendantChanged();
     void onAscendantGeometryChanged();
-    void registerWithSurface(MirSurface *surface);
+    void setShellSurface(MirSurface *surface);
 
 private:
     void listenToAscendantsChanges();
@@ -61,6 +66,7 @@
     bool m_enabled;
     QRectF m_geometry;
     MirSurface* m_surface;
+    MirSurface* m_shellSurface;
     mir::geometry::Rectangle m_mirInputArea;
     QLinkedList<QMetaObject::Connection> m_connections;