Merge lp:~schwann/ubuntu-keyboard/keyboard-delete-words into lp:ubuntu-keyboard

[Günter Schwann]

After holding the backspace for a while, remove whole words

After holding the backspace for a while, remove whole words

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:84
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/179/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/7

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/179/rebuild

review: Approve (continuous-integration)

[lp:~schwann/ubuntu-keyboard/keyboard-delete-words]

85. By Günter Schwann on 2013-10-24

Always keep sending at least one backspace

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/184/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-trusty-i386-ci/12

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-keyboard-ci/184/rebuild

review: Approve (continuous-integration)

[Thomas Moenicke (thomas-moenicke)]

tested on the device, I confirm deleting first characters, later entire words is working (messaging app + notes-app)
code looks good, thanks!

review: Approve

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2013-10-21 13:21:28 +0000
+++ src/plugin/inputmethod.cpp	2013-10-24 07:15:22 +0000
@@ -385,6 +385,14 @@
     if (emitPredictionEnabled)
         Q_EMIT predictionEnabledChanged();
 
+    QString text;
+    int position;
+    bool ok = d->host->surroundingText(text, position);
+    if (ok) {
+        d->editor.text()->setSurrounding(text);
+        d->editor.text()->setSurroundingOffset(position);
+    }
+
     updateAutoCaps();
 }
 

=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2013-10-07 14:46:39 +0000
+++ src/view/abstracttexteditor.cpp	2013-10-24 07:15:22 +0000
@@ -35,6 +35,8 @@
 #include "logic/chineselanguagefeatures.h"
 #include "logic/languagefeatures.h"
 
+#include <QElapsedTimer>
+
 namespace MaliitKeyboard {
 
 //! \class EditorOptions
@@ -263,13 +265,16 @@
 
 EditorOptions::EditorOptions()
     : backspace_auto_repeat_delay(500)
-    , backspace_auto_repeat_interval(300)
+    , backspace_auto_repeat_interval(200)
+    , backspace_word_delay(3000)
+    , backspace_word_interval(400)
 {}
 
 class AbstractTextEditorPrivate
 {
 public:
     QTimer auto_repeat_backspace_timer;
+    QElapsedTimer backspace_hold_timer;
     bool backspace_sent;
     EditorOptions options;
     QScopedPointer<Model::Text> text;
@@ -389,6 +394,7 @@
 
         commitPreedit();
         d->auto_repeat_backspace_timer.start(d->options.backspace_auto_repeat_delay);
+        d->backspace_hold_timer.restart();
     }
 }
 
@@ -666,10 +672,55 @@
 {
     Q_D(AbstractTextEditor);
 
+    if (d->backspace_hold_timer.elapsed() < d->options.backspace_word_delay) {
+        QKeyEvent ev(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier);
+        sendKeyEvent(ev);
+        d->backspace_sent = true;
+        d->auto_repeat_backspace_timer.start(d->options.backspace_auto_repeat_interval);
+    } else {
+        autoRepeatWordBackspace();
+    }
+}
+
+/*!
+ * \brief AbstractTextEditor::autoRepeatWordBackspace same as autoRepeatBackspace()
+ * but deletes whole words
+ */
+void AbstractTextEditor::autoRepeatWordBackspace()
+{
+    Q_D(AbstractTextEditor);
+
     QKeyEvent ev(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier);
-    sendKeyEvent(ev);
+
+    if (d->text->surroundingOffset() > 0) {
+        QString word = wordLeftOfCursor();
+        for (int i=0; i<word.length(); ++i)
+            sendKeyEvent(ev);
+    } else {
+        sendKeyEvent(ev);
+    }
+
     d->backspace_sent = true;
-    d->auto_repeat_backspace_timer.start(d->options.backspace_auto_repeat_interval);
+    d->auto_repeat_backspace_timer.start(d->options.backspace_word_interval);
+}
+
+/*!
+ * \brief AbstractTextEditor::wordLeftOfCursor returns the word that is left to
+ * to the cursor
+ * \return
+ */
+QString AbstractTextEditor::wordLeftOfCursor() const
+{
+    Q_D(const AbstractTextEditor);
+
+    const QString leftSurrounding = d->text->surroundingLeft();
+    int idx = leftSurrounding.length() - 1;
+    while (idx >= 0 && !isSeparator(leftSurrounding.at(idx))) {
+        --idx;
+    }
+    int length = d->text->surroundingOffset() - idx;
+
+    return leftSurrounding.right(length);
 }
 
 //! \brief Emits wordCandidatesChanged() signal with current preedit

=== modified file 'src/view/abstracttexteditor.h'
--- src/view/abstracttexteditor.h	2013-07-19 12:05:07 +0000
+++ src/view/abstracttexteditor.h	2013-10-24 07:15:22 +0000
@@ -49,6 +49,8 @@
     // all delays are in milliseconds
     int backspace_auto_repeat_delay; // delay before first automatically repeated key
     int backspace_auto_repeat_interval; // interval between automatically repeated keys
+    int backspace_word_delay; // delay before first automatically delete whole words
+    int backspace_word_interval; // interval between deleting word on while pressing the backspace
 };
 
 class AbstractTextEditorPrivate;
@@ -156,6 +158,8 @@
 
     void commitPreedit();
     Q_SLOT void autoRepeatBackspace();
+    void autoRepeatWordBackspace();
+    QString wordLeftOfCursor() const;
 };
 
 } // namespace MaliitKeyboard