Merge branch 'master' into next

[i3/i3] / include / window.h

diff --git a/include/window.h b/include/window.h
index 1c48c012e0c0626187bffdd31fd6320fa12828e5..59d3b1bbd97a3bc1401b6bda614bb23c89b6b11b 100644 (file)
--- a/include/window.h
+++ b/include/window.h
@@ -1,19 +1,28 @@
-#ifndef _WINDOW_H
-#define _WINDOW_H
+/*
+ * vim:ts=4:sw=4:expandtab
+ *
+ * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ *
+ * window.c: Updates window attributes (X11 hints/properties).
+ *
+ */
+#ifndef I3_WINDOW_H
+#define I3_WINDOW_H
 
 /**
  * Updates the WM_CLASS (consisting of the class and instance) for the
  * given window.
  *
  */
-void window_update_class(i3Window *win, xcb_get_property_reply_t *prop);
+void window_update_class(i3Window *win, xcb_get_property_reply_t *prop, bool before_mgmt);
 
 /**
  * Updates the name by using _NET_WM_NAME (encoded in UTF-8) for the given
  * window. Further updates using window_update_name_legacy will be ignored.
  *
  */
-void window_update_name(i3Window *win, xcb_get_property_reply_t *prop);
+void window_update_name(i3Window *win, xcb_get_property_reply_t *prop, bool before_mgmt);
 
 /**
  * Updates the name by using WM_NAME (encoded in COMPOUND_TEXT). We do not
@@ -22,7 +31,7 @@ void window_update_name(i3Window *win, xcb_get_property_reply_t *prop);
  * window_update_name()).
  *
  */
-void window_update_name_legacy(i3Window *win, xcb_get_property_reply_t *prop);
+void window_update_name_legacy(i3Window *win, xcb_get_property_reply_t *prop, bool before_mgmt);
 
 /**
  * Updates the CLIENT_LEADER (logical parent window).
@@ -42,4 +51,16 @@ void window_update_transient_for(i3Window *win, xcb_get_property_reply_t *prop);
  */
 void window_update_strut_partial(i3Window *win, xcb_get_property_reply_t *prop);
 
+/**
+ * Updates the WM_WINDOW_ROLE
+ *
+ */
+void window_update_role(i3Window *win, xcb_get_property_reply_t *prop, bool before_mgmt);
+
+/**
+ * Updates the WM_HINTS (we only care about the input focus handling part).
+ *
+ */
+void window_update_hints(i3Window *win, xcb_get_property_reply_t *prop);
+
 #endif