archive/CitraVR
1
0
Fork 0
mirror of https://github.com/amwatson/CitraVR.git synced 2024-09-20 03:11:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add hotkey for 'quit to menu'

Browse source
This commit is contained in:
amwatson 2024-02-12 13:16:36 -06:00
parent 70b23e1b71
commit ccb7bb207c
4 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt
View file

@ -41,6 +41,7 @@ import org.citra.citra_emu.utils.BirthdayMonth
import org.citra.citra_emu.utils.Log
import org.citra.citra_emu.utils.SystemSaveGame
import org.citra.citra_emu.utils.ThemeUtil
import org.citra.citra_emu.vr.utils.VRUtils
class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) {
private var menuTag: String? = null
@ -630,11 +631,11 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView)
}
// VR-SPECIFIC: just remove hotkeys for this version.
/* add(HeaderSetting(R.string.controller_hotkeys))
Settings.hotKeys.forEachIndexed { i: Int, key: String ->
add(HeaderSetting(R.string.controller_hotkeys))
VRUtils.hotKeys.forEachIndexed { i: Int, key: String ->
val button = getInputObject(key)
add(InputBindingSetting(button, Settings.hotkeyTitles[i]))
}*/
add(InputBindingSetting(button, VRUtils.hotkeyTitles[i]))
}
}
}

8
src/android/app/src/main/java/org/citra/citra_emu/utils/EmulationLifecycleUtil.kt
View file

@ -4,14 +4,22 @@
package org.citra.citra_emu.utils
import org.citra.citra_emu.NativeLibrary
import org.citra.citra_emu.vr.VrActivity
object EmulationLifecycleUtil {
private var shutdownHooks: MutableList<Runnable> = ArrayList()
private var pauseResumeHooks: MutableList<Runnable> = ArrayList()
fun closeGame() {
val activity = NativeLibrary.sEmulationActivity.get()
if (activity != null && activity is VrActivity) {
activity.quitToMenu()
} else {
shutdownHooks.forEach(Runnable::run)
}
}
fun pauseOrResume() {
pauseResumeHooks.forEach(Runnable::run)

6
src/android/app/src/main/java/org/citra/citra_emu/vr/VrActivity.kt
View file

@ -113,6 +113,12 @@ class VrActivity : EmulationActivity() {
runOnUiThread(clickRunnable)
}
fun quitToMenu() {
finish()
val relaunchMainIntent = Intent(this, MainActivity::class.java)
startActivity(relaunchMainIntent)
}
fun pauseGame() {
Log.info("VR [Java] pauseGame");
if (NativeLibrary.isRunning()) { NativeLibrary.pauseEmulation(); }

9
src/android/app/src/main/java/org/citra/citra_emu/vr/utils/VRUtils.kt
View file

@ -2,6 +2,8 @@ package org.citra.citra_emu.vr.utils
import android.view.KeyEvent
import org.citra.citra_emu.NativeLibrary
import org.citra.citra_emu.R
import org.citra.citra_emu.features.settings.model.Settings
object VRUtils {
val hMDType: Int
@ -19,6 +21,13 @@ object VRUtils {
}
val hotKeys = listOf(
Settings.HOTKEY_CLOSE_GAME,
)
val hotkeyTitles = listOf(
R.string.emulation_close_game,
)
// Not really VR-related, but for some reason, Citra doesn't have default mappings for gamepad
enum class ButtonType(val nativeLibrary: Int, val android: Int) {
BUTTON_A(NativeLibrary.ButtonType.BUTTON_A, KeyEvent.KEYCODE_BUTTON_A),