Draft source interaction action

Author: WarmUpTill

CMakeLists.txt

@@ -262,6 +262,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/transition-selection.cpp
           src/utils/transition-selection.hpp
           src/utils/utility.cpp

data/locale/en-US.ini

@@ -445,6 +445,12 @@ AdvSceneSwitcher.action.source.type.refreshSettings="Refresh source settings"
 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.noSettingsButtons="No buttons found!"
+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.entry="{{actions}}{{sources}}{{settingsButtons}}"
 AdvSceneSwitcher.action.source.warning="Warning: Enabling and disabling sources globally cannot be controlled by the OBS UI"
 AdvSceneSwitcher.action.source.getSettings="Get current settings"
@@ -900,6 +906,28 @@ AdvSceneSwitcher.duration.condition.equal="For exactly"
 AdvSceneSwitcher.duration.condition.less="For at most"
 AdvSceneSwitcher.duration.condition.within="Within the last"
 
+<<<<<<< HEAD
 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.key.pressCount="Key press count:"
+
+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:"
+>>>>>>> 06334ae (Draft source interaction action)

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

@@ -11,15 +11,19 @@ bool MacroActionSource::_registered = MacroActionFactory::Register(
 	{MacroActionSource::Create, MacroActionSourceEdit::Create,
 	 "AdvSceneSwitcher.action.source"});
 
