Migrate the Android port to SDL2

Author: grorp

android/SDL_Java_RMB_fix.patch

@@ -0,0 +1,18 @@
+diff --git a/android/app/src/main/java/org/libsdl/app/SDLActivity.java b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
+index fd5a056e3..83e3cf657 100644
+--- a/android/app/src/main/java/org/libsdl/app/SDLActivity.java
++++ b/android/app/src/main/java/org/libsdl/app/SDLActivity.java
+@@ -1345,7 +1345,12 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
+             }
+         }
+ 
+-        if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) {
++        if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE ||
++                /*
++                 * CUSTOM ADDITION FOR MINETEST
++                 * should be upstreamed
++                 */
++                (source & InputDevice.SOURCE_MOUSE_RELATIVE) == InputDevice.SOURCE_MOUSE_RELATIVE) {
+             // on some devices key events are sent for mouse BUTTON_BACK/FORWARD presses
+             // they are ignored here because sending them as mouse input to SDL is messy
+             if ((keyCode == KeyEvent.KEYCODE_BACK) || (keyCode == KeyEvent.KEYCODE_FORWARD)) {

android/app/src/main/java/net/minetest/minetest/GameActivity.java

@@ -20,7 +20,8 @@
 
 package net.minetest.minetest;
 
-import android.app.NativeActivity;
+import org.libsdl.app.SDLActivity;
+
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -32,6 +33,7 @@
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.LinearLayout;
+import android.content.res.Configuration;
 
 import androidx.annotation.Keep;
 import androidx.appcompat.app.AlertDialog;
@@ -45,45 +47,36 @@
 // This annotation prevents the minifier/Proguard from mangling them.
 @Keep
 @SuppressWarnings("unused")
-public class GameActivity extends NativeActivity {
-	static {
-		System.loadLibrary("c++_shared");
-		System.loadLibrary("minetest");
-	}
-
-	enum DialogType { TEXT_INPUT, SELECTION_INPUT }
-	enum DialogState { DIALOG_SHOWN, DIALOG_INPUTTED, DIALOG_CANCELED }
-
-	private DialogType lastDialogType = DialogType.TEXT_INPUT;
-	private DialogState inputDialogState = DialogState.DIALOG_CANCELED;
-	private String messageReturnValue = "";
-	private int selectionReturnValue = 0;
-
+public class GameActivity extends SDLActivity {
 	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+	protected String getMainSharedObject() {
+		return getContext().getApplicationInfo().nativeLibraryDir + "/libminetest.so";
 	}
 
-	private void makeFullScreen() {
-		this.getWindow().getDecorView().setSystemUiVisibility(
-				View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
-				View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
-				View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
+	@Override
+	protected String getMainFunction() {
+		return "SDL_Main";
 	}
 
 	@Override
-	public void onWindowFocusChanged(boolean hasFocus) {
-		super.onWindowFocusChanged(hasFocus);
-		if (hasFocus)
-			makeFullScreen();
+	protected String[] getLibraries() {
+		return new String[] {
+			"minetest"
+		};
 	}
 
+	// Prevent SDL from changing orientation settings since we already set the
+	// correct orientation in our AndroidManifest.xml
 	@Override
-	protected void onResume() {
-		super.onResume();
-		makeFullScreen();
-	}
+	public void setOrientationBis(int w, int h, boolean resizable, String hint) {}
+
+	enum DialogType { TEXT_INPUT, SELECTION_INPUT }
+	enum DialogState { DIALOG_SHOWN, DIALOG_INPUTTED, DIALOG_CANCELED }
+
+	private DialogType lastDialogType = DialogType.TEXT_INPUT;
+	private DialogState inputDialogState = DialogState.DIALOG_CANCELED;
+	private String messageReturnValue = "";
+	private int selectionReturnValue = 0;
 
 	private native void saveSettings();
 
@@ -96,11 +89,6 @@ protected void onStop() {
 		saveSettings();
 	}
 
-	@Override
-	public void onBackPressed() {
-		// Ignore the back press so Minetest can handle it
-	}
-
 	public void showTextInputDialog(String hint, String current, int editType) {
 		runOnUiThread(() -> showTextInputDialogUI(hint, current, editType));
 	}
@@ -265,4 +253,8 @@ public String getLanguage() {
 
 		return langCode;
 	}
+
+	public boolean hasPhysicalKeyboard() {
+		return getContext().getResources().getConfiguration().keyboard != Configuration.KEYBOARD_NOKEYS;
+	}
 }

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

@@ -1345,7 +1345,12 @@ public static boolean handleKeyEvent(View v, int keyCode, KeyEvent event, InputC
             }
         }
 
-        if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) {
+        if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE ||
+                /*
+                 * CUSTOM ADDITION FOR MINETEST
+                 * should be upstreamed
+                 */
+                (source & InputDevice.SOURCE_MOUSE_RELATIVE) == InputDevice.SOURCE_MOUSE_RELATIVE) {
             // on some devices key events are sent for mouse BUTTON_BACK/FORWARD presses
             // they are ignored here because sending them as mouse input to SDL is messy
             if ((keyCode == KeyEvent.KEYCODE_BACK) || (keyCode == KeyEvent.KEYCODE_FORWARD)) {

builtin/settingtypes.txt

@@ -153,8 +153,6 @@ invert_hotbar_mouse_wheel (Hotbar: Invert mouse wheel direction) bool false
 [*Touchscreen]
 
 #    Enables touchscreen mode, allowing you to play the game with a touchscreen.
-#
-#    Requires: !android
 enable_touch (Enable touchscreen) bool true
 
 #    Touchscreen sensitivity multiplier.

cmake/Modules/MinetestAndroidLibs.cmake

@@ -25,3 +25,5 @@ set(VORBIS_LIBRARY ${DEPS}/Vorbis/libvorbis.a)
 set(VORBISFILE_LIBRARY ${DEPS}/Vorbis/libvorbisfile.a)
 set(ZSTD_INCLUDE_DIR ${DEPS}/Zstd/include)
 set(ZSTD_LIBRARY ${DEPS}/Zstd/libzstd.a)
+set(SDL2_INCLUDE_DIRS ${DEPS}/SDL2/include/SDL2)
+set(SDL2_LIBRARIES ${DEPS}/SDL2/libSDL2.a)

irr/include/IEventReceiver.h

@@ -79,9 +79,6 @@ enum EEVENT_TYPE
 	*/
 	EET_USER_EVENT,
 
-	//! Pass on raw events from the OS
-	EET_SYSTEM_EVENT,
-
 	//! Application state events like a resume, pause etc.
 	EET_APPLICATION_EVENT,
 
@@ -187,17 +184,6 @@ enum ETOUCH_INPUT_EVENT
 	ETIE_COUNT
 };
 
-enum ESYSTEM_EVENT_TYPE
-{
-	//! From Android command handler for native activity messages
-	ESET_ANDROID_CMD = 0,
-
-	// TODO: for example ESET_WINDOWS_MESSAGE for win32 message loop events
-
-	//! No real event, but to get number of event types
-	ESET_COUNT
-};
-
 //! Enumeration for a commonly used application state events (it's useful mainly for mobile devices)
 enum EAPPLICATION_EVENT_TYPE
 {
@@ -528,25 +514,6 @@ struct SEvent
 		size_t UserData2;
 	};
 
-	// Raw events from the OS
-	struct SSystemEvent
-	{
-		//! Android command handler native activity messages.
-		struct SAndroidCmd
-		{
-			//!  APP_CMD_ enums defined in android_native_app_glue.h from the Android NDK
-			s32 Cmd;
-		};
-
-		// TOOD: more structs for iphone, Windows, X11, etc.
-
-		ESYSTEM_EVENT_TYPE EventType;
-		union
-		{
-			struct SAndroidCmd AndroidCmd;
-		};
-	};
-
 	// Application state event
 	struct SApplicationEvent
 	{
@@ -567,7 +534,6 @@ struct SEvent
 		struct SJoystickEvent JoystickEvent;
 		struct SLogEvent LogEvent;
 		struct SUserEvent UserEvent;
-		struct SSystemEvent SystemEvent;
 		struct SApplicationEvent ApplicationEvent;
 	};
 };

irr/include/IrrlichtDevice.h

@@ -180,10 +180,7 @@ class IrrlichtDevice : public virtual IReferenceCounted
 	virtual bool isFullscreen() const = 0;
 
 	//! Checks if the window could possibly be visible.
-	//! Currently, this only returns false when the activity is stopped on
-	//! Android. Note that for Android activities, "stopped" means something
-	//! different than you might expect (and also something different than
-	//! "paused"). Read the Android lifecycle documentation.
+	/** If this returns false, you should not do any rendering. */
 	virtual bool isWindowVisible() const { return true; };
 
 	//! Get the current color format of the window