merge r7196 from trunk

diff --git a/openbox/event.c b/openbox/event.c
index f5da603b0b9989f19bc1bd3a68a7159ebc7614bb..57540bcf25afbfadab252d0b151409e25c812d1d 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -823,6 +823,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) {