-const static std::map<SourceAction, std::string> actionTypes = {
-	{SourceAction::ENABLE, "AdvSceneSwitcher.action.source.type.enable"},
-	{SourceAction::DISABLE, "AdvSceneSwitcher.action.source.type.disable"},
-	{SourceAction::SETTINGS,
+const static std::map<MacroActionSource::Action, std::string> actionTypes = {
+	{MacroActionSource::Action::ENABLE,
+	 "AdvSceneSwitcher.action.source.type.enable"},
+	{MacroActionSource::Action::DISABLE,
+	 "AdvSceneSwitcher.action.source.type.disable"},
+	{MacroActionSource::Action::SETTINGS,
 	 "AdvSceneSwitcher.action.source.type.settings"},
-	{SourceAction::REFRESH_SETTINGS,
+	{MacroActionSource::Action::REFRESH_SETTINGS,
 	 "AdvSceneSwitcher.action.source.type.refreshSettings"},
-	{SourceAction::SETTINGS_BUTTON,
+	{MacroActionSource::Action::SETTINGS_BUTTON,
 	 "AdvSceneSwitcher.action.source.type.pressSettingsButton"},
+	{MacroActionSource::Action::INTERACT,
+	 "AdvSceneSwitcher.action.source.type.interact"},
 };
 
 static std::vector<SourceSettingButton> getSourceButtons(OBSWeakSource source)
@@ -78,20 +82,22 @@ bool MacroActionSource::PerformAction()
 {
 	auto s = obs_weak_source_get_source(_source);
 	switch (_action) {
-	case SourceAction::ENABLE:
+	case Action::ENABLE:
 		obs_source_set_enabled(s, true);
 		break;
-	case SourceAction::DISABLE:
+	case Action::DISABLE:
 		obs_source_set_enabled(s, false);
 		break;
-	case SourceAction::SETTINGS:
+	case Action::SETTINGS:
 		setSourceSettings(s, _settings);
 		break;
-	case SourceAction::REFRESH_SETTINGS:
+	case Action::REFRESH_SETTINGS:
 		refreshSourceSettings(s);
 		break;
-	case SourceAction::SETTINGS_BUTTON:
+	case Action::SETTINGS_BUTTON:
 		pressSourceButton(_button, s);
+	case Action::INTERACT:
+		_interaction.SendToSource(s);
 		break;
 	default:
 		break;
@@ -119,6 +125,7 @@ bool MacroActionSource::Save(obs_data_t *obj)
 	obs_data_set_int(obj, "action", static_cast<int>(_action));
 	obs_data_set_string(obj, "settings", _settings.c_str());
 	_button.Save(obj);
+	_interaction.Save(obj);
 	return true;
 }
 
@@ -127,9 +134,11 @@ bool MacroActionSource::Load(obs_data_t *obj)
 	MacroAction::Load(obj);
 	const char *sourceName = obs_data_get_string(obj, "source");
 	_source = GetWeakSourceByName(sourceName);
-	_action = static_cast<SourceAction>(obs_data_get_int(obj, "action"));
+	_action = static_cast<MacroActionSource::Action>(
+		obs_data_get_int(obj, "action"));
 	_settings = obs_data_get_string(obj, "settings");
 	_button.Load(obj);
+	_interaction.Load(obj);
 	return true;
 }
 
@@ -145,7 +154,7 @@ static inline void populateActionSelection(QComboBox *list)
 {
 	for (auto &[actionType, name] : actionTypes) {
 		list->addItem(obs_module_text(name.c_str()));
-		if (actionType == SourceAction::REFRESH_SETTINGS) {
+		if (actionType == MacroActionSource::Action::REFRESH_SETTINGS) {
 			list->setItemData(
 				list->count() - 1,
 				obs_module_text(
@@ -174,17 +183,17 @@ static inline void populateSourceButtonSelection(QComboBox *list,
 
 MacroActionSourceEdit::MacroActionSourceEdit(
 	QWidget *parent, std::shared_ptr<MacroActionSource> entryData)
-	: QWidget(parent)
+	: QWidget(parent),
+	  _sources(new QComboBox),
+	  _actions(new QComboBox),
+	  _settingsButtons(new QComboBox),
+	  _getSettings(new QPushButton(obs_module_text(
+		  "AdvSceneSwitcher.action.source.getSettings"))),
+	  _settings(new ResizingPlainTextEdit(this)),
+	  _warning(new QLabel(
+		  obs_module_text("AdvSceneSwitcher.action.source.warning"))),
+	  _interaction(new SourceInteractionWidget())
 {
-	_sources = new QComboBox();
-	_actions = new QComboBox();
-	_settingsButtons = new QComboBox();
-	_getSettings = new QPushButton(
-		obs_module_text("AdvSceneSwitcher.action.source.getSettings"));
-	_settings = new ResizingPlainTextEdit(this);
-	_warning = new QLabel(
-		obs_module_text("AdvSceneSwitcher.action.source.warning"));
-
 	populateActionSelection(_actions);
 	populateSourceSelection(_sources);
 
@@ -198,6 +207,13 @@ MacroActionSourceEdit::MacroActionSourceEdit(
 			 SLOT(GetSettingsClicked()));
 	QWidget::connect(_settings, SIGNAL(textChanged()), this,
 			 SLOT(SettingsChanged()));
+	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;
@@ -217,6 +233,7 @@ MacroActionSourceEdit::MacroActionSourceEdit(
 	buttonLayout->addWidget(_getSettings);
 	buttonLayout->addStretch();
 	mainLayout->addLayout(buttonLayout);
+	mainLayout->addWidget(_interaction);
 	setLayout(mainLayout);
 
 	_entryData = entryData;
@@ -238,6 +255,7 @@ void MacroActionSourceEdit::UpdateEntryData()
 	_settings->setPlainText(QString::fromStdString(_entryData->_settings));
 	_settingsButtons->setCurrentText(
 		QString::fromStdString(_entryData->_button.ToString()));
+	_interaction->SetSourceInteractionSelection(_entryData->_interaction);
 	SetWidgetVisibility();
 
 	adjustSize();
@@ -266,7 +284,7 @@ void MacroActionSourceEdit::ActionChanged(int value)
 	}
 
 	std::lock_guard<std::mutex> lock(switcher->m);
-	_entryData->_action = static_cast<SourceAction>(value);
+	_entryData->_action = static_cast<MacroActionSource::Action>(value);
 	SetWidgetVisibility();
 }
 
@@ -299,22 +317,48 @@ void MacroActionSourceEdit::SettingsChanged()
 
 	std::lock_guard<std::mutex> lock(switcher->m);
 	_entryData->_settings = _settings->toPlainText().toStdString();
+}
+
+void MacroActionSourceEdit::InteractionTypeChanged(SourceInteraction::Type value)
+{
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	_entryData->_interaction.SetType(value);
 
 	adjustSize();
 	updateGeometry();
 }
 
+void MacroActionSourceEdit::InteractionSettingsChanged(
+	SourceInteractionInstance *value)
+{
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	_entryData->_interaction.SetSettings(value);
+}
+
 void MacroActionSourceEdit::SetWidgetVisibility()
 {
-	const bool showSettings = _entryData->_action == SourceAction::SETTINGS;
-	const bool showWarning = _entryData->_action == SourceAction::ENABLE ||
-				 _entryData->_action == SourceAction::DISABLE;
+	const bool showSettings = _entryData->_action ==
+				  MacroActionSource::Action::SETTINGS;
+	const bool showWarning =
+		_entryData->_action == MacroActionSource::Action::ENABLE ||
+		_entryData->_action == MacroActionSource::Action::DISABLE;
 	_settings->setVisible(showSettings);
 	_getSettings->setVisible(showSettings);
 	_warning->setVisible(showWarning);
 	_settingsButtons->setVisible(_entryData->_action ==
 				     SourceAction::SETTINGS_BUTTON);
+	_interaction->setVisible(_entryData->_action ==
+				 MacroActionSource::Action::INTERACT);
 	adjustSize();
+	updateGeometry();
 }
 
 bool SourceSettingButton::Save(obs_data_t *obj) const

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

@@ -1,20 +1,13 @@
 #pragma once
 #include "macro-action-edit.hpp"
 #include "resizing-text-edit.hpp"
+#include "source-interact.hpp"
 
 #include <QSpinBox>
 #include <QLabel>
 #include <QPushButton>
 #include <QComboBox>
 
-enum class SourceAction {
-	ENABLE,
-	DISABLE,
-	SETTINGS,
-	REFRESH_SETTINGS,
-	SETTINGS_BUTTON,
-};
-
 struct SourceSettingButton {
 	bool Save(obs_data_t *obj) const;
 	bool Load(obs_data_t *obj);
@@ -38,10 +31,20 @@ class MacroActionSource : public MacroAction {
 		return std::make_shared<MacroActionSource>(m);
 	}
 
+	enum class Action {
+		ENABLE,
+		DISABLE,
+		SETTINGS,
+		REFRESH_SETTINGS,
+		SETTINGS_BUTTON,
+		INTERACT,
+	};
+
 	OBSWeakSource _source;
 	std::string _settings = "";
 	SourceSettingButton _button;
-	SourceAction _action = SourceAction::ENABLE;
+	SourceInteraction _interaction;
+	Action _action = Action::ENABLE;
 
 private:
 	static bool _registered;
@@ -70,6 +73,8 @@ private slots:
 	void ButtonChanged(int idx);
 	void GetSettingsClicked();
 	void SettingsChanged();
+	void InteractionTypeChanged(SourceInteraction::Type value);
+	void InteractionSettingsChanged(SourceInteractionInstance *value);
 signals:
 	void HeaderInfoChanged(const QString &);
 
@@ -80,6 +85,8 @@ private slots:
 	QPushButton *_getSettings;
 	ResizingPlainTextEdit *_settings;
 	QLabel *_warning;
+	SourceInteractionWidget *_interaction;
+
 	std::shared_ptr<MacroActionSource> _entryData;
 
 private: