Refactor|libshell: Word jumping and key modifiers in AbstractLineEditor

skyjake · Jul 24, 2013 · 887dc30 · 887dc30
1 parent 5817be2
commit 887dc30
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 8 deletions.
diff --git a/doomsday/libshell/include/de/shell/abstractlineeditor.h b/doomsday/libshell/include/de/shell/abstractlineeditor.h
@@ -96,7 +96,16 @@ class LIBSHELL_PUBLIC AbstractLineEditor : public ITextEditor
 
     EchoMode echoMode() const;
 
-    virtual bool handleControlKey(int qtKey, bool controlMod = true);
+    enum KeyModifier {
+        Unmodified = 0,
+        Shift      = 0x1,
+        Control    = 0x2,
+        Alt        = 0x4,
+        Meta       = 0x8
+    };
+    Q_DECLARE_FLAGS(KeyModifiers, KeyModifier)
+
+    virtual bool handleControlKey(int qtKey, KeyModifiers const &mods = Unmodified);
 
     /**
      * Inserts a fragment of text at the cursor position. The cursor moves
@@ -129,6 +138,8 @@ class LIBSHELL_PUBLIC AbstractLineEditor : public ITextEditor
     DENG2_PRIVATE(d)
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(AbstractLineEditor::KeyModifiers)
+
 } // namespace shell
 } // namespace de
 

diff --git a/doomsday/libshell/include/de/shell/lineeditwidget.h b/doomsday/libshell/include/de/shell/lineeditwidget.h
@@ -54,7 +54,7 @@ class LIBSHELL_PUBLIC LineEditWidget : public TextWidget, public AbstractLineEdi
 
     Vector2i cursorPosition() const;
 
-    bool handleControlKey(int qtKey, bool controlMod = true);
+    bool handleControlKey(int qtKey, KeyModifiers const &mods = Unmodified);
 
     // Events.
     void viewResized();

diff --git a/doomsday/libshell/src/abstractlineeditor.cpp b/doomsday/libshell/src/abstractlineeditor.cpp
@@ -201,6 +201,37 @@ DENG2_PIMPL(AbstractLineEditor)
         }
     }
 
+    void doWordLeft()
+    {
+        acceptCompletion();
+
+        // First jump over any non-word chars.
+        while(cursor > 0 && !text[cursor].isLetterOrNumber()) cursor--;
+
+        // At least move one character.
+        if(cursor > 0) cursor--;
+
+        // We're inside a word, jump to its beginning.
+        while(cursor > 0 && text[cursor - 1].isLetterOrNumber()) cursor--;
+
+        self.cursorMoved();
+    }
+
+    void doWordRight()
+    {
+        int const last = text.size() - 1;
+
+        acceptCompletion();
+
+        // If inside a word, jump to its end.
+        while(cursor < last && text[cursor].isLetterOrNumber()) cursor++;
+
+        // Jump over any non-word chars.
+        while(cursor < last && !text[cursor].isLetterOrNumber()) cursor++;
+
+        self.cursorMoved();
+    }
+
     void doHome()
     {
         acceptCompletion();
@@ -434,8 +465,14 @@ AbstractLineEditor::EchoMode AbstractLineEditor::echoMode() const
     return d->echoMode;
 }
 
-bool AbstractLineEditor::handleControlKey(int qtKey, bool controlMod)
+bool AbstractLineEditor::handleControlKey(int qtKey, KeyModifiers const &mods)
 {
+#ifdef MACOSX
+#  define WORD_JUMP_MODIFIER    Alt
+#else
+#  define WORD_JUMP_MODIFIER    Control
+#endif
+
     switch(qtKey)
     {
     case Qt::Key_Backspace:
@@ -447,11 +484,39 @@ bool AbstractLineEditor::handleControlKey(int qtKey, bool controlMod)
         return true;
 
     case Qt::Key_Left:
-        d->doLeft();
+#ifdef MACOSX
+        if(mods.testFlag(Control))
+        {
+            d->doHome();
+            return true;
+        }
+#endif
+        if(mods.testFlag(WORD_JUMP_MODIFIER))
+        {
+            d->doWordLeft();
+        }
+        else
+        {
+            d->doLeft();
+        }
         return true;
 
     case Qt::Key_Right:
-        d->doRight();
+#ifdef MACOSX
+        if(mods.testFlag(Control))
+        {
+            d->doEnd();
+            return true;
+        }
+#endif
+        if(mods.testFlag(WORD_JUMP_MODIFIER))
+        {
+            d->doWordRight();
+        }
+        else
+        {
+            d->doRight();
+        }
         return true;
 
     case Qt::Key_Home:
@@ -471,7 +536,7 @@ bool AbstractLineEditor::handleControlKey(int qtKey, bool controlMod)
         break;
 
     case Qt::Key_K:
-        if(controlMod)
+        if(mods.testFlag(Control))
         {
             d->killEndOfLine();
             return true;

diff --git a/doomsday/libshell/src/lineeditwidget.cpp b/doomsday/libshell/src/lineeditwidget.cpp
@@ -130,9 +130,9 @@ bool LineEditWidget::handleEvent(Event const &event)
     return TextWidget::handleEvent(event);
 }
 
-bool LineEditWidget::handleControlKey(int qtKey, bool controlMod)
+bool LineEditWidget::handleControlKey(int qtKey, KeyModifiers const &mods)
 {
-    if(AbstractLineEditor::handleControlKey(qtKey, controlMod))
+    if(AbstractLineEditor::handleControlKey(qtKey, mods))
     {
         if(qtKey == Qt::Key_Enter)
         {