diff options
| author | vaxerski <[email protected]> | 2023-02-09 15:29:02 +0000 |
|---|---|---|
| committer | vaxerski <[email protected]> | 2023-02-09 15:29:02 +0000 |
| commit | 68f56130baeff33707fc44d4fc21c5f334ef7e41 (patch) | |
| tree | 9c66e6398bdb040edbed0e2b9105484db103da9e | |
| parent | 4ea4efb871997a245539cae9d966ec8f07d3e907 (diff) | |
| download | Hyprland-68f56130baeff33707fc44d4fc21c5f334ef7e41.tar.gz Hyprland-68f56130baeff33707fc44d4fc21c5f334ef7e41.zip | |
add misc:mouse_move_focuses_monitor
| -rw-r--r-- | src/config/ConfigManager.cpp | 29 | ||||
| -rw-r--r-- | src/managers/input/InputManager.cpp | 3 |
2 files changed, 17 insertions, 15 deletions
diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index 614670e1..77c91d29 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -49,19 +49,20 @@ void CConfigManager::setDefaultVars() { configValues["general:layout"].strValue = "dwindle"; - configValues["misc:disable_hyprland_logo"].intValue = 0; - configValues["misc:disable_splash_rendering"].intValue = 0; - configValues["misc:no_vfr"].intValue = 1; - configValues["misc:mouse_move_enables_dpms"].intValue = 0; - configValues["misc:always_follow_on_dnd"].intValue = 1; - configValues["misc:layers_hog_keyboard_focus"].intValue = 1; - configValues["misc:animate_manual_resizes"].intValue = 0; - configValues["misc:disable_autoreload"].intValue = 0; - configValues["misc:enable_swallow"].intValue = 0; - configValues["misc:swallow_regex"].strValue = STRVAL_EMPTY; - configValues["misc:focus_on_activate"].intValue = 0; - configValues["misc:no_direct_scanout"].intValue = 0; - configValues["misc:hide_cursor_on_touch"].intValue = 1; + configValues["misc:disable_hyprland_logo"].intValue = 0; + configValues["misc:disable_splash_rendering"].intValue = 0; + configValues["misc:no_vfr"].intValue = 1; + configValues["misc:mouse_move_enables_dpms"].intValue = 0; + configValues["misc:always_follow_on_dnd"].intValue = 1; + configValues["misc:layers_hog_keyboard_focus"].intValue = 1; + configValues["misc:animate_manual_resizes"].intValue = 0; + configValues["misc:disable_autoreload"].intValue = 0; + configValues["misc:enable_swallow"].intValue = 0; + configValues["misc:swallow_regex"].strValue = STRVAL_EMPTY; + configValues["misc:focus_on_activate"].intValue = 0; + configValues["misc:no_direct_scanout"].intValue = 0; + configValues["misc:hide_cursor_on_touch"].intValue = 1; + configValues["misc:mouse_move_focuses_monitor"].intValue = 1; configValues["debug:int"].intValue = 0; configValues["debug:log_damage"].intValue = 0; @@ -1340,7 +1341,7 @@ void CConfigManager::tick() { } else { CONFIGPATH = g_pCompositor->explicitConfigPath; } - + if (!std::filesystem::exists(CONFIGPATH)) { Debug::log(ERR, "Config doesn't exist??"); return; diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp index caaece20..5a08c0cd 100644 --- a/src/managers/input/InputManager.cpp +++ b/src/managers/input/InputManager.cpp @@ -50,6 +50,7 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) { static auto* const PFOLLOWONDND = &g_pConfigManager->getConfigValuePtr("misc:always_follow_on_dnd")->intValue; static auto* const PHOGFOCUS = &g_pConfigManager->getConfigValuePtr("misc:layers_hog_keyboard_focus")->intValue; static auto* const PFLOATBEHAVIOR = &g_pConfigManager->getConfigValuePtr("input:float_switch_override_focus")->intValue; + static auto* const PMOUSEFOCUSMON = &g_pConfigManager->getConfigValuePtr("misc:mouse_move_focuses_monitor")->intValue; m_pFoundSurfaceToFocus = nullptr; m_pFoundLSToFocus = nullptr; @@ -140,7 +141,7 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) { g_pLayoutManager->getCurrentLayout()->onMouseMove(getMouseCoordsInternal()); - if (PMONITOR && PMONITOR != g_pCompositor->m_pLastMonitor) { + if (PMONITOR && PMONITOR != g_pCompositor->m_pLastMonitor && *PMOUSEFOCUSMON) { g_pCompositor->setActiveMonitor(PMONITOR); // set active workspace and deactivate all other in wlr |