X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fevent.c;h=6b372a85ca42a6c0ae3d06f1b5e18ebe9fc31aa0;hb=25f215444b3c8e7b186b9c3892a9a4f659e79998;hp=f67c3d5a1ebbbd39c0782bcbd234775fd2e4ec63;hpb=c768a7dae74ddc127527d64a12f42da925c73925;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index f67c3d5a..6b372a85 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -93,13 +93,10 @@ static gboolean focus_delay_cmp(gconstpointer d1, gconstpointer d2);
 static gboolean focus_delay_func(gpointer data);
 static void focus_delay_client_dest(ObClient *client, gpointer data);
 
-static gboolean menu_hide_delay_func(gpointer data);
-
 /* The time for the current event being processed */
 Time event_curtime = CurrentTime;
 
 static guint ignore_enter_focus = 0;
-static gboolean menu_can_hide;
 static gboolean focus_left_screen = FALSE;
 
 #ifdef USE_SM
@@ -363,13 +360,6 @@ static gboolean wanted_focusevent(XEvent *e, gboolean in_client_only)
         /* This means focus moved from one client to another */
         if (detail == NotifyNonlinearVirtual)
             return TRUE;
-        /* This means focus moved off of our frame window.
-           When the client reverts to parent and it lands on our frame window,
-           and they are iconifying (not being unmanaged), then we don't get
-           a focus out from the client but only from the frame window, which
-           is this event */
-        if (detail == NotifyNonlinear)
-            return TRUE;
 
         /* Otherwise.. */
         return FALSE;
@@ -494,6 +484,23 @@ static void event_process(const XEvent *ec, gpointer data)
         /* crossing events for menu */
         event_handle_menu(e);
     } else if (e->type == FocusIn) {
+        if (client &&
+            e->xfocus.detail == NotifyInferior)
+        {
+            ob_debug_type(OB_DEBUG_FOCUS,
+                          "Focus went to the frame window");
+
+            focus_left_screen = FALSE;
+
+            focus_fallback(FALSE, FALSE);
+
+            /* We don't get a FocusOut for this case, because it's just moving
+               from our Inferior up to us. This happens when iconifying a
+               window with RevertToParent focus */
+            frame_adjust_focus(client->frame, FALSE);
+            /* focus_set_client(NULL) has already been called */
+            client_calc_layer(client);
+        }
         if (e->xfocus.detail == NotifyPointerRoot ||
             e->xfocus.detail == NotifyDetailNone ||
             e->xfocus.detail == NotifyInferior ||
@@ -501,9 +508,8 @@ static void event_process(const XEvent *ec, gpointer data)
         {
             XEvent ce;
 
-            ob_debug_type(OB_DEBUG_FOCUS, "Focus went to root, "
-                          "pointer root/none or "
-                          "the frame window\n");
+            ob_debug_type(OB_DEBUG_FOCUS,
+                          "Focus went to root or pointer root/none\n");
 
             if (e->xfocus.detail == NotifyInferior ||
                 e->xfocus.detail == NotifyNonlinear)
@@ -548,7 +554,9 @@ static void event_process(const XEvent *ec, gpointer data)
 
             /* If you send focus to a window and then it disappears, you can
                get the FocusIn for it, after it is unmanaged.
-               Just wait for the next FocusOut/FocusIn pair. */
+               Just wait for the next FocusOut/FocusIn pair, but make note that
+               the window that was focused no longer is. */
+            focus_set_client(NULL);
         }
         else if (client != focus_client) {
             focus_left_screen = FALSE;
@@ -1695,8 +1703,8 @@ static gboolean event_handle_menu(XEvent *ev)
 
     switch (ev->type) {
     case ButtonRelease:
-        if ((ev->xbutton.button < 4 || ev->xbutton.button > 5)
-            && menu_can_hide)
+        if (menu_hide_delay_reached() &&
+            (ev->xbutton.button < 4 || ev->xbutton.button > 5))
         {
             if ((e = menu_entry_frame_under(ev->xbutton.x_root,
                                             ev->xbutton.y_root)))
@@ -1772,12 +1780,6 @@ static void event_handle_user_input(ObClient *client, XEvent *e)
                moved/resized */
             client = moveresize_client;
 
-        menu_can_hide = FALSE;
-        ob_main_loop_timeout_add(ob_main_loop,
-                                 config_menu_hide_delay * 1000,
-                                 menu_hide_delay_func,
-                                 NULL, g_direct_equal, NULL);
-
         if (e->type == ButtonPress ||
             e->type == ButtonRelease ||
             e->type == MotionNotify)
@@ -1793,12 +1795,6 @@ static void event_handle_user_input(ObClient *client, XEvent *e)
     }
 }
 
-static gboolean menu_hide_delay_func(gpointer data)
-{
-    menu_can_hide = TRUE;
-    return FALSE; /* no repeat */
-}
-
 static void focus_delay_dest(gpointer data)
 {
     g_free(data);