Remove setting: 'focus_follows_pointer'

It is impossible to make the feature work in every cases without
unwanted side effects, therefore it will only exists as a branch.

diff --git a/README.md b/README.md
index 5564bf3bcb4c70d575bf4d7c1e209878634a37d3..aa8560f48237ed083013299dd3cd99e3971592b0 100644 (file)
--- a/README.md
+++ b/README.md
@@ -217,8 +217,6 @@ Colors are either [X color names](http://en.wikipedia.org/wiki/X11_color_names)
 
 - `gapless_monocle` — Whether to remove gaps for tiled windows in monocle mode.
 
-- `focus_follows_pointer` — Wether to focus the window under the pointer.
-
 - `adaptative_raise` — Prevent floating windows from being raised when they might cover other floating windows.
 
 - `apply_shadow_property` — Enable shadows for floating windows via the `_COMPTON_SHADOW` property.

diff --git a/bspwm.1 b/bspwm.1
index f3aa4a666c93a821c6dba19876bc4d5a253fd533..9f2c6ac5fac54608e7327598da3c27e34e3f327e 100644 (file)
--- a/bspwm.1
+++ b/bspwm.1
@@ -329,9 +329,6 @@ Whether to remove borders for tiled windows in monocle mode.
 .I gapless_monocle
 Whether to remove gaps for tiled windows in monocle mode.
 .TP
-.I focus_follows_pointer
-Wether to focus the window under the pointer.
-.TP
 .I adaptative_raise
 Prevent floating windows from being raised when they might cover other floating windows.
 .TP

diff --git a/bspwm.c b/bspwm.c
index 736ee25f12e2dfe31e7eb6b49b912a41d21ab3c6..83b1bd11de0220e6018cbf0c8cf67f9da66693b7 100644 (file)
--- a/bspwm.c
+++ b/bspwm.c
@@ -62,11 +62,6 @@ void setup(void)
     screen_height = screen->height_in_pixels;
     root_depth = screen->root_depth;
 
-    uint32_t mask = XCB_CW_EVENT_MASK;
-    uint32_t values[] = {XCB_EVENT_MASK_POINTER_MOTION};
-    motion_recorder = xcb_generate_id(dpy);
-    xcb_create_window(dpy, XCB_COPY_FROM_PARENT, motion_recorder, root, 0, 0, screen_width, screen_height, 0, XCB_WINDOW_CLASS_INPUT_ONLY, XCB_COPY_FROM_PARENT, mask, values);
-
     xcb_atom_t net_atoms[] = {ewmh->_NET_SUPPORTED,
                               ewmh->_NET_DESKTOP_NAMES,
                               ewmh->_NET_NUMBER_OF_DESKTOPS,
@@ -243,7 +238,6 @@ int main(int argc, char *argv[])
     if (status_fifo != NULL)
         fclose(status_fifo);
     xcb_ewmh_connection_wipe(ewmh);
-    xcb_destroy_window(dpy, motion_recorder);
     free(ewmh);
     xcb_flush(dpy);
     xcb_disconnect(dpy);

diff --git a/bspwm.h b/bspwm.h
index fd6c69c18eebfc9d124de329c68af31751805543..a82c19023c25e78434be59fec804983bf12ec3c1 100644 (file)
--- a/bspwm.h
+++ b/bspwm.h
@@ -5,7 +5,6 @@
 
 #define ROOT_EVENT_MASK        (XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY)
 #define CLIENT_EVENT_MASK      (XCB_EVENT_MASK_PROPERTY_CHANGE)
-#define CLIENT_EVENT_MASK_FFP  (XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_ENTER_WINDOW)
 
 xcb_connection_t *dpy;
 int default_screen, screen_width, screen_height;
@@ -31,7 +30,6 @@ rule_t *rule_head;
 rule_t *rule_tail;
 
 pointer_state_t *frozen_pointer;
-xcb_window_t motion_recorder;
 xcb_atom_t compton_shadow;
 
 int exit_status;

diff --git a/events.c b/events.c
index 0c04ba3a52cc970ffef041a473fd57d60f66d023..72440283f7789499f0331276328dd12945b0ed87 100644 (file)
--- a/events.c
+++ b/events.c
@@ -35,12 +35,6 @@ void handle_event(xcb_generic_event_t *evt)
         case XCB_PROPERTY_NOTIFY:
             property_notify(evt);
             break;
-        case XCB_ENTER_NOTIFY:
-            enter_notify(evt);
-            break;
-        case XCB_MOTION_NOTIFY:
-            motion_notify();
-            break;
         default:
             break;
     }
@@ -226,32 +220,6 @@ void client_message(xcb_generic_event_t *evt)
     }
 }
 
