super amazing enter event skipping.

also mucho fixed for <underMouse>

diff --git a/openbox/action.c b/openbox/action.c
index de5f9a8..80b563f 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -39,8 +39,11 @@
 
 #include <glib.h>
 
 
 #include <glib.h>
 

+static gulong ignore_start = 0;
+

 static void client_action_start(union ActionData *data)
 {
 static void client_action_start(union ActionData *data)
 {

+    ignore_start = event_start_ignore_all_enters();

 }
 
 static void client_action_end(union ActionData *data, gboolean allow_enters)
 }
 
 static void client_action_end(union ActionData *data, gboolean allow_enters)


@@ -48,7 +51,7 @@ 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 && !allow_enters) {
     if (config_focus_follow)
         if (data->any.context != OB_FRAME_CONTEXT_CLIENT) {
             if (!data->any.button && data->any.c && !allow_enters) {

-                event_ignore_all_queued_enters();
+                event_end_ignore_all_enters(ignore_start);

             } else {
                 ObClient *c;
 
             } else {
                 ObClient *c;
 

diff --git a/openbox/client.c b/openbox/client.c
index 9b4932a..daa6537 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -629,6 +629,7 @@ void client_unmanage(ObClient *self)
 {
     guint j;
     GSList *it;
 {
     guint j;
     GSList *it;

+    gulong ignore_start;

 
     ob_debug("Unmanaging window: 0x%x plate 0x%x (%s) (%s)\n",
              self->window, self->frame->window,
 
     ob_debug("Unmanaging window: 0x%x plate 0x%x (%s) (%s)\n",
              self->window, self->frame->window,


@@ -640,15 +641,16 @@ void client_unmanage(ObClient *self)
        don't generate more events */
     XSelectInput(ob_display, self->window, NoEventMask);
 
        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);
 
     frame_hide(self->frame);
     /* flush to send the hide to the server quickly */
     XFlush(ob_display);
 

-    if (!client_focused(self) || !config_focus_under_mouse) {
-        /* 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);
 
 
     mouse_grab_for_client(self, FALSE);
 

diff --git a/openbox/client_menu.c b/openbox/client_menu.c
index f538eaf..ce29db1 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 "debug.h"
 #include "menu.h"
 #include "menuframe.h"

+#include "config.h"

 #include "screen.h"
 #include "client.h"
 #include "openbox.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;
                                 Time time)
 {
     gint x, y;

+    gulong ignore_start;

 
     g_assert(c);
 
 
     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 */
     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();
     }
 
         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) {
 
     /* 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)
 {
                                ObClient *c, guint state, gpointer data,
                                Time time)
 {

+    gulong ignore_start;
+

     g_assert(c);
 
     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);
     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();
     }
 
         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) {
 
     /* update the menu cuz stuff can have changed */
     if (f) {

diff --git a/openbox/event.c b/openbox/event.c
index a45d070..a75d771 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -77,6 +77,12 @@ typedef struct
     Time time;
 } ObFocusDelayData;
 
     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);
 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;
 
 /* The time for the current event being processed */
 Time event_curtime = CurrentTime;
 

-static guint ignore_enter_focus = 0;

 static gboolean focus_left_screen = FALSE;
 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)
 
 #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))
                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",
 
             ob_debug_type(OB_DEBUG_FOCUS,
                           "%sNotify mode %d detail %d on %lx\n",


@@ -1031,7 +1038,6 @@ static void event_handle_client(ObClient *client, XEvent *e)
         gint x, y, w, h;
         gboolean move = FALSE;
         gboolean resize = FALSE;
         gint x, y, w, h;
         gboolean move = FALSE;
         gboolean resize = FALSE;

-        gboolean restack = FALSE;

 
         /* get the current area */
         RECT_TO_DIMS(client->area, x, y, w, h);
 
         /* get the current area */
         RECT_TO_DIMS(client->area, x, y, w, h);


@@ -1069,9 +1075,9 @@ static void event_handle_client(ObClient *client, XEvent *e)
             }
 
             /* activate it rather than just focus it */
             }
 
             /* activate it rather than just focus it */

-            restack = stacking_restack_request(client, sibling,
-                                               e->xconfigurerequest.detail,
-                                               TRUE);
+            stacking_restack_request(client, sibling,
+                                     e->xconfigurerequest.detail,
+                                     TRUE);

 
             /* if a stacking change moves the window without resizing */
             move = TRUE;
 
             /* if a stacking change moves the window without resizing */
             move = TRUE;


@@ -1166,14 +1172,13 @@ 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)) {
                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);
                 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);
                 client_configure(client, x, y, w, h, FALSE, TRUE);

