X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=5bb0e2a09f4971d207bbde7e57a130e3a2da17b1;hb=a8a93d7d39b3cc82a25d99c9c639c97a5facbfec;hp=502d196214957381468d58e30bf85740f7c50856;hpb=27773e1cb7492de080bd19189b4fcd2a6b9a0e9e;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 502d1962..5bb0e2a0 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -71,7 +71,6 @@ typedef struct
 } ObFocusDelayData;
 
 static void event_process(const XEvent *e, gpointer data);
-static void event_client_dest(ObClient *client, gpointer data);
 static void event_handle_root(XEvent *e);
 static void event_handle_menu(XEvent *e);
 static void event_handle_dock(ObDock *s, XEvent *e);
@@ -164,7 +163,6 @@ void event_startup(gboolean reconfig)
 #endif
 
     client_add_destructor(focus_delay_client_dest, NULL);
-    client_add_destructor(event_client_dest, NULL);
 }
 
 void event_shutdown(gboolean reconfig)
@@ -176,7 +174,6 @@ void event_shutdown(gboolean reconfig)
 #endif
 
     client_remove_destructor(focus_delay_client_dest);
-    client_remove_destructor(event_client_dest);
     XFreeModifiermap(modmap);
 }
 
@@ -351,10 +348,6 @@ static gboolean wanted_focusevent(XEvent *e)
         if (detail == NotifyNonlinearVirtual)
             return TRUE;
 
-        /* This means focus reverted off of a client */
-        if (detail == NotifyInferior)
-            return TRUE;
-
         /* Otherwise.. */
         return FALSE;
     } else {
@@ -379,6 +372,9 @@ static gboolean wanted_focusevent(XEvent *e)
         /* This means focus moved from one client to another */
         if (detail == NotifyNonlinearVirtual)
             return TRUE;
+        /* This means focus had moved to our frame window and now moved off */
+        if (detail == NotifyNonlinear)
+            return TRUE;
 
         /* Otherwise.. */
         return FALSE;
@@ -394,12 +390,12 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
 {
     switch(e->type) {
     case FocusIn:
+        if (!wanted_focusevent(e))
+            return TRUE;
+        break;
     case FocusOut:
-        if (!wanted_focusevent(e)) {
-            ob_debug_type(OB_DEBUG_FOCUS, "focus event ignored\n");
+        if (!wanted_focusevent(e))
             return TRUE;
-        }
-        ob_debug_type(OB_DEBUG_FOCUS, "focus event used;\n");
         break;
     }
     return FALSE;
@@ -442,29 +438,6 @@ static void event_process(const XEvent *ec, gpointer data)
             }
         }
 
