iOS: move key/text input into separate category

Change-Id: I62c588226b307d51f7f88b1cc0c1e00c0d0f14c6
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>

4 files changed, 156 insertions, 104 deletions

diff --git a/src/plugins/platforms/ios/ios.pro b/src/plugins/platforms/ios/ios.pro
index cac44eaeba..175cc3f8bd 100644
--- a/src/plugins/platforms/ios/ios.pro
+++ b/src/plugins/platforms/ios/ios.pro
@@ -39,3 +39,5 @@ HEADERS = \
     qiosservices.h \
     quiview.h
 
+OTHER_FILES = \
+    quiview_textinput.mm
diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm
index 1b9433f3af..c25d6ba303 100644
--- a/src/plugins/platforms/ios/qioswindow.mm
+++ b/src/plugins/platforms/ios/qioswindow.mm
@@ -59,8 +59,19 @@
 
 #include <QtDebug>
 
+// Include category as an alternative to using -ObjC (Apple QA1490)
+#include "quiview_textinput.mm"
+
 @implementation QUIView
 
+@synthesize autocapitalizationType;
+@synthesize autocorrectionType;
+@synthesize enablesReturnKeyAutomatically;
+@synthesize keyboardAppearance;
+@synthesize keyboardType;
+@synthesize returnKeyType;
+@synthesize secureTextEntry;
+
 + (Class)layerClass
 {
     return [CAEAGLLayer class];
@@ -290,109 +301,6 @@
     QWindowSystemInterface::flushWindowSystemEvents();
 }
 
-@synthesize autocapitalizationType;
-@synthesize autocorrectionType;
-@synthesize enablesReturnKeyAutomatically;
-@synthesize keyboardAppearance;
-@synthesize keyboardType;
-@synthesize returnKeyType;
-@synthesize secureTextEntry;
-
-- (BOOL)canBecomeFirstResponder
-{
-    return YES;
-}
-
-- (BOOL)becomeFirstResponder
-{
-    // Note: QIOSInputContext controls our first responder status based on
-    // whether or not the keyboard should be open or closed.
-    [self updateTextInputTraits];
-    return [super becomeFirstResponder];
-}
-
-- (BOOL)resignFirstResponder
-{
-    // Resigning first responed status means that the virtual keyboard was closed, or
-    // some other view became first responder. In either case we clear the focus object to
-    // avoid blinking cursors in line edits etc:
-    if (m_qioswindow)
-        static_cast<QWindowPrivate *>(QObjectPrivate::get(m_qioswindow->window()))->clearFocusObject();
-    return [super resignFirstResponder];
-}
-
-- (BOOL)hasText
-{
-    return YES;
-}
-
-- (void)insertText:(NSString *)text
-{
-    QString string = QString::fromUtf8([text UTF8String]);
-    int key = 0;
-    if ([text isEqualToString:@"\n"]) {
-        key = (int)Qt::Key_Return;
-        if (self.returnKeyType == UIReturnKeyDone)
-            [self resignFirstResponder];
-    }
-
-    // Send key event to window system interface
-    QWindowSystemInterface::handleKeyEvent(
-        0, QEvent::KeyPress, key, Qt::NoModifier, string, false, int(string.length()));
-    QWindowSystemInterface::handleKeyEvent(
-        0, QEvent::KeyRelease, key, Qt::NoModifier, string, false, int(string.length()));
-}
-
-- (void)deleteBackward
-{
-    // Send key event to window system interface
-    QWindowSystemInterface::handleKeyEvent(
-        0, QEvent::KeyPress, (int)Qt::Key_Backspace, Qt::NoModifier);
-    QWindowSystemInterface::handleKeyEvent(
-        0, QEvent::KeyRelease, (int)Qt::Key_Backspace, Qt::NoModifier);
-}
-
-- (void)updateTextInputTraits
-{
-    // Ask the current focus object what kind of input it
-    // expects, and configure the keyboard appropriately:
-    QObject *focusObject = QGuiApplication::focusObject();
-    if (!focusObject)
-        return;
-    QInputMethodQueryEvent queryEvent(Qt::ImEnabled | Qt::ImHints);
-    if (!QCoreApplication::sendEvent(focusObject, &queryEvent))
-        return;
-    if (!queryEvent.value(Qt::ImEnabled).toBool())
-        return;
-
-    Qt::InputMethodHints hints = static_cast<Qt::InputMethodHints>(queryEvent.value(Qt::ImHints).toUInt());
-
-    self.returnKeyType = (hints & Qt::ImhMultiLine) ? UIReturnKeyDefault : UIReturnKeyDone;
-    self.secureTextEntry = BOOL(hints & Qt::ImhHiddenText);
-    self.autocorrectionType = (hints & Qt::ImhNoPredictiveText) ?
-                UITextAutocorrectionTypeNo : UITextAutocorrectionTypeDefault;
-
-    if (hints & Qt::ImhUppercaseOnly)
-        self.autocapitalizationType = UITextAutocapitalizationTypeAllCharacters;
-    else if (hints & Qt::ImhNoAutoUppercase)
-        self.autocapitalizationType = UITextAutocapitalizationTypeNone;
-    else
-        self.autocapitalizationType = UITextAutocapitalizationTypeSentences;
-
-    if (hints & Qt::ImhUrlCharactersOnly)
-        self.keyboardType = UIKeyboardTypeURL;
-    else if (hints & Qt::ImhEmailCharactersOnly)
-        self.keyboardType = UIKeyboardTypeEmailAddress;
-    else if (hints & Qt::ImhDigitsOnly)
-        self.keyboardType = UIKeyboardTypeNumberPad;
-    else if (hints & Qt::ImhFormattedNumbersOnly)
-        self.keyboardType = UIKeyboardTypeDecimalPad;
-    else if (hints & Qt::ImhDialableCharactersOnly)
-        self.keyboardType = UIKeyboardTypeNumberPad;
-    else
-        self.keyboardType = UIKeyboardTypeDefault;
-}
-
 @end
 
 @implementation UIView (QIOS)
