Merge pull request #247 from chrisws/12_29

12 29

Author: chrisws

CMakeLists.txt

@@ -101,7 +101,6 @@ function(buildSDL)
   )
 
   # message("SDL version: ${_SDL_VERSION}")
-  set(BUILD_DATE `date +"%a, %d %b %Y"`)
   set(_SDL_VERSION ${_SDL_VERSION})
   set(_SDL ON)
   set(_UnixOS ON)

configure.ac

@@ -7,7 +7,7 @@ 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], [12.29])
+AC_INIT([smallbasic], [12.30])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET

images/keypad/build.sh

@@ -10,8 +10,12 @@ declare -a IMAGE_FILES=(\
  "backspace"\
  "arrow-enter"\
  "search"\
- "keyboard-shift"\
- "keyboard"\
+ "layers"\
+ "arrow-down"\
+ "arrow-download"\
+ "arrow-up" \
+ "arrow-upload" \
+ "tag"
 )
 
 echo "#pragma once" > keypad_icons.h

src/lib/maapi.h

@@ -16,48 +16,29 @@
   02111-1307, USA.
 */
 
-#if !defined(MAAPI_H)
-#define MAAPI_H
-
-#include <stdint.h>
+#pragma once
+#include <cstdint>
 
 #define EXTENT_Y(e) ((short)(e))
 #define EXTENT_X(e) ((short)((e) >> 16))
 #define TRANS_NONE 0
 #define FONT_TYPE_SERIF 0
 #define FONT_TYPE_SANS_SERIF 1
 #define FONT_TYPE_MONOSPACE 2
-// same values as tizen enum FontStyle
 #define FONT_STYLE_NORMAL 0x0001
 #define FONT_STYLE_BOLD 0x0002
 #define FONT_STYLE_ITALIC 0x0004
-#define HANDLE_LOCAL 0
-#define RES_OUT_OF_MEMORY -1
-#define RES_BAD_INPUT -2
 #define RES_OK 1
 #define HANDLE_SCREEN 0
 #define RES_FONT_OK 1
-#define MAK_MENU 293
 #define EVENT_TYPE_POINTER_PRESSED 8
 #define EVENT_TYPE_POINTER_RELEASED 9
 #define EVENT_TYPE_POINTER_DRAGGED 10
 #define EVENT_TYPE_KEY_PRESSED 11
 #define EVENT_TYPE_OPTIONS_BOX_BUTTON_CLICKED 41
 #define EVENT_TYPE_SCREEN_CHANGED 21
 
-#ifndef _WCHAR_DEFINED
-#define _WCHAR_DEFINED
-typedef wchar_t wchar;
-#endif  //_WCHAR_DEFINED
-
-#ifndef _SYSV_TYPES_DEFINED
-#define _SYSV_TYPES_DEFINED
-typedef unsigned short ushort;
-typedef unsigned int uint;
-#endif  //_SYSV_TYPES_DEFINED
-
 typedef int MAExtent;
