Bugfix: Make resizing work when pressing floating_modifier + right mouse button on...

[i3/i3] / src / click.c

diff --git a/src/click.c b/src/click.c
index 04f5b871db5cc62966e66b763b41c012d21e6829..a046965030bfe1451337df68ed328d9e7039cab8 100644 (file)
--- a/src/click.c
+++ b/src/click.c
@@ -26,7 +26,7 @@ typedef enum { CLICK_BORDER = 0, CLICK_DECORATION = 1, CLICK_INSIDE = 2 } click_
  *
  */
 static bool tiling_resize_for_border(Con *con, border_t border, xcb_button_press_event_t *event) {
-    DLOG("border = %d\n", border);
+    DLOG("border = %d, con = %p\n", border, con);
     char way = (border == BORDER_TOP || border == BORDER_LEFT ? 'p' : 'n');
     orientation_t orientation = (border == BORDER_TOP || border == BORDER_BOTTOM ? VERT : HORIZ);
 
@@ -38,6 +38,7 @@ static bool tiling_resize_for_border(Con *con, border_t border, xcb_button_press
            resize_con->parent->orientation != orientation)
         resize_con = resize_con->parent;
 
+    DLOG("resize_con = %p\n", resize_con);
     if (resize_con->type != CT_WORKSPACE &&
         resize_con->type != CT_FLOATING_CON &&
         resize_con->parent->orientation == orientation) {
@@ -51,17 +52,25 @@ static bool tiling_resize_for_border(Con *con, border_t border, xcb_button_press
             first = second;
             second = tmp;
         }
+        DLOG("first = %p, second = %p, resize_con = %p\n",
+                first, second, resize_con);
     }
 
     if (first == NULL || second == NULL) {
         DLOG("Resize not possible\n");
         return false;
     }
-    else {
-        assert(first != second);
-        assert(first->parent == second->parent);
-        resize_graphical_handler(first, second, orientation, event);
-    }
+
+    assert(first != second);
+    assert(first->parent == second->parent);
+
+    /* We modify the X/Y position in the event so that the divider line is at
+     * the actual position of the border, not at the position of the click. */
+    if (orientation == HORIZ)
+        event->root_x = second->rect.x;
+    else event->root_y = second->rect.y;
+
+    resize_graphical_handler(first, second, orientation, event);
 
     DLOG("After resize handler, rendering\n");
     tree_render();
@@ -115,14 +124,34 @@ static bool floating_mod_on_tiled_client(Con *con, xcb_button_press_event_t *eve
  * Finds out which border was clicked on and calls tiling_resize_for_border().
  *
  */
-static bool tiling_resize(Con *con, xcb_button_press_event_t *event, click_destination_t dest) {
+static bool tiling_resize(Con *con, xcb_button_press_event_t *event, const click_destination_t dest) {
     /* check if this was a click on the window border (and on which one) */
     Rect bsr = con_border_style_rect(con);
     DLOG("BORDER x = %d, y = %d for con %p, window 0x%08x\n",
             event->event_x, event->event_y, con, event->event);
     DLOG("checks for right >= %d\n", con->window_rect.x + con->window_rect.width);
-    if (dest == CLICK_DECORATION)
+    if (dest == CLICK_DECORATION) {
+        /* The user clicked on a window decoration. We ignore the following case:
+         * The container is a h-split, tabbed or stacked container with > 1
+         * window. Decorations will end up next to each other and the user
+         * expects to switch to a window by clicking on its decoration. */
+
+        /* Since the container might either be the child *or* already a split
+         * container (in the case of a nested split container), we need to make
+         * sure that we are dealing with the split container here. */
+        Con *check_con = con;
+        if (con_is_leaf(check_con) && check_con->parent->type == CT_CON)
+            check_con = check_con->parent;
+
+        if ((check_con->layout == L_STACKED ||
+             check_con->layout == L_TABBED ||
+             check_con->orientation == HORIZ) &&
+            con_num_children(check_con) > 1) {
+            DLOG("Not handling this resize, this container has > 1 child.\n");
+            return false;
+        }
         return tiling_resize_for_border(con, BORDER_TOP, event);
+    }
 
     if (event->event_x >= 0 && event->event_x <= bsr.x &&
         event->event_y >= bsr.y && event->event_y <= con->rect.height + bsr.height)
@@ -143,7 +172,7 @@ static bool tiling_resize(Con *con, xcb_button_press_event_t *event, click_desti
  * functions for resizing/dragging.
  *
  */
-static int route_click(Con *con, xcb_button_press_event_t *event, bool mod_pressed, click_destination_t dest) {
+static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod_pressed, const click_destination_t dest) {
     DLOG("--> click properties: mod = %d, destination = %d\n", mod_pressed, dest);
     DLOG("--> OUTCOME = %p\n", con);
     DLOG("type = %d, name = %s\n", con->type, con->name);
@@ -225,7 +254,7 @@ static int route_click(Con *con, xcb_button_press_event_t *event, bool mod_press
     }
 
     /* 7: floating modifier pressed, initiate a resize */
-    if (mod_pressed && event->detail == 3) {
+    if (dest == CLICK_INSIDE && mod_pressed && event->detail == 3) {
         if (floating_mod_on_tiled_client(con, event))
             return 1;
     }
@@ -257,7 +286,7 @@ int handle_button_press(xcb_button_press_event_t *event) {
     last_timestamp = event->time;
 
     const uint32_t mod = config.floating_modifier;
-    bool mod_pressed = (mod != 0 && (event->state & mod) == mod);
+    const bool mod_pressed = (mod != 0 && (event->state & mod) == mod);
     DLOG("floating_mod = %d, detail = %d\n", mod_pressed, event->detail);
     if ((con = con_by_window_id(event->event)))
         return route_click(con, event, mod_pressed, CLICK_INSIDE);