Merge lp:~dandrader/unity-mir/fix_lp1234600 into lp:unity-mir

[Daniel d'Andrada]

Replace hardcoded keyboard size with info straight from ubuntu-keyboard

Have a communication channel between ubuntu-keyboard and unity-mir where
the former hands out all the information about itself that unity-mir might
be interested into.

Note that I'm just replacing a crude hack with a more sophisticated one.
That all should go away (including InputFilters) once a proper architecure gets
implemented.

Fixes LP#1234600

Not thoroughly tested.

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-mir-ci/103/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Worky worky!

review: Approve

=== modified file 'src/modules/Unity/Application/Application.pro'
--- src/modules/Unity/Application/Application.pro	2013-09-26 10:02:15 +0000
+++ src/modules/Unity/Application/Application.pro	2013-10-09 16:59:45 +0000
@@ -29,7 +29,8 @@
     mirsurfacemanager.cpp \
     inputarea.cpp \
     inputfilterarea.cpp \
-    shellinputarea.cpp
+    shellinputarea.cpp \
+    ubuntukeyboardinfo.cpp
 
 HEADERS += application_manager.h \
     application.h \
@@ -42,6 +43,7 @@
     shellinputarea.h \
     inputarea.h \
     inputfilterarea.h \
+    ubuntukeyboardinfo.h \
     /usr/include/unity/shell/application/ApplicationManagerInterface.h \
     /usr/include/unity/shell/application/ApplicationInfoInterface.h
 

=== modified file 'src/modules/Unity/Application/OSKController.qml'
--- src/modules/Unity/Application/OSKController.qml	2013-10-08 12:00:13 +0000
+++ src/modules/Unity/Application/OSKController.qml	2013-10-09 16:59:45 +0000
@@ -23,6 +23,10 @@
     property variant __oskSurface: null
     readonly property bool enabled: __oskSurface !== null
 
+    UbuntuKeyboardInfo {
+        id: ubuntuKeyboardInfo
+    }
+
     Connections {
         target: SurfaceManager
         onSurfaceCreated: {
@@ -50,10 +54,6 @@
     InputArea {
         id: oskInputArea
 
-        //FIXME(greyback) hardcoded - taken from maliit - Qt.inputMethod.keyboardRectangle not working
-        readonly property real heightInPortrait: units.gu(30)
-        readonly property real heightInLandscape: units.gu(20)
-
         readonly property int orientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
 
         surface: __oskSurface
@@ -64,7 +64,7 @@
         states: [
             State {
                 name: "0"
-                PropertyChanges { target: oskInputArea; height: heightInPortrait; width: undefined }
+                PropertyChanges { target: oskInputArea; height: ubuntuKeyboardInfo.height; width: undefined }
                 AnchorChanges { target: oskInputArea; anchors {
                         top: undefined
                         bottom: parent.bottom
@@ -74,7 +74,7 @@
             },
             State {
                 name: "180"
-                PropertyChanges { target: oskInputArea; height: heightInPortrait; width: undefined }
+                PropertyChanges { target: oskInputArea; height: ubuntuKeyboardInfo.height; width: undefined }
                 AnchorChanges { target: oskInputArea; anchors {
                         top: parent.top
                         bottom: undefined
@@ -84,7 +84,7 @@
             },
             State {
                 name: "270"
-                PropertyChanges { target: oskInputArea; height: undefined; width: heightInLandscape }
+                PropertyChanges { target: oskInputArea; height: undefined; width: ubuntuKeyboardInfo.height }
                 AnchorChanges { target: oskInputArea; anchors {
                         top: parent.top
                         bottom: parent.bottom
@@ -94,7 +94,7 @@
             },
             State {
                 name: "90"
-                PropertyChanges { target: oskInputArea; height: undefined; width: heightInLandscape }
+                PropertyChanges { target: oskInputArea; height: undefined; width: ubuntuKeyboardInfo.height }
                 AnchorChanges { target: oskInputArea; anchors {
                         top: parent.top
                         bottom: parent.bottom

=== modified file 'src/modules/Unity/Application/plugin.cpp'
--- src/modules/Unity/Application/plugin.cpp	2013-09-11 13:20:08 +0000
+++ src/modules/Unity/Application/plugin.cpp	2013-10-09 16:59:45 +0000
@@ -26,6 +26,7 @@
 #include "inputarea.h"
 #include "inputfilterarea.h"
 #include "shellinputarea.h"
+#include "ubuntukeyboardinfo.h"
 
 // unity-mir
 #include "logging.h"
@@ -71,6 +72,7 @@
         qmlRegisterType<InputArea>(uri, 0, 1, "InputArea");
         qmlRegisterType<ShellInputArea>(uri, 0, 1, "ShellInputArea");
         qmlRegisterType<InputFilterArea>(uri, 0, 1, "InputFilterArea");
+        qmlRegisterType<UbuntuKeyboardInfo>(uri, 0, 1, "UbuntuKeyboardInfo");
     }
 
     virtual void initializeEngine(QQmlEngine *engine, const char *uri)

=== added file 'src/modules/Unity/Application/ubuntukeyboardinfo.cpp'
--- src/modules/Unity/Application/ubuntukeyboardinfo.cpp	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/ubuntukeyboardinfo.cpp	2013-10-09 16:59:45 +0000
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ubuntukeyboardinfo.h"
+
+#include <QTimer>
+
+namespace {
+    const int gConnectionAttemptIntervalMs = 5000;
+    const int gMaxFailedAttempts = 10;
+    const char gServerName[] = "ubuntu-keyboard-info";
+}
+
+UbuntuKeyboardInfo::UbuntuKeyboardInfo(QObject *parent)
+    : QObject(parent),
+    m_failedAttempts(0),
+    m_lastWidth(0),
+    m_lastHeight(0)
+{
+    connect(&m_socket, &QLocalSocket::connected, this, &UbuntuKeyboardInfo::onConnected);
+    connect(&m_socket, &QLocalSocket::disconnected, this, &UbuntuKeyboardInfo::onDisconnected);
+    connect(&m_socket, &QIODevice::readyRead,
+            this, &UbuntuKeyboardInfo::readAllBytesFromSocket);
+
+    typedef void (QLocalSocket::*MemberFunctionType)(QLocalSocket::LocalSocketError);
+    MemberFunctionType funcPointer = &QLocalSocket::error;
+    connect(&m_socket, funcPointer,
+            this, &UbuntuKeyboardInfo::onSocketError);
+
+    tryConnectingToServer();
+}
+
+void UbuntuKeyboardInfo::tryConnectingToServer()
+{
+    m_socket.connectToServer(gServerName, QIODevice::ReadOnly);
+}
+
+void UbuntuKeyboardInfo::onConnected()
+{
+    m_failedAttempts = 0;
+}
+
+void UbuntuKeyboardInfo::onDisconnected()
+{
+    qWarning("UbuntuKeyboardInfo - disconnected");
+}
+
+void UbuntuKeyboardInfo::onSocketError(QLocalSocket::LocalSocketError socketError)
+{
+    // Polling every gConnectionAttemptIntervalMs. Not the best approach but could be worse.
+    Q_UNUSED(socketError);
+    ++m_failedAttempts;
+    if (m_failedAttempts < gMaxFailedAttempts) {
+        QTimer::singleShot(gConnectionAttemptIntervalMs, this, SLOT(tryConnectingToServer()));
+    } else {
+        qCritical() << "Failed to connect to" << gServerName << "after"
+                    << m_failedAttempts << "failed attempts";
+    }
+}
+
+void UbuntuKeyboardInfo::readAllBytesFromSocket()
+{
+    while (m_socket.bytesAvailable() > 0) {
+        readInfoFromSocket();
+    }
+}
+
+void UbuntuKeyboardInfo::readInfoFromSocket()
+{
+    const size_t sharedInfoSize = sizeof(struct SharedInfo);
+    QByteArray bytes = m_socket.read(sharedInfoSize);
+    if (bytes.size() != sharedInfoSize) {
+        qWarning() << "UbuntuKeyboardInfo: expected to receive" << sharedInfoSize
+                   << "but got" << bytes.size();
+        return;
+    }
+
+    {
+        struct SharedInfo *sharedInfo = reinterpret_cast<struct SharedInfo*>(bytes.data());
+        if (m_lastWidth != sharedInfo->keyboardWidth) {
+            m_lastWidth = sharedInfo->keyboardWidth;
+            Q_EMIT widthChanged(m_lastWidth);
+        }
+
+        if (m_lastHeight != sharedInfo->keyboardHeight) {
+            m_lastHeight = sharedInfo->keyboardHeight;
+            Q_EMIT heightChanged(m_lastHeight);
+        }
+    }
+}

=== added file 'src/modules/Unity/Application/ubuntukeyboardinfo.h'
--- src/modules/Unity/Application/ubuntukeyboardinfo.h	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/ubuntukeyboardinfo.h	2013-10-09 16:59:45 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UBUNTU_KEYBOARD_INFO_H
+#define UBUNTU_KEYBOARD_INFO_H
+
+#include <QLocalSocket>
+
+// Temporary solution to get information about the onscreen keyboard
+// This shouldn't be needed once the OSK is a properly sized surface
+// instead of a fullscreen one.
+class UbuntuKeyboardInfo : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(qreal width READ width NOTIFY widthChanged)
+    Q_PROPERTY(qreal height READ height NOTIFY heightChanged)
+public:
+    UbuntuKeyboardInfo(QObject *parent = 0);
+    qreal width() const { return m_lastWidth; }
+    qreal height() const { return m_lastHeight; }
+
+Q_SIGNALS:
+    void widthChanged(qreal width);
+    void heightChanged(qreal height);
+
+private Q_SLOTS:
+    void tryConnectingToServer();
+    void onConnected();
+    void onDisconnected();
+    void onSocketError(QLocalSocket::LocalSocketError socketError);
+    void readAllBytesFromSocket();
+
+private:
+    // NB! Must match the definition in ubuntu-keyboard. Not worth creating a shared header
+    // just for that.
+    struct SharedInfo {
+        qint32 keyboardWidth;
+        qint32 keyboardHeight;
+    };
+    void readInfoFromSocket();
+
+    int m_failedAttempts;
+
+    QLocalSocket m_socket;
+    qint32 m_lastWidth;
+    qint32 m_lastHeight;
+};
+
+#endif // UBUNTU_KEYBOARD_INFO_H