UI: refactoring to allow alternative keypad layouts

Author: Chris Warren-Smith

CMakeLists.txt

@@ -41,6 +41,7 @@ function(checkDebugMode)
     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}")
+    set(_DEBUG)
     message(STATUS "Debug mode enabled via --with-debug")
   endif()
 endfunction()

ide/config.h.in

@@ -1,6 +1,6 @@
 // This file is part of SmallBASIC
 //
-// SmallBASIC module header
+// SmallBASIC module header used with CMake
 //
 // This program is distributed under the terms of the GPL v2.0 or later
 // Download the GNU Public License (GPL) from www.gnu.org
@@ -18,7 +18,8 @@ extern "C" {
 #cmakedefine01 _UnixOS
 #cmakedefine01 IMPL_DEV_READ
 #cmakedefine01 IMPL_LOG_WRITE
-#cmakedefine   _SDL_VERSION "@_SDL_VERSION@"
+#cmakedefine01 _DEBUG
+#cmakedefine   _SDL_VERSION "@_SDL_VERSION@ "
 #cmakedefine   VERSION "@VERSION@"
 #cmakedefine   BUILD_DATE @BUILD_DATE@
 #cmakedefine   SB_DWORD_VER @SB_DWORD_VER@

keypad/build.sh

@@ -11,6 +11,8 @@ declare -a IMAGE_FILES=(\
  "arrow-enter"\
  "search"\
  "layers"\
+ "arrow-left"\
+ "arrow-right"\
  "arrow-down"\
  "arrow-download"\
  "arrow-up" \

src/platform/android/jni/editor.cpp

@@ -156,7 +156,7 @@ void Runtime::editSource(strlib::String loadPath, bool restoreOnExit) {
   if (_keypad != nullptr) {
     _output->addInput(_keypad);
   } else {
-    _keypad = new KeypadInput(false, false, charWidth, charHeight);
+    _keypad = new KeypadInput(w, false, false, charWidth, charHeight);
     _output->addInput(_keypad);
   }
 

src/platform/android/webui/package.json

@@ -6,18 +6,18 @@
   "dependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
-    "@mui/icons-material": "^7.2.0",
-    "@mui/material": "^7.2.0",
-    "@mui/x-data-grid": "^8.8.0",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "react-router-dom": "^6.27.0",
+    "@mui/icons-material": "^7.3.1",
+    "@mui/material": "^7.3.1",
+    "@mui/x-data-grid": "^8.10.1",
+    "react": "^19.1.1",
+    "react-dom": "^19.1.1",
+    "react-router-dom": "^7.8.1",
     "react-router-hash-link": "^2.4.3"
   },
   "devDependencies": {
-    "@eslint/js": "^9.31.0",
-    "@vitejs/plugin-react": "^4.6.0",
-    "eslint": "^9.31.0",
+    "@eslint/js": "^9.33.0",
+    "@vitejs/plugin-react": "^5.0.0",
+    "eslint": "^9.33.0",
     "eslint-config-react": "^1.1.7",
     "eslint-define-config": "^2.1.0",
     "eslint-plugin-import": "^2.32.0",
@@ -26,8 +26,8 @@
     "eslint-plugin-react-refresh": "^0.4.20",
     "eslint-plugin-unused-imports": "^4.1.4",
     "globals": "^16.3.0",
-    "npm-check-updates": "^18.0.1",
-    "vite": "^6.3.5",
+    "npm-check-updates": "^18.0.2",
+    "vite": "^7.1.2",
     "vite-plugin-eslint": "^1.8.1"
   },
   "scripts": {

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, true, charWidth, charHeight);
+    _keypad = new KeypadInput(w, false, true, charWidth, charHeight);
     _output->addInput(_keypad);
   }
 

src/ui/keycode.h

@@ -22,6 +22,9 @@ enum KeyCode : char {
   K_LINE_DOWN= (char)-11,
   K_PAGE_DOWN= (char)-12,
   K_TAG      = (char)-13,
+  K_LEFT     = (char)-14,
+  K_RIGHT    = (char)-15,
+  K_UPPER    = (char)-16,
   K_NULL     = 0,
   K_BACKSPACE = 8,
   K_TAB      = 9,
@@ -77,15 +80,3 @@ enum KeyCode : char {
   K_TILDE    = 126, // ~
   K_DEL      = 127  // DEL
 };
-
-inline bool isPrintable(KeyCode key) {
-  return key >= K_SPACE && key <= K_TILDE;
-}
-
-inline bool isArrow(KeyCode key) {
-  return key == K_LINE_UP || key == K_PAGE_UP || key == K_LINE_DOWN || key == K_PAGE_DOWN;
-}
-
-inline bool isRightMargin(KeyCode key) {
-  return key == K_ENTER || key == K_HELP || key == K_BACKSPACE;
-}