UI: experimental keypad to replace android keypad

- now toggles between 4 separate sub-keypad pages

Author: chrisws

src/ui/keycode.h

@@ -98,3 +98,7 @@ inline bool isExtended(KeyCode key) {
 inline bool isArrow(KeyCode key) {
   return key == K_LINE_UP || key == K_PAGE_UP || key == K_LINE_DOWN || key == K_PAGE_DOWN;
 }
+
+inline bool isRightMargin(KeyCode key) {
+  return key == K_ENTER || key == K_HELP || key == K_BACKSPACE;
+}

src/ui/keypad.cpp

@@ -164,7 +164,7 @@ KeypadDrawContext::KeypadDrawContext(int charWidth, int charHeight) :
 
 const KeypadImage *KeypadDrawContext::getImage(const RawKey &key) const {
   const KeypadImage *result;
-  switch (key._lower) {
+  switch (getKey(key)) {
   case K_CUT: result = &_cutImage; break;
   case K_COPY: result = &_copyImage; break;
   case K_PASTE: result = &_pasteImage; break;
@@ -188,6 +188,18 @@ void KeypadDrawContext::toggle() {
   _keySet = static_cast<Keyset>((_keySet + 1) % kSize);
 }
 
+KeyCode KeypadDrawContext::getKey(RawKey key) const {
+  KeyCode keyCode;
+  switch (_keySet) {
+    case kLower: keyCode = key._lower; break;
+    case kUpper: keyCode = key._upper; break;
+    case kNumber: keyCode = key._number; break;
+    case kSymbol: keyCode = key._symbol; break;
+    case kSize: keyCode = K_NULL; break;
+  }
+  return keyCode;
+}
+
 //
 // Key
 //
@@ -210,14 +222,7 @@ int Key::color(const KeypadTheme *theme) const {
 
 char Key::getKey(const KeypadDrawContext *context) const {
   char result;
-  KeyCode keyCode;
-
-  switch (context->_keySet) {
-  case kLower: keyCode = _key._lower; break;
-  case kUpper: keyCode = _key._upper; break;
-  case kNumber: keyCode = _key._number; break;
-  case kSymbol: keyCode = _key._symbol; break;
-  }
+  KeyCode keyCode = context->getKey(_key);
   switch (keyCode) {
   case K_EXT1: result = (char)164; break;
   case K_EXT2: result = (char)172; break;
@@ -305,7 +310,7 @@ void Key::onClick(const KeypadDrawContext *context) const {
   auto *event = new MAEvent();
   event->type = EVENT_TYPE_KEY_PRESSED;
   event->nativeKey = 0;
-  switch (_key._lower) {
+  switch (context->getKey(_key)) {
   case K_BACKSPACE:
     event->key = SB_KEY_BACKSPACE;
     break;
@@ -415,7 +420,7 @@ void Keypad::layout(int x, int y, int w, int h) {
       }
       Key *key = _keys[index++];
       int keyWidth = keyW;
-      if (key->_key._lower == K_ENTER || key->_key._lower == K_HELP || key->_key._lower == K_BACKSPACE) {
+      if (isRightMargin(key->_key._lower)) {
         keyWidth = _width - xPos;
       } else if (row == 0) {
         keyWidth = _width / cols;

src/ui/keypad.h

@@ -54,6 +54,7 @@ struct RawKey {
 struct KeypadDrawContext {
   explicit KeypadDrawContext(int charWidth, int charHeight);
   const KeypadImage *getImage(const RawKey &keycode) const;
+  KeyCode getKey(RawKey rawKey) const;
   void toggle();
 
   int _charWidth;

src/ui/textedit.cpp

@@ -2116,7 +2116,7 @@ void TextEditHelpWidget::clicked(int x, int y, bool pressed) {
   if (pressed && _buf._len > 0) {
     stb_textedit_click(&_buf, &_state, 0, (y - _y) + (_scroll * _charHeight));
     if (_mode == kHelpKeyword) {
-      if (x < (_x + _charWidth * 10)) {
+      if (x < (_x + _charWidth * 4)) {
         // allow scrolling from the right hand side
         toggleKeyword();
       } else {
@@ -2462,9 +2462,7 @@ void TextEditHelpWidget::buildKeywordIndex() {
     _buf.append("\n\n", 2);
     rows += 7;
     int scroll = ((_charHeight * rows) - (_height - _y)) / _charHeight;
-    if (scroll > 0) {
-      _scroll = scroll;
-    }
+    _scroll = scroll > 0 ? scroll : 0;
   } else {
     _scroll = 0;
   }