Merge branch 'master' into next

[i3/i3] / src / floating.c

diff --git a/src/floating.c b/src/floating.c
index 2ba08330c3c218982bb3eb27dd27105cc896c945..2fbf66bcfb275dc4a7f1a030e1e5d71589ea6fef 100644 (file)
--- a/src/floating.c
+++ b/src/floating.c
@@ -17,7 +17,12 @@
 extern xcb_connection_t *conn;
 
 void floating_enable(Con *con, bool automatic) {
-    bool set_focus = true;
+    bool set_focus = (con == focused);
+
+    if (con->parent && con->parent->type == CT_DOCKAREA) {
+        LOG("Container is a dock window, not enabling floating mode.\n");
+        return;
+    }
 
     if (con_is_floating(con)) {
         LOG("Container is already in floating mode, not doing anything.\n");
@@ -80,7 +85,8 @@ void floating_enable(Con *con, bool automatic) {
     /* we need to set the parent afterwards instead of passing it as an
      * argument to con_new() because nc would be inserted into the tiling layer
      * otherwise. */
-    nc->parent = con_get_workspace(con);
+    Con *ws = con_get_workspace(con);
+    nc->parent = ws;
 
     /* check if the parent container is empty and close it if so */
     if ((con->parent->type == CT_CON || con->parent->type == CT_FLOATING_CON) && con_num_children(con->parent) == 0) {
@@ -97,6 +103,7 @@ void floating_enable(Con *con, bool automatic) {
     int deco_height = config.font.height + 5;
 
     DLOG("Original rect: (%d, %d) with %d x %d\n", con->rect.x, con->rect.y, con->rect.width, con->rect.height);
+    DLOG("Geometry = (%d, %d) with %d x %d\n", con->geometry.x, con->geometry.y, con->geometry.width, con->geometry.height);
     Rect zero = { 0, 0, 0, 0 };
     nc->rect = con->geometry;
     /* If the geometry was not set (split containers), we need to determine a
@@ -116,22 +123,12 @@ void floating_enable(Con *con, bool automatic) {
     /* add pixels for the decoration */
     /* TODO: don’t add them when the user automatically puts new windows into
      * 1pixel/borderless mode */
-    nc->rect.height += deco_height + 4;
+    nc->rect.height += deco_height + 2;
     nc->rect.width += 4;
-    DLOG("Floating rect: (%d, %d) with %d x %d\n", nc->rect.x, nc->rect.y, nc->rect.width, nc->rect.height);
-    nc->orientation = NO_ORIENTATION;
-    nc->type = CT_FLOATING_CON;
-    TAILQ_INSERT_TAIL(&(nc->parent->floating_head), nc, floating_windows);
-    TAILQ_INSERT_TAIL(&(nc->parent->focus_head), nc, focused);
-
-    /* 3: attach the child to the new parent container */
-    con->parent = nc;
-    con->percent = 1.0;
-    con->floating = FLOATING_USER_ON;
 
-    /* 4: set the border style as specified with new_float */
-    if (automatic)
-        con->border_style = config.default_floating_border;
+    /* Honor the X11 border */
+    nc->rect.height += con->border_width * 2;
+    nc->rect.width += con->border_width * 2;
 
     /* Some clients (like GIMP’s color picker window) get mapped
      * to (0, 0), so we push them to a reasonable position
@@ -145,12 +142,41 @@ void floating_enable(Con *con, bool automatic) {
             nc->rect.y = leader->rect.y + (leader->rect.height / 2) - (nc->rect.height / 2);
         } else {
             /* center the window on workspace as fallback */
-            Con *ws = nc->parent;
             nc->rect.x = ws->rect.x + (ws->rect.width / 2) - (nc->rect.width / 2);
             nc->rect.y = ws->rect.y + (ws->rect.height / 2) - (nc->rect.height / 2);
         }
     }
 
+    /* Sanity check: Are the coordinates on the appropriate output? If not, we
+     * need to change them */
+    Output *current_output = get_output_containing(nc->rect.x, nc->rect.y);
+    Con *correct_output = con_get_output(ws);
+    if (!current_output || current_output->con != correct_output) {
+        DLOG("This floating window is on the wrong output, fixing coordinates (currently (%d, %d))\n",
+             nc->rect.x, nc->rect.y);
+        /* Take the relative coordinates of the current output, then add them
+         * to the coordinate space of the correct output */
+        uint32_t rel_x = (nc->rect.x - (current_output ? current_output->con->rect.x : 0));
+        uint32_t rel_y = (nc->rect.y - (current_output ? current_output->con->rect.y : 0));
+        nc->rect.x = correct_output->rect.x + rel_x;
+        nc->rect.y = correct_output->rect.y + rel_y;
+    }
+
+    DLOG("Floating rect: (%d, %d) with %d x %d\n", nc->rect.x, nc->rect.y, nc->rect.width, nc->rect.height);
+    nc->orientation = NO_ORIENTATION;
+    nc->type = CT_FLOATING_CON;
+    TAILQ_INSERT_TAIL(&(ws->floating_head), nc, floating_windows);
+    TAILQ_INSERT_TAIL(&(ws->focus_head), nc, focused);
+
+    /* 3: attach the child to the new parent container */
+    con->parent = nc;
+    con->percent = 1.0;
+    con->floating = FLOATING_USER_ON;
+
+    /* 4: set the border style as specified with new_float */
+    if (automatic)
+        con->border_style = config.default_floating_border;
+
     TAILQ_INSERT_TAIL(&(nc->nodes_head), con, nodes);
     TAILQ_INSERT_TAIL(&(nc->focus_head), con, focused);
 
@@ -158,7 +184,6 @@ void floating_enable(Con *con, bool automatic) {
     render_con(nc, false);
     render_con(con, false);
 
-    // TODO: don’t influence focus handling when Con was not focused before.
     if (set_focus)
         con_focus(con);
 
@@ -172,7 +197,6 @@ void floating_enable(Con *con, bool automatic) {
         return;
 
     ELOG("No output found at destination coordinates, centering floating window on current ws\n");
-    Con *ws = nc->parent;
     nc->rect.x = ws->rect.x + (ws->rect.width / 2) - (nc->rect.width / 2);
     nc->rect.y = ws->rect.y + (ws->rect.height / 2) - (nc->rect.height / 2);
 }
@@ -271,7 +295,7 @@ bool floating_maybe_reassign_ws(Con *con) {
     Con *content = output_get_content(output->con);
     Con *ws = TAILQ_FIRST(&(content->focus_head));
     DLOG("Moving con %p / %s to workspace %p / %s\n", con, con->name, ws, ws->name);
-    con_move_to_workspace(con, ws);
+    con_move_to_workspace(con, ws, false, true);
     con_focus(con_descend_focused(con));
     return true;
 }