M openbox/event.c → openbox/event.c

@@ -333,22 +333,23 @@ case EnterNotify:
     case LeaveNotify:
         /* NotifyUngrab occurs when a mouse button is released and the event is
            caused, like when lowering a window */
-        /* NotifyVirtual occurs when ungrabbing the pointer,
-           NotifyNonlinearVirtual occurs when closing a gtk app's menu */
+        /* NotifyVirtual occurs when ungrabbing the pointer */
         if (e->xcrossing.mode == NotifyGrab ||
             e->xcrossing.detail == NotifyInferior ||
             (e->xcrossing.mode == NotifyUngrab &&
-             (e->xcrossing.detail == NotifyVirtual ||
-              e->xcrossing.detail == NotifyNonlinearVirtual))) {
-#ifdef DEBUG_FOCUS
-            g_message("EnterNotify mode %d detail %d on %lx IGNORED",
+             e->xcrossing.detail == NotifyVirtual)) {
+#ifndef DEBUG_FOCUS
+            g_message("%sNotify mode %d detail %d on %lx IGNORED",
+                      (e->type == EnterNotify ? "Enter" : "Leave"),
                       e->xcrossing.mode,
                       e->xcrossing.detail, client?client->window:0);
 #endif
             return TRUE;
         }
-#ifdef DEBUG_FOCUS
-        g_message("EnterNotify mode %d detail %d on %lx", e->xcrossing.mode,
+#ifndef DEBUG_FOCUS
+        g_message("%sNotify mode %d detail %d on %lx",
+                  (e->type == EnterNotify ? "Enter" : "Leave"),
+                  e->xcrossing.mode,
                   e->xcrossing.detail, client?client->window:0);
 #endif
 	break;