diff --git a/src/plugins/platforms/ios/quiview.h b/src/plugins/platforms/ios/quiview.h
index deb34efe39..7a54da1321 100644
--- a/src/plugins/platforms/ios/quiview.h
+++ b/src/plugins/platforms/ios/quiview.h
@@ -42,7 +42,7 @@
 #import <UIKit/UIKit.h>
 #include "qioswindow.h"
 
-@interface QUIView : UIView <UIKeyInput>
+@interface QUIView : UIView
 {
 @public
     UITextAutocapitalizationType autocapitalizationType;
@@ -66,3 +66,6 @@
 @property(nonatomic, getter=isSecureTextEntry) BOOL secureTextEntry;
 
 @end
+
+@interface QUIView (TextInput) <UIKeyInput>
+@end
diff --git a/src/plugins/platforms/ios/quiview_textinput.mm b/src/plugins/platforms/ios/quiview_textinput.mm
new file mode 100644
index 0000000000..76d697dc19
--- /dev/null
+++ b/src/plugins/platforms/ios/quiview_textinput.mm
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used 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.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+@implementation QUIView (TextInput)
+
+- (BOOL)canBecomeFirstResponder
+{
+    return YES;
+}
+
+- (BOOL)becomeFirstResponder
+{
+    // Note: QIOSInputContext controls our first responder status based on
+    // whether or not the keyboard should be open or closed.
+    [self updateTextInputTraits];
+    return [super becomeFirstResponder];
+}
+
+- (BOOL)resignFirstResponder
+{
+    // Resigning first responed status means that the virtual keyboard was closed, or
+    // some other view became first responder. In either case we clear the focus object to
+    // avoid blinking cursors in line edits etc:
+    if (m_qioswindow)
+        static_cast<QWindowPrivate *>(QObjectPrivate::get(m_qioswindow->window()))->clearFocusObject();
+    return [super resignFirstResponder];
+}
+
+- (BOOL)hasText
+{
+    return YES;
+}
+
+- (void)insertText:(NSString *)text
+{
+    QString string = QString::fromUtf8([text UTF8String]);
+    int key = 0;
+    if ([text isEqualToString:@"\n"]) {
+        key = (int)Qt::Key_Return;
+        if (self.returnKeyType == UIReturnKeyDone)
+            [self resignFirstResponder];
+    }
+
+    // Send key event to window system interface
+    QWindowSystemInterface::handleKeyEvent(
+        0, QEvent::KeyPress, key, Qt::NoModifier, string, false, int(string.length()));
+    QWindowSystemInterface::handleKeyEvent(
+        0, QEvent::KeyRelease, key, Qt::NoModifier, string, false, int(string.length()));
+}
+
+- (void)deleteBackward
+{
+    // Send key event to window system interface
+    QWindowSystemInterface::handleKeyEvent(
+        0, QEvent::KeyPress, (int)Qt::Key_Backspace, Qt::NoModifier);
+    QWindowSystemInterface::handleKeyEvent(
+        0, QEvent::KeyRelease, (int)Qt::Key_Backspace, Qt::NoModifier);
+}
+
+- (void)updateTextInputTraits
+{
+    // Ask the current focus object what kind of input it
+    // expects, and configure the keyboard appropriately:
+    QObject *focusObject = QGuiApplication::focusObject();
+    if (!focusObject)
+        return;
+    QInputMethodQueryEvent queryEvent(Qt::ImEnabled | Qt::ImHints);
+    if (!QCoreApplication::sendEvent(focusObject, &queryEvent))
+        return;
+    if (!queryEvent.value(Qt::ImEnabled).toBool())
+        return;
+
+    Qt::InputMethodHints hints = static_cast<Qt::InputMethodHints>(queryEvent.value(Qt::ImHints).toUInt());
+
+    self.returnKeyType = (hints & Qt::ImhMultiLine) ? UIReturnKeyDefault : UIReturnKeyDone;
+    self.secureTextEntry = BOOL(hints & Qt::ImhHiddenText);
+    self.autocorrectionType = (hints & Qt::ImhNoPredictiveText) ?
+                UITextAutocorrectionTypeNo : UITextAutocorrectionTypeDefault;
+
+    if (hints & Qt::ImhUppercaseOnly)
+        self.autocapitalizationType = UITextAutocapitalizationTypeAllCharacters;
+    else if (hints & Qt::ImhNoAutoUppercase)
+        self.autocapitalizationType = UITextAutocapitalizationTypeNone;
+    else
+        self.autocapitalizationType = UITextAutocapitalizationTypeSentences;
+
+    if (hints & Qt::ImhUrlCharactersOnly)
+        self.keyboardType = UIKeyboardTypeURL;
+    else if (hints & Qt::ImhEmailCharactersOnly)
+        self.keyboardType = UIKeyboardTypeEmailAddress;
+    else if (hints & Qt::ImhDigitsOnly)
+        self.keyboardType = UIKeyboardTypeNumberPad;
+    else if (hints & Qt::ImhFormattedNumbersOnly)
+        self.keyboardType = UIKeyboardTypeDecimalPad;
+    else if (hints & Qt::ImhDialableCharactersOnly)
+        self.keyboardType = UIKeyboardTypeNumberPad;
+    else
+        self.keyboardType = UIKeyboardTypeDefault;
+}
+
+@end