merge r7288-7294 from trunk

diff --git a/data/rc.xml b/data/rc.xml
index 3ffe2a11775718e733f59a8388cef55b4b1b6921..d16ae5a2757f1b28216c42361c1dfc1047b36605 100644 (file)
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -14,11 +14,13 @@
   <focusNew>yes</focusNew>
   <!-- always try to focus new windows when they appear. other rules do
        apply -->
+  <followMouse>no</followMouse>
+  <!-- move focus to a window when you move the mouse into it -->
   <focusLast>yes</focusLast>
   <!-- focus the last used window when changing desktops, instead of the one
        under the mouse pointer. when followMouse is enabled -->
-  <followMouse>no</followMouse>
-  <!-- move focus to a window when you move the mouse into it -->
+  <underMouse>no</underMouse>
+  <!-- move focus under the mouse, even when the mouse is not moving -->
   <focusDelay>200</focusDelay>
   <!-- when followMouse is enabled, the mouse must be inside the window for
        this many milliseconds (1000 = 1 sec) before moving focus to it -->

diff --git a/data/rc.xsd b/data/rc.xsd
index 12c939eddab464a5044aec587d9c7c9a86ba69d8..e256e4481894470badeed8f76803a0159982e873 100644 (file)
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -44,6 +44,7 @@
         <xsd:element minOccurs="0" name="focusNew" type="ob:bool"/>
         <xsd:element minOccurs="0" name="focusLast" type="ob:bool"/>
         <xsd:element minOccurs="0" name="followMouse" type="ob:bool"/>
+        <xsd:element minOccurs="0" name="underMouse" type="ob:bool"/>
         <xsd:element minOccurs="0" name="focusDelay" type="xsd:integer"/>
         <xsd:element minOccurs="0" name="raiseOnFocus" type="ob:bool"/>
     </xsd:complexType>

diff --git a/doc/rc-mouse-focus.xml b/doc/rc-mouse-focus.xml
index acf2c14a0e8217aac3c8f37d2670684ca6b1ffba..069c8dbff963831693eac2987a773bd99d1aca7a 100644 (file)
--- a/doc/rc-mouse-focus.xml
+++ b/doc/rc-mouse-focus.xml
@@ -14,11 +14,13 @@
   <focusNew>yes</focusNew>
   <!-- always try to focus new windows when they appear. other rules do
        apply -->
+  <followMouse>yes</followMouse>
+  <!-- move focus to a window when you move the mouse into it -->
   <focusLast>yes</focusLast>
   <!-- focus the last used window when changing desktops, instead of the one
        under the mouse pointer. when followMouse is enabled -->
-  <followMouse>yes</followMouse>
-  <!-- move focus to a window when you move the mouse into it -->
+  <underMouse>no</underMouse>
+  <!-- move focus under the mouse, even when the mouse is not moving -->
   <focusDelay>200</focusDelay>
   <!-- when followMouse is enabled, the mouse must be inside the window for
        this many milliseconds (1000 = 1 sec) before moving focus to it -->

diff --git a/openbox/action.c b/openbox/action.c
index 39c1169b3f8f996b0e9e97a6154543ee3deb7fbe..80b563f9619a9a139b3ff82b0c8d5797e5100011 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -39,16 +39,19 @@
 
 #include <glib.h>
 
+static gulong ignore_start = 0;
+
 static void client_action_start(union ActionData *data)
 {
+    ignore_start = event_start_ignore_all_enters();
 }
 
