maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #8180 from sergey-push/8145-Mouse_Position_is_unknown_until_first_mouse_event

Browse source 
8145 - Mouse Position is unknown until first mouse event on X11
This commit is contained in:
Rémi Verschelde 2017-03-30 10:34:30 +02:00 committed by GitHub
parent 84bd039851 c79e998d1f
commit aab6687523
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

@ -2167,6 +2167,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

@ -1277,8 +1277,12 @@ void OS_X11::process_xevents() {
case EnterNotify: {
if (main_loop && !mouse_mode_grab)
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;
@ -1900,6 +1904,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();