Fix click to focus.

diff --git a/src/click.c b/src/click.c
index 69319005421831e9be6f8716b8f8fed668aafe73..5b7f08271165ddc8ea07db05cc7d3e10212e826e 100644 (file)
--- a/src/click.c
+++ b/src/click.c
@@ -286,30 +286,18 @@ int handle_button_press(void *ignored, xcb_connection_t *conn, xcb_button_press_
             return 1;
         }
 
-        if (con->layout == L_STACKED || con->layout == L_TABBED) {
-            DLOG("stacked! click is on %d, %d\n", event->event_x, event->event_y);
-            Con *child;
-            TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
-                if (!rect_contains(child->deco_rect, event->event_x, event->event_y))
-                    continue;
-
-                con_focus(child);
-                break;
-            }
-            tree_render();
-            return 1;
-        }
-
-#if 0
-        if (!floating_mod_on_tiled_client(conn, client, event)) {
-#endif
-            xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, event->time);
-            xcb_flush(conn);
-#if 0
+        DLOG("border click on non-floating container at %d, %d\n", event->event_x, event->event_y);
+        Con *child;
+        TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
+            if (!rect_contains(child->deco_rect, event->event_x, event->event_y))
+                continue;
+
+            con_focus(child);
+            break;
         }
-#endif
 
-        //return 1;
+        tree_render();
+        return 1;
     }
 
     /* click to focus */

diff --git a/src/handlers.c b/src/handlers.c
index 78522ea0a58b2c3a2e1391d46b3f5a45c5e9dc03..d8e859b174d8a1aa6cb91c35662c1bf5dd035295 100644 (file)
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -263,6 +263,9 @@ int handle_motion_notify(void *ignored, xcb_connection_t *conn, xcb_motion_notif
         return 1;
     }
 
+    if (config.disable_focus_follows_mouse)
+        return 1;
+
     if (con->layout != L_DEFAULT)
         return 1;