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

Honour --nohook on X11 as well

Browse Source
This commit is contained in:
Cacodemon345
2025-05-09 14:56:55 +06:00
committed by GitHub
parent 0b15afa80c
commit 9a69e1800d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/qt/qt_mainwindow.cpp
View File

@@ -322,7 +322,8 @@ MainWindow::MainWindow(QWidget *parent)
mouse_capture = state ? 1 : 0; mouse_capture = state ? 1 : 0;
qt_mouse_capture(mouse_capture); qt_mouse_capture(mouse_capture);
if (mouse_capture) { if (mouse_capture) {
this->grabKeyboard(); if (hook_enabled)
this->grabKeyboard();
if (ui->stackedWidget->mouse_capture_func) if (ui->stackedWidget->mouse_capture_func)
ui->stackedWidget->mouse_capture_func(this->windowHandle()); ui->stackedWidget->mouse_capture_func(this->windowHandle());
} else { } else {
@@ -1481,13 +1482,15 @@ MainWindow::eventFilter(QObject *receiver, QEvent *event)
plat_pause(curdopause); plat_pause(curdopause);
#ifdef __unix__ #ifdef __unix__
if (!QApplication::platformName().contains("wayland") && (this->windowState() & Qt::WindowActive)) { if (!QApplication::platformName().contains("wayland") && (this->windowState() & Qt::WindowActive)) {
this->grabKeyboard(); if (hook_enabled)
this->grabKeyboard();
} }
#endif #endif
} else if (event->type() == QEvent::WindowActivate) { } else if (event->type() == QEvent::WindowActivate) {
#ifdef __unix__ #ifdef __unix__
if (!QApplication::platformName().contains("wayland")) { if (!QApplication::platformName().contains("wayland")) {
this->grabKeyboard(); if (hook_enabled)
this->grabKeyboard();
} }
#endif #endif
} else if (event->type() == QEvent::WindowDeactivate) { } else if (event->type() == QEvent::WindowDeactivate) {