-void enter_notify(xcb_generic_event_t *evt)
-{
-    xcb_enter_notify_event_t *e = (xcb_enter_notify_event_t *) evt;
-    xcb_window_t win = e->event;
-
-    PRINTF("enter notify %X %d %d\n", win, e->mode, e->detail);
-
-    if (e->mode != XCB_NOTIFY_MODE_NORMAL
-            || (mon->desk->focus != NULL && mon->desk->focus->client->window == win))
-        return;
-
-    enable_motion_recorder();
-}
-
-void motion_notify(void)
-{
-    PUTS("motion notify");
-
-    disable_motion_recorder();
-
-    xcb_window_t win = XCB_NONE;
-    get_pointed_window(&win);
-    if (win != XCB_NONE)
-        window_focus(win);
-}
-
 void handle_state(monitor_t *m, desktop_t *d, node_t *n, xcb_atom_t state, unsigned int action)
 {
     if (state == ewmh->_NET_WM_STATE_FULLSCREEN) {

diff --git a/events.h b/events.h
index 9bb3493a620f91bab968d8674881675e14fcc87a..83c68208843610dc728bfd9cd3fa1e51aa1a66da 100644 (file)
--- a/events.h
+++ b/events.h
@@ -11,8 +11,6 @@ void unmap_notify(xcb_generic_event_t *);
 void configure_request(xcb_generic_event_t *);
 void client_message(xcb_generic_event_t *);
 void property_notify(xcb_generic_event_t *);
-void enter_notify(xcb_generic_event_t *);
-void motion_notify(void);
 void handle_state(monitor_t *, desktop_t *, node_t *, xcb_atom_t, unsigned int);
 void grab_pointer(pointer_action_t);
 void track_pointer(int, int);

diff --git a/messages.c b/messages.c
index afb4831ef12379c4b6bd17cfd24486c397c8d1ee..3d45489b1af7aac86da9cbbabd9207dc4ba6fbf4 100644 (file)
--- a/messages.c
+++ b/messages.c
@@ -491,20 +491,6 @@ void set_setting(char *name, char *value, char *rsp)
         bool b;
         if (parse_bool(value, &b))
             gapless_monocle = b;
-    } else if (strcmp(name, "focus_follows_pointer") == 0) {
-        bool b;
-        if (parse_bool(value, &b) && b != focus_follows_pointer) {
-            uint32_t values[] = {(focus_follows_pointer ? CLIENT_EVENT_MASK : CLIENT_EVENT_MASK_FFP)};
-            for (monitor_t *m = mon_head; m != NULL; m = m->next)
-                for (desktop_t *d = m->desk_head; d != NULL; d = d->next)
-                    for (node_t *n = first_extrema(d->root); n != NULL; n = next_leaf(n))
-                        xcb_change_window_attributes(dpy, n->client->window, XCB_CW_EVENT_MASK, values);
-            if (focus_follows_pointer)
-                disable_motion_recorder();
-            else
-                enable_motion_recorder();
-            focus_follows_pointer = b;
-        }
     } else if (strcmp(name, "adaptative_raise") == 0) {
         bool b;
         if (parse_bool(value, &b))
@@ -562,8 +548,6 @@ void get_setting(char *name, char* rsp)
         snprintf(rsp, BUFSIZ, "%s", BOOLSTR(borderless_monocle));
     else if (strcmp(name, "gapless_monocle") == 0)
         snprintf(rsp, BUFSIZ, "%s", BOOLSTR(gapless_monocle));
-    else if (strcmp(name, "focus_follows_pointer") == 0)
-        snprintf(rsp, BUFSIZ, "%s", BOOLSTR(focus_follows_pointer));
     else if (strcmp(name, "adaptative_raise") == 0)
         snprintf(rsp, BUFSIZ, "%s", BOOLSTR(adaptative_raise));
     else if (strcmp(name, "apply_shadow_property") == 0)

diff --git a/settings.c b/settings.c
index d6dcdec993420e6dc58ab5b9efc8dd82634e0b52..2a39f7e1e71888c4a6e42c8e787565f693294549 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -61,7 +61,6 @@ void load_settings(void)
 
     borderless_monocle = BORDERLESS_MONOCLE;
     gapless_monocle = GAPLESS_MONOCLE;
-    focus_follows_pointer = FOCUS_FOLLOWS_POINTER;
     adaptative_raise = ADAPTATIVE_RAISE;
     apply_shadow_property = APPLY_SHADOW_PROPERTY;
 }

diff --git a/settings.h b/settings.h
index 4ed1ec0be4d303b085ffc767da363643b95b374a..6423f3ecb32a2f279767e43ac136c93d95970d2e 100644 (file)
--- a/settings.h
+++ b/settings.h
@@ -22,7 +22,6 @@
 
 #define BORDERLESS_MONOCLE     false
 #define GAPLESS_MONOCLE        false
-#define FOCUS_FOLLOWS_POINTER  false
 #define ADAPTATIVE_RAISE       false
 #define APPLY_SHADOW_PROPERTY  false
 
@@ -49,7 +48,6 @@ int window_gap;
 
 bool borderless_monocle;
 bool gapless_monocle;
-bool focus_follows_pointer;
 bool adaptative_raise;
 bool apply_shadow_property;
 

diff --git a/tree.c b/tree.c
index 434c551b22191608ebf3b5356ad3e9252221ab5b..8b0b7055c95c51666a1592f64fafc0921848c737 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -386,15 +386,6 @@ void focus_node(monitor_t *m, desktop_t *d, node_t *n, bool is_mapped)
         xcb_set_input_focus(dpy, XCB_INPUT_FOCUS_POINTER_ROOT, n->client->window, XCB_CURRENT_TIME);
     }
 
