claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #4968 from TheBombSquad/linux-mouse-fixes

Browse Source 
Linux mouse fixes
This commit is contained in:
Miran Grča
2024-11-17 00:38:06 +01:00
committed by GitHub
parent 5abc12c776 aa7d68f113
commit 6694c39f85
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -62,3 +62,6 @@ CMakeLists.txt.user
# clangd # clangd
.cache .cache
# Jetbrains CLion
.idea

6
src/qt/qt_rendererstack.cpp
View File

@@ -200,10 +200,14 @@ RendererStack::mousePressEvent(QMouseEvent *event)
void void
RendererStack::wheelEvent(QWheelEvent *event) RendererStack::wheelEvent(QWheelEvent *event)
{ {
if (!mouse_capture) {
event->ignore();
return;
}
double numSteps = (double) event->angleDelta().y() / 120.0; double numSteps = (double) event->angleDelta().y() / 120.0;
mouse_set_z((int) numSteps); mouse_set_z((int) numSteps);
event->accept(); event->accept();
} }

4
src/qt/xinput2_mouse.cpp
View File

@@ -132,7 +132,7 @@ xinput2_proc()
XGenericEventCookie *cookie = (XGenericEventCookie *) &ev.xcookie; XGenericEventCookie *cookie = (XGenericEventCookie *) &ev.xcookie;
XNextEvent(disp, (XEvent *) &ev); XNextEvent(disp, (XEvent *) &ev);
if (XGetEventData(disp, cookie) && (cookie->type == GenericEvent) && (cookie->extension == xi2opcode)) { if (XGetEventData(disp, cookie) && (cookie->type == GenericEvent) && (cookie->extension == xi2opcode) && mouse_capture) {
const XIRawEvent *rawev = (const XIRawEvent *) cookie->data; const XIRawEvent *rawev = (const XIRawEvent *) cookie->data;
double coords[2] = { 0.0 }; double coords[2] = { 0.0 };
@@ -214,8 +214,6 @@ common_motion:
} }
prev_time = rawev->time; prev_time = rawev->time;
if (!mouse_capture)
break;
XWindowAttributes winattrib {}; XWindowAttributes winattrib {};
if (XGetWindowAttributes(disp, main_window->winId(), &winattrib)) { if (XGetWindowAttributes(disp, main_window->winId(), &winattrib)) {
auto globalPoint = main_window->mapToGlobal(QPoint(main_window->width() / 2, main_window->height() / 2)); auto globalPoint = main_window->mapToGlobal(QPoint(main_window->width() / 2, main_window->height() / 2));