update sdl3 to java (todo use fixed version!) + added buttins

Author: evgeniy-gleba

android-project/app/src/main/java/org/libsdl/app/SDLActivity.java

@@ -23,6 +23,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.LocaleList;
 import android.os.Message;
 import android.os.ParcelFileDescriptor;
 import android.util.DisplayMetrics;
@@ -60,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     private static final String TAG = "SDL";
     private static final int SDL_MAJOR_VERSION = 3;
     private static final int SDL_MINOR_VERSION = 2;
-    private static final int SDL_MICRO_VERSION = 14;
+    private static final int SDL_MICRO_VERSION = 24;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //
@@ -2116,6 +2117,44 @@ static class SDLFileDialogState {
         int requestCode;
         boolean multipleChoice;
     }
+    
+    /**
+     * This method is called by SDL using JNI.
+     */
+    public static String getPreferredLocales() {
+        String result = "";
+        if (Build.VERSION.SDK_INT >= 24 /* Android 7 (N) */) {
+            LocaleList locales = LocaleList.getAdjustedDefault();
+            for (int i = 0; i < locales.size(); i++) {
+                if (i != 0) result += ",";
+                result += formatLocale(locales.get(i));
+            }
+        } else if (mCurrentLocale != null) {
+            result = formatLocale(mCurrentLocale);
+        }
+        return result;
+    }
+
+    public static String formatLocale(Locale locale) {
+        String result = "";
+        String lang = "";
+        if (locale.getLanguage() == "in") {
+            // Indonesian is "id" according to ISO 639.2, but on Android is "in" because of Java backwards compatibility
+            lang = "id";
+        } else if (locale.getLanguage() == "") {
+            // Make sure language is never empty
+            lang = "und";
+        } else {
+            lang = locale.getLanguage();
+        }
+
+        if (locale.getCountry() == "") {
+            result = lang;
+        } else {
+            result = lang + "_" + locale.getCountry();
+        }
+        return result;
+    }
 }
 
 /**
@@ -2157,7 +2196,11 @@ class SDLClipboardHandler implements
     }
 
     public boolean clipboardHasText() {
-       return mClipMgr.hasPrimaryClip();
+        if (Build.VERSION.SDK_INT >= 28 /* Android 9 (P) */) {
+            return mClipMgr.hasPrimaryClip();
+        } else {
+            return mClipMgr.hasText();
+        }
     }
 
     public String clipboardGetText() {
@@ -2175,10 +2218,19 @@ public String clipboardGetText() {
     }
 
     public void clipboardSetText(String string) {
-       mClipMgr.removePrimaryClipChangedListener(this);
-       ClipData clip = ClipData.newPlainText(null, string);
-       mClipMgr.setPrimaryClip(clip);
-       mClipMgr.addPrimaryClipChangedListener(this);
+        mClipMgr.removePrimaryClipChangedListener(this);
+        if (string.isEmpty()) {
+            if (Build.VERSION.SDK_INT >= 28 /* Android 9 (P) */) {
+                mClipMgr.clearPrimaryClip();
+            } else {
+                ClipData clip = ClipData.newPlainText(null, "");
+                mClipMgr.setPrimaryClip(clip);
+            }
+        } else {
+            ClipData clip = ClipData.newPlainText(null, string);
+            mClipMgr.setPrimaryClip(clip);
+        }
+        mClipMgr.addPrimaryClipChangedListener(this);
     }
 
     @Override

cmake/cpm/sdl3-config.cmake

@@ -6,7 +6,7 @@ cpmaddpackage(
     GITHUB_REPOSITORY
     libsdl-org/SDL
     GIT_TAG
-    a96677bdf6b4acb84af4ec294e5f60a4e8cbbe03
+    a8589a84226a6202831a3d49ff4edda4acab9acd
     SYSTEM
     ON
     GIT_SHALLOW

src/sdl_main.cpp

@@ -1,35 +1,53 @@
 #include <SDL3/SDL.h>
 #include <SDL3/SDL_main.h>
+#include <SDL3/SDL_messagebox.h>
 
 #include <cstdlib>
 
-// avoid SDL_main unresolved externals
 int main([[maybe_unused]] int argc, [[maybe_unused]] char* argv[])
 {
-    if (!SDL_Init(SDL_INIT_EVENTS | SDL_INIT_VIDEO))
-    {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "SDL_Init failed: %s",
-                     SDL_GetError());
+    if (!SDL_Init(SDL_INIT_EVENTS | SDL_INIT_VIDEO)) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_Init failed: %s", SDL_GetError());
         return EXIT_FAILURE;
     }
 
-    struct SDLGuard final
-    {
-        ~SDLGuard() { SDL_Quit(); }
-    } sdl_guard;
-
-    if (SDL_ShowSimpleMessageBox(
-            SDL_MESSAGEBOX_INFORMATION,
-            "Hello World",
-            "!! Your SDL project successfully runs on Android !!",
-            nullptr) != 0) // Prefer nullptr over NULL
-    {
-        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
-                     "Message box failed: %s",
-                     SDL_GetError());
+    struct sdl_guard final { ~sdl_guard() { SDL_Quit(); } } sdl_guard;
+
+    const SDL_MessageBoxButtonData buttons[] = {
+            { SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT, 1, "Info" },
+            { SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT, 2, "Exit" },
+    };
+
+    const SDL_MessageBoxData box = {
+            SDL_MESSAGEBOX_INFORMATION, // flags
+            nullptr,                    // parent window
+            "Hello World",              // title
+            "!! Your SDL project successfully runs on Android !!", // message
+            (int)(sizeof(buttons) / sizeof(buttons[0])), // num buttons
+            buttons,                    // buttons
+            nullptr                     // color scheme
+    };
+
+    int button_id = -1;
+    if (!SDL_ShowMessageBox(&box, &button_id)) {
+        SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "ShowMessageBox failed: %s", SDL_GetError());
         return EXIT_FAILURE;
     }
 
+    if (button_id == 1) {
+        // Minimal “about me” info; tweak as needed
+        if (!SDL_ShowSimpleMessageBox(
+                SDL_MESSAGEBOX_INFORMATION,
+                "About",
+                "Minimalist system architect.\n"
+                "- C/C++/Python\n"
+                "- alt linux, bash\n"
+                "- snake_case, dir-name, less code fewer bugs\n",
+                nullptr)) {
+            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Info box failed: %s", SDL_GetError());
+            return EXIT_FAILURE;
+        }
+    }
+
     return EXIT_SUCCESS;
-}
+}