-static void client_action_end(union ActionData *data)
+static void client_action_end(union ActionData *data, gboolean allow_enters)
 {
     if (config_focus_follow)
         if (data->any.context != OB_FRAME_CONTEXT_CLIENT) {
-            if (!data->any.button && data->any.c) {
-                event_ignore_all_queued_enters();
+            if (!data->any.button && data->any.c && !allow_enters) {
+                event_end_ignore_all_enters(ignore_start);
             } else {
                 ObClient *c;
 
@@ -1318,7 +1321,7 @@ void action_iconify(union ActionData *data)
 {
     client_action_start(data);
     client_iconify(data->client.any.c, TRUE, TRUE, FALSE);
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_focus_order_to_bottom(union ActionData *data)
@@ -1332,14 +1335,14 @@ void action_raiselower(union ActionData *data)
 
     client_action_start(data);
     stacking_restack_request(c, NULL, Opposite, FALSE);
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_raise(union ActionData *data)
 {
     client_action_start(data);
     stacking_raise(CLIENT_AS_WINDOW(data->client.any.c));
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_unshaderaise(union ActionData *data)
@@ -1362,7 +1365,7 @@ void action_lower(union ActionData *data)
 {
     client_action_start(data);
     stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_close(union ActionData *data)
@@ -1379,21 +1382,21 @@ void action_shade(union ActionData *data)
 {
     client_action_start(data);
     client_shade(data->client.any.c, TRUE);
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_unshade(union ActionData *data)
 {
     client_action_start(data);
     client_shade(data->client.any.c, FALSE);
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_toggle_shade(union ActionData *data)
 {
     client_action_start(data);
     client_shade(data->client.any.c, !data->client.any.c->shaded);
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_toggle_omnipresent(union ActionData *data)
@@ -1408,7 +1411,7 @@ void action_move_relative_horz(union ActionData *data)
     ObClient *c = data->relative.any.c;
     client_action_start(data);
     client_move(c, c->area.x + data->relative.deltax, c->area.y);
-    client_action_end(data);
+    client_action_end(data, FALSE);
 }
 
 void action_move_relative_vert(union ActionData *data)
@@ -1416,7 +1419,7 @@ void action_move_relative_vert(union ActionData *data)
     ObClient *c = data->relative.any.c;
     client_action_start(data);
     client_move(c, c->area.x, c->area.y + data->relative.deltax);
-    client_action_end(data);
+    client_action_end(data, FALSE);
 }
 
 void action_move_to_center(union ActionData *data)
@@ -1427,7 +1430,7 @@ void action_move_to_center(union ActionData *data)
     client_action_start(data);
     client_move(c, area->width / 2 - c->area.width / 2,
                 area->height / 2 - c->area.height / 2);
-    client_action_end(data);
+    client_action_end(data, FALSE);
 }
 
 void action_resize_relative_horz(union ActionData *data)
@@ -1437,7 +1440,7 @@ void action_resize_relative_horz(union ActionData *data)
     client_resize(c,
                   c->area.width + data->relative.deltax * c->size_inc.width,
                   c->area.height);
-    client_action_end(data);
+    client_action_end(data, FALSE);
 }
 
 void action_resize_relative_vert(union ActionData *data)
@@ -1447,7 +1450,7 @@ void action_resize_relative_vert(union ActionData *data)
         client_action_start(data);
         client_resize(c, c->area.width, c->area.height +
                       data->relative.deltax * c->size_inc.height);
-        client_action_end(data);
+        client_action_end(data, FALSE);
     }
 }
 
@@ -1457,7 +1460,7 @@ void action_move_relative(union ActionData *data)
     client_action_start(data);
     client_move(c, c->area.x + data->relative.deltax, c->area.y +
                 data->relative.deltay);
-    client_action_end(data);
+    client_action_end(data, FALSE);
 }
 
 void action_resize_relative(union ActionData *data)
@@ -1478,21 +1481,21 @@ void action_resize_relative(union ActionData *data)
     
     client_try_configure(c, &x, &y, &w, &h, &lw, &lh, TRUE);
     client_move_resize(c, x + (ow - w), y + (oh - h), w, h);
-    client_action_end(data);
+    client_action_end(data, FALSE);
 }
 
 void action_maximize_full(union ActionData *data)
 {
     client_action_start(data);
     client_maximize(data->client.any.c, TRUE, 0);
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_unmaximize_full(union ActionData *data)
 {
     client_action_start(data);
     client_maximize(data->client.any.c, FALSE, 0);
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_toggle_maximize_full(union ActionData *data)
@@ -1502,21 +1505,21 @@ void action_toggle_maximize_full(union ActionData *data)
                     !(data->client.any.c->max_horz ||
                       data->client.any.c->max_vert),
                     0);
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_maximize_horz(union ActionData *data)
 {
     client_action_start(data);
     client_maximize(data->client.any.c, TRUE, 1);
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_unmaximize_horz(union ActionData *data)
 {
     client_action_start(data);
     client_maximize(data->client.any.c, FALSE, 1);
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_toggle_maximize_horz(union ActionData *data)
@@ -1524,21 +1527,21 @@ void action_toggle_maximize_horz(union ActionData *data)
     client_action_start(data);
     client_maximize(data->client.any.c,
                     !data->client.any.c->max_horz, 1);
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_maximize_vert(union ActionData *data)
 {
     client_action_start(data);
     client_maximize(data->client.any.c, TRUE, 2);
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_unmaximize_vert(union ActionData *data)
 {
     client_action_start(data);
     client_maximize(data->client.any.c, FALSE, 2);
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_toggle_maximize_vert(union ActionData *data)
@@ -1546,14 +1549,14 @@ void action_toggle_maximize_vert(union ActionData *data)
     client_action_start(data);
     client_maximize(data->client.any.c,
                     !data->client.any.c->max_vert, 2);
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_toggle_fullscreen(union ActionData *data)
 {
     client_action_start(data);
     client_fullscreen(data->client.any.c, !(data->client.any.c->fullscreen));
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_send_to_desktop(union ActionData *data)
@@ -1639,7 +1642,7 @@ void action_toggle_decorations(union ActionData *data)
 
     client_action_start(data);
     client_set_undecorated(c, !c->undecorated);
-    client_action_end(data);
+    client_action_end(data, FALSE);
 }
 
 static guint32 pick_corner(gint x, gint y, gint cx, gint cy, gint cw, gint ch,
@@ -1872,7 +1875,7 @@ void action_movetoedge(union ActionData *data)
     frame_frame_gravity(c->frame, &x, &y, c->area.width, c->area.height);
     client_action_start(data);
     client_move(c, x, y);
-    client_action_end(data);
+    client_action_end(data, FALSE);
 }
 
 void action_growtoedge(union ActionData *data)
@@ -1939,7 +1942,7 @@ void action_growtoedge(union ActionData *data)
     frame_frame_gravity(c->frame, &x, &y, width, height);
     client_action_start(data);
     client_move_resize(c, x, y, width, height);
-    client_action_end(data);
+    client_action_end(data, FALSE);
 }
 
 void action_send_to_layer(union ActionData *data)
@@ -1956,7 +1959,7 @@ void action_toggle_layer(union ActionData *data)
         client_set_layer(c, c->below ? 0 : -1);
     else if (data->layer.layer > 0)
         client_set_layer(c, c->above ? 0 : 1);
-    client_action_end(data);
+    client_action_end(data, config_focus_under_mouse);
 }
 
 void action_toggle_dockautohide(union ActionData *data)

diff --git a/openbox/client.c b/openbox/client.c
index 7da2d28aa0eae0e14e9d762269ae91229bcf7c81..74764e93310ea76a492417dfc91d44377c1d6d5a 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -629,6 +629,7 @@ void client_unmanage(ObClient *self)
 {
     guint j;
     GSList *it;
+    gulong ignore_start;
 
     ob_debug("Unmanaging window: 0x%x plate 0x%x (%s) (%s)\n",
              self->window, self->frame->window,
@@ -640,13 +641,16 @@ void client_unmanage(ObClient *self)
        don't generate more events */
     XSelectInput(ob_display, self->window, NoEventMask);
 
+    /* ignore enter events from the unmap so it doesnt mess with the focus */
+    if (!client_focused(self) || !config_focus_under_mouse)
+        ignore_start = event_start_ignore_all_enters();
+
     frame_hide(self->frame);
     /* flush to send the hide to the server quickly */
     XFlush(ob_display);
 
-    /* ignore enter events from the unmap so it doesnt mess with the
-       focus */
-    event_ignore_all_queued_enters();
+    if (!client_focused(self) || !config_focus_under_mouse)
+        event_end_ignore_all_enters(ignore_start);
 
     mouse_grab_for_client(self, FALSE);
 

diff --git a/openbox/client_menu.c b/openbox/client_menu.c
index f538eafd7f36ae263a81e2feecd8bba0f932073a..ce29db10b5945d0ad0220a507391b8103b74a4bd 100644 (file)
--- a/openbox/client_menu.c
+++ b/openbox/client_menu.c
@@ -19,6 +19,7 @@
 #include "debug.h"
 #include "menu.h"
 #include "menuframe.h"
+#include "config.h"
 #include "screen.h"
 #include "client.h"
 #include "openbox.h"
@@ -106,9 +107,13 @@ static void client_menu_execute(ObMenuEntry *e, ObMenuFrame *f,
                                 Time time)
 {
     gint x, y;
+    gulong ignore_start;
 
     g_assert(c);
 
+    if (!config_focus_under_mouse)
+        ignore_start = event_start_ignore_all_enters();
+
     switch (e->id) {
     case CLIENT_ICONIFY:
         /* the client won't be on screen anymore so hide the menu */
@@ -154,7 +159,8 @@ static void client_menu_execute(ObMenuEntry *e, ObMenuFrame *f,
         g_assert_not_reached();
     }
 
-    event_ignore_all_queued_enters();
+    if (!config_focus_under_mouse)
+        event_end_ignore_all_enters(ignore_start);
 
     /* update the menu cuz stuff can have changed */
     if (f) {
@@ -199,8 +205,13 @@ static void layer_menu_execute(ObMenuEntry *e, ObMenuFrame *f,
                                ObClient *c, guint state, gpointer data,
                                Time time)
 {
+    gulong ignore_start;
+
     g_assert(c);
 
+    if (!config_focus_under_mouse)
+        ignore_start = event_start_ignore_all_enters();
+
     switch (e->id) {
     case LAYER_TOP:
         client_set_layer(c, 1);
@@ -215,7 +226,8 @@ static void layer_menu_execute(ObMenuEntry *e, ObMenuFrame *f,
         g_assert_not_reached();
     }
 
-    event_ignore_all_queued_enters();
+    if (!config_focus_under_mouse)
+        event_end_ignore_all_enters(ignore_start);
 
     /* update the menu cuz stuff can have changed */
     if (f) {

diff --git a/openbox/config.c b/openbox/config.c
index 86068d75af24c06f68439294c3b1b9614384acf0..e34bc158be876d0d035bf934e50c319e9c667ad7 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -33,6 +33,7 @@ gboolean config_focus_follow;
 guint    config_focus_delay;
 gboolean config_focus_raise;
 gboolean config_focus_last;
+gboolean config_focus_under_mouse;
 
 ObPlacePolicy config_place_policy;
 
@@ -468,6 +469,8 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         config_focus_raise = parse_bool(doc, n);
     if ((n = parse_find_node("focusLast", node)))
         config_focus_last = parse_bool(doc, n);
+    if ((n = parse_find_node("underMouse", node)))
+        config_focus_under_mouse = parse_bool(doc, n);
 }
 
 static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -848,7 +851,8 @@ void config_startup(ObParseInst *i)
     config_focus_follow = FALSE;
     config_focus_delay = 0;
     config_focus_raise = FALSE;
-    config_focus_last = FALSE;
+    config_focus_last = TRUE;
+    config_focus_under_mouse = FALSE;
 
     parse_register(i, "focus", parse_focus, NULL);
 

diff --git a/openbox/config.h b/openbox/config.h
index 6a064fffa14e0691dccd5a4ec606ab4b234c3b32..0a4ad090855b6827ce86f436983e7d5f207d2111 100644 (file)
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -69,6 +69,9 @@ extern guint    config_focus_delay;
 extern gboolean config_focus_raise;
 /*! Focus the last focused window, not under the mouse, in follow mouse mode */
 extern gboolean config_focus_last;
+/*! Try keep focus on the window under the mouse when the mouse is not moving
+ */
+extern gboolean config_focus_under_mouse;
 
 extern ObPlacePolicy config_place_policy;
 

diff --git a/openbox/event.c b/openbox/event.c
index 6e4b4b50af242002205c961afa7f65aca8c4f870..346adcbfb35d51400168ae61abc358a169084a54 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -77,6 +77,12 @@ typedef struct
     Time time;
 } ObFocusDelayData;
 
+typedef struct
+{
+    gulong start; /* inclusive */
+    gulong end;   /* inclusive */
+} ObSerialRange;
+
 static void event_process(const XEvent *e, gpointer data);
 static void event_handle_root(XEvent *e);
 static gboolean event_handle_menu_keyboard(XEvent *e);
@@ -96,8 +102,9 @@ static void focus_delay_client_dest(ObClient *client, gpointer data);
 /* The time for the current event being processed */
 Time event_curtime = CurrentTime;
 
-static guint ignore_enter_focus = 0;
 static gboolean focus_left_screen = FALSE;
+/*! A list of ObSerialRanges which are to be ignored for mouse enter events */
+static GSList *ignore_serials = NULL;
 
 #ifdef USE_SM
 static void ice_handler(gint fd, gpointer conn)
@@ -940,7 +947,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
                corresponding enter events. Pretend like the animating window
                doesn't even exist..! */
             if (frame_iconify_animating(client->frame))
-                event_ignore_all_queued_enters();
+                event_end_ignore_all_enters(event_start_ignore_all_enters());
 
             ob_debug_type(OB_DEBUG_FOCUS,
                           "%sNotify mode %d detail %d on %lx\n",
@@ -1069,7 +1076,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
 
             /* activate it rather than just focus it */
             stacking_restack_request(client, sibling,
-                                     e->xconfigurerequest.detail, TRUE);
+                                     e->xconfigurerequest.detail,
+                                     TRUE);
 
             /* if a stacking change moves the window without resizing */
             move = TRUE;
@@ -1164,13 +1172,14 @@ static void event_handle_client(ObClient *client, XEvent *e)
                the window is actually being changed then configure it and
                send a configure notify to them */
             if (move || !RECT_EQUAL_DIMS(client->area, x, y, w, h)) {
+                gulong ignore_start;
+
                 ob_debug("Granting ConfigureRequest x %d y %d w %d h %d\n",
                          x, y, w, h);
+                ignore_start = event_start_ignore_all_enters();
                 client_configure(client, x, y, w, h, FALSE, TRUE);
+                event_end_ignore_all_enters(ignore_start);
             }
-
-            /* ignore enter events caused by these like ob actions do */
-            event_ignore_all_queued_enters();
         }
         break;
     }
@@ -1255,6 +1264,8 @@ static void event_handle_client(ObClient *client, XEvent *e)
                 client_set_desktop(client, (unsigned)e->xclient.data.l[0],
                                    FALSE);
         } else if (msgtype == prop_atoms.net_wm_state) {
+            gulong ignore_start;
+
             /* can't compress these */
             ob_debug("net_wm_state %s %ld %ld for 0x%lx\n",
                      (e->xclient.data.l[0] == 0 ? "Remove" :
@@ -1262,11 +1273,14 @@ static void event_handle_client(ObClient *client, XEvent *e)
                       e->xclient.data.l[0] == 2 ? "Toggle" : "INVALID"),
                      e->xclient.data.l[1], e->xclient.data.l[2],
                      client->window);
-            client_set_state(client, e->xclient.data.l[0],
-                             e->xclient.data.l[1], e->xclient.data.l[2]);
 
             /* ignore enter events caused by these like ob actions do */
-            event_ignore_all_queued_enters();
+            if (!config_focus_under_mouse)
+                ignore_start = event_start_ignore_all_enters();
+            client_set_state(client, e->xclient.data.l[0],
+                             e->xclient.data.l[1], e->xclient.data.l[2]);
+            if (!config_focus_under_mouse)
+                event_end_ignore_all_enters(ignore_start);
         } else if (msgtype == prop_atoms.net_close_window) {
             ob_debug("net_close_window for 0x%lx\n", client->window);
             client_close(client);
@@ -1327,6 +1341,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
                 moveresize_end(TRUE);
         } else if (msgtype == prop_atoms.net_moveresize_window) {
             gint ograv, x, y, w, h;
+            gulong ignore_start;
 
             ograv = client->gravity;
 
@@ -1371,12 +1386,12 @@ static void event_handle_client(ObClient *client, XEvent *e)
 
             client_find_onscreen(client, &x, &y, w, h, FALSE);
 
+            /* ignore enter events caused by these like ob actions do */
+            ignore_start = event_start_ignore_all_enters();
             client_configure(client, x, y, w, h, FALSE, TRUE);
+            event_end_ignore_all_enters(ignore_start);
 
             client->gravity = ograv;
-
-            /* ignore enter events caused by these like ob actions do */
-            event_ignore_all_queued_enters();
         } else if (msgtype == prop_atoms.net_restack_window) {
             if (e->xclient.data.l[0] != 2) {
                 ob_debug_type(OB_DEBUG_APP_BUGS,
@@ -1831,49 +1846,54 @@ void event_halt_focus_delay()
     ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func);
 }
 
-static Bool event_look_for_enters(Display *d, XEvent *e, XPointer arg)
+gulong event_start_ignore_all_enters()
 {
-    if (e->type == EnterNotify &&
-        /* these types aren't used for focusing */
-        !(e->xcrossing.mode == NotifyGrab ||
-          e->xcrossing.mode == NotifyUngrab ||
-          e->xcrossing.detail == NotifyInferior))
-    {
-        ObWindow *win;
-
-        /* found an enter for that leave, ignore it if it's going to
-           another window */
-        win = g_hash_table_lookup(window_map, &e->xany.window);
-        if (win && WINDOW_IS_CLIENT(win))
-            ++ignore_enter_focus;
-    }
-    return False; /* don't disrupt the queue order, just count them */
+    XSync(ob_display, FALSE);
+    return LastKnownRequestProcessed(ob_display);
 }
 
-void event_ignore_all_queued_enters()
+void event_end_ignore_all_enters(gulong start)
 {
-    XEvent e;
+    ObSerialRange *r;
 
+    g_assert(start != 0);
     XSync(ob_display, FALSE);
 
-    /* count the events without disrupting them */
-    ignore_enter_focus = 0;
-    XCheckIfEvent(ob_display, &e, event_look_for_enters, NULL);
+    r = g_new(ObSerialRange, 1);
+    r->start = start;
+    r->end = LastKnownRequestProcessed(ob_display);
+    ignore_serials = g_slist_prepend(ignore_serials, r);
+    ob_debug("ignoring serials %u-%u\n", r->start, r->end);
+
+    /* increment the serial so we don't ignore events we weren't meant to */
+    XSync(ob_display, FALSE);
+    ob_debug("now last serial %u\n", LastKnownRequestProcessed(ob_display));
 }
 
 static gboolean is_enter_focus_event_ignored(XEvent *e)
 {
+    GSList *it, *next;
+
     g_assert(e->type == EnterNotify &&
              !(e->xcrossing.mode == NotifyGrab ||
                e->xcrossing.mode == NotifyUngrab ||
                e->xcrossing.detail == NotifyInferior));
 
-    ob_debug_type(OB_DEBUG_FOCUS, "# enters ignored: %d\n",
-                  ignore_enter_focus);
+    ob_debug("checking serial %u\n", e->xany.serial);
+    for (it = ignore_serials; it; it = next) {
+        ObSerialRange *r = it->data;
 
-    if (ignore_enter_focus) {
-        --ignore_enter_focus;
-        return TRUE;
+        next = g_slist_next(it);
+
+        /* XXX wraparound... */
+        ob_debug("  ignore range %u-%u\n", r->start, r->end);
+        if ((glong)(e->xany.serial - r->end) > 0) {
+            /* past the end */
+            ignore_serials = g_slist_delete_link(ignore_serials, it);
+            g_free(r);
+        }
+        else if ((glong)(e->xany.serial - r->start) >= 0)
+            return TRUE;
     }
     return FALSE;
 }

diff --git a/openbox/event.h b/openbox/event.h
index 29f621d5d6bb6b54f582c8375fb01e7b9a9ac1ee..5c5290f0e420ce6ed1502febcead8f6d8153ff4d 100644 (file)
--- a/openbox/event.h
+++ b/openbox/event.h
@@ -39,9 +39,10 @@ void event_shutdown(gboolean reconfig);
   follows mouse */
 void event_enter_client(struct _ObClient *client);
 
-/*! Make mouse focus not move at all from the stuff that has happened up
-  till now. */
-void event_ignore_all_queued_enters();
+/*! Make mouse focus not move at all from the stuff that happens between these
+ two function calls. */
+gulong event_start_ignore_all_enters();
+void event_end_ignore_all_enters(gulong start);
 
 /*! End *all* active and passive grabs on the keyboard */
 void event_cancel_all_key_grabs();

diff --git a/openbox/focus_cycle_indicator.c b/openbox/focus_cycle_indicator.c
index 0af8ab12fb97c9a53a097c1de652e911f7be3e42..203a85ff92170c453e3549de246c6d81c218959b 100644 (file)
--- a/openbox/focus_cycle_indicator.c
+++ b/openbox/focus_cycle_indicator.c
@@ -119,13 +119,17 @@ void focus_cycle_indicator_shutdown(gboolean reconfig)
 void focus_cycle_draw_indicator(ObClient *c)
 {
     if (!c) {
+        gulong ignore_start;
+
+        /* kill enter events cause by this unmapping */
+        ignore_start = event_start_ignore_all_enters();
+
         XUnmapWindow(ob_display, focus_indicator.top.win);
         XUnmapWindow(ob_display, focus_indicator.left.win);
         XUnmapWindow(ob_display, focus_indicator.right.win);
         XUnmapWindow(ob_display, focus_indicator.bottom.win);
 
-        /* kill enter events cause by this unmapping */
-        event_ignore_all_queued_enters();
+        event_end_ignore_all_enters(ignore_start);
     } else {
         /*
           if (c)

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 8e58c935ebf150960bb16d2e61fe9b8aaed15ffe..015330bda32f2be41a9b25b972568f0b360ae349 100644 (file)
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -465,13 +465,16 @@ void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows,
 
 void focus_cycle_popup_hide()
 {
+    gulong ignore_start;
+
+    ignore_start = event_start_ignore_all_enters();
+
     XUnmapWindow(ob_display, popup.bg);
     XFlush(ob_display);
 
-    popup.mapped = FALSE;
+    event_end_ignore_all_enters(ignore_start);
 
-    /* kill enter events cause by this unmapping */
-    event_ignore_all_queued_enters();
+    popup.mapped = FALSE;
 
     while(popup.targets) {
         ObFocusCyclePopupTarget *t = popup.targets->data;

diff --git a/openbox/popup.c b/openbox/popup.c
index f46a3a7fd89a13bf666f8d1d4810f56d51bd6898..86d4fb4dec6bd01549542236fa5cb589a281e705 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -265,11 +265,15 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
 void popup_hide(ObPopup *self)
 {
     if (self->mapped) {
+        gulong ignore_start;
+
+        /* kill enter events cause by this unmapping */
+        ignore_start = event_start_ignore_all_enters();
+
         XUnmapWindow(ob_display, self->bg);
         self->mapped = FALSE;
 
-        /* kill enter events cause by this unmapping */
-        event_ignore_all_queued_enters();
+        event_end_ignore_all_enters(ignore_start);
     } else if (self->delay_mapped) {
         ob_main_loop_timeout_remove(ob_main_loop, popup_show_timeout);
         self->delay_mapped = FALSE;

diff --git a/openbox/screen.c b/openbox/screen.c
index 7b4ca7406066034c010b8c353c63642466d8dfe8..5f1991d39b10bd4b6665119ee5624cb01072ee88 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -542,6 +542,7 @@ void screen_set_desktop(guint num, gboolean dofocus)
     ObClient *c;
     GList *it;
     guint old;
+    gulong ignore_start;
      
     g_assert(num < screen_num_desktops);
 
@@ -557,6 +558,9 @@ void screen_set_desktop(guint num, gboolean dofocus)
 
     ob_debug("Moving to desktop %d\n", num+1);
 
+    /* ignore enter events caused by the move */
+    ignore_start = event_start_ignore_all_enters();
+
     if (moveresize_client)
         client_set_desktop(moveresize_client, num, TRUE);
 
@@ -606,7 +610,7 @@ void screen_set_desktop(guint num, gboolean dofocus)
         }
     }
 
-    event_ignore_all_queued_enters();
+    event_end_ignore_all_enters(ignore_start);
 
     if (event_curtime != CurrentTime)
         screen_desktop_user_time = event_curtime;

diff --git a/openbox/stacking.c b/openbox/stacking.c
index 5d01e5e925faa82467edee6254e80c3633bb0bf1..075f13868b5e303cf10e231a1eacc6572eaf7ce6 100644 (file)
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -551,9 +551,11 @@ static gboolean stacking_occludes(ObClient *client, ObClient *sibling)
     return occludes;
 }
 
-void stacking_restack_request(ObClient *client, ObClient *sibling,
-                              gint detail, gboolean activate)
+gboolean stacking_restack_request(ObClient *client, ObClient *sibling,
+                                  gint detail, gboolean activate)
 {
+    gboolean ret = FALSE;
+
     if (sibling && ((client->desktop != sibling->desktop &&
                      client->desktop != DESKTOP_ALL &&
                      sibling->desktop != DESKTOP_ALL) ||
@@ -570,6 +572,7 @@ void stacking_restack_request(ObClient *client, ObClient *sibling,
                  client->title, sibling ? sibling->title : "(all)");
         /* just lower it */
         stacking_lower(CLIENT_AS_WINDOW(client));
+        ret = TRUE;
         break;
     case BottomIf:
         ob_debug("Restack request BottomIf for client %s sibling "
@@ -577,8 +580,10 @@ void stacking_restack_request(ObClient *client, ObClient *sibling,
                  client->title, sibling ? sibling->title : "(all)");
         /* if this client occludes sibling (or anything if NULL), then
            lower it to the bottom */
-        if (stacking_occludes(client, sibling))
+        if (stacking_occludes(client, sibling)) {
             stacking_lower(CLIENT_AS_WINDOW(client));
+            ret = TRUE;
+        }
         break;
     case Above:
         ob_debug("Restack request Above for client %s sibling %s\n",
@@ -589,6 +594,7 @@ void stacking_restack_request(ObClient *client, ObClient *sibling,
             client_activate(client, FALSE, TRUE);
         else
             stacking_raise(CLIENT_AS_WINDOW(client));
+        ret = TRUE;
         break;
     case TopIf:
         ob_debug("Restack request TopIf for client %s sibling %s\n",
@@ -600,6 +606,7 @@ void stacking_restack_request(ObClient *client, ObClient *sibling,
                 client_activate(client, FALSE, TRUE);
             else
                 stacking_raise(CLIENT_AS_WINDOW(client));
+            ret = TRUE;
         }
         break;
     case Opposite:
@@ -613,9 +620,13 @@ void stacking_restack_request(ObClient *client, ObClient *sibling,
                 client_activate(client, FALSE, TRUE);
             else
                 stacking_raise(CLIENT_AS_WINDOW(client));
+            ret = TRUE;
         }
-        else if (stacking_occludes(client, sibling))
+        else if (stacking_occludes(client, sibling)) {
             stacking_lower(CLIENT_AS_WINDOW(client));
+            ret = TRUE;
+        }
         break;
     }
+    return ret;
 }

diff --git a/openbox/stacking.h b/openbox/stacking.h
index eb638734c242b47f35859b1830f40e1a9d3a26b0..bf2f56b48be2dfc59e5e76cd9f787251be0be298 100644 (file)
--- a/openbox/stacking.h
+++ b/openbox/stacking.h
@@ -67,11 +67,12 @@ void stacking_below(ObWindow *window, ObWindow *below);
   @param detail One of Above, Below, TopIf, BottomIf, Opposite
   @param activate If TRUE, and if the window is going to be raised, it will
                   be activated instead
+  @return TRUE if the client was restacked
   See http://tronche.com/gui/x/xlib/window/configure.html for details on
   how each detail works with and without a sibling.
 */
-void stacking_restack_request(struct _ObClient *client,
-                              struct _ObClient *sibling,
-                              gint detail, gboolean activate);
+gboolean stacking_restack_request(struct _ObClient *client,
+                                  struct _ObClient *sibling,
+                                  gint detail, gboolean activate);
 
 #endif