Merge branch 'next' into master

[i3/i3] / include / randr.h

diff --git a/include/randr.h b/include/randr.h
index 8222b99ac886520b8b1a5c7763a3e6ea0895d1f8..998f0d597e8839237da1885375fec363a898abbc 100644 (file)
--- a/include/randr.h
+++ b/include/randr.h
@@ -2,15 +2,14 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * For more information on RandR, please see the X.org RandR specification at
  * http://cgit.freedesktop.org/xorg/proto/randrproto/tree/randrproto.txt
  * (take your time to read it completely, it answers all questions).
  *
  */
-#ifndef I3_RANDR_H
-#define I3_RANDR_H
+#pragma once
 
 #include "data.h"
 #include <xcb/randr.h>
@@ -30,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.
@@ -85,7 +77,17 @@ Output *get_output_by_name(const char *name);
  * if there is no output which contains these coordinates.
  *
  */
-Output *get_output_containing(int x, int y);
+Output *get_output_containing(unsigned int x, unsigned int y);
+
+/*
+ * In contained_by_output, we check if any active output contains part of the container.
+ * We do this by checking if the output rect is intersected by the Rect.
+ * This is the 2-dimensional counterpart of get_output_containing.
+ * Since we don't actually need the outputs intersected by the given Rect (There could
+ * be many), we just return true or false for convenience.
+ *
+ */
+bool contained_by_output(Rect rect);
 
 /**
  * Gets the output which is the next one in the given direction.
@@ -112,4 +114,8 @@ Output *get_output_next(direction_t direction, Output *current, output_close_far
  */
 Output *get_output_next_wrap(direction_t direction, Output *current);
 
-#endif
+/*
+ * Creates an output covering the root window.
+ *
+ */
+Output *create_root_output(xcb_connection_t *conn);