Merge branch 'smallbasic:master' into master

Author: Joe7M

src/common/plugins.c

@@ -42,6 +42,7 @@ typedef int (*sblib_count_fn) (void);
 typedef int (*sblib_init_fn) (const char *);
 typedef int (*sblib_has_window_ui_fn) (void);
 typedef int (*sblib_free_fn) (int, int);
+typedef int (*sblib_refresh_id_fn) (int, int);
 typedef void (*sblib_close_fn) (void);
 
 typedef struct {
@@ -51,6 +52,7 @@ typedef struct {
   sblib_exec_fn _sblib_proc_exec;
   sblib_exec_fn _sblib_func_exec;
   sblib_free_fn _sblib_free;
+  sblib_refresh_id_fn _sblib_refresh_id;
   ext_func_node_t *_func_list;
   ext_proc_node_t *_proc_list;
   uint32_t _id;
@@ -327,6 +329,7 @@ static void slib_import_routines(slib_t *lib, int comp) {
   lib->_sblib_func_exec = slib_getoptptr(lib, "sblib_func_exec");
   lib->_sblib_proc_exec = slib_getoptptr(lib, "sblib_proc_exec");
   lib->_sblib_free = slib_getoptptr(lib, "sblib_free");
+  lib->_sblib_refresh_id = slib_getoptptr(lib, "sblib_refresh_id");
   sblib_count_fn fcount = slib_getoptptr(lib, "sblib_proc_count");
   sblib_getname_fn fgetname = slib_getoptptr(lib, "sblib_proc_getname");
 
@@ -565,6 +568,17 @@ void plugin_free(int lib_id, int cls_id, int id) {
   }
 }
 
+int plugin_refresh_id(int lib_id, int cls_id, int id) {
+  int result = id;
+  if (lib_id != -1 && cls_id != -1 && id != -1) {
+    slib_t *lib = get_lib(lib_id);
+    if (lib && lib->_sblib_refresh_id) {
+      result = lib->_sblib_refresh_id(cls_id, id);
+    }
+  }
+  return result;
+}
+
 void plugin_close() {
   for (int i = 0; i < MAX_SLIBS; i++) {
     if (plugins[i]) {
@@ -594,6 +608,7 @@ void *plugin_get_func(const char *name) { return 0; }
 int plugin_procexec(int lib_id, int index) { return -1; }
 int plugin_funcexec(int lib_id, int index, var_t *ret) { return -1; }
 void plugin_free(int lib_id, int cls_id, int id) {}
+int plugin_refresh_id(int lib_id, int cls_id, int id) {return id;}
 void plugin_close() {}
 #endif
 

src/common/plugins.h

@@ -71,6 +71,11 @@ int plugin_funcexec(int lib_id, int index, var_t *ret);
 //
 void plugin_free(int lib_id, int cls_id, int id);
 
+//
+// in v_move and plugin_free later called on source, dest remains registered
+//
+int plugin_refresh_id(int lib_id, int cls_id, int id);
+
 //
 // closes the plugin system
 //

src/common/var.c

@@ -9,6 +9,7 @@
 
 #include "common/sys.h"
 #include "common/sberr.h"
+#include "common/plugins.h"
 
 #define INT_STR_LEN 64
 
@@ -571,9 +572,9 @@ void v_move(var_t *dest, const var_t *src) {
     dest->v.m.map = src->v.m.map;
     dest->v.m.count = src->v.m.count;
     dest->v.m.size = src->v.m.size;
-    dest->v.m.id = src->v.m.id;
     dest->v.m.lib_id = src->v.m.lib_id;
     dest->v.m.cls_id = src->v.m.cls_id;
+    dest->v.m.id = plugin_refresh_id(src->v.m.lib_id, src->v.m.cls_id, src->v.m.id);
     break;
   case V_REF:
     dest->v.ref = src->v.ref;

src/common/var_map.c

@@ -317,9 +317,9 @@ void map_set(var_p_t dest, const var_p_t src) {
     hashmap_create(dest, src->v.m.count);
     hashmap_foreach(src, map_set_cb, &cb);
     dest->v.m.count = src->v.m.count;
-    dest->v.m.id = src->v.m.id;
-    dest->v.m.lib_id = -1;
-    dest->v.m.cls_id = -1;
+    dest->v.m.lib_id = src->v.m.lib_id;
+    dest->v.m.cls_id = src->v.m.cls_id;
+    dest->v.m.id = plugin_refresh_id(src->v.m.lib_id, src->v.m.cls_id, src->v.m.id);
   }
 }
 

src/include/module.h

@@ -120,13 +120,23 @@ int sblib_func_exec(int index, int param_count, slib_par_t *params, var_t *retva
 /**
  * @ingroup modlib
  *
- * executes a function
+ * free resources associated with the variable
  *
  * @param cls_id the variable class identifier
  * @param id the variable instance identifier
  */
 int sblib_free(int cls_id, int id);
 
+/**
+ * @ingroup modlib
+ *
+ * registers a fresh id to replace the given id
+ *
+ * @param cls_id the variable class identifier
+ * @param id the variable instance identifier
+ */
+int sblib_refresh_id(int cls_id, int id);
+
 /**
  * @ingroup modlib
  *

src/platform/android/app/build.gradle

@@ -7,9 +7,9 @@ android {
   // can override some attributes in main/AndroidManifest.xml
   defaultConfig {
     applicationId 'net.sourceforge.smallbasic'
-    minSdkVersion 21
+    minSdkVersion 23
     targetSdkVersion 36
-    versionCode 89
+    versionCode 91
     versionName '12.33'
     resourceConfigurations += ['en']
   }
@@ -53,6 +53,6 @@ android {
 }
 
 dependencies {
-  implementation 'androidx.core:core:1.17.0'
+  implementation 'androidx.core:core:1.18.0'
   testImplementation 'junit:junit:4.13.2'
 }

src/platform/android/app/src/main/java/net/sourceforge/smallbasic/MainActivity.java

@@ -808,8 +808,15 @@ protected void onCreate(Bundle savedInstanceState) {
 
   @Override
   protected void onPause() {
-    super.onPause();
     onActivityPaused(true);
+    // wait for Graphics::redraw() to complete
+    try {
+      Thread.sleep(10);
+    }
+    catch (Exception e) {
+      // ignored
+    }
+    super.onPause();
   }
 
   @Override

src/platform/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:9.0.0'
+    classpath 'com.android.tools.build:gradle:9.1.1'
   }
 }
 

src/platform/android/jni/runtime.cpp

@@ -33,9 +33,6 @@ Runtime *runtime = nullptr;
 // Pipe file descriptors: g_backPipe[0] is read-end, g_backPipe[1] is write-end
 static int g_backPipe[2] = {-1, -1};
 
-// whether native back key handling is active
-static bool g_predictiveBack = false;
-
 // the logical top of the screen
 static int g_top = 0;
 
@@ -115,23 +112,18 @@ void handleCommand(android_app *app, int32_t cmd) {
   }
 }
 
-static void pushBackEvent() {
-  auto *maEvent = new MAEvent();
-  maEvent->nativeKey = AKEYCODE_BACK;
-  maEvent->type = EVENT_TYPE_KEY_PRESSED;
-  runtime->pushEvent(maEvent);
-}
-
 //
 // Callback registered with ALooper that is triggered when the pipe receives data.
 // This is what wakes the blocked ALooper_pollOnce() and lets us run pushBackEvent().
 //
 static int pipeCallback(int fd, int events, void *data) {
   // clear the byte that woke the pipe, then return 1 to stay registered
-  logEntered();
-  char buf[1];
-  read(fd, buf, 1);
-  pushBackEvent();
+  if (runtime != nullptr && runtime->isActive()) {
+    logEntered();
+    char buf[1];
+    read(fd, buf, 1);
+    runtime->onBack();
+  }
   return 1;
 }
 
@@ -165,8 +157,9 @@ static void process_input(android_app *app, android_poll_source *source) {
         AKeyEvent_getKeyCode(event) == AKEYCODE_BACK) {
       // prevent AInputQueue_preDispatchEvent from attempting to close
       // the keypad here to avoid a crash in android 4.2 + 4.3.
-      if (AKeyEvent_getAction(event) == AKEY_EVENT_ACTION_DOWN && runtime->isActive() && !g_predictiveBack) {
-        pushBackEvent();
+      if (AKeyEvent_getAction(event) == AKEY_EVENT_ACTION_DOWN && runtime != nullptr && runtime->isActive()) {
+        trace("AKEYCODE_BACK event");
+        runtime->onBack();
       }
       AInputQueue_finishEvent(app->inputQueue, event, true);
     } else if (!AInputQueue_preDispatchEvent(app->inputQueue, event)) {
@@ -297,8 +290,7 @@ Runtime::Runtime(android_app *app) :
   _looper = ALooper_forThread();
   _sensorManager = ASensorManager_getInstance();
   memset(&_sensors, 0, sizeof(_sensors));
-  g_predictiveBack = getBoolean("isPredictiveBack");
-  if (g_predictiveBack) {
+  if (getBoolean("isPredictiveBack")) {
     setupBackWakePipe(_looper);
   }
 }
@@ -512,7 +504,7 @@ char *Runtime::loadResource(const char *fileName) {
 
 MAEvent *Runtime::popEvent() {
   pthread_mutex_lock(&_mutex);
-  MAEvent *result = _eventQueue->pop();
+  auto *result = _eventQueue->pop();
   pthread_mutex_unlock(&_mutex);
   return result;
 }
@@ -1003,6 +995,21 @@ void Runtime::showKeypad(bool show) {
   _app->activity->vm->DetachCurrentThread();
 }
 
+void Runtime::onBack() {
+  pthread_mutex_lock(&_mutex);
+  auto *current = _eventQueue->peek();
+  if (current == nullptr || current->nativeKey != AKEYCODE_BACK) {
+    trace("pushing back event to the queue");
+    auto *event = new MAEvent();
+    event->nativeKey = AKEYCODE_BACK;
+    event->type = EVENT_TYPE_KEY_PRESSED;
+    _eventQueue->push(event);
+  } else {
+    trace("skipping duplicate back event");
+  }
+  pthread_mutex_unlock(&_mutex);
+}
+
 void Runtime::onResize(int width, int height, int imeState) {
   logEntered();
   if (_graphics != nullptr) {
@@ -1051,7 +1058,7 @@ void Runtime::onUnicodeChar(int ch) {
 
 char *Runtime::getClipboardText() {
   char *result;
-  String text = getStringBytes("getClipboardText");
+  auto text = getStringBytes("getClipboardText");
   if (!text.empty()) {
     result = strdup(text.c_str());
   } else {
@@ -1096,7 +1103,7 @@ void System::completeKeyword(int index) const {
 int maGetEvent(MAEvent *event) {
   int result;
   if (runtime->hasEvent()) {
-    MAEvent *nextEvent = runtime->popEvent();
+    auto *nextEvent = runtime->popEvent();
     event->point = nextEvent->point;
     event->type = nextEvent->type;
     delete nextEvent;

src/platform/android/jni/runtime.h

@@ -72,6 +72,7 @@ struct Runtime : public System {
   void share(const char *path) override { setString("share", path); }
   void showCursor(CursorType cursorType) override {}
   void showKeypad(bool show);
+  void onBack();
   void onPaused(bool paused) { if (_graphics != nullptr) {_graphics->onPaused(paused);} }
   void onResize(int w, int h, int imeState);
   void onRunCompleted() override;