Revert "new_workspace null behavior + testmap functions + regex"

This reverts commit e1d18e42a8f3a597b9bf5f1bb2ab6c346e4e7983.

Fixes #180

cc @taiyu-len

1 files changed, 7 insertions, 9 deletions

diff --git a/include/commands.h b/include/commands.h
index 69ab1380..5c87be51 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -3,21 +3,19 @@
 #include <stdbool.h>
 #include "config.h"
 
-typedef enum  cmd_status {
-	CMD_SUCCESS,
-	CMD_FAILURE,
-	CMD_DEFER,
-} sway_cmd(char *criteria, int argc, char **argv);
-
 struct cmd_handler {
-	const char*command;
-	sway_cmd  *handle;
+	char *command;
+	enum  cmd_status {
+		CMD_SUCCESS,
+		CMD_FAILURE,
+		CMD_DEFER,
+	} (*handle)(int argc, char **argv);
 };
 
 enum cmd_status handle_command(char *command);
 // Handles commands during config
 enum cmd_status config_command(char *command);
 
-void remove_view_from_scratchpad(swayc_t *view);
+void remove_view_from_scratchpad();
 
 #endif