Merge branch 'master' into next

[i3/i3] / include / commands.h

diff --git a/include/commands.h b/include/commands.h
index a09e7466aa05a26013bb9913b188938399faeb85..780a9e8eb781893dd3fb69c8642783b98c73e676 100644 (file)
--- a/include/commands.h
+++ b/include/commands.h
@@ -7,13 +7,12 @@
  * commands.c: all command functions (see commands_parser.c)
  *
  */
-#ifndef I3_COMMANDS_H
-#define I3_COMMANDS_H
+#pragma once
 
 #include "commands_parser.h"
 
 /** The beginning of the prototype for every cmd_ function. */
-#define I3_CMD Match *current_match, struct CommandResult *cmd_output
+#define I3_CMD Match *current_match, struct CommandResultIR *cmd_output
 
 /**
  * Initializes the specified 'Match' data structure and the initial state of
@@ -115,6 +114,12 @@ void cmd_workspace_name(I3_CMD, char *name);
  */
 void cmd_mark(I3_CMD, char *mark);
 
+/**
+ * Implementation of 'unmark [mark]'
+ *
+ */
+void cmd_unmark(I3_CMD, char *mark);
+
 /**
  * Implementation of 'mode <string>'.
  *
@@ -182,10 +187,10 @@ void cmd_focus_level(I3_CMD, char *level);
 void cmd_focus(I3_CMD);
 
 /**
- * Implementation of 'fullscreen [global]'.
+ * Implementation of 'fullscreen [enable|disable|toggle] [global]'.
  *
  */
-void cmd_fullscreen(I3_CMD, char *fullscreen_mode);
+void cmd_fullscreen(I3_CMD, char *action, char *fullscreen_mode);
 
 /**
  * Implementation of 'move <direction> [<pixels> [px]]'.
@@ -277,4 +282,8 @@ void cmd_bar(I3_CMD, char *bar_type, char *bar_value, char *bar_id);
  */
 void cmd_shmlog(I3_CMD, char *argument);
 
-#endif
+/*
+ * Implementation of 'debuglog toggle|on|off'
+ *
+ */
+void cmd_debuglog(I3_CMD, char *argument);