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

Merge pull request #21753 from guilhermefelipecgs/fix_confined_mode 

Fixes to mouse mode confined and captured
This commit is contained in:
Rémi Verschelde 2018-09-12 21:37:30 +02:00 committed by GitHub
parent 9de03997ec 7d6364d431
commit fe78aa0c30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
platform/x11/os_x11.cpp
View File

@ -744,12 +744,15 @@ void OS_X11::set_mouse_mode(MouseMode p_mode) {
ERR_PRINT("NO GRAB");
}
center.x = current_videomode.width / 2;
center.y = current_videomode.height / 2;
XWarpPointer(x11_display, None, x11_window,
0, 0, 0, 0, (int)center.x, (int)center.y);
if (mouse_mode == MOUSE_MODE_CAPTURED) {
center.x = current_videomode.width / 2;
center.y = current_videomode.height / 2;
input->set_mouse_position(center);
XWarpPointer(x11_display, None, x11_window,
0, 0, 0, 0, (int)center.x, (int)center.y);
input->set_mouse_position(center);
}
} else {
do_mouse_warp = false;
}
@ -2067,6 +2070,10 @@ void OS_X11::process_xevents() {
Point2i rel = pos - last_mouse_pos;
if (mouse_mode == MOUSE_MODE_CAPTURED) {
pos = Point2i(current_videomode.width / 2, current_videomode.height / 2);
}
Ref<InputEventMouseMotion> mm;
mm.instance();