use I3__FILE__ for DLOG, leave __FILE__ as is

[i3/i3] / src / click.c

diff --git a/src/click.c b/src/click.c
index a046965030bfe1451337df68ed328d9e7039cab8..23b6be4f15483d417101221f8f7a778c9cf0c2c5 100644 (file)
--- a/src/click.c
+++ b/src/click.c
@@ -1,8 +1,10 @@
+#undef I3__FILE__
+#define I3__FILE__ "click.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * click.c: Button press (mouse click) events.
  *
@@ -35,13 +37,13 @@ static bool tiling_resize_for_border(Con *con, border_t border, xcb_button_press
     Con *resize_con = con;
     while (resize_con->type != CT_WORKSPACE &&
            resize_con->type != CT_FLOATING_CON &&
-           resize_con->parent->orientation != orientation)
+           con_orientation(resize_con->parent) != 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) {
+        con_orientation(resize_con->parent) == orientation) {
         first = resize_con;
         second = (way == 'n') ? TAILQ_NEXT(first, nodes) : TAILQ_PREV(first, nodes_head, nodes);
         if (second == TAILQ_END(&(first->nodes_head))) {
@@ -145,7 +147,7 @@ static bool tiling_resize(Con *con, xcb_button_press_event_t *event, const click
 
         if ((check_con->layout == L_STACKED ||
              check_con->layout == L_TABBED ||
-             check_con->orientation == HORIZ) &&
+             con_orientation(check_con) == HORIZ) &&
             con_num_children(check_con) > 1) {
             DLOG("Not handling this resize, this container has > 1 child.\n");
             return false;
@@ -193,24 +195,37 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod
          event->detail == XCB_BUTTON_INDEX_5)) {
         DLOG("Scrolling on a window decoration\n");
         orientation_t orientation = (con->parent->layout == L_STACKED ? VERT : HORIZ);
-        if (event->detail == XCB_BUTTON_INDEX_4)
+        /* To prevent scrolling from going outside the container (see ticket
+         * #557), we first check if scrolling is possible at all. */
+        Con *focused = con_descend_focused(con->parent);
+        bool scroll_prev_possible = (TAILQ_PREV(focused, nodes_head, nodes) != NULL);
+        bool scroll_next_possible = (TAILQ_NEXT(focused, nodes) != NULL);
+        if (event->detail == XCB_BUTTON_INDEX_4 && scroll_prev_possible)
             tree_next('p', orientation);
-        else tree_next('n', orientation);
+        else if (event->detail == XCB_BUTTON_INDEX_5 && scroll_next_possible)
+            tree_next('n', orientation);
         goto done;
     }
 
-    /* 2: focus this con */
+    /* 2: focus this con. If the workspace is on another output we need to
+     * do a workspace_show in order for i3bar (and others) to notice the
+     * change in workspace. */
+    Con *ws = con_get_workspace(con);
+    Con *focused_workspace = con_get_workspace(focused);
+
+    if (ws != focused_workspace)
+        workspace_show(ws);
+    focused_id = XCB_NONE;
     con_focus(con);
 
     /* 3: For floating containers, we also want to raise them on click.
      * We will skip handling events on floating cons in fullscreen mode */
-    Con *ws = con_get_workspace(con);
     Con *fs = (ws ? con_get_fullscreen_con(ws, CF_OUTPUT) : NULL);
     if (floatingcon != NULL && fs == NULL) {
         floating_raise_con(floatingcon);
 
         /* 4: floating_modifier plus left mouse button drags */
-        if (mod_pressed && event->detail == 1) {
+        if (mod_pressed && event->detail == XCB_BUTTON_INDEX_1) {
             floating_drag_window(floatingcon, event);
             return 1;
         }
@@ -259,7 +274,9 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod
             return 1;
     }
     /* 8: otherwise, check for border/decoration clicks and resize */
-    else if (dest == CLICK_BORDER || dest == CLICK_DECORATION) {
+    else if ((dest == CLICK_BORDER || dest == CLICK_DECORATION) &&
+             (event->detail == XCB_BUTTON_INDEX_1 ||
+              event->detail == XCB_BUTTON_INDEX_3)) {
         DLOG("Trying to resize (tiling)\n");
         tiling_resize(con, event, dest);
     }