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

qt: Restore Xinput2 for Qt5 builds

Browse Source
This commit is contained in:
Cacodemon345
2022-08-12 00:35:40 +06:00
parent bf8d1dda9d
commit f2cf5dd841
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/qt/qt_rendererstack.cpp
View File

@@ -75,8 +75,15 @@ RendererStack::RendererStack(QWidget *parent, int monitor_index)
if (!mouse_type || (mouse_type[0] == '\0') || !stricmp(mouse_type, "auto")) { if (!mouse_type || (mouse_type[0] == '\0') || !stricmp(mouse_type, "auto")) {
if (QApplication::platformName().contains("wayland")) if (QApplication::platformName().contains("wayland"))
strcpy(auto_mouse_type, "wayland"); strcpy(auto_mouse_type, "wayland");
# if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
else if (QApplication::platformName() == "eglfs")
strcpy(auto_mouse_type, "evdev");
else if (QApplication::platformName() == "xcb")
strcpy(auto_mouse_type, "xinput2");
# else
else if (QApplication::platformName() == "eglfs" || QApplication::platformName() == "xcb") else if (QApplication::platformName() == "eglfs" || QApplication::platformName() == "xcb")
strcpy(auto_mouse_type, "evdev"); strcpy(auto_mouse_type, "evdev");
# endif
else else
auto_mouse_type[0] = '\0'; auto_mouse_type[0] = '\0';
mouse_type = auto_mouse_type; mouse_type = auto_mouse_type;
@@ -96,6 +103,14 @@ RendererStack::RendererStack(QWidget *parent, int monitor_index)
this->mouse_poll_func = evdev_mouse_poll; this->mouse_poll_func = evdev_mouse_poll;
} }
# endif # endif
if (!stricmp(mouse_type, "xinput2")) {
extern void xinput2_init();
extern void xinput2_poll();
extern void xinput2_exit();
xinput2_init();
this->mouse_poll_func = xinput2_poll;
this->mouse_exit_func = xinput2_exit;
}
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
this->mouse_poll_func = macos_poll_mouse; this->mouse_poll_func = macos_poll_mouse;