Bugfix: Setup the _NET_SUPPORTING_WM_CHECK atom in a standards-compliant way

[i3/i3] / src / ewmh.c

diff --git a/src/ewmh.c b/src/ewmh.c
index 1736523d7a176a6efe8fd709bec576e5086170dc..a11d46583d51689df8fadccd6fa4b2321873d651 100644 (file)
--- a/src/ewmh.c
+++ b/src/ewmh.c
@@ -2,15 +2,11 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
+ * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
  *
- * © 2009-2011 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
- *
- * ewmh.c: Functions to get/set certain EWMH properties easily.
+ * ewmh.c: Get/set certain EWMH properties easily.
  *
  */
-
 #include "all.h"
 
 /*
@@ -31,7 +27,7 @@ void ewmh_update_current_desktop() {
         TAILQ_FOREACH(ws, &(output_get_content(output)->nodes_head), nodes) {
             if (ws == focused_ws) {
                 xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root,
-                        A__NET_CURRENT_DESKTOP, A_CARDINAL, 32, 1, &idx);
+                        A__NET_CURRENT_DESKTOP, XCB_ATOM_CARDINAL, 32, 1, &idx);
                 return;
             }
             ++idx;
@@ -48,12 +44,16 @@ void ewmh_update_current_desktop() {
  */
 void ewmh_update_active_window(xcb_window_t window) {
     xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root,
-            A__NET_ACTIVE_WINDOW, A_WINDOW, 32, 1, &window);
+            A__NET_ACTIVE_WINDOW, XCB_ATOM_WINDOW, 32, 1, &window);
 }
 
 /*
  * Updates the workarea for each desktop.
  *
+ * This function is not called at the moment due to:
+ * http://bugs.i3wm.org/539
+ * http://bugs.i3wm.org/301
+ *
  * EWMH: Contains a geometry for each desktop. These geometries specify an area
  * that is completely contained within the viewport. Work area SHOULD be used by
  * desktop applications to place desktop icons appropriately.
@@ -104,7 +104,7 @@ void ewmh_update_workarea() {
         }
     }
     xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root,
-            A__NET_WORKAREA, A_CARDINAL, 32,
+            A__NET_WORKAREA, XCB_ATOM_CARDINAL, 32,
             num_workspaces * (sizeof(Rect) / sizeof(uint32_t)),
             workarea);
     free(workarea);
@@ -116,14 +116,51 @@ void ewmh_update_workarea() {
  *
  */
 void ewmh_update_client_list_stacking(xcb_window_t *stack, int num_windows) {
-    DLOG("Updating _NET_CLIENT_LIST_STACKING\n");
     xcb_change_property(
         conn,
         XCB_PROP_MODE_REPLACE,
         root,
         A__NET_CLIENT_LIST_STACKING,
-        A_WINDOW,
+        XCB_ATOM_WINDOW,
         32,
         num_windows,
         stack);
 }
+
+/*
+ * Set up the EWMH hints on the root window.
+ *
+ */
+void ewmh_setup_hints() {
+    xcb_atom_t supported_atoms[] = {
+#define xmacro(atom) A_ ## atom,
+#include "atoms.xmacro"
+#undef xmacro
+    };
+
+    /* Set up the window manager’s name. According to EWMH, section "Root Window
+     * Properties", to indicate that an EWMH-compliant window manager is
+     * present, a child window has to be created (and kept alive as long as the
+     * window manager is running) which has the _NET_SUPPORTING_WM_CHECK and
+     * _NET_WM_ATOMS. */
+    xcb_window_t child_window = xcb_generate_id(conn);
+    xcb_create_window(
+        conn,
+        XCB_COPY_FROM_PARENT, /* depth */
+        child_window, /* window id */
+        root, /* parent */
+        0, 0, 1, 1, /* dimensions (x, y, w, h) */
+        0, /* border */
+        XCB_WINDOW_CLASS_INPUT_ONLY, /* window class */
+        XCB_COPY_FROM_PARENT, /* visual */
+        0,
+        NULL);
+    xcb_change_property(conn, XCB_PROP_MODE_REPLACE, child_window, A__NET_SUPPORTING_WM_CHECK, XCB_ATOM_WINDOW, 32, 1, &child_window);
+    xcb_change_property(conn, XCB_PROP_MODE_REPLACE, child_window, A__NET_WM_NAME, A_UTF8_STRING, 8, strlen("i3"), "i3");
+    xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A__NET_SUPPORTING_WM_CHECK, XCB_ATOM_WINDOW, 32, 1, &child_window);
+
+    /* I’m not entirely sure if we need to keep _NET_WM_NAME on root. */
+    xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A__NET_WM_NAME, A_UTF8_STRING, 8, strlen("i3"), "i3");
+
+    xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A__NET_SUPPORTED, XCB_ATOM_ATOM, 32, 16, supported_atoms);
+}