Merge branch 'thumbbehavior'

Author: calebtt

XMapLib/CPPRunnerGeneric.h

@@ -29,9 +29,9 @@ namespace sds
 			StopThread();
 		}
 	protected:
-		LambdaType m_lambda;
+		const LambdaType m_lambda;
 		InternalData m_local_state{}; // default constructed type InternalData
-		std::atomic<bool> m_is_stop_requested = false;
+		std::atomic<bool> m_is_stop_requested{ false };
 		std::unique_ptr<std::thread> m_local_thread;
 		std::mutex m_state_mutex;
 	public:

XMapLib/KeyboardKeyMap.h

@@ -60,33 +60,32 @@ namespace sds
 			const char printed = Utilities::VirtualMap::GetCharFromVK(obj.MappedToVK);
 			const bool isPrintable = std::isprint(static_cast<unsigned char>(printed));
 			std::osyncstream ss(os);
-			ss << "[KeyboardKeyMap]" << std::endl;
-			ss << "SendingElementVK:" << obj.SendingElementVK << std::endl;
-			ss << "MappedToVK:" << obj.MappedToVK << std::endl;
-			if (isPrintable)
-				ss << "MappedToVK(AKA):" << printed << std::endl;
-			ss << "UsesRepeat:" << obj.UsesRepeat << std::endl;
-			ss << "LastAction:" << obj.LastAction << std::endl;
-			ss << obj.LastSentTime << std::endl;
-			ss << "[/KeyboardKeyMap]";
+			ss << "[KeyboardKeyMap]" << " ";
+			ss << "SendingElementVK:" << obj.SendingElementVK << " ";
+			ss << "MappedToVK:" << obj.MappedToVK << " ";
+			ss << "MappedToVK(AKA):" << (isPrintable ? printed : ' ') << " ";
+			ss << "UsesRepeat:" << obj.UsesRepeat << " ";
+			ss << "LastAction:" << obj.LastAction << " ";
+			ss << obj.LastSentTime << " ";
+			ss << "[/KeyboardKeyMap]" << " ";
 			return os;
 		}
 		/// <summary>
 		/// Operator<< overload for std::string specialization,
 		///	writes relevant map details to the std::string.
+		///	NOTE: Changing this will break the DLL API which depends on this format.
 		/// </summary>
 		friend std::string& operator<<(std::string& os, const KeyboardKeyMap& obj)
 		{
 			const char printed = Utilities::VirtualMap::GetCharFromVK(obj.MappedToVK);
 			const bool isPrintable = std::isprint(static_cast<unsigned char>(printed));
 			std::stringstream ss;
-			ss << "[KeyboardKeyMap]" << std::endl;
+			ss << "[KeyboardKeyMap]" << " ";
 			ss << "SendingElementVK:" << obj.SendingElementVK << " ";
 			ss << "MappedToVK:" << obj.MappedToVK << " ";
-			if(isPrintable)
-				ss << "MappedToVK(AKA):" << printed << std::endl;
-			ss << "UsesRepeat:" << obj.UsesRepeat << " ";
-			ss << "[/KeyboardKeyMap]" << std::endl;
+			ss << "MappedToVK(AKA):" << (isPrintable? printed : ' ') << " ";
+			ss << "UsesRepeat:" << std::boolalpha << obj.UsesRepeat << " ";
+			ss << "[/KeyboardKeyMap]" << " ";
 			os += ss.str();
 			return os;
 		}

XMapLib/KeyboardMapper.h

@@ -99,11 +99,10 @@ namespace sds
 			while (!stopCondition)
 			{
 				const std::vector<XINPUT_KEYSTROKE> states = m_poller.getAndClearStates();
-				std::for_each(states.begin(), states.end(), [this](auto& cur)
-					{
-						m_translator.ProcessKeystroke(cur);
-					});
-				//m_translator.ProcessKeystroke(m_poller.GetUpdatedState());
+				for(const auto &cur: states)
+				{
+					m_translator.ProcessKeystroke(cur);
+				}
 				std::this_thread::sleep_for(std::chrono::milliseconds(KeyboardSettings::THREAD_DELAY_POLLER));
 			}
 		}

XMapLib/KeyboardPlayerInfo.h

