SDL: fix keypad handling

chrisws · chrisws · commit 9c0366fca702 · 2020-02-06T20:59:58.000+10:00
diff --git a/Makefile.am b/Makefile.am
@@ -64,3 +64,6 @@ release:
 ndk-stack:
 	adb logcat | ${NDK}/ndk-stack -sym src/platform/android/obj/local/armeabi
 
+appImage:
+	~/apps/linuxdeploy-x86_64.AppImage --appdir=AppDir --executable=./src/platform/fltk/sbasici && \
+	~/apps/appimagetool-x86_64.AppImage AppDir
diff --git a/configure.ac b/configure.ac
@@ -1,13 +1,13 @@
 dnl
 dnl Configure script for SmallBASIC
 dnl
-dnl Copyright(C) 2001-2019 Chris Warren-Smith.
+dnl Copyright(C) 2001-2020 Chris Warren-Smith.
 dnl
 dnl This program is distributed under the terms of the GPL v2.0
 dnl Download the GNU Public License (GPL) from www.gnu.org
 dnl
 
-AC_INIT([smallbasic], [0.12.17])
+AC_INIT([smallbasic], [0.12.18])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,8 @@
+smallbasic (0.12.18) unstable; urgency=low
+  * Various see web site
+
+ -- Chris Warren-Smith <cwarrensmith@gmail.com>  Wed, 05 Feb 2020 09:45:25 +1000
+
 smallbasic (0.12.17) unstable; urgency=low
   * Various see web site
 
diff --git a/src/lib/lodepng b/src/lib/lodepng
@@ -1 +1 @@
-Subproject commit 2e541f53ebedf6ebae375a381ca2fd6d82b460bc
+Subproject commit 5a0dba103893e6b8084be13945a826663917d00a
diff --git a/src/lib/miniaudio b/src/lib/miniaudio
@@ -1 +1 @@
-Subproject commit 1ca6f80698acbdbf9ae4a9f4200975d919de31f8
+Subproject commit df2903a0bcaf0126f9ad43d2b1238891b55bc2f6
diff --git a/src/lib/stb b/src/lib/stb
@@ -1 +1 @@
-Subproject commit f67165c2bb2af3060ecae7d20d6f731173485ad0
+Subproject commit f54acd4e13430c5122cab4ca657705c84aa61b08
diff --git a/src/platform/android/app/src/main/assets/main.bas b/src/platform/android/app/src/main/assets/main.bas
@@ -119,7 +119,7 @@ sub do_about()
   color 7
   print "Version "; sbver
   print
-  print "Copyright (c) 2002-2019 Chris Warren-Smith"
+  print "Copyright (c) 2002-2020 Chris Warren-Smith"
   print "Copyright (c) 1999-2006 Nicholas Christopoulos" + chr(10)
 
   local bn_home
diff --git a/src/platform/android/build.gradle b/src/platform/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.5.2'
+    classpath 'com.android.tools.build:gradle:3.5.3'
     classpath "com.github.ben-manes:gradle-versions-plugin:0.22.0"
   }
 }
