Bugfix: Don’t crash when the font is specified after the workspace names in configfil...

[i3/i3] / src / manage.c

diff --git a/src/manage.c b/src/manage.c
index 12d96c8c683e63758486d51b0dfc1bd278fdd520..70d12488e487527b444da0dd59f6345f5327c48a 100644 (file)
--- a/src/manage.c
+++ b/src/manage.c
@@ -111,6 +111,7 @@ void manage_window(xcb_property_handlers_t *prophs, xcb_connection_t *conn,
         xcb_property_changed(prophs, XCB_PROPERTY_NEW_VALUE, window, WM_NAME);
         xcb_property_changed(prophs, XCB_PROPERTY_NEW_VALUE, window, WM_NORMAL_HINTS);
         xcb_property_changed(prophs, XCB_PROPERTY_NEW_VALUE, window, WM_TRANSIENT_FOR);
+        xcb_property_changed(prophs, XCB_PROPERTY_NEW_VALUE, window, atoms[WM_CLIENT_LEADER]);
         xcb_property_changed(prophs, XCB_PROPERTY_NEW_VALUE, window, atoms[_NET_WM_NAME]);
 
         free(geom);
@@ -131,7 +132,8 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
                      int16_t x, int16_t y, uint16_t width, uint16_t height) {
 
         xcb_get_property_cookie_t wm_type_cookie, strut_cookie, state_cookie,
-                                  utf8_title_cookie, title_cookie, class_cookie;
+                                  utf8_title_cookie, title_cookie,
+                                  class_cookie, leader_cookie;
         uint32_t mask = 0;
         uint32_t values[3];
         uint16_t original_height = height;
@@ -147,8 +149,9 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
         strut_cookie = xcb_get_any_property_unchecked(conn, false, child, atoms[_NET_WM_STRUT_PARTIAL], UINT32_MAX);
         state_cookie = xcb_get_any_property_unchecked(conn, false, child, atoms[_NET_WM_STATE], UINT32_MAX);
         utf8_title_cookie = xcb_get_any_property_unchecked(conn, false, child, atoms[_NET_WM_NAME], 128);
+        leader_cookie = xcb_get_any_property_unchecked(conn, false, child, atoms[WM_CLIENT_LEADER], UINT32_MAX);
         title_cookie = xcb_get_any_property_unchecked(conn, false, child, WM_NAME, 128);
-        class_cookie  = xcb_get_any_property_unchecked(conn, false, child, WM_CLASS, 128);
+        class_cookie = xcb_get_any_property_unchecked(conn, false, child, WM_CLASS, 128);
 
         Client *new = table_get(&by_child, child);
 
@@ -248,11 +251,13 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
                         if (atom[i] == atoms[_NET_WM_WINDOW_TYPE_DOCK]) {
                                 LOG("Window is a dock.\n");
                                 new->dock = true;
+                                new->borderless = true;
                                 new->titlebar_position = TITLEBAR_OFF;
                                 new->force_reconfigure = true;
                                 new->container = NULL;
                                 SLIST_INSERT_HEAD(&(c_ws->screen->dock_clients), new, dock_clients);
                                 /* If it’s a dock we can’t make it float, so we break */
+                                new->floating = FLOATING_AUTO_OFF;
                                 break;
                         } else if (atom[i] == atoms[_NET_WM_WINDOW_TYPE_DIALOG] ||
                                    atom[i] == atoms[_NET_WM_WINDOW_TYPE_UTILITY] ||
@@ -264,6 +269,12 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
                         }
         }
 
+        /* All clients which have a leader should be floating */
+        if (!new->dock && !client_is_floating(new) && new->leader != 0) {
+                LOG("Client has WM_CLIENT_LEADER hint set, setting floating\n");
+                new->floating = FLOATING_AUTO_ON;
+        }
+
         if (new->workspace->auto_float) {
                 new->floating = FLOATING_AUTO_ON;
                 LOG("workspace is in autofloat mode, setting floating\n");
@@ -304,6 +315,9 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
                 preply = xcb_get_property_reply(conn, class_cookie, NULL);
                 handle_windowclass_change(NULL, conn, 0, new->child, WM_CLASS, preply);
 
+                preply = xcb_get_property_reply(conn, leader_cookie, NULL);
+                handle_clientleader_change(NULL, conn, 0, new->child, atoms[WM_CLIENT_LEADER], preply);
+
                 LOG("DEBUG: should have all infos now\n");
                 struct Assignment *assign;
                 TAILQ_FOREACH(assign, &assignments, assignments) {
@@ -375,10 +389,27 @@ void reparent_window(xcb_connection_t *conn, xcb_window_t child,
 
                 new->container = NULL;
 
-                new->floating_rect.x = new->rect.x = x;
-                new->floating_rect.y = new->rect.y = y;
                 new->rect.width = new->floating_rect.width + 2 + 2;
                 new->rect.height = new->floating_rect.height + (font->height + 2 + 2) + 2;
+
+                /* Some clients (like GIMP’s color picker window) get mapped
+                 * to (0, 0), so we push them to a reasonable position
+                 * (centered over their leader) */
+                if (new->leader != 0 && x == 0 && y == 0) {
+                        LOG("Floating client wants to (0x0), moving it over its leader instead\n");
+                        Client *leader = table_get(&by_child, new->leader);
+                        if (leader == NULL) {
+                                LOG("leader is NULL, centering it over current workspace\n");
+
+                                x = c_ws->rect.x + (c_ws->rect.width / 2) - (new->rect.width / 2);
+                                y = c_ws->rect.y + (c_ws->rect.height / 2) - (new->rect.height / 2);
+                        } else {
+                                x = leader->rect.x + (leader->rect.width / 2) - (new->rect.width / 2);
+                                y = leader->rect.y + (leader->rect.height / 2) - (new->rect.height / 2);
+                        }
+                }
+                new->floating_rect.x = new->rect.x = x;
+                new->floating_rect.y = new->rect.y = y;
                 LOG("copying floating_rect from tiling (%d, %d) size (%d, %d)\n",
                                 new->floating_rect.x, new->floating_rect.y,
                                 new->floating_rect.width, new->floating_rect.height);