Merge branch 'fix-dump-log-errmsg'

[i3/i3] / src / ewmh.c

diff --git a/src/ewmh.c b/src/ewmh.c
index 68fac63acde790e79ffebc7d15aa004597346b01..1c6d918bc30bce445c5c516cbf30fb3b0d38631c 100644 (file)
--- a/src/ewmh.c
+++ b/src/ewmh.c
@@ -16,7 +16,7 @@
  * and _NET_NUMBER_OF_DESKTOPS - 1.
  *
  */
-void ewmh_update_current_desktop() {
+void ewmh_update_current_desktop(void) {
     Con *focused_ws = con_get_workspace(focused);
     Con *output;
     uint32_t idx = 0;
@@ -50,12 +50,16 @@ void ewmh_update_active_window(xcb_window_t 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.
  *
  */
-void ewmh_update_workarea() {
+void ewmh_update_workarea(void) {
     int num_workspaces = 0, count = 0;
     Rect last_rect = {0, 0, 0, 0};
     Con *output;
@@ -112,7 +116,6 @@ 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,
@@ -123,3 +126,41 @@ void ewmh_update_client_list_stacking(xcb_window_t *stack, int num_windows) {
         num_windows,
         stack);
 }
+
+/*
+ * Set up the EWMH hints on the root window.
+ *
+ */
+void ewmh_setup_hints(void) {
+    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);
+}