asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "8145 - Mouse Position is unknown until first mouse event on X11"

Browse source
This commit is contained in:
Juan Linietsky 2017-04-06 13:08:42 -03:00 committed by GitHub
parent 0ede0302ba
commit ce948ed63b
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
platform/windows/os_windows.cpp
View file

@ -2193,9 +2193,6 @@ void OS_Windows::run() {
if (!main_loop) if (!main_loop)
return; 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(); main_loop->init();
uint64_t last_ticks = get_ticks_usec(); uint64_t last_ticks = get_ticks_usec();

9
platform/x11/os_x11.cpp
View file

@ -1277,12 +1277,8 @@ void OS_X11::process_xevents() {
case EnterNotify: { case EnterNotify: {
if (main_loop && !mouse_mode_grab) if (main_loop && !mouse_mode_grab)
main_loop->notification(MainLoop::NOTIFICATION_WM_MOUSE_ENTER); 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); input->set_mouse_in_window(true);
}
} break; } break;
case FocusIn: case FocusIn:
minimized = false; minimized = false;
@ -1904,9 +1900,6 @@ void OS_X11::run() {
if (!main_loop) if (!main_loop)
return; 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(); main_loop->init();
//uint64_t last_ticks=get_ticks_usec(); //uint64_t last_ticks=get_ticks_usec();