Merge pull request #179 from taiyu-len/master

new_workspace null behavior + testmap functions + regex

1 files changed, 9 insertions, 7 deletions

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