From cc833faa137fa4e0352d09b298e4e922e1bbe134 Mon Sep 17 00:00:00 2001
From: Lubos <tridosm@gmail.com>
Date: Sun, 17 Jul 2022 20:03:37 +0200
Subject: [PATCH] OpenXR - Hacky mapping to make the games playable

---
 UI/GameSettingsScreen.cpp   |  2 +-
 android/jni/app-android.cpp | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 279aebc1f5..39501f3700 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -691,7 +691,6 @@ void GameSettingsScreen::CreateViews() {
 		MicChoice->OnChoice.Handle(this, &GameSettingsScreen::OnMicDeviceChange);
 	}
 
-#ifndef OPENXR
 	// Control
 	LinearLayout *controlsSettings = AddTab("GameSettingsControls", ms->T("Controls"));
 
@@ -717,6 +716,7 @@ void GameSettingsScreen::CreateViews() {
 		});
 	}
 
+#ifndef OPENXR
 	// TVs don't have touch control, at least not yet.
 	if (System_GetPropertyInt(SYSPROP_DEVICE_TYPE) != DEVICE_TYPE_TV) {
 		controlsSettings->Add(new ItemHeader(co->T("OnScreen", "On-Screen Touch Controls")));
diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp
index 578e1034aa..53d0a4ee25 100644
--- a/android/jni/app-android.cpp
+++ b/android/jni/app-android.cpp
@@ -113,18 +113,29 @@ struct ButtonMapping
 };
 
 std::vector<ButtonMapping> leftControllerMapping = {
+	ButtonMapping(52, ovrButton_X),
+	ButtonMapping(53, ovrButton_Y),
+	ButtonMapping(54, ovrButton_LThumb),
+	ButtonMapping(55, ovrButton_GripTrigger),
 	ButtonMapping(19, ovrButton_Up),
 	ButtonMapping(20, ovrButton_Down),
 	ButtonMapping(21, ovrButton_Left),
 	ButtonMapping(22, ovrButton_Right),
+	ButtonMapping(23, ovrButton_Joystick),
 	ButtonMapping(66, ovrButton_Trigger),
+	ButtonMapping(4, ovrButton_Enter),
 };
 
 std::vector<ButtonMapping> rightControllerMapping = {
+	ButtonMapping(29, ovrButton_A),
+	ButtonMapping(30, ovrButton_B),
+	ButtonMapping(31, ovrButton_RThumb),
+	ButtonMapping(32, ovrButton_GripTrigger),
 	ButtonMapping(19, ovrButton_Up),
 	ButtonMapping(20, ovrButton_Down),
 	ButtonMapping(21, ovrButton_Left),
 	ButtonMapping(22, ovrButton_Right),
+	ButtonMapping(23, ovrButton_Joystick),
 	ButtonMapping(66, ovrButton_Trigger),
 };