diff options
| author | chillinbythetree <141879625+chillinbythetree@users.noreply.github.com> | 2024-10-17 01:43:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-17 05:43:47 +0000 |
| commit | a480087618ea8835663ae0eb7da3bd066c1941d0 (patch) | |
| tree | 115d245d1dfaed7e3303be1154eb75983afa3757 /niri-config/src | |
| parent | 84655d3b2627687e14431adb49450cd6af1de40f (diff) | |
| download | niri-a480087618ea8835663ae0eb7da3bd066c1941d0.tar.gz niri-a480087618ea8835663ae0eb7da3bd066c1941d0.tar.bz2 niri-a480087618ea8835663ae0eb7da3bd066c1941d0.zip | |
Add scroll-button property for Touchpad, Mouse, Trackpoint, Trackball (#744)
Diffstat (limited to 'niri-config/src')
| -rw-r--r-- | niri-config/src/lib.rs | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/niri-config/src/lib.rs b/niri-config/src/lib.rs index d94b1363..c4452534 100644 --- a/niri-config/src/lib.rs +++ b/niri-config/src/lib.rs @@ -176,6 +176,8 @@ pub struct Touchpad { pub accel_profile: Option<AccelProfile>, #[knuffel(child, unwrap(argument, str))] pub scroll_method: Option<ScrollMethod>, + #[knuffel(child, unwrap(argument))] + pub scroll_button: Option<u32>, #[knuffel(child, unwrap(argument, str))] pub tap_button_map: Option<TapButtonMap>, #[knuffel(child)] @@ -198,6 +200,8 @@ pub struct Mouse { pub accel_profile: Option<AccelProfile>, #[knuffel(child, unwrap(argument, str))] pub scroll_method: Option<ScrollMethod>, + #[knuffel(child, unwrap(argument))] + pub scroll_button: Option<u32>, #[knuffel(child)] pub left_handed: bool, #[knuffel(child)] @@ -216,6 +220,8 @@ pub struct Trackpoint { pub accel_profile: Option<AccelProfile>, #[knuffel(child, unwrap(argument, str))] pub scroll_method: Option<ScrollMethod>, + #[knuffel(child, unwrap(argument))] + pub scroll_button: Option<u32>, #[knuffel(child)] pub middle_emulation: bool, } @@ -230,6 +236,10 @@ pub struct Trackball { pub accel_speed: f64, #[knuffel(child, unwrap(argument, str))] pub accel_profile: Option<AccelProfile>, + #[knuffel(child, unwrap(argument, str))] + pub scroll_method: Option<ScrollMethod>, + #[knuffel(child, unwrap(argument))] + pub scroll_button: Option<u32>, #[knuffel(child)] pub left_handed: bool, #[knuffel(child)] @@ -2902,6 +2912,7 @@ mod tests { accel-speed 0.2 accel-profile "flat" scroll-method "two-finger" + scroll-button 272 tap-button-map "left-middle-right" disabled-on-external-mouse } @@ -2911,6 +2922,7 @@ mod tests { accel-speed 0.4 accel-profile "flat" scroll-method "no-scroll" + scroll-button 273 middle-emulation } @@ -2920,6 +2932,7 @@ mod tests { accel-speed 0.0 accel-profile "flat" scroll-method "on-button-down" + scroll-button 274 } trackball { @@ -2927,6 +2940,8 @@ mod tests { natural-scroll accel-speed 0.0 accel-profile "flat" + scroll-method "edge" + scroll-button 275 left-handed middle-emulation } @@ -3096,6 +3111,7 @@ mod tests { accel_speed: 0.2, accel_profile: Some(AccelProfile::Flat), scroll_method: Some(ScrollMethod::TwoFinger), + scroll_button: Some(272), tap_button_map: Some(TapButtonMap::LeftMiddleRight), left_handed: false, disabled_on_external_mouse: true, @@ -3107,6 +3123,7 @@ mod tests { accel_speed: 0.4, accel_profile: Some(AccelProfile::Flat), scroll_method: Some(ScrollMethod::NoScroll), + scroll_button: Some(273), left_handed: false, middle_emulation: true, }, @@ -3116,6 +3133,7 @@ mod tests { accel_speed: 0.0, accel_profile: Some(AccelProfile::Flat), scroll_method: Some(ScrollMethod::OnButtonDown), + scroll_button: Some(274), middle_emulation: false, }, trackball: Trackball { @@ -3123,6 +3141,8 @@ mod tests { natural_scroll: true, accel_speed: 0.0, accel_profile: Some(AccelProfile::Flat), + scroll_method: Some(ScrollMethod::Edge), + scroll_button: Some(275), left_handed: true, middle_emulation: true, }, |