Merge branch 'master' into next

[i3/i3] / include / randr.h

diff --git a/include/randr.h b/include/randr.h
index 779a131630bff56d870b141ad8bc346e0c1bb064..9c09f2b1276b11f55e6fc306170bd9467cb34586 100644 (file)
--- a/include/randr.h
+++ b/include/randr.h
@@ -35,12 +35,21 @@ void disable_randr(xcb_connection_t *conn);
  * Initializes a CT_OUTPUT Con (searches existing ones from inplace restart
  * before) to use for the given Output.
  *
- * XXX: for assignments, we probably need to move workspace creation from here
- * to after the loop in randr_query_outputs().
- *
  */
 void output_init_con(Output *output);
 
+/**
+ * Initializes at least one workspace for this output, trying the following
+ * steps until there is at least one workspace:
+ *
+ * • Move existing workspaces, which are assigned to be on the given output, to
+ *   the output.
+ * • Create the first assigned workspace for this output.
+ * • Create the first unused workspace.
+ *
+ */
+void init_ws_for_output(Output *output, Con *content);
+
 /**
  * Initializes the specified output, assigning the specified workspace to it.
  *
@@ -82,4 +91,10 @@ Output *get_output_containing(int x, int y);
  */
 Output *get_output_most(direction_t direction, Output *current);
 
+/**
+ * Gets the output which is the next one in the given direction.
+ *
+ */
+Output *get_output_next(direction_t direction, Output *current);
+
 #endif