Disable commands when config windows is open, and added test mode

FabioZumbi12 · FabioZumbi12 · commit ea76bd9064c1 · 2026-02-22T19:21:42.000-03:00
diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini
@@ -22,6 +22,7 @@ JoypadToOBS.Field.AxisBothDirections="Use both directions (+/-)"
 JoypadToOBS.Field.AxisMinValue="Axis min"
 JoypadToOBS.Field.AxisMaxValue="Axis max"
 JoypadToOBS.Field.InvertAxis="Invert Axis"
+JoypadToOBS.Field.TestMode="Test mode"
 JoypadToOBS.Button.SetMin="Set min"
 JoypadToOBS.Button.SetMax="Set max"
 JoypadToOBS.AxisThreshold.Any="Any movement (> 0)"
diff --git a/data/locale/pt-BR.ini b/data/locale/pt-BR.ini
@@ -22,6 +22,7 @@ JoypadToOBS.Field.AxisBothDirections="Usar ambas direções (+/-)"
 JoypadToOBS.Field.AxisMinValue="Mínimo do eixo"
 JoypadToOBS.Field.AxisMaxValue="Máximo do eixo"
 JoypadToOBS.Field.InvertAxis="Inverter Eixo"
+JoypadToOBS.Field.TestMode="Modo de teste"
 JoypadToOBS.Button.SetMin="Definir mín."
 JoypadToOBS.Button.SetMax="Definir máx."
 JoypadToOBS.AxisThreshold.Any="Qualquer movimento (> 0)"
diff --git a/data/locale/pt-PT.ini b/data/locale/pt-PT.ini
@@ -22,6 +22,7 @@ JoypadToOBS.Field.AxisBothDirections="Usar ambas direções (+/-)"
 JoypadToOBS.Field.AxisMinValue="Mínimo do eixo"
 JoypadToOBS.Field.AxisMaxValue="Máximo do eixo"
 JoypadToOBS.Field.InvertAxis="Inverter Eixo"
+JoypadToOBS.Field.TestMode="Modo de teste"
 JoypadToOBS.Button.SetMin="Definir mín."
 JoypadToOBS.Button.SetMax="Definir máx."
 JoypadToOBS.AxisThreshold.Any="Qualquer movimento (> 0)"