-            }
-
-            if (!restack || !config_focus_under_mouse) {
-                /* ignore enter events caused by these like ob actions do */
-                event_ignore_all_queued_enters();
+                event_end_ignore_all_enters(ignore_start);

             }
         }
         break;
             }
         }
         break;


@@ -1259,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) {
                 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" :
             /* can't compress these */
             ob_debug("net_wm_state %s %ld %ld for 0x%lx\n",
                      (e->xclient.data.l[0] == 0 ? "Remove" :


@@ -1266,13 +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);
                       e->xclient.data.l[0] == 2 ? "Toggle" : "INVALID"),
                      e->xclient.data.l[1], e->xclient.data.l[2],
                      client->window);

+
+            /* ignore enter events caused by these like ob actions do */
+            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]);
             client_set_state(client, e->xclient.data.l[0],
                              e->xclient.data.l[1], e->xclient.data.l[2]);

-
-            if (!config_focus_under_mouse) {
-                /* ignore enter events caused by these like ob actions do */
-                event_ignore_all_queued_enters();
-            }
+            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);
         } else if (msgtype == prop_atoms.net_close_window) {
             ob_debug("net_close_window for 0x%lx\n", client->window);
             client_close(client);


@@ -1333,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;
                 moveresize_end(TRUE);
         } else if (msgtype == prop_atoms.net_moveresize_window) {
             gint ograv, x, y, w, h;

+            gulong ignore_start;

 
             ograv = client->gravity;
 
 
             ograv = client->gravity;
 


@@ -1377,12 +1386,12 @@ static void event_handle_client(ObClient *client, XEvent *e)
 
             client_find_onscreen(client, &x, &y, w, h, FALSE);
 
 
             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);
             client_configure(client, x, y, w, h, FALSE, TRUE);

+            event_end_ignore_all_enters(ignore_start);

 
             client->gravity = ograv;
 
             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,
         } else if (msgtype == prop_atoms.net_restack_window) {
             if (e->xclient.data.l[0] != 2) {
                 ob_debug_type(OB_DEBUG_APP_BUGS,


@@ -1837,49 +1846,53 @@ void event_halt_focus_delay()
     ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func);
 }
 
     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);
 
     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)
 {
 }
 
 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));
 
     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 (e->xany.serial > r->end) {
+            ignore_serials = g_slist_delete_link(ignore_serials, it);
+            g_free(r);
+        }
+        else if (e->xany.serial >= r->start)
+            return TRUE;

     }
     return FALSE;
 }
     }
     return FALSE;
 }

diff --git a/openbox/event.h b/openbox/event.h
index 29f621d..5c5290f 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);
 
   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();
 
 /*! 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 0af8ab1..203a85f 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) {
 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);
 
         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)
     } else {
         /*
           if (c)

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 8e58c93..015330b 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()
 {
 
 void focus_cycle_popup_hide()
 {

+    gulong ignore_start;
+
+    ignore_start = event_start_ignore_all_enters();
+

     XUnmapWindow(ob_display, popup.bg);
     XFlush(ob_display);
 
     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;
 
     while(popup.targets) {
         ObFocusCyclePopupTarget *t = popup.targets->data;

diff --git a/openbox/popup.c b/openbox/popup.c
index f46a3a7..86d4fb4 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) {
 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;
 
         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;
     } 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 7b4ca74..5f1991d 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;
     ObClient *c;
     GList *it;
     guint old;

+    gulong ignore_start;

      
     g_assert(num < screen_num_desktops);
 
      
     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);
 
 
     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);
 
     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;
 
     if (event_curtime != CurrentTime)
         screen_desktop_user_time = event_curtime;