godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

8145 - Mouse Position is unknown until first mouse event on X11 & Win

Browse Source 
- X11 update input->pos on EnterNotify
- X11 & Win call first-time events processing before main initialization

(cherry picked from commit c79e998d1f)
This commit is contained in:
Sergey Pusnei 2017-03-27 21:37:23 -04:00 committed by Rémi Verschelde
parent 1c17e5b38d
commit e5d63aaece
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/windows/os_windows.cpp
View File

@ -2176,6 +2176,9 @@ 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();

9
platform/x11/os_x11.cpp
View File

@ -1282,8 +1282,12 @@ void OS_X11::process_xevents() {
if (main_loop && mouse_mode != MOUSE_MODE_CAPTURED)
main_loop->notification(MainLoop::NOTIFICATION_WM_MOUSE_ENTER);
if (input)
if (input) {
// Update mouse position. It is triggered before mouse motion.
Point2i pos(event.xmotion.x, event.xmotion.y);
input->set_mouse_pos(pos);
input->set_mouse_in_window(true);
}
} break;
case FocusIn:
minimized = false;
@ -1893,6 +1897,9 @@ 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();