UI: experimental keypad to replace android keypad

- added const declarations

Author: chrisws

src/platform/emcc/runtime.cpp

@@ -383,7 +383,7 @@ void Runtime::showCursor(CursorType cursorType) {
   }
 }
 
-void System::editSource(strlib::String loadPath, bool restoreOnExit) {
+void Runtime::editSource(strlib::String loadPath, bool restoreOnExit) {
   logEntered();
 
   strlib::String fileName;

src/platform/emcc/runtime.h

@@ -21,6 +21,7 @@ struct Runtime : public System {
   void browseFile(const char *url);
   char *getClipboardText();
   int  getFontSize() { return _output->getFontSize(); }
+  void editSource(String loadPath, bool restoreOnExit) override;
   void enableCursor(bool enabled) {}
   int  handle(int event);
   char *loadResource(const char *fileName);

src/platform/fltk/runtime.cxx

@@ -269,10 +269,6 @@ void Runtime::showCursor(CursorType cursorType) {
 //
 // System platform methods
 //
-void System::editSource(strlib::String loadPath, bool restoreOnExit) {
-  // empty
-}
-
 bool System::getPen3() {
   Fl::check();
   bool result = Fl::event_state(FL_BUTTON1);

src/platform/fltk/runtime.h

@@ -20,6 +20,7 @@ struct Runtime : public System {
   void alert(const char *title, const char *message);
   int ask(const char *title, const char *prompt, bool cancel=true);
   void browseFile(const char *url);
+  void editSource(String loadPath, bool restoreOnExit) override {}
   char *getClipboardText();
   int  getFontSize() { return _output->getFontSize(); }
   void enableCursor(bool enabled);

src/platform/sdl/editor.cpp

@@ -232,7 +232,7 @@ void Runtime::editSource(String loadPath, bool restoreOnExit) {
   if (_keypad != nullptr) {
     _output->addInput(_keypad);
   } else {
-    _keypad = new KeypadInput(false, false, charWidth, charHeight);
+    _keypad = new KeypadInput(false, true, charWidth, charHeight);
     _output->addInput(_keypad);
   }
 
@@ -329,7 +329,7 @@ void Runtime::editSource(String loadPath, bool restoreOnExit) {
           helpWidget->hide();
           helpWidget->cancelMode();
           statusMessage.setDirty(editWidget);
-          ((Runtime *)this)->debugStop();
+          Runtime::debugStop();
           break;
         case SB_KEY_CTRL('s'):
           saveFile(editWidget, loadPath);

src/platform/sdl/runtime.cpp

@@ -28,9 +28,7 @@
 #include <SDL3/SDL_messagebox.h>
 #include <SDL3/SDL_mutex.h>
 #include <SDL3/SDL_thread.h>
-#include <SDL3/SDL_timer.h>
-#include <math.h>
-#include <wchar.h>
+#include <cmath>
 
 #define WAIT_INTERVAL 5
 #define COND_WAIT_TIME 250
@@ -52,16 +50,16 @@ extern int g_debugPort;
 
 int debugThread(void *data);
 
-MAEvent *getMotionEvent(int type, SDL_Event *event) {
-  MAEvent *result = new MAEvent();
+MAEvent *getMotionEvent(int type, const SDL_Event *event) {
+  auto *result = new MAEvent();
   result->type = type;
   result->point.x = event->motion.x;
   result->point.y = event->motion.y;
   return result;
 }
 
 MAEvent *getKeyPressedEvent(int keycode, int nativeKey) {
-  MAEvent *result = new MAEvent();
+  auto *result = new MAEvent();
   result->type = EVENT_TYPE_KEY_PRESSED;
   result->key = keycode;
   result->nativeKey = nativeKey;
@@ -76,7 +74,8 @@ Runtime::Runtime(SDL_Window *window) :
   _window(window),
   _cursorHand(nullptr),
   _cursorArrow(nullptr),
-  _cursorIBeam(nullptr) {
+  _cursorIBeam(nullptr),
+  _keypad(nullptr) {
   runtime = this;
 }
 
@@ -119,8 +118,7 @@ int Runtime::ask(const char *title, const char *prompt, bool cancel) {
     buttons[2].buttonID = 2;
   }
 
-  SDL_MessageBoxData data;
-  memset(&data, 0, sizeof(SDL_MessageBoxData));
+  SDL_MessageBoxData data = {};
   data.window = _window;
   data.title = title;
   data.message = prompt;
@@ -194,9 +192,9 @@ void Runtime::debugStart(TextEditInput *editWidget, const char *file) {
     if (g_debugee != -1) {
       net_print(g_debugee, "l\n");
       char buf[OS_PATHNAME_SIZE + 1];
-      int size = net_input(g_debugee, buf, sizeof(buf), "\n");
+      const int size = net_input(g_debugee, buf, sizeof(buf), "\n");
       if (size > 0) {
-        int *marker = editWidget->getMarkers();
+        int *marker = TextEditInput::getMarkers();
         for (int i = 0; i < MAX_MARKERS; i++) {
           if (marker[i] != -1) {
             net_printf(g_debugee, "b %d\n", marker[i]);
@@ -258,7 +256,7 @@ void Runtime::enableCursor(bool enabled) {
   }
 }
 
-void Runtime::exportRun(const char *file) {
+void Runtime::exportRun(const char *file) const {
   launchExec(file);
   SDL_RaiseWindow(_window);
 }
@@ -347,7 +345,7 @@ char *Runtime::loadResource(const char *fileName) {
   return buffer;
 }
 
-void Runtime::handleKeyEvent(MAEvent &event) {
+void Runtime::handleKeyEvent(MAEvent &event) const {
   // handle keypad keys
   if (event.key != -1) {
     if (event.key == SDLK_NUMLOCKCLEAR) {
@@ -415,7 +413,7 @@ void Runtime::pause(int timeout) {
     }
   } else {
     int slept = 0;
-    while (1) {
+    while (true) {
       pollEvents(false);
       if (isBreak()) {
         break;
@@ -632,7 +630,7 @@ void Runtime::setWindowTitle(const char *title) {
     } else {
       slash++;
     }
-    int len = strlen(slash) + 16;
+    const int len = strlen(slash) + 16;
     char *buffer = new char[len];
     if (buffer) {
       sprintf(buffer, "%s - SmallBASIC", slash);
@@ -669,7 +667,7 @@ void Runtime::onResize(int width, int height) {
   }
 }
 
-SDL_Rect Runtime::getWindowRect() {
+SDL_Rect Runtime::getWindowRect() const {
   SDL_Rect result;
   if (_fullscreen) {
     result = _windowRect;
@@ -685,7 +683,7 @@ SDL_Rect Runtime::getWindowRect() {
   return result;
 }
 
-void Runtime::setWindowRect(SDL_Rect &rc) {
+void Runtime::setWindowRect(SDL_Rect &rc) const {
   SDL_GetWindowPosition(_window, &rc.x, &rc.y);
   SDL_GetWindowSize(_window, &rc.w, &rc.h);
 }
@@ -847,15 +845,15 @@ void restart() {
   g_debugTrace = false;
   g_breakPoints.removeAll();
 
-  MAEvent *event = new MAEvent();
+  auto *event = new MAEvent();
   event->type = EVENT_TYPE_RESTART;
   runtime->pushEvent(event);
   if (runtime->isThreadActive()) {
     // break out of waitForBack()
-    SDL_Event event;
-    event.type = SDL_EVENT_KEY_DOWN;
-    event.key.key = SDLK_BACKSPACE;
-    SDL_PushEvent(&event);
+    SDL_Event sdlEvent;
+    sdlEvent.type = SDL_EVENT_KEY_DOWN;
+    sdlEvent.key.key = SDLK_BACKSPACE;
+    SDL_PushEvent(&sdlEvent);
   }
 
   SDL_SignalCondition(g_cond);
@@ -958,7 +956,7 @@ extern "C" void dev_trace_line(int lineNo) {
         break;
       }
     }
-  } else if (!g_breakPoints.size() && g_debugTrace) {
+  } else if (g_breakPoints.empty() && g_debugTrace) {
     runtime->systemPrint("Trace line: %d", lineNo);
   }
   SDL_UnlockMutex(g_lock);

src/platform/sdl/runtime.h

@@ -29,16 +29,16 @@ struct Runtime final : System {
   int ask(const char *title, const char *prompt, bool cancel) override;
   void browseFile(const char *url) override;
   void construct(const char *font, const char *boldFont);
-  bool debugActive();
+  static bool debugActive();
   bool debugOpen(const char *file);
   void debugStart(TextEditInput *edit, const char *file);
   void debugStep(TextEditInput *edit, TextEditHelpWidget *help, bool cont);
-  void debugStop();
+  static void debugStop();
   void enableCursor(bool enabled) override;
-  void exportRun(const char *path);
+  void exportRun(const char *path) const;
   void redraw() const { _graphics->redraw(); }
   bool toggleFullscreen();
-  void handleKeyEvent(MAEvent &event);
+  void handleKeyEvent(MAEvent &event) const;
   bool hasEvent() const { return _eventQueue && !_eventQueue->empty(); }
   void pause(int timeout);
   void pollEvents(bool blocking);
@@ -53,13 +53,12 @@ struct Runtime final : System {
   void showCursor(CursorType cursorType) override;
   int runShell(const char *startupBas, bool once, int fontScale, int debugPort);
   char *loadResource(const char *fileName) override;
-  void logStack(int line, bool subOrFunc);
   void onResize(int w, int h);
   void onRunCompleted() override;
   void setClipboardText(const char *text) override;
   char *getClipboardText() override;
-  void setWindowRect(SDL_Rect &rect);
-  SDL_Rect getWindowRect();
+  void setWindowRect(SDL_Rect &rect) const;
+  SDL_Rect getWindowRect() const;
 
 private:
   void editSource(String loadPath, bool restoreOnExit) override;
@@ -73,7 +72,7 @@ struct Runtime final : System {
   SDL_Cursor *_cursorHand;
   SDL_Cursor *_cursorArrow;
   SDL_Cursor *_cursorIBeam;
-  KeypadInput *_keypad{};
+  KeypadInput *_keypad;
 };
 
 #endif

src/ui/graphics.cpp

@@ -96,7 +96,7 @@ Graphics::~Graphics() {
   _screen = nullptr;
 }
 
-Font *Graphics::createFont(int style, int size) {
+Font *Graphics::createFont(int style, int size) const {
   Font *result;
   bool italic = (style & FONT_STYLE_ITALIC);
   if (style & FONT_STYLE_BOLD) {
@@ -107,7 +107,7 @@ Font *Graphics::createFont(int style, int size) {
   return result;
 }
 
-void Graphics::deleteFont(Font *font) {
+void Graphics::deleteFont(const Font *font) {
   if (font == _font) {
     _font = nullptr;
   }
@@ -208,7 +208,7 @@ void Graphics::drawAaEllipse(int xc, int yc, int rx, int ry, bool fill) {
   }
 }
 
-void Graphics::drawLine(int startX, int startY, int endX, int endY) {
+void Graphics::drawLine(int startX, int startY, int endX, int endY) const {
   if (_drawTarget) {
     if (startY == endY) {
       // horizontal
@@ -271,13 +271,13 @@ void Graphics::drawLine(int startX, int startY, int endX, int endY) {
   }
 }
 
-void Graphics::drawPixel(int posX, int posY) {
+void Graphics::drawPixel(int posX, int posY) const {
   pixel_t *line = _drawTarget->getLine(posY);
   line[posX] = _drawColor;
 }
 
 void Graphics::drawRGB(const MAPoint2d *dstPoint, const void *src,
-                       const MARect *srcRect, int opacity, int stride) {
+                       const MARect *srcRect, int opacity, int stride) const {
   auto *image = (uint8_t *)src;
   float op = opacity / 100.0f;
   int top = srcRect->top;
@@ -316,7 +316,7 @@ void Graphics::drawRGB(const MAPoint2d *dstPoint, const void *src,
   }
 }
 
-void Graphics::drawChar(FT_Bitmap *bitmap, FT_Int x, FT_Int y) {
+void Graphics::drawChar(FT_Bitmap *bitmap, FT_Int x, FT_Int y) const {
   FT_Int xMax = x + bitmap->width;
   FT_Int yMax = y + bitmap->rows;
 
@@ -351,7 +351,7 @@ void Graphics::drawChar(FT_Bitmap *bitmap, FT_Int x, FT_Int y) {
   }
 }
 
-void Graphics::drawText(int left, int top, const char *str, int len) {
+void Graphics::drawText(int left, int top, const char *str, int len) const {
   if (_drawTarget && _font) {
     FT_Vector pen;
     pen.x = left;
@@ -367,7 +367,7 @@ void Graphics::drawText(int left, int top, const char *str, int len) {
   }
 }
 
-void Graphics::getImageData(Canvas *canvas, uint8_t *image, const MARect *srcRect, int stride) {
+void Graphics::getImageData(Canvas *canvas, uint8_t *image, const MARect *srcRect, int stride) const {
   size_t scale = 1;
   int x_end = srcRect->left + srcRect->width;
   int y_end = srcRect->top + srcRect->height;
@@ -389,7 +389,7 @@ void Graphics::getImageData(Canvas *canvas, uint8_t *image, const MARect *srcRec
   }
 }
 
-int Graphics::getPixel(Canvas *canvas, int posX, int posY) {
+int Graphics::getPixel(Canvas *canvas, int posX, int posY) const {
   int result = 0;
   if (canvas == HANDLE_SCREEN) {
     canvas = _screen;
@@ -411,7 +411,7 @@ int Graphics::getPixel(Canvas *canvas, int posX, int posY) {
   return result;
 }
 
-MAExtent Graphics::getTextSize(const char *str, int len) {
+MAExtent Graphics::getTextSize(const char *str, int len) const {
   int width = 0;
   int height = 0;
   if (_font) {
@@ -424,7 +424,7 @@ MAExtent Graphics::getTextSize(const char *str, int len) {
   return (MAExtent)((width << 16) + height);
 }
 
-void Graphics::setClip(int x, int y, int w, int h) {
+void Graphics::setClip(int x, int y, int w, int h) const {
   if (_drawTarget) {
     _drawTarget->setClip(x, y, w, h);
   }
@@ -444,7 +444,7 @@ MAHandle Graphics::setDrawTarget(MAHandle maHandle) {
 }
 
 // see: http://en.wikipedia.org/wiki/Xiaolin_Wu%27s_line_algorithm
-void Graphics::aaLine(int x0, int y0, int x1, int y1) {
+void Graphics::aaLine(int x0, int y0, int x1, int y1) const {
   int steep = abs(y1 - y0) > abs(x1 - x0);
 
   if (steep) {
@@ -507,7 +507,7 @@ void Graphics::aaLine(int x0, int y0, int x1, int y1) {
   }
 }
 
-void Graphics::aaPlot(int posX, int posY, double c) {
+void Graphics::aaPlot(int posX, int posY, double c) const {
   if (_drawTarget
       && posX >= _drawTarget->x()
       && posY >= _drawTarget->y()
@@ -527,7 +527,7 @@ void Graphics::aaPlot(int posX, int posY, double c) {
   }
 }
 
-void Graphics::aaPlotX8(int xc, int yc, int x, int y, double c, bool fill) {
+void Graphics::aaPlotX8(int xc, int yc, int x, int y, double c, bool fill) const {
   if (fill) {
     int x1 = xc + x;
     int x2 = xc - x;
@@ -548,7 +548,7 @@ void Graphics::aaPlotX8(int xc, int yc, int x, int y, double c, bool fill) {
 
 }
 
-void Graphics::aaPlotY8(int xc, int yc, int x, int y, double c, bool fill) {
+void Graphics::aaPlotY8(int xc, int yc, int x, int y, double c, bool fill) const {
   if (fill) {
     int x1 = xc + x;
     int x2 = xc - x;
@@ -575,7 +575,7 @@ void Graphics::plot4(int xc, int yc, int x, int y) {
   drawPixel(xc - x, yc - y);
 }
 
-void Graphics::line2(int xc, int yc, int x, int y) {
+void Graphics::line2(int xc, int yc, int x, int y) const {
   drawLine(xc - x, yc + y, xc + x, yc + y);
   drawLine(xc - x, yc - y, xc + x, yc - y);
 }