diff options
| author | Vaxry <43317083+vaxerski@users.noreply.github.com> | 2022-10-05 21:58:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-05 21:58:40 +0100 |
| commit | 32e8eda40a93f9c4a304faa54a3996087eae86e4 (patch) | |
| tree | 6f12bba8a1a5694e5b7076e497d481ff70ca1134 /src/config/ConfigManager.cpp | |
| parent | e90c5c634753bede3056bb7b3c55d001afb2ac45 (diff) | |
| parent | 477ad2dd82a68047ab90616ca3a620b481fc94f8 (diff) | |
Merge pull request #787 from fufexan/libinput
Add accel profile and scroll method
Diffstat (limited to 'src/config/ConfigManager.cpp')
| -rw-r--r-- | src/config/ConfigManager.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index 07d31e2c..3fea0ea3 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -125,6 +125,7 @@ void CConfigManager::setDefaultVars() { configValues["animations:workspaces"].intValue = 1; configValues["input:sensitivity"].floatValue = 0.f; + configValues["input:accel_profile"].strValue = STRVAL_EMPTY; configValues["input:kb_file"].strValue = STRVAL_EMPTY; configValues["input:kb_layout"].strValue = "us"; configValues["input:kb_variant"].strValue = STRVAL_EMPTY; @@ -138,6 +139,7 @@ void CConfigManager::setDefaultVars() { configValues["input:force_no_accel"].intValue = 0; configValues["input:float_switch_override_focus"].intValue = 1; configValues["input:left_handed"].intValue = 0; + configValues["input:scroll_method"].strValue = STRVAL_EMPTY; configValues["input:touchpad:natural_scroll"].intValue = 0; configValues["input:touchpad:disable_while_typing"].intValue = 1; configValues["input:touchpad:clickfinger_behavior"].intValue = 0; @@ -166,6 +168,7 @@ void CConfigManager::setDeviceDefaultVars(const std::string& dev) { auto& cfgValues = deviceConfigs[dev]; cfgValues["sensitivity"].floatValue = 0.f; + cfgValues["accel_profile"].strValue = STRVAL_EMPTY; cfgValues["kb_file"].strValue = STRVAL_EMPTY; cfgValues["kb_layout"].strValue = "us"; cfgValues["kb_variant"].strValue = STRVAL_EMPTY; @@ -182,6 +185,7 @@ void CConfigManager::setDeviceDefaultVars(const std::string& dev) { cfgValues["tap-to-click"].intValue = 1; cfgValues["drag_lock"].intValue = 0; cfgValues["left_handed"].intValue = 0; + cfgValues["scroll_method"].strValue = STRVAL_EMPTY; } void CConfigManager::setDefaultAnimationVars() { @@ -1126,7 +1130,7 @@ void CConfigManager::loadConfigLoadVars() { // Update the keyboard layout to the cfg'd one if this is not the first launch if (!isFirstLaunch) { g_pInputManager->setKeyboardLayout(); - g_pInputManager->setMouseConfigs(); + g_pInputManager->setPointerConfigs(); } // Calculate the internal vars @@ -1411,7 +1415,7 @@ void CConfigManager::dispatchExecOnce() { // set input, fixes some certain issues g_pInputManager->setKeyboardLayout(); - g_pInputManager->setMouseConfigs(); + g_pInputManager->setPointerConfigs(); // set ws names again for (auto& ws : g_pCompositor->m_vWorkspaces) { |