X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=bb6a42f964de889d8ec1d3d3d907d067c3d7efb3;hb=d915480371427b6813e7a5140caa4f15c30ee5c9;hp=5ef329c3e9e46a603efb1ce362e92a2bf22bcb7d;hpb=c1a5ad45a8f02cd0728852c3765f411d7b12dec3;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index 5ef329c3..bb6a42f9 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -275,14 +275,13 @@ static void event_hack_mods(XEvent *e)
     }
 }
 
-static gboolean wanted_focusevent(XEvent *e)
+static gboolean wanted_focusevent(XEvent *e, gboolean in_client_only)
 {
     gint mode = e->xfocus.mode;
     gint detail = e->xfocus.detail;
     Window win = e->xany.window;
 
     if (e->type == FocusIn) {
-
         /* These are ones we never want.. */
 
         /* This means focus was given by a keyboard/mouse grab. */
@@ -294,7 +293,7 @@ static gboolean wanted_focusevent(XEvent *e)
 
         /* These are the ones we want.. */
 
-        if (win == RootWindow(ob_display, ob_screen)) {
+        if (win == RootWindow(ob_display, ob_screen) && !in_client_only) {
             /* This means focus reverted off of a client */
             if (detail == NotifyPointerRoot || detail == NotifyDetailNone ||
                 detail == NotifyInferior)
@@ -310,7 +309,7 @@ static gboolean wanted_focusevent(XEvent *e)
         if (detail == NotifyNonlinearVirtual)
             return TRUE;
         /* This means focus moved to the frame window */
-        if (detail == NotifyInferior)
+        if (detail == NotifyInferior && !in_client_only)
             return TRUE;
 
         /* Otherwise.. */
@@ -318,7 +317,6 @@ static gboolean wanted_focusevent(XEvent *e)
     } else {
         g_assert(e->type == FocusOut);
 
-
         /* These are ones we never want.. */
 
         /* This means focus was taken by a keyboard/mouse grab. */
@@ -348,18 +346,58 @@ static gboolean wanted_focusevent(XEvent *e)
 
 static Bool look_for_focusin(Display *d, XEvent *e, XPointer arg)
 {
-    return e->type == FocusIn && wanted_focusevent(e);
+    return e->type == FocusIn && wanted_focusevent(e, FALSE);
+}
+
+static Bool look_for_focusin_client(Display *d, XEvent *e, XPointer arg)
+{
+    return e->type == FocusIn && wanted_focusevent(e, TRUE);
+}
+
+static void print_focusevent(XEvent *e)
+{
+    gint mode = e->xfocus.mode;
+    gint detail = e->xfocus.detail;
+    Window win = e->xany.window;
+    const gchar *modestr, *detailstr;
+
+    switch (mode) {
+    case NotifyNormal:       modestr="NotifyNormal";       break;
+    case NotifyGrab:         modestr="NotifyGrab";         break;
+    case NotifyUngrab:       modestr="NotifyUngrab";       break;
+    case NotifyWhileGrabbed: modestr="NotifyWhileGrabbed"; break;
+    }
+    switch (detail) {
+    case NotifyAncestor:    detailstr="NotifyAncestor";    break;
+    case NotifyVirtual:     detailstr="NotifyVirtual";     break;
+    case NotifyInferior:    detailstr="NotifyInferior";    break;
+    case NotifyNonlinear:   detailstr="NotifyNonlinear";   break;
+    case NotifyNonlinearVirtual: detailstr="NotifyNonlinearVirtual"; break;
+    case NotifyPointer:     detailstr="NotifyPointer";     break;
+    case NotifyPointerRoot: detailstr="NotifyPointerRoot"; break;
+    case NotifyDetailNone:  detailstr="NotifyDetailNone";  break;
+    }
+
+    g_assert(modestr);
+    g_assert(detailstr);
+    ob_debug_type(OB_DEBUG_FOCUS, "Focus%s 0x%x mode=%s detail=%s\n",
+                  (e->xfocus.type == FocusIn ? "In" : "Out"),
+                  win,
+                  modestr, detailstr);
+
 }
 
 static gboolean event_ignore(XEvent *e, ObClient *client)
 {
     switch(e->type) {
     case FocusIn:
-        if (!wanted_focusevent(e))
+        print_focusevent(e);
+        if (!wanted_focusevent(e, FALSE))
             return TRUE;
         break;
     case FocusOut:
-        if (!wanted_focusevent(e))
+        print_focusevent(e);
+        if (!wanted_focusevent(e, FALSE))
             return TRUE;
         break;
     }
@@ -438,11 +476,14 @@ static void event_process(const XEvent *ec, gpointer data)
                  hasn't received focus yet, so something else) -> send focusin
                which means the "something else" is the last thing to get a
                focusin sent to it, so the new window doesn't end up with focus.
+
+               But if the other focus in is something like PointerRoot then we
+               still want to fall back.
             */
-            if (XCheckIfEvent(ob_display, &ce, look_for_focusin, NULL)) {
+            if (XCheckIfEvent(ob_display, &ce, look_for_focusin_client, NULL)){
                 XPutBackEvent(ob_display, &ce);
                 ob_debug_type(OB_DEBUG_FOCUS,
-                              "  but another FocusIn is coming\n)");
+                              "  but another FocusIn is coming\n");
             } else {
                 /* Focus has been reverted to the root window, nothing, or to
                    our frame window.
@@ -468,8 +509,6 @@ static void event_process(const XEvent *ec, gpointer data)
         gboolean nomove = FALSE;
         XEvent ce;
 
-        ob_debug_type(OB_DEBUG_FOCUS, "FocusOut Event\n");
-
         /* Look for the followup FocusIn */
         if (!XCheckIfEvent(ob_display, &ce, look_for_focusin, NULL)) {
             /* There is no FocusIn, this means focus went to a window that
@@ -591,7 +630,7 @@ static void event_handle_root(XEvent *e)
                     ob_debug_type(OB_DEBUG_APP_BUGS,
                                   "_NET_CURRENT_DESKTOP message is missing "
                                   "a timestamp\n");
-                screen_set_desktop(d);
+                screen_set_desktop(d, TRUE);
             }
         } else if (msgtype == prop_atoms.net_number_of_desktops) {
             guint d = e->xclient.data.l[0];
@@ -1128,8 +1167,6 @@ static void event_handle_client(ObClient *client, XEvent *e)
                    msgtype == prop_atoms.net_wm_icon_name ||
                    msgtype == prop_atoms.wm_icon_name) {
             client_update_title(client);
-        } else if (msgtype == prop_atoms.wm_class) {
-            client_update_class(client);
         } else if (msgtype == prop_atoms.wm_protocols) {
             client_update_protocols(client);
             client_setup_decor_and_functions(client);
@@ -1151,9 +1188,6 @@ static void event_handle_client(ObClient *client, XEvent *e)
             client_update_sync_request_counter(client);
         }
 #endif
-        else if (msgtype == prop_atoms.sm_client_id) {
-            client_update_sm_client_id(client);
-        }
     case ColormapNotify:
         client_update_colormap(client, e->xcolormap.colormap);
         break;