UI: experimental keypad to replace android keypad

chrisws · chrisws · commit 2709c3fb9826 · 2025-06-08T19:54:03.000+09:30
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,12 +7,13 @@
 
 set(VERSION "12.29")
 cmake_minimum_required(VERSION 3.10)
-project(SmallBASIC_SDL VERSION ${VERSION} LANGUAGES C CXX)
+project(SmallBASIC VERSION ${VERSION} LANGUAGES C CXX)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(SDL3 REQUIRED)
+# cmake -DWITH_DEBUG=ON
+option(WITH_DEBUG "Enable debug build" OFF)
 
 function(writeConfig)
   execute_process(
@@ -35,13 +36,23 @@ function(writeConfig)
   )
 endfunction()
 
+function(checkDebugMode)
+  if(WITH_DEBUG)
+    set(SANITIZER_FLAGS "-fstack-protector-all -fno-omit-frame-pointer -fsanitize=address,undefined")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SANITIZER_FLAGS}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SANITIZER_FLAGS}")
+    message(STATUS "Debug mode enabled via --with-debug")
+  endif()
+endfunction()
+
 function(buildSDL)
   # Initialize variables
   set(TARGET "Building SDL version.")
   set(PACKAGE_CFLAGS "")
   set(PACKAGE_LIBS "")
 
   # check dependencies using pkg-config
+  find_package(SDL3 REQUIRED)
   find_package(PkgConfig REQUIRED)
 
   pkg_check_modules(SDL3 REQUIRED sdl3)
@@ -105,6 +116,12 @@ function(buildSDL)
   writeConfig()
 endfunction()
 
+message("generating kwp.h")
+execute_process(
+  COMMAND bash -c "(cd ../documentation && g++ -o build_kwp build_kwp.cpp && ./build_kwp > ../src/ui/kwp.h)"
+)
+
+checkDebugMode()
 buildSDL()
 
 set(COMMON_DIR ${CMAKE_SOURCE_DIR}/src/common)
diff --git a/documentation/build_kwp.cpp b/documentation/build_kwp.cpp
@@ -245,6 +245,7 @@ int main(int argc, char *argv[]) {
   }
 
   fprintf(stdout, "/* automagicaly generated file */\n");
+  fprintf(stdout, "#pragma once\n");
   fprintf(stdout, "static struct KEYWORD_HELP {\n");
   fprintf(stdout, "  const char *package;\n");
   fprintf(stdout, "  const char *keyword;\n");
diff --git a/ide/config.h.in b/ide/config.h.in
@@ -18,11 +18,10 @@ extern "C" {
 #cmakedefine01 _UnixOS
 #cmakedefine01 IMPL_DEV_READ
 #cmakedefine01 IMPL_LOG_WRITE
-
-#cmakedefine  _SDL_VERSION "@_SDL_VERSION@"
-#cmakedefine  VERSION "@VERSION@"
-#cmakedefine  BUILD_DATE @BUILD_DATE@
-#cmakedefine  SB_DWORD_VER @SB_DWORD_VER@
+#cmakedefine   _SDL_VERSION "@_SDL_VERSION@"
+#cmakedefine   VERSION "@VERSION@"
+#cmakedefine   BUILD_DATE @BUILD_DATE@
+#cmakedefine   SB_DWORD_VER @SB_DWORD_VER@
 
 #ifdef __cplusplus
 }
