diff --git a/build/nuke/Native/SilkDroid.cs b/build/nuke/Native/SilkDroid.cs index 52c2cdb1ab..6f84705b9f 100644 --- a/build/nuke/Native/SilkDroid.cs +++ b/build/nuke/Native/SilkDroid.cs @@ -103,6 +103,11 @@ string AndroidHome SourceDirectory / "Windowing" / "Silk.NET.Windowing.Sdl" / "Android" / "app-release.aar", FileExistsPolicy.Overwrite ); + + // Not expecting this to succeed, but we need to do this so we generate the bindings to go in the public API. + InheritedShell($"dotnet build \"{SourceDirectory / "Windowing" / "Silk.NET.Windowing.Sdl" / "Silk.NET.Windowing.Sdl.csproj"}\"").AssertWaitForExit(); + + // Update the public API. InheritedShell(string.Format(FormatDeclCmd, SourceDirectory / "Windowing" / "Silk.NET.Windowing.Sdl" / "Silk.NET.Windowing.Sdl.csproj")).AssertZeroExitCode(); return ret; } diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/ios/native/libSDL2.a b/src/Native/Silk.NET.SDL.Native/runtimes/ios/native/libSDL2.a index c7b68069a2..e3469b70ff 100644 Binary files a/src/Native/Silk.NET.SDL.Native/runtimes/ios/native/libSDL2.a and b/src/Native/Silk.NET.SDL.Native/runtimes/ios/native/libSDL2.a differ diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/iossimulator/native/libSDL2.a b/src/Native/Silk.NET.SDL.Native/runtimes/iossimulator/native/libSDL2.a index 2066c85288..efbf09b5d9 100644 Binary files a/src/Native/Silk.NET.SDL.Native/runtimes/iossimulator/native/libSDL2.a and b/src/Native/Silk.NET.SDL.Native/runtimes/iossimulator/native/libSDL2.a differ diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/tvos/native/libSDL2.a b/src/Native/Silk.NET.SDL.Native/runtimes/tvos/native/libSDL2.a index 9e9422ff13..d6605533a1 100644 Binary files a/src/Native/Silk.NET.SDL.Native/runtimes/tvos/native/libSDL2.a and b/src/Native/Silk.NET.SDL.Native/runtimes/tvos/native/libSDL2.a differ diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/tvossimulator/native/libSDL2.a b/src/Native/Silk.NET.SDL.Native/runtimes/tvossimulator/native/libSDL2.a index 94bd91fde3..5d8ea6f5b0 100644 Binary files a/src/Native/Silk.NET.SDL.Native/runtimes/tvossimulator/native/libSDL2.a and b/src/Native/Silk.NET.SDL.Native/runtimes/tvossimulator/native/libSDL2.a differ diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/win-arm64/native/SDL2.dll b/src/Native/Silk.NET.SDL.Native/runtimes/win-arm64/native/SDL2.dll index 601103a927..257cc3cd3d 100644 Binary files a/src/Native/Silk.NET.SDL.Native/runtimes/win-arm64/native/SDL2.dll and b/src/Native/Silk.NET.SDL.Native/runtimes/win-arm64/native/SDL2.dll differ diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/win-x64/native/SDL2.dll b/src/Native/Silk.NET.SDL.Native/runtimes/win-x64/native/SDL2.dll index a477e3c7ab..348d1d70a2 100644 Binary files a/src/Native/Silk.NET.SDL.Native/runtimes/win-x64/native/SDL2.dll and b/src/Native/Silk.NET.SDL.Native/runtimes/win-x64/native/SDL2.dll differ diff --git a/src/Native/Silk.NET.SDL.Native/runtimes/win-x86/native/SDL2.dll b/src/Native/Silk.NET.SDL.Native/runtimes/win-x86/native/SDL2.dll index 1f4ab07d60..6298da2f0c 100644 Binary files a/src/Native/Silk.NET.SDL.Native/runtimes/win-x86/native/SDL2.dll and b/src/Native/Silk.NET.SDL.Native/runtimes/win-x86/native/SDL2.dll differ diff --git a/src/Windowing/Silk.NET.Windowing.Sdl/Android/app-release.aar b/src/Windowing/Silk.NET.Windowing.Sdl/Android/app-release.aar index 99d2061d8f..24c099088f 100644 Binary files a/src/Windowing/Silk.NET.Windowing.Sdl/Android/app-release.aar and b/src/Windowing/Silk.NET.Windowing.Sdl/Android/app-release.aar differ diff --git a/src/Windowing/Silk.NET.Windowing.Sdl/PublicAPI/net6.0-android/PublicAPI.Unshipped.txt b/src/Windowing/Silk.NET.Windowing.Sdl/PublicAPI/net6.0-android/PublicAPI.Unshipped.txt index 7dc5c58110..3c46ded9ff 100644 --- a/src/Windowing/Silk.NET.Windowing.Sdl/PublicAPI/net6.0-android/PublicAPI.Unshipped.txt +++ b/src/Windowing/Silk.NET.Windowing.Sdl/PublicAPI/net6.0-android/PublicAPI.Unshipped.txt @@ -1 +1,7 @@ #nullable enable +~override Silk.NET.Windowing.Sdl.Android.SilkActivity.SetOrientationBis(int w, int h, bool resizable, string hint) -> void +~static Silk.NET.Windowing.Sdl.SdlWindowing.CreateFrom(void* handle, Silk.NET.Core.Contexts.IGLContext? ctx = null) -> Silk.NET.Windowing.IView +~static Silk.NET.Windowing.Sdl.SdlWindowing.GetExistingApi(Silk.NET.Windowing.IView view) -> Silk.NET.SDL.Sdl? +~static Silk.NET.Windowing.Sdl.SdlWindowing.GetHandle(Silk.NET.Windowing.IView view) -> Silk.NET.SDL.Window* +~static Silk.NET.Windowing.Sdl.SdlWindowing.GetSysWMInfo(Silk.NET.Windowing.IView view) -> Silk.NET.SDL.SysWMInfo? +~static Silk.NET.Windowing.Sdl.SdlWindowing.IsViewSdl(Silk.NET.Windowing.IView view) -> bool diff --git a/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java b/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java index ee5521fd5e..65c5a42370 100644 --- a/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java +++ b/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java @@ -186,7 +186,7 @@ public BluetoothGatt getGatt() { // Because on Chromebooks we show up as a dual-mode device, it will attempt to connect TRANSPORT_AUTO, which will use TRANSPORT_BREDR instead // of TRANSPORT_LE. Let's force ourselves to connect low energy. private BluetoothGatt connectGatt(boolean managed) { - if (Build.VERSION.SDK_INT >= 23 /* Android 6.0 (M) */) { + if (Build.VERSION.SDK_INT >= 23) { try { return mDevice.connectGatt(mManager.getContext(), managed, this, TRANSPORT_LE); } catch (Exception e) { @@ -429,7 +429,7 @@ public void run() { } }); } - } + } else if (newState == 0) { mIsConnected = false; } diff --git a/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/HIDDeviceManager.java b/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/HIDDeviceManager.java index e7281fdf26..cf3c9267fb 100644 --- a/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/HIDDeviceManager.java +++ b/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/HIDDeviceManager.java @@ -170,7 +170,7 @@ private void initializeUSB() { Log.i(TAG," Interface protocol: " + mUsbInterface.getInterfaceProtocol()); Log.i(TAG," Endpoint count: " + mUsbInterface.getEndpointCount()); - // Get endpoint details + // Get endpoint details for (int epi = 0; epi < mUsbInterface.getEndpointCount(); epi++) { UsbEndpoint mEndpoint = mUsbInterface.getEndpoint(epi); @@ -251,8 +251,6 @@ private boolean isXbox360Controller(UsbDevice usbDevice, UsbInterface usbInterfa 0x20d6, // PowerA 0x24c6, // PowerA 0x2c22, // Qanba - 0x2dc8, // 8BitDo - 0x9886, // ASTRO Gaming }; if (usbInterface.getInterfaceClass() == UsbConstants.USB_CLASS_VENDOR_SPEC && @@ -273,19 +271,15 @@ private boolean isXboxOneController(UsbDevice usbDevice, UsbInterface usbInterfa final int XB1_IFACE_SUBCLASS = 71; final int XB1_IFACE_PROTOCOL = 208; final int[] SUPPORTED_VENDORS = { - 0x03f0, // HP - 0x044f, // Thrustmaster 0x045e, // Microsoft 0x0738, // Mad Catz 0x0e6f, // PDP 0x0f0d, // Hori - 0x10f5, // Turtle Beach 0x1532, // Razer Wildcat 0x20d6, // PowerA 0x24c6, // PowerA - 0x2dc8, // 8BitDo + 0x2dc8, /* 8BitDo */ 0x2e24, // Hyperkin - 0x3537, // GameSir }; if (usbInterface.getId() == 0 && @@ -359,19 +353,13 @@ private void connectHIDDeviceUSB(UsbDevice usbDevice) { private void initializeBluetooth() { Log.d(TAG, "Initializing Bluetooth"); - if (Build.VERSION.SDK_INT >= 31 /* Android 12 */ && - mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH_CONNECT, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) { - Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH_CONNECT"); - return; - } - - if (Build.VERSION.SDK_INT <= 30 /* Android 11.0 (R) */ && + if (Build.VERSION.SDK_INT <= 30 && mContext.getPackageManager().checkPermission(android.Manifest.permission.BLUETOOTH, mContext.getPackageName()) != PackageManager.PERMISSION_GRANTED) { Log.d(TAG, "Couldn't initialize Bluetooth, missing android.permission.BLUETOOTH"); return; } - if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE) || (Build.VERSION.SDK_INT < 18 /* Android 4.3 (JELLY_BEAN_MR2) */)) { + if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE) || (Build.VERSION.SDK_INT < 18)) { Log.d(TAG, "Couldn't initialize Bluetooth, this version of Android does not support Bluetooth LE"); return; } @@ -536,7 +524,7 @@ public void setFrozen(boolean frozen) { for (HIDDevice device : mDevicesById.values()) { device.setFrozen(frozen); } - } + } } ////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -585,7 +573,7 @@ public boolean openDevice(int deviceID) { try { final int FLAG_MUTABLE = 0x02000000; // PendingIntent.FLAG_MUTABLE, but don't require SDK 31 int flags; - if (Build.VERSION.SDK_INT >= 31 /* Android 12.0 (S) */) { + if (Build.VERSION.SDK_INT >= 31) { flags = FLAG_MUTABLE; } else { flags = 0; diff --git a/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java b/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java index bfe0cf954d..d20fe80bc6 100644 --- a/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java +++ b/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java @@ -52,7 +52,7 @@ public int getProductId() { @Override public String getSerialNumber() { String result = null; - if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) { + if (Build.VERSION.SDK_INT >= 21) { try { result = mDevice.getSerialNumber(); } @@ -74,7 +74,7 @@ public int getVersion() { @Override public String getManufacturerName() { String result = null; - if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) { + if (Build.VERSION.SDK_INT >= 21) { result = mDevice.getManufacturerName(); } if (result == null) { @@ -86,7 +86,7 @@ public String getManufacturerName() { @Override public String getProductName() { String result = null; - if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) { + if (Build.VERSION.SDK_INT >= 21) { result = mDevice.getProductName(); } if (result == null) { diff --git a/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDL.java b/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDL.java index 44c21c1c75..dafc0cb87d 100644 --- a/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDL.java +++ b/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDL.java @@ -29,7 +29,6 @@ public static void initialize() { // This function stores the current activity (SDL or not) public static void setContext(Context context) { - SDLAudioManager.setContext(context); mContext = context; } diff --git a/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDLActivity.java b/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDLActivity.java index fd5a056e3f..eef4ee870b 100644 --- a/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDLActivity.java +++ b/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDLActivity.java @@ -60,8 +60,8 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener { private static final String TAG = "SDL"; private static final int SDL_MAJOR_VERSION = 2; - private static final int SDL_MINOR_VERSION = 30; - private static final int SDL_MICRO_VERSION = 1; + private static final int SDL_MINOR_VERSION = 26; + private static final int SDL_MICRO_VERSION = 2; /* // Display InputType.SOURCE/CLASS of events and devices // @@ -93,7 +93,7 @@ public static void debugSource(int sources, String prefix) { s2 = s_copy & InputDevice.SOURCE_ANY; // keep source only, no class; - if (Build.VERSION.SDK_INT >= 23) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { tst = InputDevice.SOURCE_BLUETOOTH_STYLUS; if ((s & tst) == tst) src += " BLUETOOTH_STYLUS"; s2 &= ~tst; @@ -107,7 +107,7 @@ public static void debugSource(int sources, String prefix) { if ((s & tst) == tst) src += " GAMEPAD"; s2 &= ~tst; - if (Build.VERSION.SDK_INT >= 21) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { tst = InputDevice.SOURCE_HDMI; if ((s & tst) == tst) src += " HDMI"; s2 &= ~tst; @@ -146,7 +146,7 @@ public static void debugSource(int sources, String prefix) { if ((s & tst) == tst) src += " TOUCHSCREEN"; s2 &= ~tst; - if (Build.VERSION.SDK_INT >= 18) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) { tst = InputDevice.SOURCE_TOUCH_NAVIGATION; if ((s & tst) == tst) src += " TOUCH_NAVIGATION"; s2 &= ~tst; @@ -170,7 +170,7 @@ public static void debugSource(int sources, String prefix) { */ public static boolean mIsResumedCalled, mHasFocus; - public static final boolean mHasMultiWindow = (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */); + public static final boolean mHasMultiWindow = (Build.VERSION.SDK_INT >= 24); // Cursor types // private static final int SDL_SYSTEM_CURSOR_NONE = -1; @@ -224,9 +224,9 @@ public enum NativeState { protected static SDLGenericMotionListener_API12 getMotionListener() { if (mMotionListener == null) { - if (Build.VERSION.SDK_INT >= 26 /* Android 8.0 (O) */) { + if (Build.VERSION.SDK_INT >= 26) { mMotionListener = new SDLGenericMotionListener_API26(); - } else if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) { + } else if (Build.VERSION.SDK_INT >= 24) { mMotionListener = new SDLGenericMotionListener_API24(); } else { mMotionListener = new SDLGenericMotionListener_API12(); @@ -393,7 +393,7 @@ public void onClick(DialogInterface dialog,int id) { mHIDDeviceManager = HIDDeviceManager.acquire(this); // Set up the surface - mSurface = createSDLSurface(this); + mSurface = createSDLSurface(getApplication()); mLayout = new RelativeLayout(this); mLayout.addView(mSurface); @@ -404,7 +404,7 @@ public void onClick(DialogInterface dialog,int id) { SDLActivity.onNativeOrientationChanged(mCurrentOrientation); try { - if (Build.VERSION.SDK_INT < 24 /* Android 7.0 (N) */) { + if (Build.VERSION.SDK_INT < 24) { mCurrentLocale = getContext().getResources().getConfiguration().locale; } else { mCurrentLocale = getContext().getResources().getConfiguration().getLocales().get(0); @@ -588,8 +588,6 @@ protected void onDestroy() { mHIDDeviceManager = null; } - SDLAudioManager.release(this); - if (SDLActivity.mBrokenLibraries) { super.onDestroy(); return; @@ -768,7 +766,7 @@ public void handleMessage(Message msg) { } break; case COMMAND_CHANGE_WINDOW_STYLE: - if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) { + if (Build.VERSION.SDK_INT >= 19) { if (context instanceof Activity) { Window window = ((Activity) context).getWindow(); if (window != null) { @@ -843,7 +841,7 @@ boolean sendCommand(int command, Object data) { msg.obj = data; boolean result = commandHandler.sendMessage(msg); - if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) { + if (Build.VERSION.SDK_INT >= 19) { if (command == COMMAND_CHANGE_WINDOW_STYLE) { // Ensure we don't return until the resize has actually happened, // or 500ms have passed. @@ -971,18 +969,15 @@ public void setOrientationBis(int w, int h, boolean resizable, String hint) /* If set, hint "explicitly controls which UI orientations are allowed". */ if (hint.contains("LandscapeRight") && hint.contains("LandscapeLeft")) { orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE; - } else if (hint.contains("LandscapeLeft")) { - orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE; } else if (hint.contains("LandscapeRight")) { + orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE; + } else if (hint.contains("LandscapeLeft")) { orientation_landscape = ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE; } - /* exact match to 'Portrait' to distinguish with PortraitUpsideDown */ - boolean contains_Portrait = hint.contains("Portrait ") || hint.endsWith("Portrait"); - - if (contains_Portrait && hint.contains("PortraitUpsideDown")) { + if (hint.contains("Portrait") && hint.contains("PortraitUpsideDown")) { orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT; - } else if (contains_Portrait) { + } else if (hint.contains("Portrait")) { orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT; } else if (hint.contains("PortraitUpsideDown")) { orientation_portrait = ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT; @@ -1095,7 +1090,7 @@ public static boolean supportsRelativeMouse() // thus SDK version 27. If we are in DeX mode and not API 27 or higher, as a result, // we should stick to relative mode. // - if (Build.VERSION.SDK_INT < 27 /* Android 8.1 (O_MR1) */ && isDeXMode()) { + if ((Build.VERSION.SDK_INT < 27) && isDeXMode()) { return false; } @@ -1185,7 +1180,7 @@ public static boolean isChromebook() { * This method is called by SDL using JNI. */ public static boolean isDeXMode() { - if (Build.VERSION.SDK_INT < 24 /* Android 7.0 (N) */) { + if (Build.VERSION.SDK_INT < 24) { return false; } try { @@ -1345,6 +1340,23 @@ public static boolean handleKeyEvent(View v, int keyCode, KeyEvent event, InputC } } + if ((source & InputDevice.SOURCE_KEYBOARD) == InputDevice.SOURCE_KEYBOARD) { + if (event.getAction() == KeyEvent.ACTION_DOWN) { + if (isTextInputEvent(event)) { + if (ic != null) { + ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1); + } else { + SDLInputConnection.nativeCommitText(String.valueOf((char) event.getUnicodeChar()), 1); + } + } + onNativeKeyDown(keyCode); + return true; + } else if (event.getAction() == KeyEvent.ACTION_UP) { + onNativeKeyUp(keyCode); + return true; + } + } + if ((source & InputDevice.SOURCE_MOUSE) == InputDevice.SOURCE_MOUSE) { // 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 @@ -1359,21 +1371,6 @@ public static boolean handleKeyEvent(View v, int keyCode, KeyEvent event, InputC } } - if (event.getAction() == KeyEvent.ACTION_DOWN) { - if (isTextInputEvent(event)) { - if (ic != null) { - ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1); - } else { - SDLInputConnection.nativeCommitText(String.valueOf((char) event.getUnicodeChar()), 1); - } - } - onNativeKeyDown(keyCode); - return true; - } else if (event.getAction() == KeyEvent.ACTION_UP) { - onNativeKeyUp(keyCode); - return true; - } - return false; } @@ -1620,7 +1617,7 @@ public boolean onKey(DialogInterface d, int keyCode, KeyEvent event) { private final Runnable rehideSystemUi = new Runnable() { @Override public void run() { - if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) { + if (Build.VERSION.SDK_INT >= 19) { int flags = View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY | @@ -1673,7 +1670,7 @@ public static int createCustomCursor(int[] colors, int width, int height, int ho Bitmap bitmap = Bitmap.createBitmap(colors, width, height, Bitmap.Config.ARGB_8888); ++mLastCursorID; - if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) { + if (Build.VERSION.SDK_INT >= 24) { try { mCursors.put(mLastCursorID, PointerIcon.create(bitmap, hotSpotX, hotSpotY)); } catch (Exception e) { @@ -1689,7 +1686,7 @@ public static int createCustomCursor(int[] colors, int width, int height, int ho * This method is called by SDL using JNI. */ public static void destroyCustomCursor(int cursorID) { - if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) { + if (Build.VERSION.SDK_INT >= 24) { try { mCursors.remove(cursorID); } catch (Exception e) { @@ -1703,7 +1700,7 @@ public static void destroyCustomCursor(int cursorID) { */ public static boolean setCustomCursor(int cursorID) { - if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) { + if (Build.VERSION.SDK_INT >= 24) { try { mSurface.setPointerIcon(mCursors.get(cursorID)); } catch (Exception e) { @@ -1758,7 +1755,7 @@ public static boolean setSystemCursor(int cursorID) { cursor_type = 1002; //PointerIcon.TYPE_HAND; break; } - if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) { + if (Build.VERSION.SDK_INT >= 24) { try { mSurface.setPointerIcon(PointerIcon.getSystemIcon(SDL.getContext(), cursor_type)); } catch (Exception e) { @@ -1772,7 +1769,7 @@ public static boolean setSystemCursor(int cursorID) { * This method is called by SDL using JNI. */ public static void requestPermission(String permission, int requestCode) { - if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) { + if (Build.VERSION.SDK_INT < 23) { nativePermissionResult(requestCode, true); return; } @@ -1801,7 +1798,7 @@ public static int openURL(String url) i.setData(Uri.parse(url)); int flags = Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_MULTIPLE_TASK; - if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) { + if (Build.VERSION.SDK_INT >= 21) { flags |= Intent.FLAG_ACTIVITY_NEW_DOCUMENT; } else { flags |= Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET; @@ -2005,18 +2002,6 @@ public boolean setComposingText(CharSequence text, int newCursorPosition) { @Override public boolean deleteSurroundingText(int beforeLength, int afterLength) { - if (Build.VERSION.SDK_INT <= 29 /* Android 10.0 (Q) */) { - // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions>/14560344/android-backspace-in-webview-baseinputconnection - // and https://bugzilla.libsdl.org/show_bug.cgi?id=2265 - if (beforeLength > 0 && afterLength == 0) { - // backspace(s) - while (beforeLength-- > 0) { - nativeGenerateScancodeForUnichar('\b'); - } - return true; - } - } - if (!super.deleteSurroundingText(beforeLength, afterLength)) { return false; } diff --git a/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDLAudioManager.java b/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDLAudioManager.java index 7c821a4097..2bfc718609 100644 --- a/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDLAudioManager.java +++ b/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDLAudioManager.java @@ -1,8 +1,5 @@ package org.libsdl.app; -import android.content.Context; -import android.media.AudioDeviceCallback; -import android.media.AudioDeviceInfo; import android.media.AudioFormat; import android.media.AudioManager; import android.media.AudioRecord; @@ -11,67 +8,34 @@ import android.os.Build; import android.util.Log; -import java.util.Arrays; - -public class SDLAudioManager { +public class SDLAudioManager +{ protected static final String TAG = "SDLAudio"; protected static AudioTrack mAudioTrack; protected static AudioRecord mAudioRecord; - protected static Context mContext; - - private static final int[] NO_DEVICES = {}; - - private static AudioDeviceCallback mAudioDeviceCallback; public static void initialize() { mAudioTrack = null; mAudioRecord = null; - mAudioDeviceCallback = null; - - if(Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) - { - mAudioDeviceCallback = new AudioDeviceCallback() { - @Override - public void onAudioDevicesAdded(AudioDeviceInfo[] addedDevices) { - Arrays.stream(addedDevices).forEach(deviceInfo -> addAudioDevice(deviceInfo.isSink(), deviceInfo.getId())); - } - - @Override - public void onAudioDevicesRemoved(AudioDeviceInfo[] removedDevices) { - Arrays.stream(removedDevices).forEach(deviceInfo -> removeAudioDevice(deviceInfo.isSink(), deviceInfo.getId())); - } - }; - } - } - - public static void setContext(Context context) { - mContext = context; - if (context != null) { - registerAudioDeviceCallback(); - } - } - - public static void release(Context context) { - unregisterAudioDeviceCallback(context); } // Audio protected static String getAudioFormatString(int audioFormat) { switch (audioFormat) { - case AudioFormat.ENCODING_PCM_8BIT: - return "8-bit"; - case AudioFormat.ENCODING_PCM_16BIT: - return "16-bit"; - case AudioFormat.ENCODING_PCM_FLOAT: - return "float"; - default: - return Integer.toString(audioFormat); + case AudioFormat.ENCODING_PCM_8BIT: + return "8-bit"; + case AudioFormat.ENCODING_PCM_16BIT: + return "16-bit"; + case AudioFormat.ENCODING_PCM_FLOAT: + return "float"; + default: + return Integer.toString(audioFormat); } } - protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) { + protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, int desiredChannels, int desiredFrames) { int channelConfig; int sampleSize; int frameSize; @@ -79,14 +43,14 @@ protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, Log.v(TAG, "Opening " + (isCapture ? "capture" : "playback") + ", requested " + desiredFrames + " frames of " + desiredChannels + " channel " + getAudioFormatString(audioFormat) + " audio at " + sampleRate + " Hz"); /* On older devices let's use known good settings */ - if (Build.VERSION.SDK_INT < 21 /* Android 5.0 (LOLLIPOP) */) { + if (Build.VERSION.SDK_INT < 21) { if (desiredChannels > 2) { desiredChannels = 2; } } /* AudioTrack has sample rate limitation of 48000 (fixed in 5.0.2) */ - if (Build.VERSION.SDK_INT < 22 /* Android 5.1 (LOLLIPOP_MR1) */) { + if (Build.VERSION.SDK_INT < 22) { if (sampleRate < 8000) { sampleRate = 8000; } else if (sampleRate > 48000) { @@ -95,7 +59,7 @@ protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, } if (audioFormat == AudioFormat.ENCODING_PCM_FLOAT) { - int minSDKVersion = (isCapture ? 23 /* Android 6.0 (M) */ : 21 /* Android 5.0 (LOLLIPOP) */); + int minSDKVersion = (isCapture ? 23 : 21); if (Build.VERSION.SDK_INT < minSDKVersion) { audioFormat = AudioFormat.ENCODING_PCM_16BIT; } @@ -156,7 +120,7 @@ protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, channelConfig = AudioFormat.CHANNEL_OUT_5POINT1 | AudioFormat.CHANNEL_OUT_BACK_CENTER; break; case 8: - if (Build.VERSION.SDK_INT >= 23 /* Android 6.0 (M) */) { + if (Build.VERSION.SDK_INT >= 23) { channelConfig = AudioFormat.CHANNEL_OUT_7POINT1_SURROUND; } else { Log.v(TAG, "Requested " + desiredChannels + " channels, getting 5.1 surround"); @@ -237,10 +201,6 @@ protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, return null; } - if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */ && deviceId != 0) { - mAudioRecord.setPreferredDevice(getOutputAudioDeviceInfo(deviceId)); - } - mAudioRecord.startRecording(); } @@ -264,10 +224,6 @@ protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, return null; } - if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */ && deviceId != 0) { - mAudioTrack.setPreferredDevice(getInputAudioDeviceInfo(deviceId)); - } - mAudioTrack.play(); } @@ -282,73 +238,11 @@ protected static int[] open(boolean isCapture, int sampleRate, int audioFormat, return results; } - private static AudioDeviceInfo getInputAudioDeviceInfo(int deviceId) { - if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) { - AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE); - return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS)) - .filter(deviceInfo -> deviceInfo.getId() == deviceId) - .findFirst() - .orElse(null); - } else { - return null; - } - } - - private static AudioDeviceInfo getOutputAudioDeviceInfo(int deviceId) { - if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) { - AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE); - return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)) - .filter(deviceInfo -> deviceInfo.getId() == deviceId) - .findFirst() - .orElse(null); - } else { - return null; - } - } - - private static void registerAudioDeviceCallback() { - if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) { - AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE); - audioManager.registerAudioDeviceCallback(mAudioDeviceCallback, null); - } - } - - private static void unregisterAudioDeviceCallback(Context context) { - if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) { - AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); - audioManager.unregisterAudioDeviceCallback(mAudioDeviceCallback); - } - } - - /** - * This method is called by SDL using JNI. - */ - public static int[] getAudioOutputDevices() { - if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) { - AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE); - return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)).mapToInt(AudioDeviceInfo::getId).toArray(); - } else { - return NO_DEVICES; - } - } - - /** - * This method is called by SDL using JNI. - */ - public static int[] getAudioInputDevices() { - if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) { - AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE); - return Arrays.stream(audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS)).mapToInt(AudioDeviceInfo::getId).toArray(); - } else { - return NO_DEVICES; - } - } - /** * This method is called by SDL using JNI. */ - public static int[] audioOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) { - return open(false, sampleRate, audioFormat, desiredChannels, desiredFrames, deviceId); + public static int[] audioOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames) { + return open(false, sampleRate, audioFormat, desiredChannels, desiredFrames); } /** @@ -360,11 +254,6 @@ public static void audioWriteFloatBuffer(float[] buffer) { return; } - if (android.os.Build.VERSION.SDK_INT < 21 /* Android 5.0 (LOLLIPOP) */) { - Log.e(TAG, "Attempted to make an incompatible audio call with uninitialized audio! (floating-point output is supported since Android 5.0 Lollipop)"); - return; - } - for (int i = 0; i < buffer.length;) { int result = mAudioTrack.write(buffer, i, buffer.length - i, AudioTrack.WRITE_BLOCKING); if (result > 0) { @@ -437,22 +326,18 @@ public static void audioWriteByteBuffer(byte[] buffer) { /** * This method is called by SDL using JNI. */ - public static int[] captureOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames, int deviceId) { - return open(true, sampleRate, audioFormat, desiredChannels, desiredFrames, deviceId); + public static int[] captureOpen(int sampleRate, int audioFormat, int desiredChannels, int desiredFrames) { + return open(true, sampleRate, audioFormat, desiredChannels, desiredFrames); } /** This method is called by SDL using JNI. */ public static int captureReadFloatBuffer(float[] buffer, boolean blocking) { - if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) { - return 0; - } else { - return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING); - } + return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING); } /** This method is called by SDL using JNI. */ public static int captureReadShortBuffer(short[] buffer, boolean blocking) { - if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) { + if (Build.VERSION.SDK_INT < 23) { return mAudioRecord.read(buffer, 0, buffer.length); } else { return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING); @@ -461,7 +346,7 @@ public static int captureReadShortBuffer(short[] buffer, boolean blocking) { /** This method is called by SDL using JNI. */ public static int captureReadByteBuffer(byte[] buffer, boolean blocking) { - if (Build.VERSION.SDK_INT < 23 /* Android 6.0 (M) */) { + if (Build.VERSION.SDK_INT < 23) { return mAudioRecord.read(buffer, 0, buffer.length); } else { return mAudioRecord.read(buffer, 0, buffer.length, blocking ? AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING); @@ -506,9 +391,4 @@ public static void audioSetThreadPriority(boolean iscapture, int device_id) { } public static native int nativeSetupJNI(); - - public static native void removeAudioDevice(boolean isCapture, int deviceId); - - public static native void addAudioDevice(boolean isCapture, int deviceId); - } diff --git a/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDLControllerManager.java b/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDLControllerManager.java index d6913f1571..82373d9d6f 100644 --- a/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDLControllerManager.java +++ b/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDLControllerManager.java @@ -24,7 +24,7 @@ public class SDLControllerManager public static native int nativeAddJoystick(int device_id, String name, String desc, int vendor_id, int product_id, boolean is_accelerometer, int button_mask, - int naxes, int axis_mask, int nhats, int nballs); + int naxes, int nhats, int nballs); public static native int nativeRemoveJoystick(int device_id); public static native int nativeAddHaptic(int device_id, String name); public static native int nativeRemoveHaptic(int device_id); @@ -42,7 +42,7 @@ public static native void onNativeHat(int device_id, int hat_id, public static void initialize() { if (mJoystickHandler == null) { - if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) { + if (Build.VERSION.SDK_INT >= 19) { mJoystickHandler = new SDLJoystickHandler_API19(); } else { mJoystickHandler = new SDLJoystickHandler_API16(); @@ -50,7 +50,7 @@ public static void initialize() { } if (mHapticHandler == null) { - if (Build.VERSION.SDK_INT >= 26 /* Android 8.0 (O) */) { + if (Build.VERSION.SDK_INT >= 26) { mHapticHandler = new SDLHapticHandler_API26(); } else { mHapticHandler = new SDLHapticHandler(); @@ -168,32 +168,6 @@ public int compare(InputDevice.MotionRange arg0, InputDevice.MotionRange arg1) { arg1Axis = MotionEvent.AXIS_GAS; } - // Make sure the AXIS_Z is sorted between AXIS_RY and AXIS_RZ. - // This is because the usual pairing are: - // - AXIS_X + AXIS_Y (left stick). - // - AXIS_RX, AXIS_RY (sometimes the right stick, sometimes triggers). - // - AXIS_Z, AXIS_RZ (sometimes the right stick, sometimes triggers). - // This sorts the axes in the above order, which tends to be correct - // for Xbox-ish game pads that have the right stick on RX/RY and the - // triggers on Z/RZ. - // - // Gamepads that don't have AXIS_Z/AXIS_RZ but use - // AXIS_LTRIGGER/AXIS_RTRIGGER are unaffected by this. - // - // References: - // - https://developer.android.com/develop/ui/views/touch-and-input/game-controllers/controller-input - // - https://www.kernel.org/doc/html/latest/input/gamepad.html - if (arg0Axis == MotionEvent.AXIS_Z) { - arg0Axis = MotionEvent.AXIS_RZ - 1; - } else if (arg0Axis > MotionEvent.AXIS_Z && arg0Axis < MotionEvent.AXIS_RZ) { - --arg0Axis; - } - if (arg1Axis == MotionEvent.AXIS_Z) { - arg1Axis = MotionEvent.AXIS_RZ - 1; - } else if (arg1Axis > MotionEvent.AXIS_Z && arg1Axis < MotionEvent.AXIS_RZ) { - --arg1Axis; - } - return arg0Axis - arg1Axis; } } @@ -236,7 +210,7 @@ public void pollInputDevices() { mJoysticks.add(joystick); SDLControllerManager.nativeAddJoystick(joystick.device_id, joystick.name, joystick.desc, getVendorId(joystickDevice), getProductId(joystickDevice), false, - getButtonMask(joystickDevice), joystick.axes.size(), getAxisMask(joystick.axes), joystick.hats.size()/2, 0); + getButtonMask(joystickDevice), joystick.axes.size(), joystick.hats.size()/2, 0); } } } @@ -317,9 +291,6 @@ public int getProductId(InputDevice joystickDevice) { public int getVendorId(InputDevice joystickDevice) { return 0; } - public int getAxisMask(List ranges) { - return -1; - } public int getButtonMask(InputDevice joystickDevice) { return -1; } @@ -337,43 +308,6 @@ public int getVendorId(InputDevice joystickDevice) { return joystickDevice.getVendorId(); } - @Override - public int getAxisMask(List ranges) { - // For compatibility, keep computing the axis mask like before, - // only really distinguishing 2, 4 and 6 axes. - int axis_mask = 0; - if (ranges.size() >= 2) { - // ((1 << SDL_GAMEPAD_AXIS_LEFTX) | (1 << SDL_GAMEPAD_AXIS_LEFTY)) - axis_mask |= 0x0003; - } - if (ranges.size() >= 4) { - // ((1 << SDL_GAMEPAD_AXIS_RIGHTX) | (1 << SDL_GAMEPAD_AXIS_RIGHTY)) - axis_mask |= 0x000c; - } - if (ranges.size() >= 6) { - // ((1 << SDL_GAMEPAD_AXIS_LEFT_TRIGGER) | (1 << SDL_GAMEPAD_AXIS_RIGHT_TRIGGER)) - axis_mask |= 0x0030; - } - // Also add an indicator bit for whether the sorting order has changed. - // This serves to disable outdated gamecontrollerdb.txt mappings. - boolean have_z = false; - boolean have_past_z_before_rz = false; - for (InputDevice.MotionRange range : ranges) { - int axis = range.getAxis(); - if (axis == MotionEvent.AXIS_Z) { - have_z = true; - } else if (axis > MotionEvent.AXIS_Z && axis < MotionEvent.AXIS_RZ) { - have_past_z_before_rz = true; - } - } - if (have_z && have_past_z_before_rz) { - // If both these exist, the compare() function changed sorting order. - // Set a bit to indicate this fact. - axis_mask |= 0x8000; - } - return axis_mask; - } - @Override public int getButtonMask(InputDevice joystickDevice) { int button_mask = 0; @@ -809,7 +743,7 @@ public boolean onGenericMotion(View v, MotionEvent event) { @Override public boolean supportsRelativeMouse() { - return (!SDLActivity.isDeXMode() || Build.VERSION.SDK_INT >= 27 /* Android 8.1 (O_MR1) */); + return (!SDLActivity.isDeXMode() || (Build.VERSION.SDK_INT >= 27)); } @Override @@ -819,7 +753,7 @@ public boolean inRelativeMode() { @Override public boolean setRelativeMouseEnabled(boolean enabled) { - if (!SDLActivity.isDeXMode() || Build.VERSION.SDK_INT >= 27 /* Android 8.1 (O_MR1) */) { + if (!SDLActivity.isDeXMode() || (Build.VERSION.SDK_INT >= 27)) { if (enabled) { SDLActivity.getContentView().requestPointerCapture(); } else { diff --git a/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDLSurface.java b/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDLSurface.java index 0857e4b6f3..dcd26d495c 100644 --- a/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDLSurface.java +++ b/src/Windowing/SilkDroid/app/src/main/java/org/libsdl/app/SDLSurface.java @@ -116,7 +116,7 @@ public void surfaceChanged(SurfaceHolder holder, int nDeviceHeight = height; try { - if (Build.VERSION.SDK_INT >= 17 /* Android 4.2 (JELLY_BEAN_MR1) */) { + if (Build.VERSION.SDK_INT >= 17) { DisplayMetrics realMetrics = new DisplayMetrics(); mDisplay.getRealMetrics( realMetrics ); nDeviceWidth = realMetrics.widthPixels; @@ -163,7 +163,7 @@ public void surfaceChanged(SurfaceHolder holder, // Don't skip in MultiWindow. if (skip) { - if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) { + if (Build.VERSION.SDK_INT >= 24) { if (SDLActivity.mSingleton.isInMultiWindowMode()) { Log.v("SDL", "Don't skip in Multi-Window"); skip = false;