Merge lp:~michael-sheldon/ubuntu-keyboard/swipe-cursor-vivid into lp:ubuntu-keyboard/vivid

[Michael Sheldon]

Implement swipe based cursor movement after long pressing on the space key

Implement swipe based cursor movement after long pressing on the space key

[lp:~michael-sheldon/ubuntu-keyboard/swipe-cursor-vivid]

527. By Michael Sheldon on 2017-01-09

Implement swipe based cursor movement after long pressing on the space key

528. By Michael Sheldon on 2017-01-10

Fix position calculation for swipe cursor movement after releasing and swiping a second time

529. By Michael Sheldon on 2017-01-11

Wait until cursor movement has stopped to trigger autocaps

530. By Michael Sheldon on 2017-01-11

Reduce cursor swipe timeout duration to 400ms

Unmerged revisions

530. By Michael Sheldon on 2017-01-11

Reduce cursor swipe timeout duration to 400ms

529. By Michael Sheldon on 2017-01-11

Wait until cursor movement has stopped to trigger autocaps

528. By Michael Sheldon on 2017-01-10

Fix position calculation for swipe cursor movement after releasing and swiping a second time

527. By Michael Sheldon on 2017-01-09

Implement swipe based cursor movement after long pressing on the space key

=== modified file 'qml/Keyboard.qml'
--- qml/Keyboard.qml	2016-08-02 12:05:45 +0000
+++ qml/Keyboard.qml	2017-01-11 14:04:26 +0000
@@ -42,6 +42,12 @@
     property bool landscape: width > height
     readonly property bool tablet: landscape ? width >= units.gu(90) : height >= units.gu(90)
 
+    property bool cursorSwipe: false
+    property int prevSwipePositionX
+    property int prevSwipePositionY
+    property int cursorSwipeDuration: 400
+    property var timerSwipe: swipeTimer
+    
     property variant input_method: maliit_input_method
     property variant event_handler: maliit_event_handler
 
@@ -253,7 +259,7 @@
         Connections {
             target: input_method
             onActivateAutocaps: {
-                if (keypad.state == "CHARACTERS" && keypad.activeKeypadState != "CAPSLOCK") {
+                if (keypad.state == "CHARACTERS" && keypad.activeKeypadState != "CAPSLOCK" && !cursorSwipe) {
                     keypad.activeKeypadState = "SHIFTED";
                     keypad.autoCapsTriggered = true;
                 } else {
@@ -273,8 +279,51 @@
             }
         }
 
+        MouseArea {
+            id: cursorSwipeArea
+            anchors.fill: parent
+            enabled: cursorSwipe
+
+            Rectangle {
+                anchors.fill: parent
+                visible: parent.enabled
+                color: UI.charKeyPressedColor
+                opacity: 0.5
+            }
+
+            onMouseXChanged: {
+                processSwipe(mouseX, mouseY)
+            }
+
+            onPressed: {
+                prevSwipePositionX = mouseX
+                prevSwipePositionY = mouseY
+                fullScreenItem.timerSwipe.stop()
+            }
+
+            onReleased: {
+                fullScreenItem.timerSwipe.restart()
+            }
+        }
+
     } // canvas
 
+    Timer {
+        id: swipeTimer
+        interval: cursorSwipeDuration
+        running: false
+        onTriggered: {
+            fullScreenItem.cursorSwipe = false
+            // We only enable autocaps after cursor movement has stopped
+            if (keypad.delayedAutoCaps) {
+                keypad.activeKeypadState = "SHIFTED"
+                keypad.delayedAutoCaps = false
+            } else {
+                keypad.activeKeypadState = "NORMAL"
+            }
+        }
+    }
+
     function reportKeyboardVisibleRect() {
 
         var vx = 0;
@@ -318,4 +367,21 @@
         event_handler.onKeyReleased("", "end");
     }
 
+    function processSwipe(positionX, positionY) {
+        if (positionX < prevSwipePositionX - units.gu(1) && input_method.surroundingLeft != "") {
+            sendLeftKey();
+            prevSwipePositionX = positionX
+        } else if (positionX > prevSwipePositionX + units.gu(1) && input_method.surroundingRight != "") {
+            sendRightKey();
+            prevSwipePositionX = positionX
+        }
+        if (positionY < prevSwipePositionY - units.gu(4)) {
+            sendUpKey();
+            prevSwipePositionY = positionY
+        } else if (positionY > prevSwipePositionY + units.gu(4)) {
+            sendDownKey();
+            prevSwipePositionY = positionY
+        }
+    }
+
 } // fullScreenItem

