Merge branch 'master' into next

[i3/i3] / include / x.h

diff --git a/include/x.h b/include/x.h
index 29a8bec20c87d26b8278937674302ebbeb78605f..c3d4ffc7cc29f5bac0194aa9ca401f469ee70e8e 100644 (file)
--- a/include/x.h
+++ b/include/x.h
@@ -1,9 +1,15 @@
 /*
  * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * x.c: Interface to X11, transfers our in-memory state to X11 (see also
+ *      render.c). Basically a big state machine.
+ *
  */
-
-#ifndef _X_H
-#define _X_H
+#ifndef I3_X_H
+#define I3_X_H
 
 /** Stores the X11 window ID of the currently focused window */
 extern xcb_window_t focused_id;
@@ -13,7 +19,7 @@ extern xcb_window_t focused_id;
  * every container from con_new().
  *
  */
-void x_con_init(Con *con);
+void x_con_init(Con *con, uint16_t depth);
 
 /**
  * Moves a child window from Container src to Container dest.
@@ -102,7 +108,7 @@ void x_set_name(Con *con, const char *name);
  * Sets up i3 specific atoms (I3_SOCKET_PATH and I3_CONFIG_PATH)
  *
  */
-void x_set_i3_atoms();
+void x_set_i3_atoms(void);
 
 /**
  * Set warp_to coordinates.  This will trigger on the next call to
@@ -111,4 +117,12 @@ void x_set_i3_atoms();
  */
 void x_set_warp_to(Rect *rect);
 
+/**
+ * Applies the given mask to the event mask of every i3 window decoration X11
+ * window. This is useful to disable EnterNotify while resizing so that focus
+ * is untouched.
+ *
+ */
+void x_mask_event_mask(uint32_t mask);
+
 #endif