@@ -1325,6 +1695,7 @@ function showPage(page) {
Game folders
+
A SelectB Back
diff --git a/src/android/app/src/main/java/org/nxemu/ui/emulation/EmulationActivity.kt b/src/android/app/src/main/java/org/nxemu/ui/emulation/EmulationActivity.kt
index bc727e72..47890533 100644
--- a/src/android/app/src/main/java/org/nxemu/ui/emulation/EmulationActivity.kt
+++ b/src/android/app/src/main/java/org/nxemu/ui/emulation/EmulationActivity.kt
@@ -15,6 +15,7 @@ import android.os.SystemClock
import android.util.Base64
import android.util.Log
import android.view.Gravity
+import android.view.InputDevice
import android.view.KeyEvent
import android.view.MotionEvent
import android.view.SurfaceHolder
@@ -64,6 +65,16 @@ class EmulationActivity : ComponentActivity(), SurfaceHolder.Callback {
private lateinit var overlayAppVersion: String
private lateinit var overlayPhoneModel: String
private lateinit var overlaySoc: String
+ private var drawerStickY = 0
+ private val drawerStickRepeat = object : Runnable {
+ override fun run() {
+ if (drawerStickY == 0 || !::drawerLayout.isInitialized || !drawerLayout.isDrawerOpen(Gravity.START)) {
+ return
+ }
+ moveDrawerFocus(drawerStickY)
+ perfStatsHandler.postDelayed(this, DRAWER_REPEAT_MS)
+ }
+ }
private val settingChangedListener: (String) -> Unit = { setting ->
if (setting == NXCoreSetting.DisplayedFrames) {
@@ -133,13 +144,26 @@ class EmulationActivity : ComponentActivity(), SurfaceHolder.Callback {
override fun onResume() {
super.onResume()
InputHandler.updateControllerData()
- if (::surfaceInputOverlay.isInitialized && !surfaceInputOverlay.isInEditMode()) {
+ if (::surfaceInputOverlay.isInitialized) {
updateInputOverlayLayout()
surfaceInputOverlay.refreshControls()
}
}
override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+ if (event.keyCode == KeyEvent.KEYCODE_BACK) {
+ return super.dispatchKeyEvent(event)
+ }
+ val source = event.source
+ val fromGamepad = source and InputDevice.SOURCE_GAMEPAD == InputDevice.SOURCE_GAMEPAD ||
+ source and InputDevice.SOURCE_JOYSTICK == InputDevice.SOURCE_JOYSTICK
+ if (!fromGamepad) {
+ return super.dispatchKeyEvent(event)
+ }
+ if (::drawerLayout.isInitialized && drawerLayout.isDrawerOpen(Gravity.START)) {
+ handleDrawerPad(event)
+ return true
+ }
if (InputHandler.dispatchKeyEvent(event)) {
return true
}
@@ -147,6 +171,12 @@ class EmulationActivity : ComponentActivity(), SurfaceHolder.Callback {
}
override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean {
+ val fromStick = event.source and InputDevice.SOURCE_JOYSTICK == InputDevice.SOURCE_JOYSTICK ||
+ event.source and InputDevice.SOURCE_GAMEPAD == InputDevice.SOURCE_GAMEPAD
+ if (fromStick && ::drawerLayout.isInitialized && drawerLayout.isDrawerOpen(Gravity.START)) {
+ handleDrawerStick(event)
+ return true
+ }
if (InputHandler.dispatchGenericMotionEvent(event)) {
return true
}
@@ -165,17 +195,12 @@ class EmulationActivity : ComponentActivity(), SurfaceHolder.Callback {
override fun onDrawerOpened(drawerView: View) {
drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
- findViewById(R.id.in_game_menu).requestFocus()
+ drawerMenuItems().first().requestFocus()
}
override fun onDrawerClosed(drawerView: View) {
- drawerLayout.setDrawerLockMode(
- if (surfaceInputOverlay.isInEditMode()) {
- DrawerLayout.LOCK_MODE_LOCKED_CLOSED
- } else {
- savedDrawerLockMode()
- },
- )
+ releaseDrawerStick()
+ drawerLayout.setDrawerLockMode(savedDrawerLockMode())
if (loadingIndicator.visibility != View.VISIBLE) {
surfaceInputOverlay.visibility = View.VISIBLE
}
@@ -225,6 +250,69 @@ class EmulationActivity : ComponentActivity(), SurfaceHolder.Callback {
},
)
}
+
+ private fun drawerMenuItems(): List {
+ return listOf(
+ lockDrawerItem,
+ findViewById(R.id.menu_exit),
+ )
+ }
+
+ private fun handleDrawerPad(event: KeyEvent) {
+ val down = event.action == KeyEvent.ACTION_DOWN
+ when (event.keyCode) {
+ KeyEvent.KEYCODE_BUTTON_B -> {
+ if (down && event.repeatCount == 0) {
+ drawerLayout.closeDrawer(Gravity.START)
+ }
+ }
+ KeyEvent.KEYCODE_BUTTON_A, KeyEvent.KEYCODE_DPAD_CENTER, KeyEvent.KEYCODE_ENTER -> {
+ if (down && event.repeatCount == 0) {
+ currentDrawerItem().performClick()
+ }
+ }
+ KeyEvent.KEYCODE_DPAD_UP -> if (down) moveDrawerFocus(-1)
+ KeyEvent.KEYCODE_DPAD_DOWN -> if (down) moveDrawerFocus(1)
+ }
+ }
+
+ private fun handleDrawerStick(event: MotionEvent) {
+ val y = when {
+ event.getAxisValue(MotionEvent.AXIS_Y) > DRAWER_STICK_DEADZONE -> 1
+ event.getAxisValue(MotionEvent.AXIS_Y) < -DRAWER_STICK_DEADZONE -> -1
+ else -> 0
+ }
+ if (y == drawerStickY) {
+ return
+ }
+ drawerStickY = y
+ perfStatsHandler.removeCallbacks(drawerStickRepeat)
+ if (y == 0) {
+ return
+ }
+ moveDrawerFocus(y)
+ perfStatsHandler.postDelayed(drawerStickRepeat, DRAWER_REPEAT_MS)
+ }
+
+ private fun releaseDrawerStick() {
+ drawerStickY = 0
+ perfStatsHandler.removeCallbacks(drawerStickRepeat)
+ }
+
+ private fun moveDrawerFocus(delta: Int) {
+ val items = drawerMenuItems()
+ if (items.isEmpty()) {
+ return
+ }
+ val current = items.indexOfFirst { it.hasFocus() }.let { if (it < 0) 0 else it }
+ items[(current + delta).coerceIn(0, items.lastIndex)].requestFocus()
+ }
+
+ private fun currentDrawerItem(): View {
+ val items = drawerMenuItems()
+ return items.firstOrNull { it.hasFocus() } ?: items.first().also { it.requestFocus() }
+ }
+
private fun hideSystemBars() {
WindowCompat.getInsetsController(window, window.decorView).apply {
hide(WindowInsetsCompat.Type.systemBars())
@@ -470,5 +558,7 @@ class EmulationActivity : ComponentActivity(), SurfaceHolder.Callback {
companion object {
const val EXTRA_GAME_PATH = "org.nxemu.EXTRA_GAME_PATH"
private const val TAG = "NxEmu-Emulation"
+ private const val DRAWER_REPEAT_MS = 220L
+ private const val DRAWER_STICK_DEADZONE = 0.5f
}
}
diff --git a/src/android/app/src/main/java/org/nxemu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/nxemu/ui/main/MainActivity.kt
index 8fb57c6c..085bf9ad 100644
--- a/src/android/app/src/main/java/org/nxemu/ui/main/MainActivity.kt
+++ b/src/android/app/src/main/java/org/nxemu/ui/main/MainActivity.kt
@@ -1,9 +1,11 @@
package org.nxemu.ui.main
import android.content.Intent
+import android.hardware.input.InputManager
import android.net.Uri
import android.os.Bundle
import android.util.Log
+import android.view.InputDevice
import android.view.KeyEvent
import android.view.MotionEvent
import android.webkit.ConsoleMessage
@@ -28,6 +30,22 @@ class MainActivity : ComponentActivity() {
private lateinit var webView: WebView
private val inputMapping = InputMappingSession(this) { refreshControllerPages() }
private var emulationLaunchPending = false
+ private var stickX = 0
+ private var stickY = 0
+ private val stickRepeat = object : Runnable {
+ override fun run() {
+ if (stickX == 0 && stickY == 0) return
+ nudgeBrowserStick()
+ if (::webView.isInitialized && !isDestroyed) {
+ webView.postDelayed(this, STICK_REPEAT_MS)
+ }
+ }
+ }
+ private val inputDeviceListener = object : InputManager.InputDeviceListener {
+ override fun onInputDeviceAdded(deviceId: Int) = refreshConnectedControllers()
+ override fun onInputDeviceRemoved(deviceId: Int) = refreshConnectedControllers()
+ override fun onInputDeviceChanged(deviceId: Int) = refreshConnectedControllers()
+ }
private val settingChangedForwarder: (String) -> Unit = { setting ->
runOnUiThread {
webView.evaluateJavascript(
@@ -137,22 +155,108 @@ class MainActivity : ComponentActivity() {
if (inputMapping.onKey(event)) {
return true
}
+ if (handleBrowserPad(event)) {
+ return true
+ }
if (InputHandler.dispatchKeyEvent(event)) {
return true
}
return super.dispatchKeyEvent(event)
}
+ private fun handleBrowserPad(event: KeyEvent): Boolean {
+ val script = when (event.keyCode) {
+ KeyEvent.KEYCODE_BUTTON_Y ->
+ browserPadScript(event, repeat = false, "typeof openSettingsFromPad==='function'&&openSettingsFromPad()")
+ KeyEvent.KEYCODE_BUTTON_B ->
+ browserPadScript(event, repeat = false, "typeof goBackFromPad==='function'&&goBackFromPad()")
+ KeyEvent.KEYCODE_BUTTON_A, KeyEvent.KEYCODE_DPAD_CENTER ->
+ browserPadScript(event, repeat = false, "typeof launchSelectedGame==='function'&&launchSelectedGame()")
+ KeyEvent.KEYCODE_DPAD_LEFT ->
+ browserPadScript(event, repeat = true, "typeof moveGameSelection==='function'&&moveGameSelection('left')")
+ KeyEvent.KEYCODE_DPAD_RIGHT ->
+ browserPadScript(event, repeat = true, "typeof moveGameSelection==='function'&&moveGameSelection('right')")
+ KeyEvent.KEYCODE_DPAD_UP ->
+ browserPadScript(event, repeat = true, "typeof moveGameSelection==='function'&&moveGameSelection('up')")
+ KeyEvent.KEYCODE_DPAD_DOWN ->
+ browserPadScript(event, repeat = true, "typeof moveGameSelection==='function'&&moveGameSelection('down')")
+ else -> return false
+ }
+ if (script.isNotEmpty() && ::webView.isInitialized && !isDestroyed) {
+ webView.evaluateJavascript(script, null)
+ }
+ return true
+ }
+
+ private fun browserPadScript(event: KeyEvent, repeat: Boolean, script: String): String {
+ if (event.action != KeyEvent.ACTION_DOWN) return ""
+ if (!repeat && event.repeatCount != 0) return ""
+ return script
+ }
+
override fun dispatchGenericMotionEvent(event: MotionEvent): Boolean {
if (inputMapping.onMotion(event)) {
return true
}
+ if (handleBrowserStick(event)) {
+ return true
+ }
if (InputHandler.dispatchGenericMotionEvent(event)) {
return true
}
return super.dispatchGenericMotionEvent(event)
}
+ private fun handleBrowserStick(event: MotionEvent): Boolean {
+ val source = event.source
+ val fromStick = source and InputDevice.SOURCE_JOYSTICK == InputDevice.SOURCE_JOYSTICK ||
+ source and InputDevice.SOURCE_GAMEPAD == InputDevice.SOURCE_GAMEPAD
+ if (!fromStick) {
+ return false
+ }
+ val x = stickDirection(event.getAxisValue(MotionEvent.AXIS_X))
+ val y = stickDirection(event.getAxisValue(MotionEvent.AXIS_Y))
+ if (x == stickX && y == stickY) {
+ return x != 0 || y != 0
+ }
+ stickX = x
+ stickY = y
+ if (::webView.isInitialized) {
+ webView.removeCallbacks(stickRepeat)
+ }
+ if (x == 0 && y == 0) {
+ return false
+ }
+ nudgeBrowserStick()
+ if (::webView.isInitialized && !isDestroyed) {
+ webView.postDelayed(stickRepeat, STICK_REPEAT_MS)
+ }
+ return true
+ }
+
+ private fun stickDirection(value: Float): Int {
+ return when {
+ value > STICK_DEADZONE -> 1
+ value < -STICK_DEADZONE -> -1
+ else -> 0
+ }
+ }
+
+ private fun nudgeBrowserStick() {
+ if (!::webView.isInitialized || isDestroyed) {
+ return
+ }
+ val moves = buildString {
+ if (stickX < 0) append("moveGameSelection('left');")
+ if (stickX > 0) append("moveGameSelection('right');")
+ if (stickY < 0) append("moveGameSelection('up');")
+ if (stickY > 0) append("moveGameSelection('down');")
+ }
+ if (moves.isEmpty()) {
+ return
+ }
+ webView.evaluateJavascript("if(typeof moveGameSelection==='function'){$moves}", null)
+ }
fun beginControllerMap(playerIndex: Int, mapId: String, title: String, filterIndex: Int) {
runOnUiThread {
inputMapping.begin(playerIndex, mapId, title, filterIndex)
@@ -173,6 +277,20 @@ class MainActivity : ComponentActivity() {
}
}
+ private fun refreshConnectedControllers() {
+ if (!::webView.isInitialized || isDestroyed) {
+ return
+ }
+ webView.post {
+ if (!isDestroyed) {
+ webView.evaluateJavascript(
+ "typeof renderControllersSummary==='function'&&renderControllersSummary()",
+ null,
+ )
+ }
+ }
+ }
+
fun editOverlayLayout() {
startActivity(Intent(this, OverlayLayoutActivity::class.java))
}
@@ -204,4 +322,9 @@ class MainActivity : ComponentActivity() {
null,
)
}
+
+ companion object {
+ private const val STICK_REPEAT_MS = 220L
+ private const val STICK_DEADZONE = 0.5f
+ }
}
diff --git a/src/android/app/src/main/res/drawable/in_game_menu_item.xml b/src/android/app/src/main/res/drawable/in_game_menu_item.xml
new file mode 100644
index 00000000..b3453232
--- /dev/null
+++ b/src/android/app/src/main/res/drawable/in_game_menu_item.xml
@@ -0,0 +1,13 @@
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
diff --git a/src/android/app/src/main/res/layout/activity_emulation.xml b/src/android/app/src/main/res/layout/activity_emulation.xml
index e92268db..a438e2c2 100644
--- a/src/android/app/src/main/res/layout/activity_emulation.xml
+++ b/src/android/app/src/main/res/layout/activity_emulation.xml
@@ -160,9 +160,10 @@
android:id="@+id/menu_lock_drawer"
android:layout_width="match_parent"
android:layout_height="48dp"
- android:background="?android:attr/selectableItemBackground"
+ android:background="@drawable/in_game_menu_item"
android:clickable="true"
android:focusable="true"
+ android:focusableInTouchMode="true"
android:gravity="center_vertical"
android:paddingHorizontal="20dp"
android:text="@string/lock_drawer"
@@ -173,9 +174,10 @@
android:id="@+id/menu_exit"
android:layout_width="match_parent"
android:layout_height="48dp"
- android:background="?android:attr/selectableItemBackground"
+ android:background="@drawable/in_game_menu_item"
android:clickable="true"
android:focusable="true"
+ android:focusableInTouchMode="true"
android:gravity="center_vertical"
android:paddingHorizontal="20dp"
android:text="@string/emulation_exit"