Merge branch 'master' into next

[i3/i3] / include / randr.h

diff --git a/include/randr.h b/include/randr.h
index 50e19938eb14c4a371bc1fcbf45b3a08928543ff..9c09f2b1276b11f55e6fc306170bd9467cb34586 100644 (file)
--- a/include/randr.h
+++ b/include/randr.h
@@ -18,24 +18,49 @@ TAILQ_HEAD(outputs_head, xoutput);
 extern struct outputs_head outputs;
 
 /**
- * Returns true if both screen objects describe the same screen (checks their
- * size and position).
+ * We have just established a connection to the X server and need the initial
+ * XRandR information to setup workspaces for each screen.
  *
  */
-bool screens_are_equal(Output *screen1, Output *screen2);
+void randr_init(int *event_base);
 
 /**
- * We have just established a connection to the X server and need the initial
- * XRandR information to setup workspaces for each screen.
+ * Disables RandR support by creating exactly one output with the size of the
+ * X11 screen.
+ *
+ */
+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.
+ *
+ */
+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 initialize_randr(xcb_connection_t *conn, int *event_base);
+void init_ws_for_output(Output *output, Con *content);
+
+/**
+ * Initializes the specified output, assigning the specified workspace to it.
+ *
+ */
+//void initialize_output(xcb_connection_t *conn, Output *output, Workspace *workspace);
 
 /**
  * (Re-)queries the outputs via RandR and stores them in the list of outputs.
  *
  */
-void randr_query_screens(xcb_connection_t *conn);
+void randr_query_outputs();
 
 /**
  * Returns the first output which is active.
@@ -44,19 +69,32 @@ void randr_query_screens(xcb_connection_t *conn);
 Output *get_first_output();
 
 /**
- * Looks in virtual_screens for the i3Screen which contains coordinates x, y
+ * Returns the output with the given name if it is active (!) or NULL.
+ *
+ */
+Output *get_output_by_name(const char *name);
+
+/**
+ * Returns the active (!) output which contains the coordinates x, y or NULL
+ * if there is no output which contains these coordinates.
  *
  */
-Output *get_screen_containing(int x, int y);
+Output *get_output_containing(int x, int y);
 
 /**
- * Gets the screen which is the last one in the given direction, for example
- * the screen on the most bottom when direction == D_DOWN, the screen most
+ * Gets the output which is the last one in the given direction, for example
+ * the output on the most bottom when direction == D_DOWN, the output most
  * right when direction == D_RIGHT and so on.
  *
- * This function always returns a screen.
+ * This function always returns a output.
+ *
+ */
+Output *get_output_most(direction_t direction, Output *current);
+
+/**
+ * Gets the output which is the next one in the given direction.
  *
  */
-Output *get_screen_most(direction_t direction, Output *current);
+Output *get_output_next(direction_t direction, Output *current);
 
 #endif