diff --git a/src/platform/sdl/runtime.h b/src/platform/sdl/runtime.h
@@ -20,20 +20,20 @@
 #include "platform/sdl/display.h"
 
 struct Runtime : public System {
-  Runtime(SDL_Window *window);
-  virtual ~Runtime();
+  explicit Runtime(SDL_Window *window);
+  ~Runtime() override;
 
-  void addShortcut(const char *) {}
-  void alert(const char *title, const char *message);
-  int ask(const char *title, const char *prompt, bool cancel);
-  void browseFile(const char *url);
+  void addShortcut(const char *) override {}
+  void alert(const char *title, const char *message) override;
+  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();
   bool debugOpen(const char *file);
   void debugStart(TextEditInput *edit, const char *file);
   void debugStep(TextEditInput *edit, TextEditHelpWidget *help, bool cont);
   void debugStop();
-  void enableCursor(bool enabled);
+  void enableCursor(bool enabled) override;
   void exportRun(const char *path);
   void redraw() { _graphics->redraw(); }
   bool toggleFullscreen();
@@ -42,21 +42,21 @@ struct Runtime : public System {
   void pause(int timeout);
   void pollEvents(bool blocking);
   MAEvent *popEvent() { return _eventQueue->pop(); }
-  MAEvent processEvents(int waitFlag);
+  MAEvent processEvents(int waitFlag) override;
   void processEvent(MAEvent &event);
   void pushEvent(MAEvent *event) { _eventQueue->push(event); }
-  void saveWindowRect();
-  void setWindowRect(int x, int y, int width, int height);
-  void setWindowTitle(const char *title);
-  void share(const char *path) {}
-  void showCursor(CursorType cursorType);
+  void saveWindowRect() override;
+  void setWindowRect(int x, int y, int width, int height) override;
+  void setWindowTitle(const char *title) override;
+  void share(const char *path) override {}
+  void showCursor(CursorType cursorType) override;
   int runShell(const char *startupBas, bool once, int fontScale, int debugPort);
-  char *loadResource(const char *fileName);
+  char *loadResource(const char *fileName) override;
   void logStack(int line, bool subOrFunc);
   void onResize(int w, int h);
-  void onRunCompleted();
-  void setClipboardText(const char *text);
-  char *getClipboardText();
+  void onRunCompleted() override;
+  void setClipboardText(const char *text) override;
+  char *getClipboardText() override;
   void setWindowRect(SDL_Rect &rect);
   SDL_Rect getWindowRect();
 
diff --git a/src/ui/ansiwidget.cpp b/src/ui/ansiwidget.cpp
@@ -158,13 +158,13 @@ void AnsiWidget::drawRect(int x1, int y1, int x2, int y2) {
 }
 
 // draw a filled rectangle onto the offscreen buffer
-void AnsiWidget::drawRectFilled(int x1, int y1, int x2, int y2) {
+void AnsiWidget::drawRectFilled(int x1, int y1, int x2, int y2) const {
   _back->drawRectFilled(x1, y1, x2, y2);
   flush(false, false, MAX_PENDING_GRAPHICS);
 }
 
 // display any pending images changed
-void AnsiWidget::flush(bool force, bool vscroll, int maxPending) {
+void AnsiWidget::flush(bool force, bool vscroll, int maxPending) const {
   if (_front != nullptr && _autoflush) {
     bool update = false;
     if (force) {
@@ -178,7 +178,7 @@ void AnsiWidget::flush(bool force, bool vscroll, int maxPending) {
   }
 }
 
-int AnsiWidget::getScreenId(bool back) {
+int AnsiWidget::getScreenId(bool back) const {
   int result = 0;
   for (int i = 0; i < MAX_SCREENS; i++) {
     if (_screens[i] == (back ? _back : _front)) {
@@ -347,18 +347,18 @@ void AnsiWidget::setFontSize(int fontSize) {
 }
 
 // sets the pixel to the given color at the given xy location
-void AnsiWidget::setPixel(int x, int y, int c) {
+void AnsiWidget::setPixel(int x, int y, int c) const {
   _back->setPixel(x, y, c);
   flush(false, false, MAX_PENDING_GRAPHICS);
 }
 
-void AnsiWidget::setStatus(const char *label) {
+void AnsiWidget::setStatus(const char *label) const {
   _back->_label = label;
   _back->setDirty();
 }
 
 // sets the current text drawing color
-void AnsiWidget::setTextColor(long fg, long bg) {
+void AnsiWidget::setTextColor(long fg, long bg) const {
   _back->setTextColor(fg, bg);
 }
 
@@ -484,7 +484,7 @@ bool AnsiWidget::pointerMoveEvent(MAEvent &event) {
 }
 
 // handler for pointer release events
-void AnsiWidget::pointerReleaseEvent(MAEvent &event) {
+void AnsiWidget::pointerReleaseEvent(const MAEvent &event) {
   if (_activeButton != nullptr && _front == _screens[MENU_SCREEN]) {
     _activeButton->clicked(event.point.x, event.point.y, false);
   } else if (_activeButton != nullptr && _activeButton->_pressed) {
@@ -531,7 +531,7 @@ void AnsiWidget::pointerReleaseEvent(MAEvent &event) {
 
 // handles the characters following the \e[ sequence. Returns whether a further call
 // is required to complete the process.
-bool AnsiWidget::doEscape(const char *&p, int textHeight) {
+bool AnsiWidget::doEscape(const char *&p, int textHeight) const {
   int escValue = 0;
 
   while (isdigit(*p)) {
@@ -594,7 +594,7 @@ void AnsiWidget::doSwipe(int start, bool moveDown, int distance, int maxScroll)
 }
 
 // draws the focus screen's active button
-void AnsiWidget::drawActiveButton() {
+void AnsiWidget::drawActiveButton() const {
 #if defined(_SDL) || defined(_FLTK)
   if (_focus != nullptr && !_activeButton->hasHover()) {
     MAHandle currentHandle = maSetDrawTarget(HANDLE_SCREEN);
@@ -624,7 +624,7 @@ void AnsiWidget::drawActiveButton() {
 #endif
 }
 
-bool AnsiWidget::drawHoverLink(MAEvent &event) {
+bool AnsiWidget::drawHoverLink(const MAEvent &event) {
 #if defined(_SDL) || defined(_FLTK)
   if (_front != _screens[MENU_SCREEN]) {
     int dx = _front->_x;
@@ -704,7 +704,7 @@ void AnsiWidget::handleEscape(const char *&p, int lineHeight) {
 }
 
 // returns whether the event is over the given screen
-bool AnsiWidget::setActiveButton(MAEvent &event, Screen *screen) {
+bool AnsiWidget::setActiveButton(const MAEvent &event, Screen *screen) {
   bool result = false;
   if (_front != _screens[MENU_SCREEN] &&
       screen->overlaps(event.point.x, event.point.y)) {
diff --git a/src/ui/ansiwidget.h b/src/ui/ansiwidget.h
@@ -34,80 +34,80 @@ struct AnsiWidget {
   ~AnsiWidget();
 
   void addImage(ImageDisplay &image);
-  void addInput(FormInput *input) { _back->_inputs.add(input); }
+  void addInput(FormInput *input) const { _back->_inputs.add(input); }
   void clearScreen();
   bool construct();
   void drawArc(int xc, int yc, double r, double start, double end, double aspect);
   void drawEllipse(int xc, int yc, int rx, int ry, int fill);
   void drawImage(ImageDisplay &image);
-  void drawOverlay(bool vscroll) { _back->drawOverlay(vscroll); }
+  void drawOverlay(bool vscroll) const { _back->drawOverlay(vscroll); }
   void drawLine(int x1, int y1, int x2, int y2);
   void drawRect(int x1, int y1, int x2, int y2);
-  void drawRectFilled(int x1, int y1, int x2, int y2);
-  void flush(bool force, bool vscroll=false, int maxPending = MAX_PENDING);
-  void flushNow() { if (_front) _front->drawBase(false); }
-  int  getBackgroundColor() { return _back->_bg; }
-  int  getCharHeight()  { return _back->_charHeight; }
-  int  getCharWidth()  { return _back->_charWidth; }
-  int  getColor() { return _back->_fg; }
+  void drawRectFilled(int x1, int y1, int x2, int y2) const;
+  void flush(bool force, bool vscroll=false, int maxPending = MAX_PENDING) const;
+  void flushNow() const { if (_front) _front->drawBase(false); }
+  int  getBackgroundColor() const { return _back->_bg; }
+  int  getCharHeight() const { return _back->_charHeight; }
+  int  getCharWidth() const { return _back->_charWidth; }
+  int  getColor() const { return _back->_fg; }
   int  getFontSize() const { return _fontSize; }
-  FormInput *getNextField(FormInput *field) { return _back->getNextField(field); }
-  int  getPixel(int x, int y) { return _back->getPixel(x, y); }
-  int  getStatusHeight() { return _back->_height - _back->_statusOffset; }
-  int  getScreenId(bool back);
-  int  getScreenWidth() { return _back->_width; }
-  void getScroll(int &x, int &y) { _back->getScroll(x, y); }
+  FormInput *getNextField(FormInput *field) const { return _back->getNextField(field); }
+  int  getPixel(int x, int y) const { return _back->getPixel(x, y); }
+  int  getStatusHeight() const { return _back->_height - _back->_statusOffset; }
+  int  getScreenId(bool back) const;
+  int  getScreenWidth() const { return _back->_width; }
+  void getScroll(int &x, int &y) const { _back->getScroll(x, y); }
   int  getHeight() const { return _height; }
   int  getWidth() const  { return _width; }
-  int  getX() { return _back->_curX; }
-  int  getY() { return _back->_curY; }
+  int  getX() const { return _back->_curX; }
+  int  getY() const { return _back->_curY; }
   int  getMenuIndex() const { return _back->getIndex(_activeButton); }
   bool hasActiveButton() const { return _activeButton != nullptr; }
   bool hasHover() const { return _hoverInput != nullptr; }
   bool hasMenu() const { return _back == _screens[MENU_SCREEN]; }
   void handleMenu(bool up);
   void insetMenuScreen(int x, int y, int w, int h);
   void insetTextScreen(int x, int y, int w, int h);
-  bool overLabel(int x, int y) { return _back->overLabel(x, y); };
-  bool overMenu(int x, int y) { return _back->overMenu(x, y); };
+  bool overLabel(int x, int y) const { return _back->overLabel(x, y); };
+  bool overMenu(int x, int y) const { return _back->overMenu(x, y); };
   bool pointerTouchEvent(MAEvent &event);
   bool pointerMoveEvent(MAEvent &event);
-  void pointerReleaseEvent(MAEvent &event);
+  void pointerReleaseEvent(const MAEvent &event);
   void print(const char *str);
   void redraw();
   void removeHover();
-  void removeImage(int imageId) { _back->removeImage(imageId); }
-  bool removeInput(FormInput *input) { return _back->removeInput(input); }
+  void removeImage(int imageId) const { _back->removeImage(imageId); }
+  bool removeInput(FormInput *input) const { return _back->removeInput(input); }
   void removeInputs();
-  void resetScroll() { _back->resetScroll(); }
+  void resetScroll() const { _back->resetScroll(); }
   void reset();
-  void resetFont() { _back->reset(_fontSize); _back->updateFont(); }
+  void resetFont() const { _back->reset(_fontSize); _back->updateFont(); }
   void resize(int width, int height);
   bool scroll(bool up, bool page);
   void selectBackScreen(int screenId);
   void selectFrontScreen(int screenId);
   int  selectScreen(int screenId, bool forceFlush=true);
   void setColor(long color);
-  void setDirty() { _back->setDirty(); }
+  void setDirty() const { _back->setDirty(); }
   void setAutoflush(bool autoflush) { _autoflush = autoflush; }
   void setFont(int size, bool bold, bool italic);
   void setFontSize(int fontSize);
-  void setPixel(int x, int y, int c);
-  void setScroll(int x, int y) { _back->setScroll(x, y); }
-  void setStatus(const char *label);
-  void setTextColor(long fg, long bg);
+  void setPixel(int x, int y, int c) const;
+  void setScroll(int x, int y) const { _back->setScroll(x, y); }
+  void setStatus(const char *label) const;
+  void setTextColor(long fg, long bg) const;
   void setXY(int x, int y);
-  int  textHeight() { return _back->_charHeight; }
-  void updateInputs(var_p_t form, bool setv) { _back->updateInputs(form, setv); }
+  int  textHeight() const { return _back->_charHeight; }
+  void updateInputs(var_p_t form, bool setv) const { _back->updateInputs(form, setv); }
 
 private:
   Screen *createScreen(int screenId);
-  bool doEscape(const char *&p, int textHeight);
+  bool doEscape(const char *&p, int textHeight) const;
   void doSwipe(int start, bool moveDown, int distance, int maxScroll);
-  void drawActiveButton();
-  bool drawHoverLink(MAEvent &event);
+  void drawActiveButton() const;
+  bool drawHoverLink(const MAEvent &event);
   void handleEscape(const char *&p, int textHeight);
-  bool setActiveButton(MAEvent &event, Screen *screen);
+  bool setActiveButton(const MAEvent &event, Screen *screen);
 
   Screen *_screens[MAX_SCREENS]{};
   Screen *_back;   // screen being painted/written
diff --git a/src/ui/keypad.cpp b/src/ui/keypad.cpp
diff --git a/src/ui/keypad.h b/src/ui/keypad.h

Original file line number	Diff line number	Diff line change
`@@ -245,6 +245,7 @@ int main(int argc, char *argv[]) {`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`fprintf(stdout, "/* automagicaly generated file */\n");`
	`248`	`+ fprintf(stdout, "#pragma once\n");`
`248`	`249`	`fprintf(stdout, "static struct KEYWORD_HELP {\n");`
`249`	`250`	`fprintf(stdout, " const char *package;\n");`
`250`	`251`	`fprintf(stdout, " const char *keyword;\n");`