-    if (e->type == FocusIn || e->type == FocusOut) {
-        gint mode = e->xfocus.mode;
-        gint detail = e->xfocus.detail;
-        Window window = e->xfocus.window;
-        if (detail == NotifyVirtual) {
-            ob_debug_type(OB_DEBUG_FOCUS,
-                          "FOCUS %s NOTIFY VIRTUAL window 0x%x\n",
-                          (e->type == FocusIn ? "IN" : "OUT"), window);
-        }
-
-        else if (detail == NotifyNonlinearVirtual) {
-            ob_debug_type(OB_DEBUG_FOCUS,
-                          "FOCUS %s NOTIFY NONLINVIRTUAL window 0x%x\n",
-                          (e->type == FocusIn ? "IN" : "OUT"), window);
-        }
-
-        else
-            ob_debug_type(OB_DEBUG_FOCUS,
-                          "UNKNOWN FOCUS %s (d %d, m %d) window 0x%x\n",
-                          (e->type == FocusIn ? "IN" : "OUT"),
-                          detail, mode, window);
-    }
-
     event_set_curtime(e);
     event_hack_mods(e);
     if (event_ignore(e, client)) {
@@ -482,21 +455,9 @@ static void event_process(const XEvent *ec, gpointer data)
         /* crossing events for menu */
         event_handle_menu(e);
     } else if (e->type == FocusIn) {
-        if (e->xfocus.detail == NotifyPointerRoot ||
-                   e->xfocus.detail == NotifyDetailNone) {
-            ob_debug_type(OB_DEBUG_FOCUS, "Focus went to root\n");
-            /* Focus has been reverted to the root window or nothing, so fall
-               back to something other than the window which just had it. */
-            focus_fallback(FALSE);
-        } else if (e->xfocus.detail == NotifyInferior) {
-            ob_debug_type(OB_DEBUG_FOCUS, "Focus went to parent\n");
-            /* Focus has been reverted to parent, which is our frame window,
-               or the root window, so fall back to something other than the
-               window which had it. */
-            focus_fallback(FALSE);
-        } else if (client && client != focus_client) {
-            focus_set_client(client);
+        if (client && client != focus_client) {
             frame_adjust_focus(client->frame, TRUE);
+            focus_set_client(client);
             client_calc_layer(client);
         }
     } else if (e->type == FocusOut) {
@@ -510,9 +471,21 @@ static void event_process(const XEvent *ec, gpointer data)
             /* There is no FocusIn, this means focus went to a window that
                is not being managed, or a window on another screen. */
             ob_debug_type(OB_DEBUG_FOCUS, "Focus went to a black hole !\n");
+            /* nothing is focused */
+            focus_set_client(NULL);
         } else if (ce.xany.window == e->xany.window) {
+            ob_debug_type(OB_DEBUG_FOCUS, "Focus didn't go anywhere\n");
             /* If focus didn't actually move anywhere, there is nothing to do*/
             nomove = TRUE;
+        } else if (ce.xfocus.detail == NotifyPointerRoot ||
+                   ce.xfocus.detail == NotifyDetailNone ||
+                   ce.xfocus.detail == NotifyInferior) {
+            ob_debug_type(OB_DEBUG_FOCUS, "Focus went to root\n");
+            /* Focus has been reverted to the root window or nothing
+               FocusOut events come after UnmapNotify, so we don't need to
+               worry about focusing an invalid window
+             */
+            focus_fallback(TRUE);
         } else {
             /* Focus did move, so process the FocusIn event */
             ObEventData ed = { .ignored = FALSE };
@@ -528,9 +501,8 @@ static void event_process(const XEvent *ec, gpointer data)
         }
 
         if (client && !nomove) {
-            /* This client is no longer focused, so show that */
-            focus_hilite = NULL;
             frame_adjust_focus(client->frame, FALSE);
+            /* focus_set_client has already been called for sure */
             client_calc_layer(client);
         }
     } else if (group)
@@ -591,12 +563,10 @@ static void event_process(const XEvent *ec, gpointer data)
 
                 if (e->type == ButtonPress || e->type == ButtonRelease ||
                     e->type == MotionNotify) {
-                    if (!keyboard_interactively_grabbed())
-                        mouse_event(client, e);
+                    mouse_event(client, e);
                 } else if (e->type == KeyPress) {
                     keyboard_event((focus_cycle_target ? focus_cycle_target :
-                                    (focus_hilite ? focus_hilite : client)),
-                                   e);
+                                    client), e);
                 }
             }
         }
@@ -1353,8 +1323,8 @@ static void focus_delay_dest(gpointer data)
 
 static gboolean focus_delay_cmp(gconstpointer d1, gconstpointer d2)
 {
-    const ObFocusDelayData *f1 = d1, *f2 = d2;
-    return f1->client == f2->client;
+    const ObFocusDelayData *f1 = d1;
+    return f1->client == d2;
 }
 
 static gboolean focus_delay_func(gpointer data)
@@ -1377,12 +1347,6 @@ static void focus_delay_client_dest(ObClient *client, gpointer data)
                                      client, FALSE);
 }
 
-static void event_client_dest(ObClient *client, gpointer data)
-{
-    if (client == focus_hilite)
-        focus_hilite = NULL;
-}
-
 void event_halt_focus_delay()
 {
     ob_main_loop_timeout_remove(ob_main_loop, focus_delay_func);