From d4799d02385ffd9bb4c0ba2c757059a70305daf0 Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Date: Fri, 28 Aug 2015 15:46:07 +0200
Subject: iOS: compose key events from QKeySequences
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of hard-coding the key and modifier that should trigger a
shortcut, we read it out from the QKeySequence that corresponds to
a StandardKey instead.

Change-Id: I6325534d3ff91c788d7e660d9009954e437b8534
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
---
 src/plugins/platforms/ios/qiostextresponder.mm | 28 +++++++++++++++++---------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'src/plugins/platforms/ios/qiostextresponder.mm')

diff --git a/src/plugins/platforms/ios/qiostextresponder.mm b/src/plugins/platforms/ios/qiostextresponder.mm
index 685ff8ff47..4e109f6921 100644
--- a/src/plugins/platforms/ios/qiostextresponder.mm
+++ b/src/plugins/platforms/ios/qiostextresponder.mm
@@ -333,65 +333,73 @@
 
 #ifndef QT_NO_SHORTCUT
 
+- (void)sendShortcut:(QKeySequence::StandardKey)standardKey
+{
+    const int keys = QKeySequence(standardKey)[0];
+    Qt::Key key = Qt::Key(keys & 0x0000FFFF);
+    Qt::KeyboardModifiers modifiers = Qt::KeyboardModifiers(keys & 0xFFFF0000);
+    [self sendKeyPressRelease:key modifiers:modifiers];
+}
+
 - (void)cut:(id)sender
 {
     Q_UNUSED(sender);
-    [self sendKeyPressRelease:Qt::Key_X modifiers:Qt::ControlModifier];
+    [self sendShortcut:QKeySequence::Cut];
 }
 
 - (void)copy:(id)sender
 {
     Q_UNUSED(sender);
-    [self sendKeyPressRelease:Qt::Key_C modifiers:Qt::ControlModifier];
+    [self sendShortcut:QKeySequence::Copy];
 }
 
 - (void)paste:(id)sender
 {
     Q_UNUSED(sender);
-    [self sendKeyPressRelease:Qt::Key_V modifiers:Qt::ControlModifier];
+    [self sendShortcut:QKeySequence::Paste];
 }
 
 - (void)selectAll:(id)sender
 {
     Q_UNUSED(sender);
-    [self sendKeyPressRelease:Qt::Key_A modifiers:Qt::ControlModifier];
+    [self sendShortcut:QKeySequence::SelectAll];
 }
 
 - (void)delete:(id)sender
 {
     Q_UNUSED(sender);
-    [self sendKeyPressRelease:Qt::Key_Delete modifiers:Qt::ControlModifier];
+    [self sendShortcut:QKeySequence::Delete];
 }
 
 - (void)toggleBoldface:(id)sender
 {
     Q_UNUSED(sender);
-    [self sendKeyPressRelease:Qt::Key_B modifiers:Qt::ControlModifier];
+    [self sendShortcut:QKeySequence::Bold];
 }
 
 - (void)toggleItalics:(id)sender
 {
     Q_UNUSED(sender);
-    [self sendKeyPressRelease:Qt::Key_I modifiers:Qt::ControlModifier];
+    [self sendShortcut:QKeySequence::Italic];
 }
 
 - (void)toggleUnderline:(id)sender
 {
     Q_UNUSED(sender);
-    [self sendKeyPressRelease:Qt::Key_U modifiers:Qt::ControlModifier];
+    [self sendShortcut:QKeySequence::Underline];
 }
 
 // -------------------------------------------------------------------------
 
 - (void)undo
 {
-    [self sendKeyPressRelease:Qt::Key_Z modifiers:Qt::ControlModifier];
+    [self sendShortcut:QKeySequence::Undo];
     [self rebuildUndoStack];
 }
 
 - (void)redo
 {
-    [self sendKeyPressRelease:Qt::Key_Z modifiers:Qt::ControlModifier|Qt::ShiftModifier];
+    [self sendShortcut:QKeySequence::Redo];
     [self rebuildUndoStack];
 }
 
-- 
cgit v1.2.3


From d75505faccc9a86d9e76932ae022b660e01ad1a5 Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Date: Tue, 8 Sep 2015 13:38:41 +0200
Subject: iOS: silence compiler warning about unimplemented
 'selectionRectsForRange'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implement a dummy method to silence the compiler.
After testing, this method seems to never be called. Which is
good, since the current IM API in Qt have little to offer to resolve
what is being asked. Until a need arise, we just return
an empty array.

Change-Id: I573eb8205a7e635a46d487ae175fb46e3a602001
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
---
 src/plugins/platforms/ios/qiostextresponder.mm | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/plugins/platforms/ios/qiostextresponder.mm')

diff --git a/src/plugins/platforms/ios/qiostextresponder.mm b/src/plugins/platforms/ios/qiostextresponder.mm
index 4e109f6921..c9120e848c 100644
--- a/src/plugins/platforms/ios/qiostextresponder.mm
+++ b/src/plugins/platforms/ios/qiostextresponder.mm
@@ -738,6 +738,15 @@
     return toCGRect(startRect.united(endRect));
 }
 
+- (NSArray *)selectionRectsForRange:(UITextRange *)range
+{
+    Q_UNUSED(range);
+    // This method is supposed to return a rectangle for each line with selection. Since we don't
+    // expose an API in Qt/IM for getting this information, and since we never seems to be getting
+    // a call from UIKit for this, we return an empty array until a need arise.
+    return [[NSArray new] autorelease];
+}
+
 - (CGRect)caretRectForPosition:(UITextPosition *)position
 {
     Q_UNUSED(position);
-- 
cgit v1.2.3