@@ -10,7 +10,7 @@ namespace sds
 	{
 		using PidType = int;
 		//ISO CPP guidelines C.45 followed here: https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rc-default
-		std::atomic<PidType> player_id = 0;
+		std::atomic<PidType> player_id{ 0 };
 		//default ctor
 		KeyboardPlayerInfo() = default;
 		//copy constructor

XMapLib/KeyboardTranslator.h

@@ -42,13 +42,13 @@ namespace sds
 			//Key repeat loop
 			KeyRepeatLoop();
 			//search the map for a matching virtual key and send it
-			std::for_each(m_map_token_info.begin(), m_map_token_info.end(), [this, &stroke](auto &w)
+			for(auto &w: m_map_token_info)
+			{
+				if (w.SendingElementVK == stroke.VirtualKey)
 				{
-					if (w.SendingElementVK == stroke.VirtualKey)
-					{
-						this->Normal(w, stroke);
-					}
-				});
+					this->Normal(w, stroke);
+				}
+			}
 		}
 		std::string AddKeyMap(KeyboardKeyMap w)
 		{
@@ -71,25 +71,25 @@ namespace sds
 		{
 			//If enough time has passed, reset the key for use again, provided it uses the key-repeat behavior--
 			//otherwise reset it immediately.
-			std::for_each(m_map_token_info.begin(), m_map_token_info.end(), [](auto& e)
-				{
-					const bool DoUpdate = (e.LastAction == InpType::KEYUP && e.LastSentTime.IsElapsed()) && e.UsesRepeat;
-					const bool DoImmediate = e.LastAction == InpType::KEYUP && !e.UsesRepeat;
-					if (DoUpdate || DoImmediate)
-						e.LastAction = InpType::NONE;
-				});
+			for(auto &e: m_map_token_info)
+			{
+				const bool DoUpdate = (e.LastAction == InpType::KEYUP && e.LastSentTime.IsElapsed()) && e.UsesRepeat;
+				const bool DoImmediate = e.LastAction == InpType::KEYUP && !e.UsesRepeat;
+				if (DoUpdate || DoImmediate)
+					e.LastAction = InpType::NONE;
+			}
 		}
 		void KeyRepeatLoop()
 		{
-			std::for_each(m_map_token_info.begin(), m_map_token_info.end(), [this](auto& w)
+			for(auto &w: m_map_token_info)
+			{
+				using AT = sds::KeyboardKeyMap::ActionType;
+				if (w.UsesRepeat && (((w.LastAction == AT::KEYDOWN) || (w.LastAction == AT::KEYREPEAT))))
 				{
-					using AT = sds::KeyboardKeyMap::ActionType;
-					if(w.UsesRepeat && (((w.LastAction == AT::KEYDOWN) || (w.LastAction == AT::KEYREPEAT))))
-					{
-						if (w.LastSentTime.IsElapsed())
-							this->SendTheKey(w, true, AT::KEYREPEAT);
-					}
-				});
+					if (w.LastSentTime.IsElapsed())
+						this->SendTheKey(w, true, AT::KEYREPEAT);
+				}
+			}
 		}
 		/// <summary>
 		/// Normal keypress simulation logic. 
