80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Xi2: Warp mouse cursor only on Xi2 thread

Browse Source
This commit is contained in:
Cacodemon345
2022-02-17 10:25:37 +06:00
committed by GitHub
parent d51d3cc4a7
commit 4f9af2eb77
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/qt/xinput2_mouse.cpp
View File

@@ -120,6 +120,14 @@ void xinput2_proc()
prev_rel_coords[0] = relative_coords[0]; prev_rel_coords[0] = relative_coords[0];
prev_rel_coords[1] = relative_coords[1]; prev_rel_coords[1] = relative_coords[1];
prev_time = rawev->time; prev_time = rawev->time;
if (!mouse_capture) break;
XWindowAttributes winattrib{};
if (XGetWindowAttributes(disp, main_window->winId(), &winattrib)) {
auto globalPoint = main_window->mapToGlobal(QPoint(main_window->width() / 2, main_window->height() / 2));
XWarpPointer(disp, XRootWindow(disp, XScreenNumberOfScreen(winattrib.screen)), XRootWindow(disp, XScreenNumberOfScreen(winattrib.screen)), 0, 0, 0, 0, globalPoint.x(), globalPoint.y());
XFlush(disp);
}
} }
case XI_Motion: { case XI_Motion: {
if (XKeysymToKeycode(disp, XK_Home) == 69) { if (XKeysymToKeycode(disp, XK_Home) == 69) {
@@ -175,13 +183,6 @@ void xinput2_poll()
{ {
mouse_x = xi2_mouse_x; mouse_x = xi2_mouse_x;
mouse_y = xi2_mouse_y; mouse_y = xi2_mouse_y;
XWindowAttributes winattrib{};
if (XGetWindowAttributes(disp, main_window->winId(), &winattrib))
{
auto globalPoint = main_window->mapToGlobal(QPoint(main_window->width() / 2, main_window->height() / 2));
XWarpPointer(disp, XRootWindow(disp, XScreenNumberOfScreen(winattrib.screen)), XRootWindow(disp, XScreenNumberOfScreen(winattrib.screen)), 0, 0, 0, 0, globalPoint.x(), globalPoint.y());
XFlush(disp);
}
} }
xi2_mouse_x = 0; xi2_mouse_x = 0;
xi2_mouse_y = 0; xi2_mouse_y = 0;