X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Ffloating.c;h=2f3f9bac3413d53b9f4bfb457e21104df29f951a;hb=d3e458bc7892280798eafb281a5be7106babc14c;hp=ef500bf6d2e7f902134cded7990ff1e7e2115cd7;hpb=b484ed5f9d4214ff6bdf205d0beec2207d3ed272;p=i3%2Fi3

diff --git a/src/floating.c b/src/floating.c
index ef500bf6..2f3f9bac 100644
--- a/src/floating.c
+++ b/src/floating.c
@@ -85,7 +85,7 @@ void floating_enable(Con *con, bool automatic) {
     /* 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);
+        tree_close(con->parent, DONT_KILL_WINDOW, false);
     }
 
     char *name;
@@ -147,15 +147,30 @@ void floating_enable(Con *con, bool automatic) {
         }
     }
 
+    TAILQ_INSERT_TAIL(&(nc->nodes_head), con, nodes);
+    TAILQ_INSERT_TAIL(&(nc->focus_head), con, focused);
+
     /* 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.
     if (set_focus)
         con_focus(con);
+
+    /* Check if we need to re-assign it to a different workspace because of its
+     * coordinates and exit if that was done successfully. */
+    if (floating_maybe_reassign_ws(nc))
+        return;
+
+    /* Sanitize coordinates: Check if they are on any output */
+    if (get_output_containing(nc->rect.x, nc->rect.y) != NULL)
+        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);
 }
 
 void floating_disable(Con *con, bool automatic) {
@@ -171,7 +186,7 @@ void floating_disable(Con *con, bool automatic) {
     /* 2: kill parent container */
     TAILQ_REMOVE(&(con->parent->parent->floating_head), con->parent, floating_windows);
     TAILQ_REMOVE(&(con->parent->parent->focus_head), con->parent, focused);
-    tree_close(con->parent, false, false);
+    tree_close(con->parent, DONT_KILL_WINDOW, false);
 
     /* 3: re-attach to the parent of the currently focused con on the workspace
      * this floating con was on */
@@ -225,16 +240,51 @@ void floating_raise_con(Con *con) {
     TAILQ_INSERT_TAIL(&(con->parent->floating_head), con, floating_windows);
 }
 
+/*
+ * Checks if con’s coordinates are within its workspace and re-assigns it to
+ * the actual workspace if not.
+ *
+ */
+bool floating_maybe_reassign_ws(Con *con) {
+    Output *output = get_output_containing(
+        con->rect.x + (con->rect.width / 2),
+        con->rect.y + (con->rect.height / 2));
+
+    if (!output) {
+        ELOG("No output found at destination coordinates?\n");
+        return false;
+    }
+
+    if (con_get_output(con) == output->con) {
+        DLOG("still the same ws\n");
+        return false;
+    }
+
+    DLOG("Need to re-assign!\n");
+
+    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_focus(con_descend_focused(con));
+    return true;
+}
+
 DRAGGING_CB(drag_window_callback) {
     struct xcb_button_press_event_t *event = extra;
 
     /* Reposition the client correctly while moving */
     con->rect.x = old_rect->x + (new_x - event->root_x);
     con->rect.y = old_rect->y + (new_y - event->root_y);
-    /* TODO: don’t re-render the whole tree just because we change
-     * coordinates of a floating window */
+
+    render_con(con, false);
+    x_push_node(con);
+    xcb_flush(conn);
+
+    /* Check if we cross workspace boundaries while moving */
+    if (!floating_maybe_reassign_ws(con))
+        return;
     tree_render();
-    x_push_changes(croot);
 }
 
 /*
@@ -331,7 +381,7 @@ void floating_resize_window(Con *con, bool proportional,
 
     if (event->event_y <= (con->rect.height / 2))
         corner |= BORDER_TOP;
-    else corner |= BORDER_RIGHT;
+    else corner |= BORDER_BOTTOM;
 
     struct resize_window_callback_params params = { corner, proportional, event };
 
@@ -374,19 +424,15 @@ void drag_pointer(Con *con, xcb_button_press_event_t *event, xcb_window_t
     while ((inside_event = xcb_wait_for_event(conn))) {
         /* We now handle all events we can get using xcb_poll_for_event */
         do {
-            /* Same as get_event_handler in xcb */
-            int nr = inside_event->response_type;
-            if (nr == 0) {
-                /* An error occured */
-                //handle_event(NULL, conn, inside_event);
+            /* skip x11 errors */
+            if (inside_event->response_type == 0) {
                 free(inside_event);
                 continue;
             }
-            assert(nr < 256);
-            nr &= XCB_EVENT_RESPONSE_TYPE_MASK;
-            assert(nr >= 2);
+            /* Strip off the highest bit (set if the event is generated) */
+            int type = (inside_event->response_type & 0x7F);
 
-            switch (nr) {
+            switch (type) {
                 case XCB_BUTTON_RELEASE:
                     goto done;
 
@@ -398,13 +444,13 @@ void drag_pointer(Con *con, xcb_button_press_event_t *event, xcb_window_t
 
                 case XCB_UNMAP_NOTIFY:
                     DLOG("Unmap-notify, aborting\n");
-                    xcb_event_handle(&evenths, inside_event);
+                    handle_event(type, inside_event);
                     goto done;
 
                 default:
                     DLOG("Passing to original handler\n");
                     /* Use original handler */
-                    xcb_event_handle(&evenths, inside_event);
+                    handle_event(type, inside_event);
                     break;
             }
             if (last_motion_notify != inside_event)