-typedef void* MAAddress;
 typedef intptr_t MAHandle;
 
 typedef struct MARect {
@@ -170,7 +151,7 @@ void maDrawText(int left, int top, const char *str, int length);
 /**
  * Copies the back buffer to the physical screen.
  */
-void maUpdateScreen(void);
+void maUpdateScreen();
 
 /**
  * Returns the size in pixels of Latin-1 text as it would appear on-screen.
@@ -181,7 +162,7 @@ MAExtent maGetTextSize(const char *str);
  * Returns the screen size.
  * Returns the screen size.
  */
-MAExtent maGetScrSize(void);
+MAExtent maGetScrSize();
 
 /**
  * Returns a handle to one of the default fonts of the device, in the style and size you specify.
@@ -231,14 +212,14 @@ void maDrawImageRegion(MAHandle image, const MARect *srcRect, const MAPoint2d *d
  * \param width Width, in pixels, of the new image. Must be \> 0.
  * \param height Height, in pixels, of the new image. Must be \> 0.
  * \see maSetDrawTarget()
- * \returns #RES_OK if succeded and #RES_OUT_OF_MEMORY if failed.
+ * \returns #RES_OK if succeeded and #RES_OUT_OF_MEMORY if failed.
  */
 int maCreateDrawableImage(MAHandle placeholder, int width, int height);
 
 /**
  *  Creates a new placeholder and returns the handle to it.
  */
-MAHandle maCreatePlaceholder(void);
+MAHandle maCreatePlaceholder();
 
 /**
  * Releases a handle returned by maCreatePlaceholder().
@@ -264,13 +245,13 @@ void maDestroyPlaceholder(MAHandle handle);
  * The destination rectangle is defined as { 0,0, \a srcRect.width, \a srcRect.height }.
  * Parts of the destination array that are outside the destination rectangle are not modified.
  * If \a srcRect is outside the bounds of the source image,
- * or if \a srcRect.width is greater than \a scanlength, a MoSync Panic is thrown.
+ * or if \a srcRect.width is greater than \a scanLength, a MoSync Panic is thrown.
  * \param image The handle to the source image.
  * \param dst The address of the destination array.
- * \param scanlength The width of the image, in pixels, represented by the destination array.
+ * \param scanLength The width of the image, in pixels, represented by the destination array.
  * \param srcRect The portion of the source image to be copied.
  */
-void maGetImageData(MAHandle image, void *dst, const MARect *srcRect, int scanlength);
+void maGetImageData(MAHandle image, void *dst, const MARect *srcRect, int scanLength);
 
 /**
  * Sets the current draw target.
@@ -287,17 +268,17 @@ MAHandle maSetDrawTarget(MAHandle image);
  * Returns the number of milliseconds that has passed since some unknown point in time.
  * Accuracy is platform-specific, but should be better than 20 ms.
  */
-int maGetMilliSecondCount(void);
+int maGetMilliSecondCount();
 
 /**
  * Shows the virtual keyboard.
  */
-void maShowVirtualKeyboard(void);
+void maShowVirtualKeyboard();
 
 /**
  * Hides the virtual keyboard.
  */
-void maHideVirtualKeyboard(void);
+void maHideVirtualKeyboard();
 
 /**
  * There is a FIFO buffer that contains up to #EVENT_BUFFER_SIZE events.
@@ -339,4 +320,3 @@ void maPushEvent(MAEvent *event);
  */
 void maWait(int timeout);
 
-#endif

src/platform/android/app/build.gradle

@@ -2,15 +2,15 @@ apply plugin: 'com.android.application'
 
 android {
   // app can use the API features included in this API level and lower.
-  compileSdk 34
+  compileSdk 36
 
   // can override some attributes in main/AndroidManifest.xml
   defaultConfig {
     applicationId 'net.sourceforge.smallbasic'
     minSdkVersion 21
-    targetSdkVersion 34
-    versionCode 78
-    versionName '12.29'
+    targetSdkVersion 36
+    versionCode 80
+    versionName '12.30'
     resourceConfigurations += ['en']
   }
 

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

@@ -36,6 +36,8 @@
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
+import android.window.OnBackInvokedCallback;
+import android.window.OnBackInvokedDispatcher;
 
 import androidx.annotation.RequiresPermission;
 import androidx.core.app.ActivityCompat;
@@ -118,6 +120,7 @@ public class MainActivity extends NativeActivity {
   public static native void consoleLog(String value);
   public static native boolean libraryMode();
   public static native void onActivityPaused(boolean paused);
+  public static native void onBack();
   public static native void onResize(int width, int height);
   public static native void onUnicodeChar(int ch);
   public static native boolean optionSelected(int index);
@@ -766,6 +769,7 @@ protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setImmersiveMode();
     setupStorageEnvironment();
+    setupPredictiveBack();
     if (!libraryMode()) {
       processIntent();
       processSettings();
@@ -1055,6 +1059,24 @@ private void setImmersiveMode() {
     }
   }
 
+  //
+  // Hook into Predictive Back (Android 13+)
+  //
+  private void setupPredictiveBack() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      getOnBackInvokedDispatcher().registerOnBackInvokedCallback(
+          OnBackInvokedDispatcher.PRIORITY_DEFAULT,
+          new OnBackInvokedCallback() {
+            @Override
+            public void onBackInvoked() {
+              Log.d(TAG, "onBackInvoked");
+              onBack();
+            }
+          }
+      );
+    }
+  }
+
   private void setupStorageEnvironment() {
     _storage = new Storage();
     setenv("EXTERNAL_DIR", _storage.getExternal());

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

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

src/platform/android/build.gradle

@@ -47,6 +47,8 @@ LOCAL_SRC_FILES  := main.cpp                   \
                     ../../../ui/image.cpp      \
                     ../../../ui/inputs.cpp     \
                     ../../../ui/textedit.cpp   \
+                    ../../../ui/keypad.cpp     \
+                    ../../../ui/image_codec.cpp\
                     ../../../ui/strlib.cpp     \
                     ../../../ui/graphics.cpp   \
                     ../../../ui/system.cpp

src/platform/android/jni/Android.mk

@@ -1,2 +1,3 @@
 APP_ABI := all
 APP_STL := c++_shared
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true