UI: experimental keypad to replace android keypad

Author: chrisws

src/platform/android/app/build.gradle

@@ -2,15 +2,15 @@ apply plugin: 'com.android.application'
 
 android {
   // app can use the API features included in this API level and lower.
-  compileSdk 34
+  compileSdk 36
 
   // can override some attributes in main/AndroidManifest.xml
   defaultConfig {
     applicationId 'net.sourceforge.smallbasic'
     minSdkVersion 21
-    targetSdkVersion 34
-    versionCode 78
-    versionName '12.29'
+    targetSdkVersion 36
+    versionCode 79
+    versionName '12.30'
     resourceConfigurations += ['en']
   }
 

src/platform/android/jni/Application.mk

@@ -1,2 +1,3 @@
 APP_ABI := all
 APP_STL := c++_shared
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

src/platform/android/jni/editor.cpp

@@ -134,11 +134,17 @@ void Runtime::editSource(strlib::String loadPath, bool restoreOnExit) {
           redraw = false;
           break;
         case SB_KEY_F(1):
-          widget = helpWidget;
-          helpWidget->createKeywordIndex();
-          helpWidget->showPopup(-4, -2);
-          helpWidget->setFocus(true);
-          showStatus = false;
+          if (widget == helpWidget) {
+            // end help mode
+            widget = editWidget;
+            helpWidget->hide();
+            helpWidget->cancelMode();
+          } else {
+            widget = helpWidget;
+            helpWidget->createKeywordIndex();
+            helpWidget->showPopup(-4, -2);
+            helpWidget->setFocus(true);
+          }
           break;
         case SB_KEY_F(9):
         case SB_KEY_CTRL('r'):
@@ -148,17 +154,15 @@ void Runtime::editSource(strlib::String loadPath, bool restoreOnExit) {
           }
           break;
         case SB_KEY_CTRL('f'):
-          if (widget == helpWidget && helpWidget->searchMode()) {
-            // end searching
+          if (widget == helpWidget) {
+            // end help mode
             widget = editWidget;
             helpWidget->hide();
             helpWidget->cancelMode();
-            showStatus = false;
           } else {
             widget = helpWidget;
             helpWidget->createSearch(false);
             showHelpLineInput(helpWidget);
-            showStatus = true;
           }
           break;
         case SB_KEY_CTRL('s'):

src/ui/keypad.cpp

@@ -159,11 +159,11 @@ char Key::getKey(bool useShift) const {
   char result;
   KeyCode keyCode = useShift ? _alt : _key;
   switch (keyCode) {
-  case K_EXT1: result = 164; break;
-  case K_EXT2: result = 172; break;
-  case K_EXT3: result = 182; break;
-  case K_EXT4: result = 222; break;
-  case K_EXT5: result = 223; break;
+  case K_EXT1: result = (char)164; break;
+  case K_EXT2: result = (char)172; break;
+  case K_EXT3: result = (char)182; break;
+  case K_EXT4: result = (char)222; break;
+  case K_EXT5: result = (char)223; break;
   default:
     result = keyCode;
     break;
@@ -280,7 +280,7 @@ void Key::onClick(const bool useShift) const {
     event->key = SB_KEY_F(1);
     break;
   default:
-    event->key = getKey(useShift);
+    event->key = (unsigned char)getKey(useShift);
     break;
   }
   maPushEvent(event);

src/ui/keypad.h

@@ -18,7 +18,7 @@ using namespace strlib;
 #if defined(_SDL)
 // for cursor display
 #define HAS_HOVER true
-#define PADDING 8
+#define PADDING 6
 #else
 #define HAS_HOVER false
 #define PADDING 16

src/ui/textedit.cpp

@@ -425,9 +425,12 @@ char EditBuffer::getChar(int pos) const {
 }
 
 int EditBuffer::insertChars(int pos, const char *text, int num) {
+#if defined(_SDL)
   if (num == 1 && *text < 0) {
+    // avoid spurious keyboard characters
     return 0;
   }
+#endif
   int required = _len + num + 1;
   if (required >= _size) {
     _size += (required + GROW_SIZE);
@@ -542,7 +545,7 @@ void TextEditInput::completeWord(const char *word) {
     int start = wordStart();
     int end = _state.cursor;
     int len = end - start;
-    int insertLen = strlen(word) - len;
+    size_t insertLen = strlen(word) - len;
     int index = end == 0 ? 0 : end - 1;
     bool lastUpper = isupper(_buf._buffer[index]);
 
@@ -558,7 +561,7 @@ const char *TextEditInput::completeKeyword(int index) {
   const char *help = nullptr;
   char *selection = getWordBeforeCursor();
   if (selection != nullptr) {
-    int len = strlen(selection);
+    size_t len = strlen(selection);
     int count = 0;
     for (auto & i : keyword_help) {
       if (strncasecmp(selection, i.keyword, len) == 0 &&
@@ -1240,7 +1243,7 @@ void TextEditInput::calcMargin() {
 void TextEditInput::changeCase() {
   int start, end;
   char *selection = getSelection(&start, &end);
-  int len = strlen(selection);
+  size_t len = strlen(selection);
   enum { up, down, mixed } curcase = isupper(selection[0]) ? up : down;
 
   for (int i = 1; i < len; i++) {
@@ -1330,7 +1333,7 @@ void TextEditInput::editEnter() {
 
     // check whether the previous line was a comment
     char *buf = lineText(prevLineStart);
-    int length = strlen(buf);
+    size_t length = strlen(buf);
     int pos = 0;
     while (buf && (buf[pos] == ' ' || buf[pos] == '\t')) {
       pos++;
@@ -1498,7 +1501,7 @@ void TextEditInput::findMatchingBrace() {
 int TextEditInput::getCompletions(StringList *list, int max) {
   int count = 0;
   char *selection = getWordBeforeCursor();
-  unsigned len = selection != nullptr ? strlen(selection) : 0;
+  size_t len = selection != nullptr ? strlen(selection) : 0;
   if (len > 0) {
     for (int i = 0; i < keyword_help_len && count < max; i++) {
       if (strncasecmp(selection, keyword_help[i].keyword, len) == 0) {
@@ -2128,7 +2131,7 @@ void TextEditHelpWidget::createCompletionHelp() {
   reset(kCompletion);
 
   char *selection = _editor->getWordBeforeCursor();
-  int len = selection != nullptr ? strlen(selection) : 0;
+  size_t len = selection != nullptr ? strlen(selection) : 0;
   if (len > 0) {
     StringList words;
     for (auto & i : keyword_help) {
@@ -2353,7 +2356,7 @@ void TextEditHelpWidget::reset(HelpMode mode) {
 }
 
 bool TextEditHelpWidget::selected(MAPoint2d pt, int scrollX, int scrollY, bool &redraw) {
-  bool result = hasFocus();
+  bool result = hasFocus() && FormEditInput::overlaps(pt, scrollX, scrollY);
   if (result) {
     dragPage(pt.y, redraw);
   }