From 29e6f6d07b34781f4fbcf91fde97d706aa1db913 Mon Sep 17 00:00:00 2001
From: Ada <ada+github@thingvellir.net>
Date: Fri, 11 Apr 2025 04:14:35 +1000
Subject: [PATCH] Trigger click emulation for XR

---
 plugins/openxr/src/OpenXrInputPlugin.cpp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/plugins/openxr/src/OpenXrInputPlugin.cpp b/plugins/openxr/src/OpenXrInputPlugin.cpp
index d18fa96627..89f86be592 100644
--- a/plugins/openxr/src/OpenXrInputPlugin.cpp
+++ b/plugins/openxr/src/OpenXrInputPlugin.cpp
@@ -398,7 +398,7 @@ bool OpenXrInputPlugin::InputDevice::initActions() {
         // not really usable, bare minimum
         {"/interaction_profiles/khr/simple_controller", {
             {"left_secondary_click",   hand_left  + "/menu/click"},
-            {"left_trigger_click",     hand_left  + "/select/click"},
+            {"left_trigger_value",     hand_left  + "/select/click"},
             {"left_pose",              hand_left  + "/grip/pose"},
             {"left_haptic",            "/user/hand/left/output/haptic"},
 
@@ -433,7 +433,6 @@ bool OpenXrInputPlugin::InputDevice::initActions() {
             {"left_secondary_click",   hand_left  + "/y/click"},
             {"left_squeeze_value",     hand_left  + "/squeeze/value"},
             {"left_trigger_value",     hand_left  + "/trigger/value"},
-            {"left_trigger_click",     hand_left  + "/trigger/click"},
             {"left_thumbstick",        hand_left  + "/thumbstick"},
             {"left_thumbstick_click",  hand_left  + "/thumbstick/click"},
             {"left_thumbstick_touch",  hand_left  + "/thumbstick/touch"},
@@ -444,7 +443,6 @@ bool OpenXrInputPlugin::InputDevice::initActions() {
             {"right_secondary_click",  hand_right  + "/b/click"},
             {"right_squeeze_value",    hand_right  + "/squeeze/value"},
             {"right_trigger_value",    hand_right  + "/trigger/value"},
-            {"right_trigger_click",    hand_right  + "/trigger/click"},
             {"right_thumbstick",       hand_right  + "/thumbstick"},
             {"right_thumbstick_click", hand_right  + "/thumbstick/click"},
             {"right_thumbstick_touch", hand_right  + "/thumbstick/touch"},
@@ -455,7 +453,6 @@ bool OpenXrInputPlugin::InputDevice::initActions() {
             {"left_secondary_click",   hand_left  + "/menu/click"},
             {"left_squeeze_value",     hand_left  + "/squeeze/click"},
             {"left_trigger_value",     hand_left  + "/trigger/value"},
-            {"left_trigger_click",     hand_left  + "/trigger/click"},
             {"left_thumbstick",        hand_left  + "/thumbstick"},
             {"left_thumbstick_click",  hand_left  + "/trackpad/click"},
             {"left_thumbstick_touch",  hand_left  + "/trackpad/touch"},
@@ -465,7 +462,6 @@ bool OpenXrInputPlugin::InputDevice::initActions() {
             {"right_secondary_click",   hand_right  + "/menu/click"},
             {"right_squeeze_value",     hand_right  + "/squeeze/click"},
             {"right_trigger_value",     hand_right  + "/trigger/value"},
-            {"right_trigger_click",     hand_right  + "/trigger/click"},
             {"right_thumbstick",        hand_right  + "/thumbstick"},
             {"right_thumbstick_click",  hand_right  + "/trackpad/click"},
             {"right_thumbstick_touch",  hand_right  + "/trackpad/touch"},
@@ -622,6 +618,23 @@ void OpenXrInputPlugin::InputDevice::update(float deltaTime, const controller::I
         }
     }
 
+    // emulate stick clicks for controllers that don't have them
+    {
+        const auto& left_trigger = _actions.at("left_trigger_value")->getFloat();
+        const auto& left_click = _actions.at("left_trigger_click")->getBool();
+
+        const auto& right_trigger = _actions.at("right_trigger_value")->getFloat();
+        const auto& right_click = _actions.at("right_trigger_click")->getBool();
+
+        if (!left_click.isActive && (left_trigger.isActive && left_trigger.currentState > 0.9f)) {
+            _buttonPressedMap.insert(controller::LT_CLICK);
+        }
+
+        if (!right_click.isActive && (right_trigger.isActive && right_trigger.currentState > 0.9f)) {
+            _buttonPressedMap.insert(controller::RT_CLICK);
+        }
+    }
+
     std::vector<std::tuple<std::string, controller::StandardAxisChannel, controller::StandardAxisChannel>> axesToUpdate = {
         {"left_thumbstick", controller::LX, controller::LY},
         {"right_thumbstick", controller::RX, controller::RY},