UI: experimental keypad to replace android keypad

Author: chrisws

src/platform/android/jni/editor.cpp

@@ -13,13 +13,11 @@
 #include "common/device.h"
 #include "ui/keypad.h"
 
-extern Runtime *runtime;
-
 void showHelpLineInput(TextEditHelpWidget *helpWidget, int width = 35) {
   helpWidget->showPopup(width, 1);
 }
 
-void System::editSource(strlib::String loadPath, bool restoreOnExit) {
+void Runtime::editSource(strlib::String loadPath, bool restoreOnExit) {
   logEntered();
 
   strlib::String fileName;
@@ -60,19 +58,25 @@ void System::editSource(strlib::String loadPath, bool restoreOnExit) {
   _output->clearScreen();
   _output->addInput(editWidget);
   _output->addInput(helpWidget);
-  _output->addInput(new KeypadInput(false, false, charWidth, charHeight));
+
+  if (_keypad != nullptr) {
+    _output->addInput(_keypad);
+  } else {
+    _keypad = new KeypadInput(false, false, charWidth, charHeight);
+    _output->addInput(_keypad);
+  }
 
   // to layout inputs
   _output->resize(w, h);
 
   if (gsb_last_line && isBreak()) {
     String msg = "Break at line: ";
     msg.append(gsb_last_line);
-    runtime->alert(msg);
+    alert(msg);
   } else if (gsb_last_error && !isBack()) {
     // program stopped with an error
     editWidget->setCursorRow(gsb_last_line + editWidget->getSelectionRow() - 1);
-    runtime->alert(gsb_last_errmsg);
+    alert(gsb_last_errmsg);
   }
 
   bool showStatus = !editWidget->getScroll();
@@ -89,11 +93,6 @@ void System::editSource(strlib::String loadPath, bool restoreOnExit) {
         _output->setStatus(editWidget->isDirty() ? dirtyFile : cleanFile);
         _output->redraw();
         showStatus = true;
-      } else if (widget == helpWidget && helpWidget->searchMode()) {
-        // end searching
-        widget = editWidget;
-        helpWidget->hide();
-        helpWidget->cancelMode();
       }
       break;
     case EVENT_TYPE_POINTER_RELEASED:
@@ -149,9 +148,18 @@ void System::editSource(strlib::String loadPath, bool restoreOnExit) {
           }
           break;
         case SB_KEY_CTRL('f'):
-          widget = helpWidget;
-          helpWidget->createSearch(false);
-          showHelpLineInput(helpWidget);
+          if (widget == helpWidget && helpWidget->searchMode()) {
+            // end searching
+            widget = editWidget;
+            helpWidget->hide();
+            helpWidget->cancelMode();
+            showStatus = false;
+          } else {
+            widget = helpWidget;
+            helpWidget->createSearch(false);
+            showHelpLineInput(helpWidget);
+            showStatus = true;
+          }
           break;
         case SB_KEY_CTRL('s'):
           saveFile(editWidget, loadPath);
@@ -222,13 +230,17 @@ void System::editSource(strlib::String loadPath, bool restoreOnExit) {
     if (!_output->removeInput(editWidget)) {
       trace("Failed to remove editor input");
     }
+    if (!_output->removeInput(_keypad)) {
+      trace("Failed to remove keypad input");
+    }
     _editor = editWidget;
     _editor->setFocus(false);
   } else {
     _editor = nullptr;
+    _keypad = nullptr;
   }
 
-  // deletes editWidget unless it has been removed
+  // deletes editWidget and _keypad unless it has been removed
   _output->removeInputs();
   if (!isClosing() && restoreOnExit) {
     _output->selectScreen(prevScreenId);

src/platform/android/jni/runtime.cpp

@@ -219,7 +219,8 @@ Runtime::Runtime(android_app *app) :
   _graphics(nullptr),
   _app(app),
   _eventQueue(nullptr),
-  _sensorEventQueue(nullptr) {
+  _sensorEventQueue(nullptr),
+  _keypad(nullptr) {
   _app->userData = nullptr;
   _app->onAppCmd = handleCommand;
   _app->onInputEvent = handleInput;
@@ -240,10 +241,12 @@ Runtime::~Runtime() {
   delete _output;
   delete _eventQueue;
   delete _graphics;
+  delete _keypad;
   runtime = nullptr;
   _output = nullptr;
   _eventQueue = nullptr;
   _graphics = nullptr;
+  _keypad = nullptr;
   pthread_mutex_destroy(&_mutex);
   disableSensor();
 }
@@ -770,7 +773,7 @@ void Runtime::handleKeyEvent(MAEvent &event) {
           break;
         }
       }
-    } else if (event.nativeKey < 127 && event.nativeKey != event.key) {
+    } else if (event.nativeKey != 0 && event.nativeKey < 127 && event.nativeKey != event.key) {
       // avoid translating keys send from onUnicodeChar
       event.key = getUnicodeChar(event.nativeKey, event.key);
     }
@@ -853,7 +856,9 @@ MAEvent Runtime::processEvents(int waitFlag) {
   case 1:
     // wait for an event
     _output->flush(true);
-    pollEvents(true);
+    if (!hasEvent()) {
+      pollEvents(true);
+    }
     break;
   case 2:
     _output->flush(false);

src/platform/android/jni/runtime.h

@@ -11,6 +11,7 @@
 
 #include "config.h"
 #include "ui/system.h"
+#include "ui/keypad.h"
 #include "platform/android/jni/display.h"
 #include "platform/android/jni/audio.h"
 
@@ -68,7 +69,7 @@ struct Runtime : public System {
   void share(const char *path) override { setString("share", path); }
   void showCursor(CursorType cursorType) override {}
   void showKeypad(bool show);
-  void onPaused(bool paused) { if (_graphics != NULL) _graphics->onPaused(paused); }
+  void onPaused(bool paused) { if (_graphics != nullptr) _graphics->onPaused(paused); }
   void onResize(int w, int h);
   void onRunCompleted() override;
   void onUnicodeChar(int ch);
@@ -83,6 +84,8 @@ struct Runtime : public System {
   int  getFontId();
 
 private:
+  void editSource(String loadPath, bool restoreOnExit) override;
+
   bool _keypadActive;
   bool _hasFocus;
   Graphics *_graphics;
@@ -94,6 +97,7 @@ struct Runtime : public System {
   const ASensor * _sensors[MAX_SENSORS]{};
   ASensorEventQueue *_sensorEventQueue;
   Audio _audio;
+  KeypadInput *_keypad;
 };
 
 #endif