Merge branch 'next' into master

[i3/i3] / include / randr.h

diff --git a/include/randr.h b/include/randr.h
index 823ddea4e98f1be582ee2a7ca91cb9137ef762cf..998f0d597e8839237da1885375fec363a898abbc 100644 (file)
--- a/include/randr.h
+++ b/include/randr.h
@@ -29,13 +29,6 @@ typedef enum {
  */
 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.
@@ -120,3 +113,9 @@ Output *get_output_next(direction_t direction, Output *current, output_close_far
  *
  */
 Output *get_output_next_wrap(direction_t direction, Output *current);
+
+/*
+ * Creates an output covering the root window.
+ *
+ */
+Output *create_root_output(xcb_connection_t *conn);