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

diff --git a/openbox/event.c b/openbox/event.c
index 0799f3b3..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
@@ -487,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 ||
@@ -494,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)
@@ -531,7 +544,7 @@ static void event_process(const XEvent *ec, gpointer data)
                 */
 
                 if (!focus_left_screen)
-                    focus_fallback(TRUE, FALSE);
+                    focus_fallback(FALSE, FALSE);
             }
         }
         else if (!client)
@@ -541,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;
@@ -823,6 +838,10 @@ static void event_handle_client(ObClient *client, XEvent *e)
         }
         break;
     case MotionNotify:
+        /* when there is a grab on the pointer, we won't get enter/leave
+           notifies, but we still get motion events */
+        if (grab_on_pointer()) break;
+
         con = frame_context(client, e->xmotion.window,
                             e->xmotion.x, e->xmotion.y);
         switch (con) {
@@ -1101,13 +1120,14 @@ static void event_handle_client(ObClient *client, XEvent *e)
            desktop. eg. open amarok window on desktop 1, switch to desktop
            2, click amarok tray icon. it will move by its decoration size.
         */
-        if (move && !resize &&
-            x != client->area.x &&
+        if (x != client->area.x &&
             x == (client->frame->area.x + client->frame->size.left -
                   (gint)client->border_width) &&
             y != client->area.y &&
             y == (client->frame->area.y + client->frame->size.top -
-                  (gint)client->border_width))
+                  (gint)client->border_width) &&
+            w == client->area.width &&
+            h == client->area.height)
         {
             ob_debug_type(OB_DEBUG_APP_BUGS,
                           "Application %s is trying to move via "
@@ -1508,7 +1528,9 @@ static void event_handle_dock(ObDock *s, XEvent *e)
         dock_hide(FALSE);
         break;
     case LeaveNotify:
-        dock_hide(TRUE);
+        /* don't hide when moving into a dock app */
+        if (e->xcrossing.detail != NotifyInferior)
+            dock_hide(TRUE);
         break;
     }
 }
@@ -1577,13 +1599,8 @@ static gboolean event_handle_menu_keyboard(XEvent *ev)
     if (frame == NULL)
         ret = FALSE;
 
-    else if (keycode == ob_keycode(OB_KEY_ESCAPE) && state == 0) {
-        /* Escape goes to the parent menu or closes the last one */
-        if (frame->parent)
-            menu_frame_select(frame, NULL, TRUE);
-        else
-            menu_frame_hide_all();
-    }
+    else if (keycode == ob_keycode(OB_KEY_ESCAPE) && state == 0)
+        menu_frame_hide_all();
 
     else if (keycode == ob_keycode(OB_KEY_RETURN) && (state == 0 ||
                                                       state == ControlMask))
@@ -1686,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)))
@@ -1763,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)
@@ -1784,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);