From: Dana Jansens <danakj@orodu.net>
Date: Thu, 31 May 2007 23:15:49 +0000 (+0000)
Subject: merge r7196 from trunk
X-Git-Tag: openbox-3_3_995-RELEASE~19
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=4b03660227f79cfbb20f9e5a335a167e23bb4b6b;p=dana%2Fopenbox.git

merge r7196 from trunk
---

diff --git a/openbox/event.c b/openbox/event.c
index f5da603b..57540bcf 100644
--- 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) {