aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorvaxerski <[email protected]>2022-11-21 23:26:18 +0000
committervaxerski <[email protected]>2022-11-21 23:26:18 +0000
commiteb86e7967f7d218a7c9412e484473fd578dbf64c (patch)
tree037745127a714d15aa0e3703002afea9475c396b
parent88874fcfe2f9e57171eb0641b5336ad09116ef55 (diff)
downloadHyprland-eb86e7967f7d218a7c9412e484473fd578dbf64c.tar.gz
Hyprland-eb86e7967f7d218a7c9412e484473fd578dbf64c.zip
add scroll_button libinput opt
-rw-r--r--src/config/ConfigManager.cpp2
-rw-r--r--src/managers/input/InputManager.cpp6
2 files changed, 7 insertions, 1 deletions
diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp
index 83ecd3f4..ec87ef20 100644
--- a/src/config/ConfigManager.cpp
+++ b/src/config/ConfigManager.cpp
@@ -142,6 +142,7 @@ void CConfigManager::setDefaultVars() {
configValues["input:float_switch_override_focus"].intValue = 1;
configValues["input:left_handed"].intValue = 0;
configValues["input:scroll_method"].strValue = STRVAL_EMPTY;
+ configValues["input:scroll_button"].intValue = 0;
configValues["input:touchpad:natural_scroll"].intValue = 0;
configValues["input:touchpad:disable_while_typing"].intValue = 1;
configValues["input:touchpad:clickfinger_behavior"].intValue = 0;
@@ -193,6 +194,7 @@ void CConfigManager::setDeviceDefaultVars(const std::string& dev) {
cfgValues["drag_lock"].intValue = 0;
cfgValues["left_handed"].intValue = 0;
cfgValues["scroll_method"].strValue = STRVAL_EMPTY;
+ cfgValues["scroll_button"].intValue = 0;
cfgValues["touch_transform"].intValue = 0;
cfgValues["touch_output"].strValue = STRVAL_EMPTY;
cfgValues["enabled"].intValue = 1; // only for mice / touchpads
diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp
index 24bab360..17a67020 100644
--- a/src/managers/input/InputManager.cpp
+++ b/src/managers/input/InputManager.cpp
@@ -779,7 +779,11 @@ void CInputManager::setPointerConfigs() {
libinput_device_config_accel_set_profile(LIBINPUTDEV, LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT);
} else {
Debug::log(WARN, "Unknown acceleration profile, falling back to default");
- }
+ }
+
+ const auto SCROLLBUTTON = HASCONFIG ? g_pConfigManager->getDeviceInt(devname, "scroll_button") : g_pConfigManager->getInt("input:scroll_button");
+
+ libinput_device_config_scroll_set_button(LIBINPUTDEV, SCROLLBUTTON == 0 ? libinput_device_config_scroll_get_default_button(LIBINPUTDEV) : SCROLLBUTTON);
Debug::log(LOG, "Applied config to mouse %s, sens %.2f", m.name.c_str(), LIBINPUTSENS);
}