Draft source interaction action

Author: WarmUpTill

CMakeLists.txt

@@ -301,6 +301,8 @@ target_sources(
           src/utils/screenshot-helper.hpp
           src/utils/section.cpp
           src/utils/section.hpp
+          src/utils/source-interact.cpp
+          src/utils/source-interact.hpp
           src/utils/slider-spinbox.cpp
           src/utils/slider-spinbox.hpp
           src/utils/source-selection.cpp

data/locale/en-US.ini

@@ -561,6 +561,12 @@ AdvSceneSwitcher.action.source.type.pressSettingsButton="Press settings button"
 AdvSceneSwitcher.action.source.type.refreshSettings.tooltip="Can be used to refresh browser, media, etc. sources"
 AdvSceneSwitcher.action.source.type.deinterlaceMode="Set deinterlace mode"
 AdvSceneSwitcher.action.source.type.deinterlaceOrder="Set deinterlace field order"
+AdvSceneSwitcher.action.source.type.interact="Interact"
+AdvSceneSwitcher.action.source.type.interact.selectType="Interaction type:{{type}}"
+AdvSceneSwitcher.action.source.type.interact.mouseClick="Send mouse click"
+AdvSceneSwitcher.action.source.type.interact.mouseMove="Send mouse move"
+AdvSceneSwitcher.action.source.type.interact.mouseWheel="Send mouse wheel"
+AdvSceneSwitcher.action.source.type.interact.keyPress="Send key press"
 AdvSceneSwitcher.action.source.noSettingsButtons="No buttons found!"
 AdvSceneSwitcher.action.source.entry="{{actions}}{{sources}}{{settingsButtons}}{{deinterlaceMode}}{{deinterlaceOrder}}"
 AdvSceneSwitcher.action.source.warning="Warning: Enabling and disabling sources globally cannot be controlled by the OBS UI\nYou might be looking for \"Scene item visibility\""
@@ -1197,3 +1203,22 @@ AdvSceneSwitcher.duration.condition.within="Within the last"
 AdvSceneSwitcher.audio.monitor.none="Monitor Off"
 AdvSceneSwitcher.audio.monitor.monitorOnly="Monitor Only (mute output)"
 AdvSceneSwitcher.audio.monitor.both="Monitor and Output"
+
+AdvSceneSwitcher.key="Key:"
+AdvSceneSwitcher.key.up="Key up:"
+
+AdvSceneSwitcher.modifierKey="Modifier keys:"
+AdvSceneSwitcher.modifierKey.shift="Shift"
+AdvSceneSwitcher.modifierKey.ctrl="Ctrl"
+AdvSceneSwitcher.modifierKey.alt="Alt"
+AdvSceneSwitcher.modifierKey.meta="Meta"
+
+AdvSceneSwitcher.mouse.button="Mouse button:"
+AdvSceneSwitcher.mouse.button.left="Left"
+AdvSceneSwitcher.mouse.button.middle="Middle"
+AdvSceneSwitcher.mouse.button.right="Right"
+AdvSceneSwitcher.mouse.position="Mouse position:"
+AdvSceneSwitcher.mouse.up="Mouse up event:"
+AdvSceneSwitcher.mouse.count="Mouse click count:"
+AdvSceneSwitcher.mouse.leave="Mouse leave event:"
+AdvSceneSwitcher.mouse.scrollAmount="Mouse scroll amount:"

src/macro-core/macro-action-source.cpp

@@ -27,6 +27,8 @@ const static std::map<MacroActionSource::Action, std::string> actionTypes = {
 	 "AdvSceneSwitcher.action.source.type.deinterlaceMode"},
 	{MacroActionSource::Action::DEINTERLACE_FIELD_ORDER,
 	 "AdvSceneSwitcher.action.source.type.deinterlaceOrder"},
+	{MacroActionSource::Action::INTERACT,
+	 "AdvSceneSwitcher.action.source.type.interact"},
 };
 
 const static std::map<obs_deinterlace_mode, std::string> deinterlaceModes = {
@@ -128,6 +130,8 @@ bool MacroActionSource::PerformAction()
 		break;
 	case Action::SETTINGS_BUTTON:
 		pressSourceButton(_button, s);
+	case Action::INTERACT:
+		_interaction.SendToSource(s);
 		break;
 	case Action::DEINTERLACE_MODE:
 		obs_source_set_deinterlace_mode(s, _deinterlaceMode);
@@ -165,6 +169,7 @@ bool MacroActionSource::Save(obs_data_t *obj) const
 			 static_cast<int>(_deinterlaceMode));
 	obs_data_set_int(obj, "deinterlaceOrder",
 			 static_cast<int>(_deinterlaceOrder));
+	_interaction.Save(obj);
 	return true;
 }
 
@@ -179,6 +184,7 @@ bool MacroActionSource::Load(obs_data_t *obj)
 		obs_data_get_int(obj, "deinterlaceMode"));
 	_deinterlaceOrder = static_cast<obs_deinterlace_field_order>(
 		obs_data_get_int(obj, "deinterlaceOrder"));
+	_interaction.Load(obj);
 	return true;
 }
 
