From 23e2fb8d5a312dda0fbe79d41c11107e50bee691 Mon Sep 17 00:00:00 2001
From: WarmUpTill <WarmUpTill@web.de>
Date: Sat, 14 Jan 2023 18:58:15 +0100
Subject: [PATCH] Enable getting variable values from cursor condition

---
 src/macro-core/macro-condition-cursor.cpp | 6 ++++++
 src/macro-core/macro-condition-cursor.hpp | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/macro-core/macro-condition-cursor.cpp b/src/macro-core/macro-condition-cursor.cpp
index 0ea702cb..6c2ee651 100644
--- a/src/macro-core/macro-condition-cursor.cpp
+++ b/src/macro-core/macro-condition-cursor.cpp
@@ -54,6 +54,8 @@ bool MacroConditionCursor::CheckCondition()
 	case Condition::REGION:
 		ret = cursorPos.first >= _minX && cursorPos.second >= _minY &&
 		      cursorPos.first <= _maxX && cursorPos.second <= _maxY;
+		SetVariableValue(std::to_string(cursorPos.first) + " " +
+				 std::to_string(cursorPos.second));
 		break;
 	case Condition::MOVING:
 		ret = switcher->cursorPosChanged;
@@ -63,6 +65,10 @@ bool MacroConditionCursor::CheckCondition()
 		break;
 	}
 	_lastCheckTime = std::chrono::high_resolution_clock::now();
+
+	if (GetVariableValue().empty()) {
+		SetVariableValue(ret ? "true" : "false");
+	}
 	return ret;
 }
 
diff --git a/src/macro-core/macro-condition-cursor.hpp b/src/macro-core/macro-condition-cursor.hpp
index 353b88cb..46b5d8aa 100644
--- a/src/macro-core/macro-condition-cursor.hpp
+++ b/src/macro-core/macro-condition-cursor.hpp
@@ -9,7 +9,7 @@
 
 class MacroConditionCursor : public MacroCondition {
 public:
-	MacroConditionCursor(Macro *m) : MacroCondition(m) {}
+	MacroConditionCursor(Macro *m) : MacroCondition(m, true) {}
 	bool CheckCondition();
 	bool Save(obs_data_t *obj) const;
 	bool Load(obs_data_t *obj);