UI: Fix RGB handling with IMAGE

Author: chrisws

ChangeLog

@@ -1,3 +1,9 @@
+2021-06-12 (12.22)
+	UI: Fix potential memory leak using IMAGE
+	UI: Fix RGB handling with IMAGE
+	ANDROID: restore home directory when resuming from run
+	ANDROID: removed samsung keypad warning
+
 2021-06-06 (12.22)
 	UI: implemented image.draw(), fix image.save in andoid #115
 

src/platform/android/app/build.gradle

@@ -9,7 +9,7 @@ android {
     applicationId 'net.sourceforge.smallbasic'
     minSdkVersion 16
     targetSdkVersion 30
-    versionCode 45
+    versionCode 46
     versionName "12.22"
     resConfigs "en"
   }

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

@@ -38,6 +38,11 @@
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
+
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -63,8 +68,6 @@
 import java.net.Socket;
 import java.net.SocketException;
 import java.net.URLDecoder;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -78,10 +81,6 @@
 import java.util.concurrent.Semaphore;
 import java.util.zip.GZIPInputStream;
 
-import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.core.content.FileProvider;
 import dalvik.system.BaseDexClassLoader;
 
 /**
@@ -471,7 +470,8 @@ public boolean removeLocationUpdates() {
     if (_locationAdapter != null) {
       LocationManager locationService = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
       if (locationService != null) {
-        locationService.removeUpdates(_locationAdapter);
+        // requires coarse location permission
+        //locationService.removeUpdates(_locationAdapter);
         _locationAdapter = null;
         result = true;
       }
@@ -603,14 +603,7 @@ public void run() {
         InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
         if (imm != null) {
           if (show) {
-            String id = Settings.Secure.getString(activity.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
-            if (id != null && id.toLowerCase().contains("samsung")) {
-              imm.showInputMethodPicker();
-              String message = getResources().getString(R.string.samsung_keyboard);
-              Toast.makeText(activity, message, Toast.LENGTH_LONG).show();
-            } else {
-              imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
-            }
+            imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
           } else {
             imm.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
           }

src/platform/android/jni/Android.mk

@@ -15,7 +15,7 @@ LOCAL_PATH := $(JNI_PATH)
 include $(CLEAR_VARS)
 LOCAL_MODULE     := smallbasic
 LOCAL_CFLAGS     := -DHAVE_CONFIG_H=1 -DLODEPNG_NO_COMPILE_CPP \
-	                  -DPIXELFORMAT_RGBA8888 -Wno-unknown-pragmas
+	                  -DPIXELFORMAT_ARGB8888 -Wno-unknown-pragmas
 LOCAL_C_INCLUDES := $(SB_HOME) $(SB_HOME)/src  \
                     $(FREETYPE_HOME)/freetype/include/freetype2   \
                     $(FREETYPE_HOME)/freetype/include/freetype2/freetype

src/platform/android/jni/display.cpp

@@ -145,7 +145,7 @@ bool Graphics::construct(int fontId) {
     if (_screen && _screen->create(_w, _h)) {
       _drawTarget = _screen;
       maSetColor(DEFAULT_BACKGROUND);
-      ANativeWindow_setBuffersGeometry(_app->window, 0, 0, AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM);
+      ANativeWindow_setBuffersGeometry(_app->window, 0, 0, PIXELFORMAT);
       result = true;
     } else {
       trace("Failed to create canvas");
@@ -163,9 +163,9 @@ void Graphics::redraw() {
     if (!locked) {
       trace("Unable to lock window buffer");
     } else {
-      if (buffer.format != AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM) {
+      if (buffer.format != PIXELFORMAT) {
         ANativeWindow_unlockAndPost(_app->window);
-        ANativeWindow_setBuffersGeometry(_app->window, 0, 0, AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM);
+        ANativeWindow_setBuffersGeometry(_app->window, 0, 0, PIXELFORMAT);
         locked = ANativeWindow_lock(_app->window, &buffer, nullptr) == 0;
         trace("Restore format %d", locked);
       }

src/platform/android/jni/runtime.cpp

@@ -516,14 +516,7 @@ void Runtime::loadConfig() {
   _output->setFontSize(fontSize);
   _initialFontSize = _output->getFontSize();
 
-  const char *storage = getenv("EXTERNAL_DIR");
-  if (!storage) {
-    storage = getenv("INTERNAL_DIR");
-  }
-  if (storage) {
-    setenv("HOME_DIR", storage, 1);
-    chdir(storage);
-  }
+  onRunCompleted();
   if (loadSettings(settings)) {
     String *s = settings.get(FONT_SCALE_KEY);
     if (s) {
@@ -534,11 +527,6 @@ void Runtime::loadConfig() {
         _output->setFontSize(fontSize);
       }
     }
-    s = settings.get(PATH_KEY);
-    if (s) {
-      trace("path = %s", s->c_str());
-      chdir(s->c_str());
-    }
     s = settings.get(MUTE_AUDIO_KEY);
     if (s && s->toInteger() == 1) {
       opt_mute_audio = 1;
@@ -896,6 +884,17 @@ void Runtime::onResize(int width, int height) {
   }
 }
 
+void Runtime::onRunCompleted() {
+  const char *storage = getenv("EXTERNAL_DIR");
+  if (!storage) {
+    storage = getenv("INTERNAL_DIR");
+  }
+  if (storage) {
+    setenv("HOME_DIR", storage, 1);
+    chdir(storage);
+  }
+}
+
 void Runtime::onUnicodeChar(int ch) {
   auto *maEvent = new MAEvent();
   maEvent->type = EVENT_TYPE_KEY_PRESSED;

src/platform/android/jni/runtime.h

@@ -61,7 +61,6 @@ struct Runtime : public System {
   void runShell();
   char *loadResource(const char *fileName);
   void optionsBox(StringList *items);
-  void restoreWindowRect() {}
   void saveWindowRect() {}
   void setWindowSize(int width, int height) {};
   void setWindowTitle(const char *title) {}
@@ -70,6 +69,7 @@ struct Runtime : public System {
   void showKeypad(bool show);
   void onPaused(bool paused) { if (_graphics != NULL) _graphics->onPaused(paused); }
   void onResize(int w, int h);
+  void onRunCompleted();
   void onUnicodeChar(int ch);
   void loadConfig();
   void loadEnvConfig(Properties<String *> &settings, const char *key);

src/platform/console/image.cpp

@@ -8,7 +8,7 @@
 // Copyright(C) 2002-2018 Chris Warren-Smith.
 
 #define LODEPNG_NO_COMPILE_CPP
-#define PIXELFORMAT_RGBA8888
+#define PIXELFORMAT_ARGB8888
 #define IMG_WIDTH "width"
 #define IMG_HEIGHT "height"
 #define IMG_NAME "name"

src/platform/fltk/Makefile.am

@@ -10,6 +10,7 @@ AM_CPPFLAGS =                                                 \
   -DPACKAGE_PREFIX=\""$(prefix)"\"                            \
   -DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\"                      \
   -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
+  -DPIXELFORMAT_ARGB8888=1                                    \
   @PACKAGE_CFLAGS@ @FLTK_CXXFLAGS@
 
 EXTRA_DIST =                      \

src/platform/fltk/runtime.h

@@ -25,7 +25,7 @@ struct Runtime : public System {
   void enableCursor(bool enabled);
   int handle(int event);
   void optionsBox(StringList *items);
-  void restoreWindowRect() {}
+  void onRunCompleted() {}
   void saveWindowRect() {}
   MAEvent processEvents(int waitFlag);
   bool run(const char *bas) { return execute(bas); }