UI: ctrl+shift left or right arrow

Author: chrisws

src/common/keymap.h

@@ -51,10 +51,11 @@ extern "C" {
 #define SB_KEY_SF(x)    (0xFFE0+(x))
 
 // Control & Alt keys (parameter = capital character)
-#define SB_KEY_CTRL(c)     (0xF1000000 + (c))
-#define SB_KEY_ALT(c)      (0xF2000000 + (c))
-#define SB_KEY_CTRL_ALT(c) (0xF4000000 + (c))
-#define SB_KEY_SHIFT(c)    (0xF8000000 + (c))
+#define SB_KEY_CTRL(c)       (0xF1000000 + (c))
+#define SB_KEY_ALT(c)        (0xF2000000 + (c))
+#define SB_KEY_CTRL_ALT(c)   (0xF3000000 + (c))
+#define SB_KEY_SHIFT(c)      (0xF4000000 + (c))
+#define SB_KEY_SHIFT_CTRL(c) (0xF5000000 + (c))
 
 // keypad
 #define SB_KEY_KP_DIV     0xFFDA

src/platform/sdl/runtime.cpp

@@ -355,6 +355,9 @@ void Runtime::handleKeyEvent(MAEvent &event) {
     if ((event.nativeKey & KMOD_CTRL) &&
         (event.nativeKey & KMOD_ALT)) {
       event.key = SB_KEY_CTRL_ALT(event.key);
+    } else if ((event.nativeKey & KMOD_CTRL) &&
+               (event.nativeKey & KMOD_SHIFT)) {
+      event.key = SB_KEY_SHIFT_CTRL(event.key);
     } else if (event.nativeKey & KMOD_CTRL) {
       event.key = SB_KEY_CTRL(event.key);
     } else if (event.nativeKey & KMOD_ALT) {
@@ -461,7 +464,11 @@ void Runtime::pollEvents(bool blocking) {
           }
           if (maEvent == NULL &&
               ((ev.key.keysym.sym >= SDLK_KP_1 && ev.key.keysym.sym <= SDLK_KP_9) ||
-               (ev.key.keysym.mod & KMOD_CTRL) ||
+               ((ev.key.keysym.mod & KMOD_CTRL) &&
+                ev.key.keysym.sym != SDLK_LSHIFT &&
+                ev.key.keysym.sym != SDLK_RSHIFT &&
+                ev.key.keysym.sym != SDLK_LCTRL &&
+                ev.key.keysym.sym != SDLK_RCTRL) ||
                (ev.key.keysym.mod & KMOD_ALT))) {
             maEvent = new MAEvent();
             maEvent->type = EVENT_TYPE_KEY_PRESSED;

src/ui/textedit.cpp

@@ -644,6 +644,12 @@ bool TextEditInput::edit(int key, int screenWidth, int charWidth) {
   case SB_KEY_ENTER:
     editEnter();
     break;
+  case SB_KEY_SHIFT_CTRL(SB_KEY_LEFT):
+    selectNavigate(true);
+    break;
+  case SB_KEY_SHIFT_CTRL(SB_KEY_RIGHT):
+    selectNavigate(false);
+    break;
   case -1:
     return false;
     break;
@@ -796,6 +802,14 @@ bool TextEditInput::selected(MAPoint2d pt, int scrollX, int scrollY, bool &redra
   return focus;
 }
 
+void TextEditInput::selectNavigate(bool up) {
+  int start = _state.select_start == _state.select_end ? _state.cursor : _state.select_start;
+  _state.select_start = _state.select_end = _state.cursor;
+  stb_textedit_key(&_buf, &_state, up ? STB_TEXTEDIT_K_WORDLEFT : STB_TEXTEDIT_K_WORDRIGHT);
+  _state.select_start = start;
+  _state.select_end = _state.cursor;
+}
+
 char *TextEditInput::copy(bool cut) {
   int selectStart = MIN(_state.select_start, _state.select_end);
   int selectEnd = MAX(_state.select_start, _state.select_end);

src/ui/textedit.h

@@ -110,6 +110,7 @@ struct TextEditInput : public FormEditInput {
   char *getWordBeforeCursor();
   bool replaceNext(const char *text);
   int  getCompletions(StringList *list, int max);
+  void selectNavigate(bool up);
 
 protected:
   enum SyntaxState {
@@ -233,8 +234,8 @@ struct TextEditHelpWidget : public TextEditInput {
 #define STB_TEXTEDIT_K_PGUP       SB_KEY_PGUP
 #define STB_TEXTEDIT_K_PGDOWN     SB_KEY_PGDN
 #define STB_TEXTEDIT_NEWLINE      '\n'
-#define STB_TEXTEDIT_K_CONTROL    0xF1000000
-#define STB_TEXTEDIT_K_SHIFT      0xF8000000
+#define STB_TEXTEDIT_K_CONTROL    SB_KEY_CTRL(0)
+#define STB_TEXTEDIT_K_SHIFT      SB_KEY_SHIFT(0)
 #define STB_TEXTEDIT_GETWIDTH_NEWLINE 0.0f
 #define STB_TEXTEDIT_KEYTOTEXT(k) k
 #define STB_TEXTEDIT_STRINGLEN(o) o->_len