Re-Implement support for RandR changes

[i3/i3] / include / randr.h

diff --git a/include/randr.h b/include/randr.h
index 627afdbe9f8239f2db245ec61902567daf67e293..779a131630bff56d870b141ad8bc346e0c1bb064 100644 (file)
--- a/include/randr.h
+++ b/include/randr.h
@@ -22,13 +22,36 @@ extern struct outputs_head outputs;
  * XRandR information to setup workspaces for each screen.
  *
  */
-void initialize_randr(xcb_connection_t *conn, int *event_base);
+void randr_init(int *event_base);
+
+/**
+ * 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.
+ *
+ * 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 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.
@@ -43,19 +66,20 @@ Output *get_first_output();
 Output *get_output_by_name(const char *name);
 
 /**
- * Looks in virtual_screens for the i3Screen which contains coordinates x, y
+ * 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_screen_most(direction_t direction, Output *current);
+Output *get_output_most(direction_t direction, Output *current);
 
 #endif