@@ -249,7 +255,8 @@ MacroActionSourceEdit::MacroActionSourceEdit(
 	  _deinterlaceMode(new QComboBox()),
 	  _deinterlaceOrder(new QComboBox()),
 	  _warning(new QLabel(
-		  obs_module_text("AdvSceneSwitcher.action.source.warning")))
+		  obs_module_text("AdvSceneSwitcher.action.source.warning"))),
+	  _interaction(new SourceInteractionWidget())
 {
 	populateActionSelection(_actions);
 	auto sources = GetSourceNames();
@@ -273,6 +280,13 @@ MacroActionSourceEdit::MacroActionSourceEdit(
 			 this, SLOT(DeinterlaceModeChanged(int)));
 	QWidget::connect(_deinterlaceOrder, SIGNAL(currentIndexChanged(int)),
 			 this, SLOT(DeinterlaceOrderChanged(int)));
+	QWidget::connect(
+		_interaction,
+		SIGNAL(SettingsChanged(SourceInteractionInstance *)), this,
+		SLOT(InteractionSettingsChanged(SourceInteractionInstance *)));
+	QWidget::connect(_interaction,
+			 SIGNAL(TypeChanged(SourceInteraction::Type)), this,
+			 SLOT(InteractionTypeChanged(SourceInteraction::Type)));
 
 	QVBoxLayout *mainLayout = new QVBoxLayout;
 	QHBoxLayout *entryLayout = new QHBoxLayout;
@@ -294,6 +308,7 @@ MacroActionSourceEdit::MacroActionSourceEdit(
 	buttonLayout->addWidget(_getSettings);
 	buttonLayout->addStretch();
 	mainLayout->addLayout(buttonLayout);
+	mainLayout->addWidget(_interaction);
 	setLayout(mainLayout);
 
 	_entryData = entryData;
@@ -318,6 +333,7 @@ void MacroActionSourceEdit::UpdateEntryData()
 		static_cast<int>(_entryData->_deinterlaceMode)));
 	_deinterlaceOrder->setCurrentIndex(_deinterlaceOrder->findData(
 		static_cast<int>(_entryData->_deinterlaceOrder)));
+	_interaction->SetSourceInteractionSelection(_entryData->_interaction);
 	SetWidgetVisibility();
 }
 
@@ -377,6 +393,16 @@ void MacroActionSourceEdit::SettingsChanged()
 
 	auto lock = LockContext();
 	_entryData->_settings = _settings->toPlainText().toStdString();
+}
+
+void MacroActionSourceEdit::InteractionTypeChanged(SourceInteraction::Type value)
+{
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
+	_entryData->_interaction.SetType(value);
 
 	adjustSize();
 	updateGeometry();
@@ -405,6 +431,16 @@ void MacroActionSourceEdit::DeinterlaceOrderChanged(int idx)
 			_deinterlaceOrder->itemData(idx).toInt());
 }
 
+void MacroActionSourceEdit::InteractionSettingsChanged(
+	SourceInteractionInstance *value)
+{
+	if (_loading || !_entryData) {
+		return;
+	}
+	auto lock = LockContext();
+	_entryData->_interaction.SetSettings(value);
+}
+
 void MacroActionSourceEdit::SetWidgetVisibility()
 {
 	const bool showSettings = _entryData->_action ==
@@ -424,6 +460,8 @@ void MacroActionSourceEdit::SetWidgetVisibility()
 	_deinterlaceOrder->setVisible(
 		_entryData->_action ==
 		MacroActionSource::Action::DEINTERLACE_FIELD_ORDER);
+	_interaction->setVisible(_entryData->_action ==
+				 MacroActionSource::Action::INTERACT);
 	adjustSize();
 	updateGeometry();
 }

src/macro-core/macro-action-source.hpp

@@ -2,6 +2,7 @@
 #include "macro-action-edit.hpp"
 #include "variable-text-edit.hpp"
 #include "source-selection.hpp"
+#include "source-interact.hpp"
 
 #include <QSpinBox>
 #include <QLabel>
@@ -39,6 +40,7 @@ class MacroActionSource : public MacroAction {
 	obs_deinterlace_mode _deinterlaceMode = OBS_DEINTERLACE_MODE_DISABLE;
 	obs_deinterlace_field_order _deinterlaceOrder =
 		OBS_DEINTERLACE_FIELD_ORDER_TOP;
+	SourceInteraction _interaction;
 
 	enum class Action {
 		ENABLE,
@@ -48,6 +50,7 @@ class MacroActionSource : public MacroAction {
 		SETTINGS_BUTTON,
 		DEINTERLACE_MODE,
 		DEINTERLACE_FIELD_ORDER,
+		INTERACT,
 	};
 	Action _action = Action::ENABLE;
 
@@ -80,6 +83,8 @@ private slots:
 	void SettingsChanged();
 	void DeinterlaceModeChanged(int);
 	void DeinterlaceOrderChanged(int);
+	void InteractionTypeChanged(SourceInteraction::Type value);
+	void InteractionSettingsChanged(SourceInteractionInstance *value);
 signals:
 	void HeaderInfoChanged(const QString &);
 
@@ -92,6 +97,8 @@ private slots:
 	QComboBox *_deinterlaceMode;
 	QComboBox *_deinterlaceOrder;
 	QLabel *_warning;
+	SourceInteractionWidget *_interaction;
+
 	std::shared_ptr<MacroActionSource> _entryData;
 
 private: