Merge branch 'keybind-refactor'

1 files changed, 29 insertions, 3 deletions

diff --git a/keybinds.h b/keybinds.h
index 686eaf8..a742240 100644
--- a/keybinds.h
+++ b/keybinds.h
@@ -2,6 +2,7 @@
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
+
 #include <map>
 #include <string>
 #include <X11/keysym.h>
@@ -12,20 +13,45 @@
 #include "util.h"
 
 struct Keybind {
-	KeySym key;
+	KeyCode key;
 	unsigned int modifiers;
+	bool operator<(const Keybind &o) const;
+	bool operator==(const Keybind &o) const;
+};
+
+struct KeyFunction
+{
 	std::string command;
+    int mapID;
 };
 
-class KeybindsModule {
+#define getKeymap(X) \
+	keyMaps.find(X)->second
+
+
+class KeybindsModule
+{
 public:
 	KeybindsModule(CommandsModule& commandsModule, Config& cfg, Globals& globals, void (*updateMousePos)());
 	~KeybindsModule() = default;
 	const void bind(const CommandArg* argv);
+	const void quitKey(const CommandArg* argv);
+	const void bindMode(const CommandArg* argv);
 	const void handleKeypress(XKeyEvent e);
 	const void clearKeybinds();
 private:
-	std::vector<Keybind> binds;
+	Keybind getKeybind(std::string bindString);
+	void changeMap(int newMapID);
+	std::map<int, std::map<Keybind, KeyFunction>> keyMaps;
+	const Keybind emacsBindMode(std::string bindString);
+	const Keybind normalBindMode(std::string bindString);
+	std::map<std::string, const Keybind(KeybindsModule::*)(std::string bindString)> bindModes;
+	const Keybind(KeybindsModule::* bindFunc)(std::string bindString);
+	// Modifier keys to ignore when canceling a keymap
+	KeyCode ignoredKeys[8] = {50, 37, 133, 64, 62, 105, 134, 108};
+	int currentMapID = 0;
+	int nextKeymapID = 1;
+	Keybind exitBind = {42, 0x40};
 	CommandsModule& commandsModule;
 	Config& cfg;
 	Globals& globals;