UI: experimental keypad to replace android keypad

- fixed some intellij issues

Author: chrisws

src/platform/android/jni/editor.cpp

@@ -87,6 +87,7 @@ void Runtime::editSource(strlib::String loadPath, bool restoreOnExit) {
 
   while (_state == kEditState) {
     MAEvent event = getNextEvent();
+    bool exitHelp = false;
     switch (event.type) {
     case EVENT_TYPE_POINTER_PRESSED:
       if (!showStatus && widget == editWidget && event.point.x < editWidget->getMarginWidth()) {
@@ -135,14 +136,11 @@ void Runtime::editSource(strlib::String loadPath, bool restoreOnExit) {
           break;
         case SB_KEY_F(1):
           if (widget == helpWidget) {
-            // end help mode
-            widget = editWidget;
-            helpWidget->hide();
-            helpWidget->cancelMode();
+            exitHelp = true;
           } else {
             widget = helpWidget;
-            helpWidget->createKeywordIndex();
             helpWidget->showPopup(-4, -2);
+            helpWidget->createKeywordIndex();
             helpWidget->setFocus(true);
           }
           break;
@@ -155,10 +153,7 @@ void Runtime::editSource(strlib::String loadPath, bool restoreOnExit) {
           break;
         case SB_KEY_CTRL('f'):
           if (widget == helpWidget) {
-            // end help mode
-            widget = editWidget;
-            helpWidget->hide();
-            helpWidget->cancelMode();
+            exitHelp = true;
           } else {
             widget = helpWidget;
             helpWidget->createSearch(false);
@@ -203,7 +198,7 @@ void Runtime::editSource(strlib::String loadPath, bool restoreOnExit) {
       }
     }
 
-    if (isBack() && widget == helpWidget) {
+    if ((exitHelp || isBack()) && widget == helpWidget) {
       widget = editWidget;
       helpWidget->hide();
       editWidget->setFocus(true);

src/ui/audio.cpp

@@ -9,8 +9,8 @@
 #define MINIAUDIO_IMPLEMENTATION
 
 #include "config.h"
-#include <stdio.h>
-#include <stdint.h>
+#include <cstdio>
+#include <cstdint>
 #include <unistd.h>
 #include "include/osd.h"
 #include "ui/strlib.h"
@@ -153,7 +153,7 @@ bool audio_open() {
     ma_backend_dsound,
 #endif
   };
-  if (ma_context_init(backends, sizeof(backends)/sizeof(backends[0]), NULL, &context) != MA_SUCCESS) {
+  if (ma_context_init(backends, sizeof(backends)/sizeof(backends[0]), nullptr, &context) != MA_SUCCESS) {
     result = false;
   } else {
     queuePos = 0;
@@ -170,7 +170,7 @@ void audio_close() {
 }
 
 void osd_audio(const char *path) {
-  Sound *sound = new Sound();
+  auto *sound = new Sound();
   ma_result result = sound->construct(path);
   if (result != MA_SUCCESS) {
     delete sound;
@@ -197,7 +197,7 @@ void osd_clear_sound_queue() {
   // remove any cached sounds from the queue
   List_each(Sound *, it, queue) {
     Sound *next = *it;
-    if (next != NULL && next->_decoder != nullptr) {
+    if (next != nullptr && next->_decoder != nullptr) {
       queue.remove(it);
       it--;
     }

src/ui/system.cpp

@@ -753,7 +753,7 @@ char *System::readSource(const char *fileName) {
   }
   if (buffer != nullptr) {
     delete [] _programSrc;
-    int len = strlen(buffer) + 1;
+    size_t len = strlen(buffer) + 1;
     _programSrc = new char[len];
     memcpy(_programSrc, buffer, len);
     _programSrc[len - 1] = '\0';

src/ui/textedit.cpp

@@ -2411,8 +2411,9 @@ void TextEditHelpWidget::buildKeywordIndex() {
   _buf.clear();
   _buf.append("SmallBASIC language reference\n\n");
   _buf.append("+ Select a category\n|\n");
+  int rows = 4;
 
-  keywordIterator([=](int index, int packageIndex, bool nextPackage) {
+  keywordIterator([&](int index, int packageIndex, bool nextPackage) {
     if (nextPackage) {
       const char *package = keyword_help[index].package;
       if (packageIndex < _packageIndex) {
@@ -2430,9 +2431,11 @@ void TextEditHelpWidget::buildKeywordIndex() {
       }
       _buf.append(package);
       _buf.append("\n", 1);
+      ++rows;
 
       if (_packageOpen && _packageIndex == packageIndex) {
         _buf.append("   |\n", 5);
+        ++rows;
       }
     }
 
@@ -2441,6 +2444,7 @@ void TextEditHelpWidget::buildKeywordIndex() {
       _buf.append(LEVEL2_OPEN, LEVEL2_LEN);
       _buf.append(keyword_help[index].keyword);
       _buf.append("\n", 1);
+      ++rows;
     }
 
     return true;
@@ -2456,10 +2460,15 @@ void TextEditHelpWidget::buildKeywordIndex() {
     _buf.append("\n\n", 2);
     _buf.append(keyword_help[_keywordIndex].help);
     _buf.append("\n\n", 2);
+    rows += 7;
+    int scroll = ((_charHeight * rows) - (_height - _y)) / _charHeight;
+    if (scroll > 0) {
+      _scroll = scroll;
+    }
+  } else {
+    _scroll = 0;
   }
-
   _cursorRow = getCursorRow();
-  _scroll = 0;
 }
 
 void TextEditHelpWidget::showPopup(int cols, int rows) {