Added config key for default orientation of containers (new_container_orientation...

[i3/i3] / src / floating.c

diff --git a/src/floating.c b/src/floating.c
index 3cf8ab5fc1d5ddf65d39fac093330b64296dcc4f..ef500bf6d2e7f902134cded7990ff1e7e2115cd7 100644 (file)
--- a/src/floating.c
+++ b/src/floating.c
@@ -30,6 +30,10 @@ void floating_enable(Con *con, bool automatic) {
      * are children of the workspace. */
     if (con->type == CT_WORKSPACE) {
         LOG("This is a workspace, creating new container around content\n");
+        if (con_num_children(con) == 0) {
+            LOG("Workspace is empty, aborting\n");
+            return;
+        }
         /* TODO: refactor this with src/con.c:con_set_layout */
         Con *new = con_new(NULL);
         new->parent = con;
@@ -68,7 +72,7 @@ void floating_enable(Con *con, bool automatic) {
     TAILQ_REMOVE(&(con->parent->nodes_head), con, nodes);
     TAILQ_REMOVE(&(con->parent->focus_head), con, focused);
 
-    con_fix_percent(con->parent, WINDOW_REMOVE);
+    con_fix_percent(con->parent);
 
     /* 2: create a new container to render the decoration on, add
      * it as a floating window to the workspace */
@@ -78,21 +82,43 @@ void floating_enable(Con *con, bool automatic) {
      * otherwise. */
     nc->parent = con_get_workspace(con);
 
+    /* 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) {
+        DLOG("Old container empty after setting this child to floating, closing\n");
+        tree_close(con->parent, false, false);
+    }
+
     char *name;
     asprintf(&name, "[i3 con] floatingcon around %p", con);
     x_set_name(nc, name);
     free(name);
 
     /* find the height for the decorations */
-    i3Font *font = load_font(conn, config.font);
-    int deco_height = font->height + 5;
-
-    nc->rect = con->rect;
+    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);
+    Rect zero = { 0, 0, 0, 0 };
+    nc->rect = con->geometry;
+    /* If the geometry was not set (split containers), we need to determine a
+     * sensible one by combining the geometry of all children */
+    if (memcmp(&(nc->rect), &zero, sizeof(Rect)) == 0) {
+        DLOG("Geometry not set, combining children\n");
+        Con *child;
+        TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+            DLOG("child geometry: %d x %d\n", child->geometry.width, child->geometry.height);
+            nc->rect.width += child->geometry.width;
+            nc->rect.height = max(nc->rect.height, child->geometry.height);
+        }
+    }
+    /* Raise the width/height to at least 75x50 (minimum size for windows) */
+    nc->rect.width = max(nc->rect.width, 75);
+    nc->rect.height = max(nc->rect.height, 50);
     /* 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.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);
@@ -100,6 +126,7 @@ void floating_enable(Con *con, bool automatic) {
 
     /* 3: attach the child to the new parent container */
     con->parent = nc;
+    con->percent = 1.0;
     con->floating = FLOATING_USER_ON;
 
     /* Some clients (like GIMP’s color picker window) get mapped
@@ -120,6 +147,10 @@ void floating_enable(Con *con, bool automatic) {
         }
     }
 
+    /* render the cons to get initial window_rect correct */
+    render_con(nc, false);
+    render_con(con, false);
+
     TAILQ_INSERT_TAIL(&(nc->nodes_head), con, nodes);
     TAILQ_INSERT_TAIL(&(nc->focus_head), con, focused);
     // TODO: don’t influence focus handling when Con was not focused before.
@@ -142,14 +173,25 @@ void floating_disable(Con *con, bool automatic) {
     TAILQ_REMOVE(&(con->parent->parent->focus_head), con->parent, focused);
     tree_close(con->parent, false, false);
 
-    /* 3: re-attach to previous parent */
-    con->parent = con_get_workspace(con);
+    /* 3: re-attach to the parent of the currently focused con on the workspace
+     * this floating con was on */
+    Con *focused = con_descend_tiling_focused(con_get_workspace(con));
+
+    /* if there is no other container on this workspace, focused will be the
+     * workspace itself */
+    if (focused->type == CT_WORKSPACE)
+        con->parent = focused;
+    else con->parent = focused->parent;
+
+    /* con_fix_percent will adjust the percent value */
+    con->percent = 0.0;
+
     TAILQ_INSERT_TAIL(&(con->parent->nodes_head), con, nodes);
     TAILQ_INSERT_TAIL(&(con->parent->focus_head), con, focused);
 
     con->floating = FLOATING_USER_OFF;
 
-    con_fix_percent(con->parent, WINDOW_ADD);
+    con_fix_percent(con->parent);
     // TODO: don’t influence focus handling when Con was not focused before.
     con_focus(con);
 }
@@ -242,12 +284,10 @@ DRAGGING_CB(resize_window_callback) {
         dest_height = old_rect->height - (new_y - event->root_y);
     else dest_height = old_rect->height + (new_y - event->root_y);
 
-    /* TODO: minimum window size */
-#if 0
     /* Obey minimum window size */
-    dest_width = max(dest_width, client_min_width(client));
-    dest_height = max(dest_height, client_min_height(client));
-#endif
+    Rect minimum = con_minimum_size(con);
+    dest_width = max(dest_width, minimum.width);
+    dest_height = max(dest_height, minimum.height);
 
     /* User wants to keep proportions, so we may have to adjust our values */
     if (params->proportional) {
@@ -309,7 +349,6 @@ void floating_resize_window(Con *con, bool proportional,
 void drag_pointer(Con *con, xcb_button_press_event_t *event, xcb_window_t
                 confine_to, border_t border, callback_t callback, void *extra)
 {
-    xcb_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root;
     uint32_t new_x, new_y;
     Rect old_rect;
     if (con != NULL)