diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-03-03 14:41:36 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-03-03 14:41:36 -0300 |
| commit | 2c2894ceb674927a35d2798b3e63adabdb020077 (patch) | |
| tree | 9e8950e0acc8fb7531fa60ce8c0321a5b60c335a /platform/x11/os_x11.cpp | |
| parent | 4d2198110b4af7f203eeef95697255569e49bce7 (diff) | |
| parent | a0ee5cc3531786a652ee43d3a57cb69dff34bd70 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
modules/gdscript/gd_tokenizer.cpp
scene/resources/shader_graph.h
Diffstat (limited to 'platform/x11/os_x11.cpp')
| -rw-r--r-- | platform/x11/os_x11.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index a40af8d2a9..ac1818d200 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -479,8 +479,12 @@ void OS_X11::warp_mouse_pos(const Point2& p_to) { last_mouse_pos=p_to; } else { + /*XWindowAttributes xwa; + XGetWindowAttributes(x11_display, x11_window, &xwa); + printf("%d %d\n", xwa.x, xwa.y); needed? */ + XWarpPointer(x11_display, None, x11_window, - 0,0,0,0, (int)p_to.x, (int)p_to.y); + 0,0,0,0, (int)p_to.x , (int)p_to.y); } } |