Merge branch 'fix-dump-log-errmsg'

[i3/i3] / src / x.c

diff --git a/src/x.c b/src/x.c
index e4e768ea3c0d38ffa34a06b454093cebb7437fcd..08eb8fee30be8393cf4b752c57aebd7d89a47be1 100644 (file)
--- a/src/x.c
+++ b/src/x.c
@@ -85,23 +85,60 @@ static con_state *state_for_frame(xcb_window_t window) {
  * every container from con_new().
  *
  */
-void x_con_init(Con *con) {
+void x_con_init(Con *con, uint16_t depth) {
     /* TODO: maybe create the window when rendering first? we could then even
      * get the initial geometry right */
 
     uint32_t mask = 0;
-    uint32_t values[2];
+    uint32_t values[5];
+
+    xcb_visualid_t visual = XCB_COPY_FROM_PARENT;
+    xcb_colormap_t win_colormap = XCB_NONE;
+    if (depth != root_depth && depth != XCB_COPY_FROM_PARENT) {
+        /* For custom visuals, we need to create a colormap before creating
+         * this window. It will be freed directly after creating the window. */
+        visual = get_visualid_by_depth(depth);
+        win_colormap = xcb_generate_id(conn);
+        xcb_create_colormap_checked(conn, XCB_COLORMAP_ALLOC_NONE, win_colormap, root, visual);
+
+        /* We explicitly set a background color and border color (even though we
+         * don’t even have a border) because the X11 server requires us to when
+         * using 32 bit color depths, see
+         * http://stackoverflow.com/questions/3645632 */
+        mask |= XCB_CW_BACK_PIXEL;
+        values[0] = root_screen->black_pixel;
+
+        mask |= XCB_CW_BORDER_PIXEL;
+        values[1] = root_screen->black_pixel;
+
+        /* our own frames should not be managed */
+        mask |= XCB_CW_OVERRIDE_REDIRECT;
+        values[2] = 1;
+
+        /* see include/xcb.h for the FRAME_EVENT_MASK */
+        mask |= XCB_CW_EVENT_MASK;
+        values[3] = FRAME_EVENT_MASK & ~XCB_EVENT_MASK_ENTER_WINDOW;
+
+        mask |= XCB_CW_COLORMAP;
+        values[4] = win_colormap;
+    } else {
+        /* our own frames should not be managed */
+        mask = XCB_CW_OVERRIDE_REDIRECT;
+        values[0] = 1;
 
-    /* our own frames should not be managed */
-    mask |= XCB_CW_OVERRIDE_REDIRECT;
-    values[0] = 1;
+        /* see include/xcb.h for the FRAME_EVENT_MASK */
+        mask |= XCB_CW_EVENT_MASK;
+        values[1] = FRAME_EVENT_MASK & ~XCB_EVENT_MASK_ENTER_WINDOW;
 
-    /* see include/xcb.h for the FRAME_EVENT_MASK */
-    mask |= XCB_CW_EVENT_MASK;
-    values[1] = FRAME_EVENT_MASK & ~XCB_EVENT_MASK_ENTER_WINDOW;
+        mask |= XCB_CW_COLORMAP;
+        values[2] = colormap;
+    }
 
     Rect dims = { -15, -15, 10, 10 };
-    con->frame = create_window(conn, dims, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCURSOR_CURSOR_POINTER, false, mask, values);
+    con->frame = create_window(conn, dims, depth, visual, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCURSOR_CURSOR_POINTER, false, mask, values);
+
+    if (win_colormap != XCB_NONE)
+        xcb_free_colormap(conn, win_colormap);
 
     struct con_state *state = scalloc(sizeof(struct con_state));
     state->id = con->frame;
@@ -601,7 +638,13 @@ void x_push_node(Con *con) {
                 xcb_free_pixmap(conn, con->pixmap);
                 xcb_free_gc(conn, con->pm_gc);
             }
-            xcb_create_pixmap(conn, root_depth, con->pixmap, con->frame, rect.width, rect.height);
+
+            uint16_t win_depth = root_depth;
+            if (con->window)
+                win_depth = con->window->depth;
+
+            xcb_create_pixmap(conn, win_depth, con->pixmap, con->frame, rect.width, rect.height);
+
             /* For the graphics context, we disable GraphicsExposure events.
              * Those will be sent when a CopyArea request cannot be fulfilled
              * properly due to parts of the source being unmapped or otherwise
@@ -970,7 +1013,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) {
     xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_SOCKET_PATH, A_UTF8_STRING, 8,
                         (current_socketpath == NULL ? 0 : strlen(current_socketpath)),
                         current_socketpath);