=== modified file 'qml/keys/SpaceKey.qml'
--- qml/keys/SpaceKey.qml	2016-04-18 15:23:00 +0000
+++ qml/keys/SpaceKey.qml	2017-01-11 14:04:26 +0000
@@ -30,6 +30,8 @@
     action: "space"
     switchBackFromSymbols: true
 
+    overridePressArea: true
+
     Label {
         anchors.centerIn: parent
         anchors.verticalCenterOffset: -parent.rowMargin / 2 - units.gu(0.15)
@@ -40,4 +42,37 @@
         text: Languages.languageIdToName(maliit_input_method.activeLanguage)
         horizontalAlignment: Text.AlignHCenter
     }
+
+    MouseArea {
+        id: swipeArea
+        anchors.fill: parent
+
+        onPressAndHold: {
+            fullScreenItem.cursorSwipe = true
+            spaceKey.currentlyPressed = false
+        }
+
+        onPressed: {
+            spaceKey.currentlyPressed = true
+            fullScreenItem.timerSwipe.stop()
+        }
+        onReleased: {
+            if (fullScreenItem.cursorSwipe) {
+                fullScreenItem.timerSwipe.restart()
+            } else {
+                spaceKey.currentlyPressed = false
+                event_handler.onKeyReleased("", "space")
+                if (switchBackFromSymbols && panel.state === "SYMBOLS") {
+                    panel.state = "CHARACTERS"
+                }
+            }
+        }
+
+        onMouseXChanged: {
+            if (fullScreenItem.cursorSwipe) {
+                fullScreenItem.processSwipe(mouseX, mouseY);
+            }
+        }
+    }
+
 }

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2016-10-12 12:43:45 +0000
+++ src/plugin/inputmethod.cpp	2017-01-11 14:04:26 +0000
@@ -670,6 +670,18 @@
     d->editor.setCursorPosition(pos);
 }
 
+QString InputMethod::surroundingLeft()
+{
+    Q_D(InputMethod);
+    return d->editor.text()->surroundingLeft();
+}
+
+QString InputMethod::surroundingRight()
+{
+    Q_D(InputMethod);
+    return d->editor.text()->surroundingRight();
+}
+
 bool InputMethod::languageIsSupported(const QString plugin) {
     Q_D(const InputMethod);
     foreach(QString pluginPath, d->pluginPaths) {

=== modified file 'src/plugin/inputmethod.h'
--- src/plugin/inputmethod.h	2015-08-15 06:10:39 +0000
+++ src/plugin/inputmethod.h	2017-01-11 14:04:26 +0000
@@ -61,6 +61,8 @@
     Q_PROPERTY(QString currentPluginPath READ currentPluginPath NOTIFY currentPluginPathChanged)
     Q_PROPERTY(QString preedit READ preedit WRITE replacePreedit NOTIFY preeditChanged)
     Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition NOTIFY cursorPositionChanged)
+    Q_PROPERTY(QString surroundingLeft READ surroundingLeft)
+    Q_PROPERTY(QString surroundingRight READ surroundingRight)
 
     Q_ENUMS(TextContentType)
 
@@ -135,6 +137,9 @@
 
     QObject* actionKeyOverride() const;
 
+    QString surroundingLeft();
+    QString surroundingRight();
+
     Q_SLOT void close();
 
     Q_INVOKABLE bool languageIsSupported(const QString plugin);