Implement command bar, make Keybinds use functions rather than command strings

1 files changed, 24 insertions, 16 deletions

diff --git a/config.def.h b/config.def.h
index 8ea25ec..485c3b5 100644
--- a/config.def.h
+++ b/config.def.h
@@ -4,6 +4,11 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
+/* forward declarations */
+int mode;
+/* Cinnamon is declared in main.c before including config.h. Yes, I know this code is held together by hopes and dreams, but good enough. */
+void tabopen(Cinnamon* cinnamon);
+
 /* default window width/height, can be resized after. */
 #define WINDOW_WIDTH 1024
 #define WINDOW_HEIGHT 768
@@ -16,25 +21,28 @@
 /* Keybind definitions */
 typedef struct {
 	const char* key;
-	const char* command;
+	void (*fptr)(Cinnamon*);
 } Keybind;
 
-/* TODO: make this use functions and not command strings */
+static void _insmode(Cinnamon* cinnamon) {
+	mode = 1;
+}
+
 static const Keybind keybinds[] = {
-	{ "<S-o>", ":tab_open" },
-	{ "d", ":tab_close" },
-	{ "o", ":commandline_show \":open\"" },
-	{ "i", ":mode insert" },
-	{ "<A-1>", ":tab_select 1" },
-	{ "<A-2>", ":tab_select 2" },
-	{ "<A-3>", ":tab_select 3" },
-	{ "<A-4>", ":tab_select 4" },
-	{ "<A-5>", ":tab_select 5" },
-	{ "<A-6>", ":tab_select 6" },
-	{ "<A-7>", ":tab_select 7" },
-	{ "<A-8>", ":tab_select 8" },
-	{ "<A-9>", ":tab_select 9" },
-	{ "<A-0>", ":tab_select 10" },
+	{ "<S-o>", &tabopen },
+	// { "d", ":tab_close" },
+	// { "o", ":commandline_show \":open\"" },
+	{ "i", &_insmode },
+	// { "<A-1>", ":tab_select 1" },
+	// { "<A-2>", ":tab_select 2" },
+	// { "<A-3>", ":tab_select 3" },
+	// { "<A-4>", ":tab_select 4" },
+	// { "<A-5>", ":tab_select 5" },
+	// { "<A-6>", ":tab_select 6" },
+	// { "<A-7>", ":tab_select 7" },
+	// { "<A-8>", ":tab_select 8" },
+	// { "<A-9>", ":tab_select 9" },
+	// { "<A-0>", ":tab_select 10" },
 };
 
 #endif