diff --git a/pcsx2-qt/MainWindow.cpp b/pcsx2-qt/MainWindow.cpp index f451a574c6..2441db5468 100644 --- a/pcsx2-qt/MainWindow.cpp +++ b/pcsx2-qt/MainWindow.cpp @@ -107,6 +107,7 @@ MainWindow::MainWindow() #if !defined(_WIN32) && !defined(__APPLE__) s_use_central_widget = DisplayContainer::isRunningOnWayland(); #endif + createCheckMousePositionTimer(); } MainWindow::~MainWindow() @@ -1071,6 +1072,21 @@ bool MainWindow::shouldHideMainWindow() const QtHost::InNoGUIMode(); } +bool MainWindow::shouldMouseGrab() const +{ + if (!s_vm_valid || s_vm_paused) + return false; + + if (!Host::GetBoolSettingValue("EmuCore", "EnableMouseGrab", false)) + return false; + + bool windowsHidden = (!m_debugger_window || m_debugger_window->isHidden()) && + (!m_controller_settings_window || m_controller_settings_window->isHidden()) && + (!m_settings_window || m_settings_window->isHidden()); + + return windowsHidden && (isActiveWindow() || isRenderingFullscreen()); +} + bool MainWindow::shouldAbortForMemcardBusy(const VMLock& lock) { if (MemcardBusy::IsBusy() && !GSDumpReplayer::IsReplayingDump()) @@ -2541,6 +2557,35 @@ QWidget* MainWindow::getDisplayContainer() const return (m_display_container ? static_cast(m_display_container) : static_cast(m_display_widget)); } +void MainWindow::createCheckMousePositionTimer() +{ + m_mouse_check_timer = new QTimer(this); + connect(m_mouse_check_timer, &QTimer::timeout, this, &MainWindow::checkMousePosition); + m_mouse_check_timer->start(16); +} + +void MainWindow::checkMousePosition() +{ + if (!shouldMouseGrab()) + return; + + QPoint globalCursorPos = QCursor::pos(); + const QRect& windowBounds = isRenderingFullscreen() ? screen()->geometry() : geometry(); + + if (windowBounds.contains(globalCursorPos)) + return; + + QCursor::setPos( + std::clamp(globalCursorPos.x(), windowBounds.left(), windowBounds.right()), + std::clamp(globalCursorPos.y(), windowBounds.top(), windowBounds.bottom())); +} + +void MainWindow::mouseMoveEvent(QMouseEvent* event) +{ + QWidget::mouseMoveEvent(event); +} + + void MainWindow::saveDisplayWindowGeometryToConfig() { QWidget* container = getDisplayContainer(); diff --git a/pcsx2-qt/MainWindow.h b/pcsx2-qt/MainWindow.h index 0509b58be6..8f73bb24b8 100644 --- a/pcsx2-qt/MainWindow.h +++ b/pcsx2-qt/MainWindow.h @@ -128,7 +128,7 @@ private Q_SLOTS: void mouseModeRequested(bool relative_mode, bool hide_cursor); void releaseRenderWindow(); void focusDisplayWidget(); - + void createCheckMousePositionTimer(); void onGameListRefreshComplete(); void onGameListRefreshProgress(const QString& status, int current, int total); void onGameListSelectionChanged(); @@ -182,13 +182,14 @@ private Q_SLOTS: void onInputRecPlayActionTriggered(); void onInputRecStopActionTriggered(); void onInputRecOpenViewer(); - void onVMStarting(); void onVMStarted(); void onVMPaused(); void onVMResumed(); void onVMStopped(); + void checkMousePosition(); + void onGameChanged(const QString& title, const QString& elf_override, const QString& disc_path, const QString& serial, quint32 disc_crc, quint32 crc); @@ -206,6 +207,7 @@ protected: void dropEvent(QDropEvent* event) override; void moveEvent(QMoveEvent* event) override; void resizeEvent(QResizeEvent* event) override; + void mouseMoveEvent(QMouseEvent* event) override; #ifdef _WIN32 bool nativeEvent(const QByteArray& eventType, void* message, qintptr* result) override; @@ -240,6 +242,7 @@ private: bool isRenderingToMain() const; bool shouldHideMouseCursor() const; bool shouldHideMainWindow() const; + bool shouldMouseGrab() const; void switchToGameListView(); void switchToEmulationView(); @@ -312,6 +315,8 @@ private: QString m_last_fps_status; + QTimer* m_mouse_check_timer = nullptr; + #ifdef _WIN32 void* m_device_notification_handle = nullptr; #endif diff --git a/pcsx2-qt/Settings/InterfaceSettingsWidget.cpp b/pcsx2-qt/Settings/InterfaceSettingsWidget.cpp index 9d5e57e6fa..7e1b0ee966 100644 --- a/pcsx2-qt/Settings/InterfaceSettingsWidget.cpp +++ b/pcsx2-qt/Settings/InterfaceSettingsWidget.cpp @@ -80,6 +80,8 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsWindow* dialog, QWidget SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.pauseOnControllerDisconnection, "UI", "PauseOnControllerDisconnection", false); SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.discordPresence, "EmuCore", "EnableDiscordPresence", false); + SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.mouseGrab, "EmuCore", "EnableMouseGrab", false); + SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.startFullscreen, "UI", "StartFullscreen", false); SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_ui.doubleClickTogglesFullscreen, "UI", "DoubleClickTogglesFullscreen", true); @@ -161,6 +163,9 @@ InterfaceSettingsWidget::InterfaceSettingsWidget(SettingsWindow* dialog, QWidget dialog->registerWidgetHelp( m_ui.discordPresence, tr("Enable Discord Presence"), tr("Unchecked"), tr("Shows the game you are currently playing as part of your profile in Discord.")); + dialog->registerWidgetHelp( + m_ui.mouseGrab, tr("Enable Mouse Grab"), tr("Unchecked"), + tr("Locks the mouse cursor to the windows when PCSX2 is in focus.")); dialog->registerWidgetHelp( m_ui.doubleClickTogglesFullscreen, tr("Double-Click Toggles Fullscreen"), tr("Checked"), tr("Allows switching in and out of fullscreen mode by double-clicking the game window.")); diff --git a/pcsx2-qt/Settings/InterfaceSettingsWidget.ui b/pcsx2-qt/Settings/InterfaceSettingsWidget.ui index f42b72f094..6fc709aa20 100644 --- a/pcsx2-qt/Settings/InterfaceSettingsWidget.ui +++ b/pcsx2-qt/Settings/InterfaceSettingsWidget.ui @@ -50,6 +50,13 @@ + + + + Enable Mouse Grab + + +