Merge branch 'master' into next

[i3/i3] / include / commands.h

diff --git a/include/commands.h b/include/commands.h
index 6d195a092473cc1c7cd5f75d7ab0eca2aa24dea2..87f0ac1ac775f7bee549378b283c0d65d859072d 100644 (file)
--- a/include/commands.h
+++ b/include/commands.h
@@ -15,18 +15,6 @@
 /** The beginning of the prototype for every cmd_ function. */
 #define I3_CMD Match *current_match, struct CommandResult *cmd_output
 
-/*
- * Helper data structure for an operation window (window on which the operation
- * will be performed). Used to build the TAILQ owindows.
- *
- */
-typedef struct owindow {
-    Con *con;
-    TAILQ_ENTRY(owindow) owindows;
-} owindow;
-
-typedef TAILQ_HEAD(owindows_head, owindow) owindows_head;
-
 /**
  * Initializes the specified 'Match' data structure and the initial state of
  * commands.c for matching target windows of a command.
@@ -158,7 +146,7 @@ void cmd_move_workspace_to_output(I3_CMD, char *name);
 void cmd_split(I3_CMD, char *direction);
 
 /**
- * Implementaiton of 'kill [window|client]'.
+ * Implementation of 'kill [window|client]'.
  *
  */
 void cmd_kill(I3_CMD, char *kill_mode_str);
@@ -218,25 +206,25 @@ void cmd_layout(I3_CMD, char *layout_str);
 void cmd_layout_toggle(I3_CMD, char *toggle_mode);
 
 /**
- * Implementaiton of 'exit'.
+ * Implementation of 'exit'.
  *
  */
 void cmd_exit(I3_CMD);
 
 /**
- * Implementaiton of 'reload'.
+ * Implementation of 'reload'.
  *
  */
 void cmd_reload(I3_CMD);
 
 /**
- * Implementaiton of 'restart'.
+ * Implementation of 'restart'.
  *
  */
 void cmd_restart(I3_CMD);
 
 /**
- * Implementaiton of 'open'.
+ * Implementation of 'open'.
  *
  */
 void cmd_open(I3_CMD);
@@ -277,4 +265,10 @@ void cmd_scratchpad_show(I3_CMD);
  */
 void cmd_rename_workspace(I3_CMD, char *old_name, char *new_name);
 
+/**
+ * Implementation of 'bar (hidden_state hide|show|toggle)|(mode dock|hide|invisible|toggle) [<bar_id>]'
+ *
+ */
+void cmd_bar(I3_CMD, char *bar_type, char *bar_value, char *bar_id);
+
 #endif