Merge lp:~michael-sheldon/ubuntu/utopic/maliit-framework/fix-input-method-size-updates into lp:ubuntu/utopic/maliit-framework

[Michael Sheldon]

Ensure that input method area sizes are always updated when sent from the keyboard plugin regardless of whether the keyboard is currently active. This allows for hiding animations to correctly set the input method area whilst the keyboard is otherwise inactive.

Ensures that input method area sizes are always updated when sent from the keyboard plugin regardless of whether the keyboard is currently active. This allows for hiding animations to correctly set the input method area whilst the keyboard is otherwise inactive.

[lp:~michael-sheldon/ubuntu/utopic/maliit-framework/fix-input-method-size-updates]

18. By Michael Sheldon on 2014-08-04

Fix building against g++ 4.9

=== added directory '.pc/0009-update-input-region-when-hiding.patch'
=== added directory '.pc/0009-update-input-region-when-hiding.patch/src'
=== added file '.pc/0009-update-input-region-when-hiding.patch/src/windowgroup.cpp'
--- .pc/0009-update-input-region-when-hiding.patch/src/windowgroup.cpp	1970-01-01 00:00:00 +0000
+++ .pc/0009-update-input-region-when-hiding.patch/src/windowgroup.cpp	2014-08-04 15:52:39 +0000
@@ -0,0 +1,176 @@
+/* * This file is part of Maliit framework *
+ *
+ * Copyright (C) 2013 Openismus GmbH
+ *
+ * Contact: [e-mail]
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation
+ * and appearing in the file LICENSE.LGPL included in the packaging
+ * of this file.
+ */
+
+#include <QDebug>
+
+#include "abstractplatform.h"
+#include "windowgroup.h"
+
+namespace Maliit
+{
+
+WindowGroup::WindowGroup(const QSharedPointer<AbstractPlatform> &platform)
+    : m_platform(platform),
+      m_active(false)
+{
+    m_hideTimer.setSingleShot(true);
+    m_hideTimer.setInterval(2000);
+    connect(&m_hideTimer, SIGNAL(timeout()), this, SLOT(hideWindows()));
+}
+
+WindowGroup::~WindowGroup()
+{}
+
+void WindowGroup::activate()
+{
+    m_active = true;
+    m_hideTimer.stop();
+}
+
+void WindowGroup::deactivate(HideMode mode)
+{
+    if (m_active) {
+        m_active = false;
+
+        if (mode == HideImmediate) {
+            hideWindows();
+        } else {
+            m_hideTimer.start();
+        }
+    }
+}
+
+void WindowGroup::setupWindow(QWindow *window, Maliit::Position position)
+{
+    if (window) {
+        if (not containsWindow(window)) {
+            QWindow *parent = window->parent ();
+
+            if (parent and not containsWindow(parent)) {
+                qWarning () << "Plugin is misbehaving - tried to register a window with yet-unregistered parent!";
+                return;
+            }
+            m_window_list.append (WindowData(window, position));
+
+            window->setFlags (Qt::FramelessWindowHint |
+                              Qt::WindowStaysOnTopHint |
+                              Qt::WindowDoesNotAcceptFocus);
+
+            connect (window, SIGNAL (visibleChanged(bool)),
+                     this, SLOT (onVisibleChanged(bool)));
+            connect (window, SIGNAL (heightChanged(int)),
+                     this, SLOT (updateInputMethodArea()));
+            connect (window, SIGNAL (widthChanged(int)),
+                     this, SLOT (updateInputMethodArea()));
+            connect (window, SIGNAL (xChanged(int)),
+                     this, SLOT (updateInputMethodArea()));
+            connect (window, SIGNAL (yChanged(int)),
+                     this, SLOT (updateInputMethodArea()));
+            m_platform->setupInputPanel(window, position);
+            updateInputMethodArea();
+        }
+    }
+}
+
+void WindowGroup::setScreenRegion(const QRegion &region, QWindow *window)
+{
+    if (window == 0 && m_window_list.size() > 0) {
+        window = m_window_list.at(0).m_window.data();
+    }
+    m_platform->setInputRegion(window, region);
+}
+
+void WindowGroup::setInputMethodArea(const QRegion &region, QWindow *window)
+{
+    if (window == 0 && m_window_list.size() > 0) {
+        window = m_window_list.at(0).m_window.data();
+    }
+
+    for (int i = 0; i < m_window_list.size(); ++i) {
+        WindowData &data = m_window_list[i];
+        if (data.m_window == window) {
+            data.m_inputMethodArea = region;
+            break;
+        }
+    }
+
+    if (m_active) {
+        updateInputMethodArea();
+    }
+}
+
+void WindowGroup::setApplicationWindow(WId id)
+{
+    Q_FOREACH (const WindowData &data, m_window_list) {
+        if (data.m_window and not data.m_window->parent()) {
+            m_platform->setApplicationWindow(data.m_window, id);
+        }
+    }
+}
+
+void WindowGroup::onVisibleChanged(bool visible)
+{
+    if (m_active) {
+        updateInputMethodArea();
+    } else if (visible) {
+        QWindow *window = qobject_cast<QWindow*>(sender());
+
+        if (window) {
+            qWarning () << "An inactive plugin is misbehaving - tried to show a window!";
+            window->setVisible (false);
+        }
+    }
+}
+
+void WindowGroup::updateInputMethodArea()
+{
+    QRegion new_area;
+
+    Q_FOREACH (const WindowData &data, m_window_list) {
+        if (data.m_window and not data.m_window->parent() and
+            data.m_window->isVisible() and
+            not data.m_inputMethodArea.isEmpty()) {
+            new_area |= data.m_inputMethodArea.translated(data.m_window->position());
+        }
+    }
+
+    if (new_area != m_last_im_area) {
+        m_last_im_area = new_area;
+        Q_EMIT inputMethodAreaChanged(m_last_im_area);
+    }
+}
+
+bool WindowGroup::containsWindow(QWindow *window)
+{
+    Q_FOREACH (const WindowData &data, m_window_list) {
+        if (data.m_window == window) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void WindowGroup::hideWindows()
+{
+    m_hideTimer.stop();
+
+    Q_FOREACH (const WindowData &data, m_window_list) {
+        if (data.m_window) {
+            data.m_window->setVisible (false);
+        }
+    }
+    updateInputMethodArea();
+}
+
+} // namespace Maliit

=== added directory '.pc/0010-fix-building-with-g++-4.9.patch'
=== added directory '.pc/0010-fix-building-with-g++-4.9.patch/src'
=== added file '.pc/0010-fix-building-with-g++-4.9.patch/src/src.pro'
--- .pc/0010-fix-building-with-g++-4.9.patch/src/src.pro	1970-01-01 00:00:00 +0000
+++ .pc/0010-fix-building-with-g++-4.9.patch/src/src.pro	2014-08-04 15:52:39 +0000
@@ -0,0 +1,193 @@
+include(../config.pri)
+
+TOP_DIR = ..
+
+VERSION = $$MALIIT_ABI_VERSION
+TEMPLATE = lib
+TARGET = $$TOP_DIR/lib/$$MALIIT_PLUGINS_LIB
+
+# Input
+PLUGIN_HEADERS_PUBLIC = \
+        maliit/plugins/inputmethodplugin.h \
+        maliit/plugins/abstractinputmethod.h \
+        maliit/plugins/abstractinputmethodhost.h \
+        maliit/plugins/keyoverride.h \
+        maliit/plugins/keyoverridedata.h \
+        maliit/plugins/attributeextension.h \
+        maliit/plugins/extensionevent.h \
+        maliit/plugins/updateevent.h \
+        maliit/plugins/updatereceiver.h \
+        maliit/plugins/plugindescription.h \
+        maliit/plugins/subviewdescription.h \
+        maliit/plugins/abstractpluginsetting.h \
+
+PLUGIN_SOURCES += \
+        maliit/plugins/abstractinputmethod.cpp \
+        maliit/plugins/abstractinputmethodhost.cpp \
+        maliit/plugins/keyoverride.cpp \
+        maliit/plugins/keyoverridedata.cpp \
+        maliit/plugins/attributeextension.cpp \
+        maliit/plugins/extensionevent.cpp \
+        maliit/plugins/updateevent.cpp \
+        maliit/plugins/updatereceiver.cpp \
+        maliit/plugins/plugindescription.cpp \
+        maliit/plugins/subviewdescription.cpp \
+
+PLUGIN_HEADERS_PRIVATE += \
+        maliit/plugins/keyoverride_p.h \
+        maliit/plugins/attributeextension_p.h \
+        maliit/plugins/extensionevent_p.h \
+        maliit/plugins/updateevent_p.h \
+
+SERVER_HEADERS_PUBLIC += \
+        mimserver.h \
+
+SERVER_SOURCES += \
+        mimserver.cpp \
+
+SERVER_HEADERS_PRIVATE += \
+        mimpluginmanager.h \
+        mimpluginmanager_p.h \
+        minputmethodhost.h \
+        mattributeextensionid.h \
+        mattributeextensionmanager.h \
+        msharedattributeextensionmanager.h \
+        mimhwkeyboardtracker.h \
+        mimonscreenplugins.h \
+        mimsubviewoverride.h \
+        mimserveroptions.h \
+        windowgroup.h \
+        windowdata.h \
+        abstractplatform.h \
+        unknownplatform.h \
+
+SERVER_SOURCES += \
+        mimpluginmanager.cpp \
+        minputmethodhost.cpp \
+        mattributeextensionid.cpp \
+        mattributeextensionmanager.cpp \
+        msharedattributeextensionmanager.cpp \
+        mimonscreenplugins.cpp \
+        mimsubviewoverride.cpp \
+        mimserveroptions.cpp \
+        windowgroup.cpp \
+        windowdata.cpp \
+        abstractplatform.cpp \
+        unknownplatform.cpp \
+
+!noxcb {
+    SERVER_HEADERS_PRIVATE += xcbplatform.h
+    SERVER_SOURCES += xcbplatform.cpp
+    PKGCONFIG += xcb xcb-xfixes
+}
+
+wayland {
+    SERVER_HEADERS_PRIVATE += waylandplatform.h
+    SERVER_SOURCES += waylandplatform.cpp
+}
+
+SETTINGS_HEADERS_PRIVATE += \
+        mimsettingsqsettings.h \
+        mimsettings.h \
+
+SETTINGS_SOURCES += \
+        mimsettings.cpp \
+        mimsettingsqsettings.cpp \
+
+QUICK_HEADERS_PRIVATE += \
+        quick/maliitquick.h \
+        quick/inputmethodquick.h \
+        quick/inputmethodquickplugin.h \
+        quick/keyoverridequick.h \
+        quick/keyoverridequick_p.h \
+
+QUICK_SOURCES += \
+        quick/inputmethodquick.cpp \
+        quick/inputmethodquickplugin.cpp \
+        quick/keyoverridequick.cpp \
+
+!nohwkeyboard {
+    SERVER_HEADERS_PRIVATE += mimhwkeyboardtracker_p.h
+    SERVER_SOURCES += mimhwkeyboardtracker.cpp
+
+    enable-contextkit {
+        PKGCONFIG += contextsubscriber-1.0
+        DEFINES += HAVE_CONTEXTSUBSCRIBER
+    } else {
+        # libudev needed by non-contextkit MImHwKeyboardTracker
+        PKGCONFIG += libudev
+    }
+} else {
+    SERVER_SOURCES += mimhwkeyboardtracker_stub.cpp
+}
+
+HEADERS += \
+        $$PLUGIN_HEADERS_PUBLIC \
+        $$PLUGIN_HEADERS_PRIVATE \
+        $$SERVER_HEADERS_PUBLIC \
+        $$SERVER_HEADERS_PRIVATE \
+        $$SETTINGS_HEADERS_PRIVATE \
+        $$QUICK_HEADERS_PRIVATE
+
+SOURCES += \
+        $$PLUGIN_SOURCES \
+        $$SERVER_SOURCES \
+        $$SETTINGS_SOURCES \
+        $$QUICK_SOURCES
+
+CONFIG += link_pkgconfig
+QT = core gui gui-private dbus qml quick
+
+
+# coverage flags are off per default, but can be turned on via qmake COV_OPTION=on
+for(OPTION,$$list($$lower($$COV_OPTION))){
+    isEqual(OPTION, on){
+        QMAKE_CXXFLAGS += -ftest-coverage -fprofile-arcs -fno-elide-constructors
+        LIBS += -lgcov
+    }
+}
+
+OBJECTS_DIR = .obj
+MOC_DIR = .moc
+
+QMAKE_CLEAN += $$OBJECTS_DIR/*.gcno $$OBJECTS_DIR/*.gcda
+
+target.path += $$LIBDIR
+
+plugins_headers.path += $$INCLUDEDIR/$$MALIIT_PLUGINS_HEADER/maliit/plugins
+plugins_headers.files += $$PLUGIN_HEADERS_PUBLIC
+
+server_headers.path += $$INCLUDEDIR/$$MALIIT_SERVER_HEADER
+server_headers.files += $$SERVER_HEADERS_PUBLIC
+
+OTHER_FILES += \
+    maliit-server.pc.in \
+    maliit-plugins.pc.in \
+    libmaliit-plugins.pri
+
+OTHER_FILES += \
+    config.h.in \
+    maliit-plugins.prf.in \
+    maliit-defines.prf.in \
+
+outputFiles(config.h  maliit-defines.prf maliit-plugins.prf maliit-plugins.pc maliit-server.pc)
+
+install_pkgconfig.path = $${LIBDIR}/pkgconfig
+install_pkgconfig.files = \
+    $$OUT_PWD/MeegoImFramework.pc \
+    $$OUT_PWD/maliit-plugins.pc \
+    $$OUT_PWD/maliit-server.pc \
+
+install_prf.path = $$MALIIT_INSTALL_PRF
+install_prf.files = $$OUT_PWD/maliit-plugins.prf $$OUT_PWD/maliit-defines.prf
+
+INSTALLS += \
+    target \
+    plugins_headers \
+    server_headers \
+    install_prf \
+    install_pkgconfig \
+
+include($$TOP_DIR/weston-protocols/libmaliit-weston-protocols.pri)
+include($$TOP_DIR/connection/libmaliit-connection.pri)
+include($$TOP_DIR/common/libmaliit-common.pri)

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2014-06-02 15:26:38 +0000
+++ .pc/applied-patches	2014-08-04 15:52:39 +0000
@@ -6,3 +6,5 @@
 0006-fix_orientation_to_angle_mapping.patch
 0007-use_host_prefix_for_mkspecs.patch
 0008-qt5.3-fix.patch
+0009-update-input-region-when-hiding.patch
+0010-fix-building-with-g++-4.9.patch

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-02 15:26:38 +0000
+++ debian/changelog	2014-08-04 15:52:39 +0000
@@ -1,3 +1,13 @@
+maliit-framework (0.99.0+git20130615+97e8335-0ubuntu10) utopic; urgency=medium
+
+  * Ensure that input method area sizes are always updated when sent from the
+    keyboard plugin regardless of whether the keyboard is currently active.
+    This allows for hiding animations to correctly set the input method area 
+    whilst the keyboard is otherwise inactive.
+  * Fix building with g++ 4.9
+
+ -- Michael Sheldon <[e-mail]>  Mon, 04 Aug 2014 16:34:14 +0100
+
 maliit-framework (0.99.0+git20130615+97e8335-0ubuntu9) utopic; urgency=medium
   
   [ Timo Jyrinki ]

=== added file 'debian/patches/0009-update-input-region-when-hiding.patch'
--- debian/patches/0009-update-input-region-when-hiding.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0009-update-input-region-when-hiding.patch	2014-08-04 15:52:39 +0000
@@ -0,0 +1,25 @@
+Author: Michael Sheldon <[e-mail]>
+Forwarded: no
+Description: Update input method area when hiding the keyboard
+ This patch ensures that maliit continues to update the input method area after the
+ keyboard has been dismissed. This allows keyboard hiding animations to provide a
+ smooth transition between the showing and hiding states.
+
+Index: maliit-framework-0.99+git20130702+97e8335/src/windowgroup.cpp
+===================================================================
+--- maliit-framework-0.99.0+git20130615+97e8335.orig/src/windowgroup.cpp
++++ maliit-framework-0.99.0+git20130615+97e8335/src/windowgroup.cpp
+@@ -104,9 +104,10 @@ void WindowGroup::setInputMethodArea(con
+         }
+     }
+ 
+-    if (m_active) {
+-        updateInputMethodArea();
+-    }
++    // We should update the input method area regardless of whether we're still
++    // active or not, as keyboard hiding animations could be changing this 
++    // region after we've deactivated
++    updateInputMethodArea();
+ }
+ 
+ void WindowGroup::setApplicationWindow(WId id)

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-06-02 15:26:38 +0000
+++ debian/patches/series	2014-08-04 15:52:39 +0000
@@ -6,3 +6,5 @@
 0006-fix_orientation_to_angle_mapping.patch
 0007-use_host_prefix_for_mkspecs.patch
 0008-qt5.3-fix.patch
+0009-update-input-region-when-hiding.patch
+0010-fix-building-with-g++-4.9.patch

=== modified file 'src/src.pro'
--- src/src.pro	2013-07-23 19:47:04 +0000
+++ src/src.pro	2014-08-04 15:52:39 +0000
@@ -147,6 +147,10 @@
     }
 }
 
+# g++ 4.9 introduces a new check for unused functions that we wish to ignore
+# to avoid removing upstream code
+QMAKE_CXXFLAGS += -Wno-unused-function
+
 OBJECTS_DIR = .obj
 MOC_DIR = .moc
 

=== modified file 'src/windowgroup.cpp'
--- src/windowgroup.cpp	2013-07-23 19:47:04 +0000
+++ src/windowgroup.cpp	2014-08-04 15:52:39 +0000
@@ -104,9 +104,10 @@
         }
     }
 
-    if (m_active) {
-        updateInputMethodArea();
-    }
+    // We should update the input method area regardless of whether we're still
+    // active or not, as keyboard hiding animations could be changing this 
+    // region after we've deactivated
+    updateInputMethodArea();
 }
 
 void WindowGroup::setApplicationWindow(WId id)