From 7f32db5ac9143deb2afe918fd3aee791c101481e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 8 Apr 2017 11:28:25 +0200 Subject: [PATCH] Revert "8145 - Mouse Position is unknown until first mouse event on X11 & Win" This reverts commit e5d63aaece5310aee39ba1da9a595fc7a8410a50. Same reasoning as #8291. --- platform/windows/os_windows.cpp | 3 --- platform/x11/os_x11.cpp | 9 +-------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index d74369f46cb..37bfb68b7b3 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -2177,9 +2177,6 @@ void OS_Windows::run() { if (!main_loop) return; - // Process all events before the main initialization so the cursor will get initialized properly - process_events(); // get rid of pending events - main_loop->init(); uint64_t last_ticks = get_ticks_usec(); diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 002a890e0cf..82cb1a02505 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -1283,12 +1283,8 @@ void OS_X11::process_xevents() { if (main_loop && mouse_mode != MOUSE_MODE_CAPTURED) main_loop->notification(MainLoop::NOTIFICATION_WM_MOUSE_ENTER); - if (input) { - // Update mouse position. It is triggered before mouse motion. - Point2i pos(event.xmotion.x, event.xmotion.y); - input->set_mouse_pos(pos); + if (input) input->set_mouse_in_window(true); - } } break; case FocusIn: minimized = false; @@ -1898,9 +1894,6 @@ void OS_X11::run() { if (!main_loop) return; - // Process all events before the main initialization so the cursor will get initialized properly - process_xevents(); // get rid of pending events - main_loop->init(); // uint64_t last_ticks=get_ticks_usec();