1 files changed, 32 insertions, 43 deletions

diff --git a/client/x11/red_window.cpp b/client/x11/red_window.cpp
index 1647cd4d..7e25c608 100644
--- a/client/x11/red_window.cpp
+++ b/client/x11/red_window.cpp
@@ -844,6 +844,10 @@ void RedWindow_p::win_proc(XEvent& event)
     case EnterNotify:
         if (!red_window->_ignore_pointer) {
             red_window->on_pointer_enter();
+            Point origin = red_window->get_origin();
+            red_window->get_listener().on_mouse_motion(event.xcrossing.x - origin.x,
+                                                       event.xcrossing.y - origin.y,
+                                                       to_red_buttons_state(event.xcrossing.state));
         } else {
             red_window->_shadow_pointer_state = true;
             memcpy(&red_window->_shadow_pointer_event, &event, sizeof(XEvent));
@@ -860,13 +864,35 @@ void RedWindow_p::win_proc(XEvent& event)
     }
 }
 
-void RedWindow_p::sync()
+void RedWindow_p::sync(bool shadowed)
 {
+    if (shadowed) {
+        _ignore_foucs = true;
+        _ignore_pointer = true;
+        _shadow_foucs_state = _focused;
+        _shadow_pointer_state = _pointer_in_window;
+        _shadow_focus_event.xany.serial = 0;
+    }
     XSync(x_display, False);
     XEvent event;
     while (XCheckWindowEvent(x_display, _win, ~long(0), &event)) {
         win_proc(event);
     }
+    if (!shadowed) {
+        return;
+    }
+    _ignore_foucs = false;
+    _ignore_pointer = false;
+    if (_shadow_foucs_state != _focused) {
+        DBG(0, "put back shadowed focus event");
+        XPutBackEvent(x_display, &_shadow_focus_event);
+    } else if (_shadow_focus_event.xany.serial > 0) {
+        focus_serial = _shadow_focus_event.xany.serial;
+    }
+    if (_shadow_pointer_state != _pointer_in_window) {
+        DBG(0, "put back shadowed pointer event");
+        XPutBackEvent(x_display, &_shadow_pointer_event);
+    }
 }
 
 void RedWindow_p::wait_for_reparent()
@@ -977,7 +1003,9 @@ RedWindow_p::RedWindow_p()
     : _win (None)
     , _glcont_copy (NULL)
     , _icon (NULL)
+    , _focused (false)
     , _ignore_foucs (false)
+    , _pointer_in_window (false)
     , _ignore_pointer (false)
 {
 }
@@ -1147,8 +1175,6 @@ RedWindow::RedWindow(RedWindow::Listener& listener, int screen)
     , _type (TYPE_NORMAL)
     , _local_cursor (NULL)
     , _cursor_visible (true)
-    , _focused (false)
-    , _pointer_in_window (false)
     , _trace_key_interception (false)
     , _key_interception_on (false)
     , _menu (NULL)
@@ -1554,55 +1580,18 @@ void RedWindow::do_start_key_interception()
     // LeaveNotify and EnterNotify.
 
     ASSERT(_focused);
-    _ignore_foucs = true;
-    _ignore_pointer = true;
-    _shadow_foucs_state = true;
-    _shadow_pointer_state = true;
-    _shadow_focus_event.xany.serial = 0;
     XGrabKeyboard(x_display, _win, True, GrabModeAsync, GrabModeAsync, CurrentTime);
-    sync();
+    sync(true);
     _listener.on_start_key_interception();
-    _ignore_foucs = false;
-    _ignore_pointer = false;
     _key_interception_on = true;
-    if (!_shadow_foucs_state) {
-        DBG(0, "put back shadowed focus out");
-        XPutBackEvent(x_display, &_shadow_focus_event);
-    } else if (_shadow_focus_event.xany.serial > 0) {
-        ASSERT(focus_window == this);
-        focus_serial = _shadow_focus_event.xany.serial;
-    }
-
-    if (!_shadow_pointer_state) {
-        DBG(0, "put back shadowed pointer leave");
-        XPutBackEvent(x_display, &_shadow_pointer_event);
-    }
 }
 
 void RedWindow::do_stop_key_interception()
 {
-    _ignore_foucs = true;
-    _ignore_pointer = true;
-    _shadow_foucs_state = _focused;
-    _shadow_pointer_state = _pointer_in_window;
-    _shadow_focus_event.xany.serial = 0;
     XUngrabKeyboard(x_display, CurrentTime);
-    sync();
+    sync(true);
     _key_interception_on = false;
     _listener.on_stop_key_interception();
-    _ignore_foucs = false;
-    _ignore_pointer = false;
-    if (_shadow_foucs_state != _focused) {
-        DBG(0, "put back shadowed focus event");
-        XPutBackEvent(x_display, &_shadow_focus_event);
-     } else if (_shadow_focus_event.xany.serial > 0) {
-        focus_serial = _shadow_focus_event.xany.serial;
-    }
-
-    if (_shadow_pointer_state != _pointer_in_window) {
-        DBG(0, "put back shadowed pointer event");
-        XPutBackEvent(x_display, &_shadow_pointer_event);
-    }
 }
 
 void RedWindow::start_key_interception()
@@ -1659,7 +1648,7 @@ void RedWindow::hide_cursor()
 void RedWindow::release_mouse()
 {
     XUngrabPointer(x_display, CurrentTime);
-    sync();
+    sync(true);
 }
 
 void RedWindow::cupture_mouse()