From 74c58cdf74c4921071da93c4cbfaf22f672242a5 Mon Sep 17 00:00:00 2001
From: BossCode45 <human.cyborg42@gmail.com>
Date: Thu, 6 Mar 2025 21:26:04 +1300
Subject: feat: Added the "S" modifier to the emacs bind mode

You can now use S as a modifier for shift when binding with emacs mode
if you're unable to capatilise the key to be bound.
---
 src/config.cpp   |  2 +-
 src/keybinds.cpp | 55 +++++++++++++++++++++++++++++++------------------------
 src/main.cpp     |  1 +
 3 files changed, 33 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/config.cpp b/src/config.cpp
index 925e6ea..df8a43d 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -57,7 +57,7 @@ Config::Config(CommandsModule& commandsModule)
 	commandsModule.addCommand("gaps", &Config::gapsCmd, 1, {NUM}, this);
 	commandsModule.addCommand("outergaps", &Config::outerGapsCmd, 1, {NUM}, this);
 	commandsModule.addCommand("logfile", &Config::logFileCmd, 1, {STR_REST}, this);
-	commandsModule.addCommand("addworkspace", &Config::addWorkspaceCmd, 2, {STR, NUM_ARR_REST}, this);
+	commandsModule.addCommand("addWorkspace", &Config::addWorkspaceCmd, 2, {STR, NUM_ARR_REST}, this);
 	commandsModule.addCommand("swapmods", &Config::swapSuperAltCmd, 0, {}, this);
 }
 
diff --git a/src/keybinds.cpp b/src/keybinds.cpp
index 235f8c1..1f60a75 100644
--- a/src/keybinds.cpp
+++ b/src/keybinds.cpp
@@ -168,48 +168,55 @@ const Keybind KeybindsModule::emacsBindMode(string bindString)
 	Keybind bind;
 	bind.modifiers = 0;
 
-	const std::regex keyRegex("^(?:([CMs])-)?(?:([CMs])-)?(?:([CMs])-)?([^\\s]|(SPC|ESC|RET|))$");
+	//cout << "Adding keybind: '"  << bindString << "'" << endl;
+
+	const std::regex keyRegex("^((?:[CMSs]-)*)([^\\s]|(?:SPC|ESC|RET))$");
 	std::smatch keyMatch;
 	if(std::regex_match(bindString, keyMatch, keyRegex))
 	{
-		for (int i = 1; i < 3; i++)
+		std::ssub_match modifierMatch = keyMatch[1];
+		for(std::string modifier : split(modifierMatch, '-'))
 		{
-			std::ssub_match modifierMatch = keyMatch[i];
-			if(modifierMatch.matched)
+			if(modifier == "s")
+			{
+				//cout << "\tModifier: s" << endl;
+				bind.modifiers |= cfg.swapSuperAlt?Mod1Mask:Mod4Mask;
+			}
+			else if(modifier == "M")
+			{
+				//cout << "\tModifier: M" << endl;
+				bind.modifiers |= cfg.swapSuperAlt?Mod4Mask:Mod1Mask;
+			}
+			else if(modifier == "C")
+			{
+				//cout << "\tModifier: C" << endl;
+				bind.modifiers |= ControlMask;
+			}
+			else if(modifier == "S")
 			{
-				std::string modifier = modifierMatch.str();
-				if(modifier == "s")
-				{
-					bind.modifiers |= Mod4Mask >> 3 * cfg.swapSuperAlt;
-				}
-				else if(modifier == "M")
-				{
-					bind.modifiers |= Mod1Mask << 3 * cfg.swapSuperAlt;
-				}
-				else if(modifier == "C")
-				{
-					bind.modifiers |= ControlMask;
-				}
+				//cout << "\tModifier: S" << endl;
+				bind.modifiers |= ShiftMask;
 			}
 		}
 	}
-	KeySym keySym = XStringToKeysym(keyMatch[4].str().c_str());
+	KeySym keySym = XStringToKeysym(keyMatch[2].str().c_str());
+	//cout << "\tKey: " << keyMatch[2].str() << endl;
 	
-	if(isUpper(keyMatch[4].str().c_str()) && keySym != NoSymbol)
+	if(isUpper(keyMatch[2].str().c_str()) && keySym != NoSymbol)
 	{
 		bind.modifiers |= ShiftMask;
 	}
 	if(keySym == NoSymbol)
 	{
-		if(keyMatch[4].str() == "RET")
+		if(keyMatch[2].str() == "RET")
 			keySym = XK_Return;
-		else if(keyMatch[4].str() == "ESC")
+		else if(keyMatch[2].str() == "ESC")
 			keySym = XK_Escape;
-		else if(keyMatch[4].str() == "SPC")
+		else if(keyMatch[2].str() == "SPC")
 			keySym = XK_space;
-		else if(keyMatch[4].str() == "-")
+		else if(keyMatch[2].str() == "-")
 			keySym = XK_minus;
-		else if(keyMatch[4].str() == "+")
+		else if(keyMatch[2].str() == "+")
 			keySym = XK_plus;
 		else
 			throw Err(CFG_ERR_KEYBIND, "Keybind '" + bindString + "' is invalid");
diff --git a/src/main.cpp b/src/main.cpp
index 291151f..45e4eba 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,6 +17,7 @@
 #include <iostream>
 #include <map>
 #include <ostream>
+#include <regex>
 #include <string>
 #include <sys/poll.h>
 #include <sys/select.h>
-- 
cgit v1.2.3