diff --git a/src/joypad-plugin.cpp b/src/joypad-plugin.cpp
@@ -247,21 +247,31 @@ bool obs_module_load(void)
 	});
 
 	g_input.SetOnButtonPressed([](const JoypadEvent &event) {
+		if (JoypadUiEmulateBindingDialogAction(event, &g_actions)) {
+			return;
+		}
+		if (JoypadUiIsBindingDialogOpen()) {
+			return;
+		}
 		auto matches = g_config.FindMatchingBindings(event);
 		for (const auto &binding : matches) {
 			g_actions.Execute(binding);
 		}
 	});
 	g_input.SetOnAxisChanged([](const JoypadEvent &event) {
+		if (JoypadUiEmulateBindingDialogAction(event, &g_actions)) {
+			return;
+		}
+		if (JoypadUiIsBindingDialogOpen()) {
+			return;
+		}
 		if (!event.is_axis) {
 			return;
 		}
 		auto matches = g_config.FindMatchingBindings(event);
 		if (matches.empty()) {
 			return;
 		}
-		obs_log(LOG_INFO, "axis raw: device=%s axis=%d value=%.3f", event.device_name.c_str(), event.axis_index,
-			event.axis_raw_value);
 		for (const auto &binding : matches) {
 			g_actions.Execute(binding);
 			if (binding.action == JoypadActionType::SetSourceVolumePercent) {
diff --git a/src/joypad-ui.cpp b/src/joypad-ui.cpp
@@ -17,6 +17,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
 #include "joypad-ui.h"
+#include "joypad-actions.h"
 
 #include <obs-frontend-api.h>
 #include <obs-module.h>
@@ -54,14 +55,24 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <QSpinBox>
 
 #include <algorithm>
+#include <atomic>
 #include <cmath>
+#include <mutex>
 #include <vector>
 
 namespace {
 constexpr int kDeviceIdRole = Qt::UserRole;
 constexpr int kDeviceStableIdRole = Qt::UserRole + 1;
 constexpr int kDeviceTypeIdRole = Qt::UserRole + 2;
 
+std::atomic<int> g_binding_dialog_open_count{0};
+struct DialogTestState {
+	bool enabled = false;
+	JoypadBinding binding;
+};
+std::mutex g_dialog_test_mutex;
+DialogTestState g_dialog_test_state;
+
 inline QString L(const char *key)
 {
 	return QString::fromUtf8(obs_module_text(key));
@@ -339,6 +350,26 @@ QString input_label_from_binding(const JoypadBinding &binding)
 	return L("JoypadToOBS.Common.ButtonNumber").arg(binding.button);
 }
 
+double map_axis_raw_to_percent_for_test(const JoypadBinding &binding, double raw)
+{
+	double minv = binding.axis_min_value;
+	double maxv = binding.axis_max_value;
+	if (maxv <= minv) {
+		minv = 0.0;
+		maxv = 1024.0;
+	}
+	double percent = ((raw - minv) / (maxv - minv)) * 100.0;
+	if (binding.axis_inverted) {
+		percent = 100.0 - percent;
+	}
+	percent = std::clamp(percent, 0.0, 100.0);
+	double base = std::clamp(percent / 100.0, 0.0, 1.0);
+	double gamma = binding.slider_gamma > 0.0 ? binding.slider_gamma : 0.6;
+	gamma = std::clamp(gamma, 0.1, 50.0);
+	double curved = std::pow(base, gamma);
+	return std::clamp(curved * 100.0, 0.0, 100.0);
+}
+
 class JoypadBindingDialog : public QDialog {
 public:
 	JoypadBindingDialog(QWidget *parent, JoypadConfigStore *config, JoypadInputManager *input,
@@ -348,6 +379,7 @@ class JoypadBindingDialog : public QDialog {
 		  input_(input),
 		  existing_(existing)
 	{
+		g_binding_dialog_open_count.fetch_add(1, std::memory_order_relaxed);
 		setWindowTitle(L("JoypadToOBS.Dialog.AddTitle"));
 		setModal(true);
 
@@ -476,6 +508,7 @@ class JoypadBindingDialog : public QDialog {
 		volume_spin_ = new QDoubleSpinBox(action_group);
 		volume_allow_above_unity_ = new QCheckBox(L("JoypadToOBS.Field.AllowAboveDb"), action_group);
 		invert_axis_checkbox_ = new QCheckBox(L("JoypadToOBS.Field.InvertAxis"), action_group);
+		test_mode_checkbox_ = new QCheckBox(L("JoypadToOBS.Field.TestMode"), action_group);
 		volume_spin_->setRange(-60.0, 20.0);
 		volume_spin_->setSingleStep(1.0);
 		volume_spin_->setValue(0.0);
@@ -489,6 +522,7 @@ class JoypadBindingDialog : public QDialog {
 		action_layout->addWidget(volume_spin_, 2, 1);
 		action_layout->addWidget(volume_allow_above_unity_, 3, 0, 1, 2);
 		action_layout->addWidget(invert_axis_checkbox_, 4, 0, 1, 2);
+		action_layout->addWidget(test_mode_checkbox_, 5, 0, 1, 2);
 
 		layout->addWidget(action_group);
 		layout->addWidget(target_group);
@@ -498,8 +532,19 @@ class JoypadBindingDialog : public QDialog {
 
 		connect(buttons, &QDialogButtonBox::accepted, this, &JoypadBindingDialog::accept);
 		connect(buttons, &QDialogButtonBox::rejected, this, &JoypadBindingDialog::reject);
+		connect(test_mode_checkbox_, &QCheckBox::toggled, this, [this](bool) { PublishTestBinding(); });
 		connect(listen_button_, &QPushButton::clicked, this, &JoypadBindingDialog::OnListen);
 		connect(action_combo_, &QComboBox::currentIndexChanged, this, &JoypadBindingDialog::UpdateActionUi);
+		connect(action_combo_, &QComboBox::currentIndexChanged, this, [this](int) { PublishTestBinding(); });
+		connect(device_combo_, &QComboBox::currentIndexChanged, this, [this](int) { PublishTestBinding(); });
+		connect(scene_combo_, &QComboBox::currentIndexChanged, this, [this](int) { PublishTestBinding(); });
+		connect(source_combo_, &QComboBox::currentIndexChanged, this, [this](int) { PublishTestBinding(); });
+		connect(filter_combo_, &QComboBox::currentIndexChanged, this, [this](int) { PublishTestBinding(); });
+		connect(bool_checkbox_, &QCheckBox::toggled, this, [this](bool) { PublishTestBinding(); });
+		connect(use_current_scene_, &QCheckBox::toggled, this, [this](bool) { PublishTestBinding(); });
+		connect(axis_both_checkbox_, &QCheckBox::toggled, this, [this](bool) { PublishTestBinding(); });
+		connect(axis_threshold_combo_, &QComboBox::currentIndexChanged, this,
+			[this](int) { PublishTestBinding(); });
 		connect(volume_spin_, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, [this](double value) {
 			if (CurrentAction() != JoypadActionType::SetSourceVolumePercent) {
 				return;
@@ -513,9 +558,11 @@ class JoypadBindingDialog : public QDialog {
 			axis_value_slider_->setValue((int)percent);
 			axis_live_value_label_->setText(L("JoypadToOBS.Common.PercentValue").arg(percent, 0, 'f', 0) +
 							" " + L("JoypadToOBS.Common.DbValue").arg(db, 0, 'f', 1));
+			PublishTestBinding();
 		});
 		connect(invert_axis_checkbox_, &QCheckBox::toggled, this, [this](bool) {
 			if (CurrentAction() != JoypadActionType::SetSourceVolumePercent) {
+				PublishTestBinding();
 				return;
 			}
 			if (!learned_event_.is_axis) {
@@ -526,19 +573,24 @@ class JoypadBindingDialog : public QDialog {
 			axis_value_slider_->setValue((int)percent);
 			axis_live_value_label_->setText(L("JoypadToOBS.Common.PercentValue").arg(percent, 0, 'f', 0) +
 							" " + L("JoypadToOBS.Common.DbValue").arg(db, 0, 'f', 1));
+			PublishTestBinding();
+		});
+		connect(volume_allow_above_unity_, &QCheckBox::toggled, this, [this](bool checked) {
+			binding_.allow_above_unity = checked;
+			PublishTestBinding();
 		});
-		connect(volume_allow_above_unity_, &QCheckBox::toggled, this,
-			[this](bool checked) { binding_.allow_above_unity = checked; });
 		connect(source_combo_, &QComboBox::currentIndexChanged, this, &JoypadBindingDialog::ReloadFilters);
 		connect(axis_set_min_button_, &QPushButton::clicked, this, [this]() {
 			binding_.axis_min_value = last_axis_value_;
 			axis_min_label_->setText(L("JoypadToOBS.Field.AxisMinValue") + ": " +
 						 QString::number(binding_.axis_min_value, 'f', 2));
+			PublishTestBinding();
 		});
 		connect(axis_set_max_button_, &QPushButton::clicked, this, [this]() {
 			binding_.axis_max_value = last_axis_value_;
 			axis_max_label_->setText(L("JoypadToOBS.Field.AxisMaxValue") + ": " +
 						 QString::number(binding_.axis_max_value, 'f', 2));
+			PublishTestBinding();
 		});
 		if (input_) {
 			axis_handler_id_ = input_->AddOnAxisChanged([this](const JoypadEvent &event) {
@@ -604,13 +656,18 @@ class JoypadBindingDialog : public QDialog {
 			UpdateActionUi();
 			UpdateAxisUi(false);
 		}
+		PublishTestBinding();
 		refresh_timer_ = new QTimer(this);
 		connect(refresh_timer_, &QTimer::timeout, this, &JoypadBindingDialog::RefreshDeviceList);
 		refresh_timer_->start(1000);
 	}
 
 	~JoypadBindingDialog() override
 	{
+		{
+			std::lock_guard<std::mutex> lock(g_dialog_test_mutex);
+			g_dialog_test_state.enabled = false;
+		}
 		if (refresh_timer_) {
 			refresh_timer_->stop();
 			refresh_timer_ = nullptr;
@@ -622,20 +679,43 @@ class JoypadBindingDialog : public QDialog {
 				axis_handler_id_ = 0;
 			}
 		}
+		g_binding_dialog_open_count.fetch_sub(1, std::memory_order_relaxed);
 	}
 
 	JoypadBinding Binding() const { return binding_; }
 
 protected:
 	void accept() override
 	{
-		if (!ReadBinding()) {
+		if (!ReadBinding(true)) {
 			return;
 		}
 		QDialog::accept();
 	}
 
 private:
+	void PublishTestBinding()
+	{
+		if (!test_mode_checkbox_ || !test_mode_checkbox_->isChecked()) {
+			std::lock_guard<std::mutex> lock(g_dialog_test_mutex);
+			g_dialog_test_state.enabled = false;
+			return;
+		}
+		if (!ReadBinding(false)) {
+			std::lock_guard<std::mutex> lock(g_dialog_test_mutex);
+			g_dialog_test_state.enabled = false;
+			return;
+		}
+		JoypadBinding test = binding_;
+		if (test.action == JoypadActionType::SetSourceVolumePercent) {
+			double percent = learned_event_.is_axis ? MapRawToPercent(last_axis_value_) : 50.0;
+			test.volume_value = std::clamp(percent, 0.0, 100.0);
+		}
+		std::lock_guard<std::mutex> lock(g_dialog_test_mutex);
+		g_dialog_test_state.enabled = true;
+		g_dialog_test_state.binding = test;
+	}
+
 	void RefreshDeviceList()
 	{
 		if (!input_) {
@@ -1058,6 +1138,7 @@ class JoypadBindingDialog : public QDialog {
 						}
 					}
 					SelectDevice(event);
+					PublishTestBinding();
 				},
 				Qt::QueuedConnection);
 		});
@@ -1085,9 +1166,9 @@ class JoypadBindingDialog : public QDialog {
 		}
 	}
 
-	bool ReadBinding()
+	bool ReadBinding(bool require_input)
 	{
-		if (!learned_event_.is_axis && learned_event_.button <= 0) {
+		if (require_input && !learned_event_.is_axis && learned_event_.button <= 0) {
 			button_label_->setText(L("JoypadToOBS.Common.PressButtonOrAxisFirst"));
 			return false;
 		}
@@ -1098,7 +1179,8 @@ class JoypadBindingDialog : public QDialog {
 		binding_.device_type_id = device_combo_->currentData(kDeviceTypeIdRole).toString().toStdString();
 		binding_.device_name = device_combo_->currentText().toStdString();
 
-		if (CurrentAction() == JoypadActionType::SetSourceVolumePercent && !learned_event_.is_axis) {
+		if (require_input && CurrentAction() == JoypadActionType::SetSourceVolumePercent &&
+		    !learned_event_.is_axis) {
 			button_label_->setText(L("JoypadToOBS.Common.AxisOnlyForSlider"));
 			return false;
 		}
@@ -1242,13 +1324,80 @@ class JoypadBindingDialog : public QDialog {
 	QDoubleSpinBox *volume_spin_ = nullptr;
 	QCheckBox *volume_allow_above_unity_ = nullptr;
 	QCheckBox *invert_axis_checkbox_ = nullptr;
+	QCheckBox *test_mode_checkbox_ = nullptr;
 	int axis_handler_id_ = 0;
 	QTimer *refresh_timer_ = nullptr;
 	bool is_listening_ = false;
 };
 
 } // namespace
 
+bool JoypadUiIsBindingDialogOpen()
+{
+	return g_binding_dialog_open_count.load(std::memory_order_relaxed) > 0;
+}
+
+bool JoypadUiEmulateBindingDialogAction(const JoypadEvent &event, JoypadActionEngine *actions)
+{
+	DialogTestState state;
+	{
+		std::lock_guard<std::mutex> lock(g_dialog_test_mutex);
+		if (!g_dialog_test_state.enabled) {
+			return false;
+		}
+		state = g_dialog_test_state;
+	}
+
+	if (!actions) {
+		return true;
+	}
+
+	const JoypadBinding &binding = state.binding;
+	JoypadBinding adjusted = binding;
+
+	if (binding.input_type == JoypadInputType::Button) {
+		if (event.is_axis) {
+			return true;
+		}
+		if (binding.button > 0 && event.button != binding.button) {
+			return true;
+		}
+		actions->Execute(adjusted);
+		return true;
+	}
+
+	if (!event.is_axis) {
+		return true;
+	}
+	if (binding.axis_index >= 0 && event.axis_index != binding.axis_index) {
+		return true;
+	}
+
+	double value = binding.axis_inverted ? -event.axis_value : event.axis_value;
+	double abs_value = std::fabs(value);
+	if (binding.action == JoypadActionType::SetSourceVolumePercent) {
+		adjusted.volume_value = map_axis_raw_to_percent_for_test(binding, event.axis_raw_value);
+		actions->Execute(adjusted);
+		return true;
+	}
+	if (binding.axis_direction != JoypadAxisDirection::Both) {
+		int dir = value >= 0.0 ? 1 : -1;
+		if (dir != (int)binding.axis_direction) {
+			return true;
+		}
+	}
+	if (abs_value < binding.axis_threshold) {
+		return true;
+	}
+	if (binding.action == JoypadActionType::AdjustSourceVolume) {
+		double sign = value >= 0.0 ? 1.0 : -1.0;
+		double intensity = std::clamp(abs_value, 0.0, 1.0);
+		adjusted.volume_value = std::fabs(binding.volume_value) * intensity * sign;
+	}
+	actions->Execute(adjusted);
+	return true;
+}
+
 JoypadToolsDialog::JoypadToolsDialog(QWidget *parent, JoypadConfigStore *config, JoypadInputManager *input)
 	: QDialog(parent),
 	  config_(config),
diff --git a/src/joypad-ui.h b/src/joypad-ui.h
@@ -30,6 +30,7 @@ class QLabel;
 class QComboBox;
 class QTimer;
 class QPlainTextEdit;
+class JoypadActionEngine;
 
 class JoypadToolsDialog : public QDialog {
 public:
@@ -56,3 +57,6 @@ class JoypadToolsDialog : public QDialog {
 	QTimer *update_timer_ = nullptr;
 	QTimer *comment_debounce_timer_ = nullptr;
 };
+
+bool JoypadUiIsBindingDialogOpen();
+bool JoypadUiEmulateBindingDialogAction(const JoypadEvent &event, JoypadActionEngine *actions);