diff --git a/src/platform/sdl/editor.cpp b/src/platform/sdl/editor.cpp
@@ -28,6 +28,7 @@ bool g_returnToLine;
 struct StatusMessage {
   explicit StatusMessage(TextEditInput *editor) :
     _dirty(editor->isDirty()),
+    _insert(true),
     _row(editor->getRow()),
     _col(editor->getCol()) {
   }
@@ -61,6 +62,9 @@ struct StatusMessage {
         .append(",")
         .append(editor->getCol())
         .append(") ");
+      if (!_insert) {
+        message.append(" Ovwrt ");
+      }
       int digits = snprintf(NULL, 0, "%d%d",
                             editor->getRow(), editor->getCol());
       int spaces = 6 - digits;
@@ -93,7 +97,12 @@ struct StatusMessage {
     _dirty = !editor->isDirty();
   }
 
+  void setInsert() {
+    _insert = !_insert;
+  }
+
   bool _dirty;
+  bool _insert;
   int _row;
   int _col;
   String _fileName;
@@ -379,6 +388,12 @@ void System::editSource(String loadPath, bool restoreOnExit) {
           helpWidget->createCompletionHelp();
           helpWidget->show();
           break;
+        case SB_KEY_INSERT:
+          statusMessage.setInsert();
+          widget->edit(event.key, sw, charWidth);
+          statusMessage.update(editWidget, _output, true);
+          redraw = true;
+          break;
         case SB_KEY_CTRL('v'):
         case SB_KEY_SHIFT(SB_KEY_INSERT):
           text = getClipboardText();
diff --git a/src/platform/sdl/keymap.h b/src/platform/sdl/keymap.h
@@ -12,13 +12,8 @@
 const int keymap[][2] = {
   {SDLK_RETURN, SB_KEY_ENTER},
   {SDLK_ESCAPE, SB_KEY_ESCAPE},
-  {SDLK_KP_PERIOD, SB_KEY_KP_DEL},
-  {SDLK_KP_ENTER, SB_KEY_KP_ENTER},
-  {SDLK_KP_DIVIDE, SB_KEY_KP_DIV},
-  {SDLK_KP_MULTIPLY, SB_KEY_KP_MUL},
-  {SDLK_KP_MINUS, SB_KEY_KP_MINUS},
-  {SDLK_KP_PLUS, SB_KEY_KP_PLUS},
-  {SDLK_KP_EQUALS, '='},
+  {SDLK_KP_PERIOD, '.'},
+  {SDLK_KP_ENTER, SB_KEY_ENTER},
   {SDLK_TAB, SB_KEY_TAB},
   {SDLK_BACKSPACE, SB_KEY_BACKSPACE},
   {SDLK_DELETE, SB_KEY_DELETE},
diff --git a/src/platform/sdl/runtime.cpp b/src/platform/sdl/runtime.cpp
@@ -363,7 +363,7 @@ void Runtime::handleKeyEvent(MAEvent &event) {
     } else if (event.key == SDLK_KP_4) {
       event.key = event.nativeKey == KMOD_NUM ? '4' : SB_KEY_LEFT;
     } else if (event.key == SDLK_KP_5) {
-      event.key = '5';
+      event.key = event.nativeKey == KMOD_NUM ? '5' : SB_KEY_CTRL(SB_KEY_HOME);
     } else if (event.key == SDLK_KP_6) {
       event.key = event.nativeKey == KMOD_NUM ? '6' : SB_KEY_RIGHT;
     } else if (event.key == SDLK_KP_7) {
@@ -372,6 +372,8 @@ void Runtime::handleKeyEvent(MAEvent &event) {
       event.key = event.nativeKey == KMOD_NUM ? '8' : SB_KEY_UP;
     } else if (event.key == SDLK_KP_9) {
       event.key = event.nativeKey == KMOD_NUM ? '9' : SB_KEY_PGUP;
+    } else if (event.key == SDLK_KP_0) {
+      event.key = event.nativeKey == KMOD_NUM ? '0' : SB_KEY_INSERT;
     }
   }
 
@@ -443,7 +445,7 @@ void Runtime::pollEvents(bool blocking) {
       case SDL_TEXTINPUT:
         // pre-transformed/composted text
         mod = SDL_GetModState();
-        if (!mod || (mod & (KMOD_SHIFT|KMOD_CAPS))) {
+        if (!mod || (mod & (KMOD_SHIFT | KMOD_CAPS | KMOD_NUM))) {
           // ALT + CTRL keys handled in SDL_KEYDOWN
           if (ev.text.text[0] < 0) {
             wchar_t keycode;
@@ -510,7 +512,9 @@ void Runtime::pollEvents(bool blocking) {
             }
           }
           if (maEvent == NULL &&
-              ((ev.key.keysym.sym >= SDLK_KP_1 && ev.key.keysym.sym <= SDLK_KP_9) ||
+              // Non-numeric-keypad, Control and Alt keys
+              (((ev.key.keysym.sym >= SDLK_KP_1 && ev.key.keysym.sym <= SDLK_KP_0) &&
+                ev.key.keysym.mod != KMOD_NUM) ||
                ((ev.key.keysym.mod & KMOD_CTRL) &&
                 ev.key.keysym.sym != SDLK_LSHIFT &&
                 ev.key.keysym.sym != SDLK_RSHIFT &&

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:3.5.2'`
	`8`	`+ classpath 'com.android.tools.build:gradle:3.5.3'`
`9`	`9`	`classpath "com.github.ben-manes:gradle-versions-plugin:0.22.0"`
`10`	`10`	`}`
`11`	`11`	`}`