@@ -128,8 +128,8 @@ namespace sds
 		bool IsOvertaking(const KeyboardKeyMap &detail, KeyboardKeyMap &outOvertaken)
 		{
 			//Is detail a thumbstick direction map, and if so, which thumbstick.
-			const auto leftAxisIterator = std::find(KeyboardSettings::THUMBSTICK_L_VK_LIST.begin(), KeyboardSettings::THUMBSTICK_L_VK_LIST.end(), detail.SendingElementVK);
-			const auto rightAxisIterator = std::find(KeyboardSettings::THUMBSTICK_R_VK_LIST.begin(), KeyboardSettings::THUMBSTICK_R_VK_LIST.end(), detail.SendingElementVK);
+			const auto leftAxisIterator = std::ranges::find(KeyboardSettings::THUMBSTICK_L_VK_LIST, detail.SendingElementVK);
+			const auto rightAxisIterator = std::ranges::find(KeyboardSettings::THUMBSTICK_R_VK_LIST, detail.SendingElementVK);
 			const bool leftStick = leftAxisIterator != KeyboardSettings::THUMBSTICK_L_VK_LIST.end();
 			const bool rightStick = rightAxisIterator != KeyboardSettings::THUMBSTICK_R_VK_LIST.end();
 			//find a key-down'd or repeat'd direction of the same thumbstick
@@ -140,10 +140,10 @@ namespace sds
 				auto TestFunc = [&stickSettingList, &detail](const KeyboardKeyMap& elem)
 				{
 					if ((elem.LastAction == InpType::KEYDOWN || elem.LastAction == InpType::KEYREPEAT) && elem.SendingElementVK != detail.SendingElementVK)
-						return std::find(stickSettingList.begin(), stickSettingList.end(), elem.SendingElementVK) != stickSettingList.end();
+						return std::ranges::find(stickSettingList, elem.SendingElementVK) != stickSettingList.end();
 					return false;
 				};
-				const auto mpit = std::find_if(m_map_token_info.begin(), m_map_token_info.end(), TestFunc);
+				const auto mpit = std::ranges::find_if(m_map_token_info, TestFunc);
 				if (mpit == m_map_token_info.end())
 					return false;
 				outOvertaken = *mpit;

XMapLib/MouseMapper.h

@@ -17,10 +17,10 @@ namespace sds
 		using InternalType = int;
 		using LambdaRunnerType = sds::CPPRunnerGeneric<InternalType>;
 		using lock = LambdaRunnerType::ScopedLockType;
-		std::atomic<StickMap> m_stickmap_info = StickMap::NEITHER_STICK;
-		std::atomic<SHORT> m_thread_x = 0;
-		std::atomic<SHORT> m_thread_y = 0;
-		std::atomic<int> m_mouse_sensitivity = MouseSettings::SENSITIVITY_DEFAULT;
+		std::atomic<StickMap> m_stickmap_info{ StickMap::NEITHER_STICK };
+		std::atomic<SHORT> m_thread_x{ 0 };
+		std::atomic<SHORT> m_thread_y{0};
+		std::atomic<int> m_mouse_sensitivity{ MouseSettings::SENSITIVITY_DEFAULT };
 		sds::MousePlayerInfo m_local_player;
 		sds::MouseInputPoller m_poller;
 		std::unique_ptr<LambdaRunnerType> m_workThread;

XMapLib/MouseMoveThread.h

@@ -13,12 +13,12 @@ namespace sds
 		using InternalType = int;
 		using LambdaRunnerType = sds::CPPRunnerGeneric<InternalType>;
 		using lock = LambdaRunnerType::ScopedLockType;
-		std::atomic<size_t> m_x_axis_delay = 1;
-		std::atomic<size_t> m_y_axis_delay = 1;
-		std::atomic<bool> m_is_x_moving = false;
-		std::atomic<bool> m_is_y_moving = false;
-		std::atomic<bool> m_is_x_positive = false;
-		std::atomic<bool> m_is_y_positive = false;
+		std::atomic<size_t> m_x_axis_delay{ 1 };
+		std::atomic<size_t> m_y_axis_delay{ 1 };
+		std::atomic<bool> m_is_x_moving{ false };
+		std::atomic<bool> m_is_y_moving{ false };
+		std::atomic<bool> m_is_x_positive{ false };
+		std::atomic<bool> m_is_y_positive{ false };
 		std::unique_ptr<LambdaRunnerType> m_workThread;
 		void InitWorkThread() noexcept
 		{

XMapLib/MousePlayerInfo.h

@@ -10,11 +10,11 @@ namespace sds
 		using PidType = int;
 		using DzType = int;
 		//ISO CPP guidelines C.45 followed here: https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rc-default
-		std::atomic<DzType> left_x_dz = XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE; // left stick X axis dz
-		std::atomic<DzType> left_y_dz = XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE; // left stick Y axis dz
-		std::atomic<DzType> right_x_dz = XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE; // right stick X axis dz
-		std::atomic<DzType> right_y_dz = XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE; // right stick Y axis dz
-		std::atomic<PidType> player_id = 0;
+		std::atomic<DzType> left_x_dz{ XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE }; // left stick X axis dz
+		std::atomic<DzType> left_y_dz{ XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE }; // left stick Y axis dz
+		std::atomic<DzType> right_x_dz{ XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE }; // right stick X axis dz
+		std::atomic<DzType> right_y_dz{ XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE }; // right stick Y axis dz
+		std::atomic<PidType> player_id{ 0 };
 		//default ctor
 		MousePlayerInfo() = default;
 		//copy constructor

XMapLib/ThumbstickToDelay.h

@@ -13,7 +13,7 @@ namespace sds
 	class ThumbstickToDelay
 	{
 		const std::string BAD_DELAY_MSG = "Bad timer delay value, exception.";
-		inline static std::atomic<bool> m_is_deadzone_activated = false; //shared between instances
+		inline static std::atomic<bool> m_is_deadzone_activated{ false }; //shared between instances
 		float m_alt_deadzone_multiplier = MouseSettings::ALT_DEADZONE_MULT_DEFAULT;
 		int m_axis_sensitivity = MouseSettings::SENSITIVITY_DEFAULT;
 		int m_x_axis_deadzone = MouseSettings::DEADZONE_DEFAULT;

XMapLib/XMapLib.cpp

@@ -7,12 +7,12 @@
 #include "MouseMapper.h"
 
 using namespace std;
-void AddTestKeyMappings(sds::KeyboardMapper& mapper);
+void AddTestKeyMappings(sds::KeyboardMapper& mapper, std::osyncstream &ss);
 
 class GetterExit
 {
 	std::unique_ptr<std::thread> workerThread;
-	std::atomic<bool> m_exitState = false;
+	std::atomic<bool> m_exitState{ false };
 	const sds::KeyboardMapper& m_mp;
 public:
 	GetterExit(const sds::KeyboardMapper& m) : m_mp(m) { startThread(); }
@@ -36,11 +36,12 @@ class GetterExit
 	}
 	void workThread()
 	{
-		std::cin.get(); // block and wait
+		std::cin.get(); // block and wait for enter key
 		std::cin.clear();
 		std::osyncstream ss(std::cerr);
+		//prints out the maps, for debugging info.
 		auto mapList = m_mp.GetMaps();
-		for_each(begin(mapList), end(mapList), [&ss](const sds::KeyboardKeyMap& theMap)
+		ranges::for_each(mapList, [&ss](const sds::KeyboardKeyMap& theMap)
 			{
 				ss << theMap << endl << endl;
 			});
@@ -52,40 +53,43 @@ int main()
 {
 	using namespace sds;
 	using namespace sds::Utilities;
+
 	MousePlayerInfo player;
 	KeyboardPlayerInfo kplayer;
 	MouseMapper mouser(player);
 	KeyboardMapper keyer(kplayer);
-	AddTestKeyMappings(keyer);
+	std::osyncstream ss(std::cout);
+	AddTestKeyMappings(keyer, ss);
 	GetterExit getter(keyer);
 	std::string err = mouser.SetSensitivity(75); // 75 out of 100
 	Utilities::LogError(err); // won't do anything if the string is empty
 	mouser.SetStick(StickMap::RIGHT_STICK);
 
-	std::cout << "[Enter] to dump keymap contents and quit." << endl;
-	std::cout << "Xbox controller polling started..." << endl;
-	std::cout << "Controller reported as: " << (mouser.IsControllerConnected() && keyer.IsControllerConnected() ? "Connected.": "Disconnected.") << std::endl;
+	ss << "[Enter] to dump keymap contents and quit." << endl;
+	ss << "Xbox controller polling started..." << endl;
+	ss << "Controller reported as: " << (mouser.IsControllerConnected() && keyer.IsControllerConnected() ? "Connected.": "Disconnected.") << std::endl;
+	ss.emit();
 	do
 	{
 		const bool isControllerConnected = mouser.IsControllerConnected() && keyer.IsControllerConnected();
 		const bool isThreadRunning = mouser.IsRunning() && keyer.IsRunning();
 		if (!isThreadRunning && isControllerConnected)
 		{
-			std::cout << "Controller reported as: " << "Connected." << std::endl;
+			ss << "Controller reported as: " << "Connected." << std::endl;
 			keyer.Start();
 			mouser.Start();
 		}
 		if ((!isControllerConnected) && isThreadRunning)
 		{
-			std::cout << "Controller reported as: " << "Disconnected." << std::endl;
+			ss << "Controller reported as: " << "Disconnected." << std::endl;
 			keyer.Stop();
 			mouser.Stop();
 		}
 		std::this_thread::sleep_for(std::chrono::milliseconds(10));
 	} while (!getter());
 	return 0;
 }
-void AddTestKeyMappings(sds::KeyboardMapper& mapper)
+void AddTestKeyMappings(sds::KeyboardMapper& mapper, std::osyncstream &ss)
 {
 	using namespace sds;
 	const auto buttons =
@@ -114,15 +118,16 @@ void AddTestKeyMappings(sds::KeyboardMapper& mapper)
 		KeyboardKeyMap{VK_PAD_X, 0x52, false} // 'r'
 	};
 	std::string errorCondition;
-	for_each(begin(buttons), end(buttons), [&mapper, &errorCondition](const KeyboardKeyMap& m)
+	ranges::for_each(buttons, [&mapper, &errorCondition](const KeyboardKeyMap& m)
 		{
 			if (errorCondition.empty())
 			{
 				errorCondition = mapper.AddMap(m);
 			}
 		});
 	if (!errorCondition.empty())
-		cout << "Added buttons until error: " << errorCondition << endl;
+		ss << "Added buttons until error: " << errorCondition << endl;
 	else
-		cout << "Added: " << buttons.size() << " key mappings." << endl;
+		ss << "Added: " << buttons.size() << " key mappings." << endl;
+	ss.emit();
 }