-    if (focus_follows_pointer) {
-        xcb_window_t win = XCB_NONE;
-        get_pointed_window(&win);
-        if (win != n->client->window)
-            enable_motion_recorder();
-        else
-            disable_motion_recorder();
-    }
-
     if (!is_tiled(n->client)) {
         if (!adaptative_raise || !might_cover(d, n))
             window_raise(n->client->window);
@@ -949,7 +940,7 @@ void restore(char *file_path)
         for (monitor_t *m = mon_head; m != NULL; m = m->next)
             for (desktop_t *d = m->desk_head; d != NULL; d = d->next)
                 for (node_t *n = first_extrema(d->root); n != NULL; n = next_leaf(n)) {
-                    uint32_t values[] = {(focus_follows_pointer ? CLIENT_EVENT_MASK_FFP : CLIENT_EVENT_MASK)};
+                    uint32_t values[] = {CLIENT_EVENT_MASK};
                     xcb_change_window_attributes(dpy, n->client->window, XCB_CW_EVENT_MASK, values);
                     if (n->client->floating) {
                         n->vacant = true;

diff --git a/window.c b/window.c
index 13c3019d1077b1f1b6da150c7e1a82a4b7f083c3..c52029f4749fdcc5128a8423983763f0adb12f39 100644 (file)
--- a/window.c
+++ b/window.c
@@ -154,7 +154,7 @@ void manage_window(monitor_t *m, desktop_t *d, xcb_window_t win)
     if (takes_focus)
         xcb_set_input_focus(dpy, XCB_INPUT_FOCUS_POINTER_ROOT, win, XCB_CURRENT_TIME);
 
-    uint32_t values[] = {(focus_follows_pointer ? CLIENT_EVENT_MASK_FFP : CLIENT_EVENT_MASK)};
+    uint32_t values[] = {CLIENT_EVENT_MASK};
     xcb_change_window_attributes(dpy, c->window, XCB_CW_EVENT_MASK, values);
 
     num_clients++;
@@ -411,27 +411,6 @@ void update_floating_rectangle(client_t *c)
     }
 }
 
-
-void save_pointer_position(xcb_point_t *pos)
-{
-    xcb_query_pointer_reply_t *qpr = xcb_query_pointer_reply(dpy, xcb_query_pointer(dpy, root), NULL);
-    if (qpr != NULL) {
-        *pos = (xcb_point_t) {qpr->root_x, qpr->root_y};
-        free(qpr);
-    }
-}
-
-void get_pointed_window(xcb_window_t *win)
-{
-    window_lower(motion_recorder);
-    xcb_query_pointer_reply_t *qpr = xcb_query_pointer_reply(dpy, xcb_query_pointer(dpy, root), NULL);
-    if (qpr != NULL) {
-        *win = qpr->child;
-        free(qpr);
-    }
-    window_raise(motion_recorder);
-}
-
 void window_focus(xcb_window_t win)
 {
     window_location_t loc;
@@ -511,14 +490,3 @@ void toggle_visibility(void)
     if (visible)
         update_current();
 }
-
-void enable_motion_recorder(void)
-{
-    window_raise(motion_recorder);
-    window_show(motion_recorder);
-}
-
-void disable_motion_recorder(void)
-{
-    window_hide(motion_recorder);
-}

diff --git a/window.h b/window.h
index cb72b12066b133edc1d3b52a5d46e6bcdf4e8d8c..da1f38ec2ba4ce702abe3f33e72a962ac006d020 100644 (file)
--- a/window.h
+++ b/window.h
@@ -34,12 +34,9 @@ void window_lower(xcb_window_t);
 void window_set_visibility(xcb_window_t, bool);
 void window_hide(xcb_window_t);
 void window_show(xcb_window_t);
-void enable_motion_recorder(void);
-void disable_motion_recorder(void);
 void toggle_visibility(void);
 uint32_t get_border_color(client_t *, bool, bool);
 void update_floating_rectangle(client_t *);
-void get_pointed_window(xcb_window_t *);
 void list_windows(char *);
 
 #endif