Merge branch 'master' into next

[i3/i3] / include / x.h

diff --git a/include/x.h b/include/x.h
index afc1645cd2044683991502d5bbc541da3bcd7e8b..b6bb4a5283702dd2f0110f2122b2d28574f77710 100644 (file)
--- a/include/x.h
+++ b/include/x.h
@@ -8,8 +8,8 @@
  *      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;
@@ -19,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.
@@ -93,8 +93,12 @@ void x_push_changes(Con *con);
  * Raises the specified container in the internal stack of X windows. The
  * next call to x_push_changes() will make the change visible in X11.
  *
+ * If above_all is true, the X11 window will be raised to the top
+ * of the stack. This should only be used for precisely one fullscreen
+ * window per output.
+ *
  */
-void x_raise_con(Con *con);
+void x_raise_con(Con *con, bool above_all);
 
 /**
  * Sets the WM_NAME property (so, no UTF8, but used only for debugging anyways)
@@ -104,11 +108,17 @@ void x_raise_con(Con *con);
  */
 void x_set_name(Con *con, const char *name);
 
+/**
+ * Set up the SHMLOG_PATH atom.
+ *
+ */
+void update_shmlog_atom(void);
+
 /**
  * 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