YaLTeR/niri
1
1
Fork 0
mirror of https://github.com/YaLTeR/niri.git synced 2024-09-17 15:27:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bump libinput to 1.21, add dwtp flag

Browse Source
This commit is contained in:
Ivan Molodetskikh 2024-02-03 08:20:15 +04:00
parent 795da53d53
commit baa6263cbe
5 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -1585,6 +1585,7 @@ dependencies = [
"input-sys", "input-sys",
"io-lifetimes 1.0.11", "io-lifetimes 1.0.11",
"libc", "libc",
"log",
"udev", "udev",
] ]
@ -2057,6 +2058,7 @@ dependencies = [
"directories", "directories",
"futures-util", "futures-util",
"git-version", "git-version",
"input",
"keyframe", "keyframe",
"libc", "libc",
"log", "log",

1
Cargo.toml
View File

@ -50,6 +50,7 @@ clap = { version = "4.4.18", features = ["derive", "string"] }
directories = "5.0.1" directories = "5.0.1"
futures-util = { version = "0.3.30", default-features = false, features = ["std", "io"] } futures-util = { version = "0.3.30", default-features = false, features = ["std", "io"] }
git-version = "0.3.9" git-version = "0.3.9"
input = { version = "0.9.0", features = ["libinput_1_21"] }
keyframe = { version = "1.1.1", default-features = false } keyframe = { version = "1.1.1", default-features = false }
libc = "0.2.153" libc = "0.2.153"
log = { version = "0.4.20", features = ["max_level_trace", "release_max_level_debug"] } log = { version = "0.4.20", features = ["max_level_trace", "release_max_level_debug"] }

4
niri-config/src/lib.rs
View File

@ -124,6 +124,8 @@ pub struct Touchpad {
#[knuffel(child)] #[knuffel(child)]
pub dwt: bool, pub dwt: bool,
#[knuffel(child)] #[knuffel(child)]
pub dwtp: bool,
#[knuffel(child)]
pub natural_scroll: bool, pub natural_scroll: bool,
#[knuffel(child, unwrap(argument), default)] #[knuffel(child, unwrap(argument), default)]
pub accel_speed: f64, pub accel_speed: f64,
@ -765,6 +767,7 @@ mod tests {
touchpad { touchpad {
tap tap
dwt dwt
dwtp
accel-speed 0.2 accel-speed 0.2
accel-profile "flat" accel-profile "flat"
tap-button-map "left-middle-right" tap-button-map "left-middle-right"
@ -867,6 +870,7 @@ mod tests {
touchpad: Touchpad { touchpad: Touchpad {
tap: true, tap: true,
dwt: true, dwt: true,
dwtp: true,
natural_scroll: false, natural_scroll: false,
accel_speed: 0.2, accel_speed: 0.2,
accel_profile: Some(AccelProfile::Flat), accel_profile: Some(AccelProfile::Flat),

1
resources/default-config.kdl
View File

@ -28,6 +28,7 @@ input {
touchpad { touchpad {
tap tap
// dwt // dwt
// dwtp
natural-scroll natural-scroll
// accel-speed 0.2 // accel-speed 0.2
// accel-profile "flat" // accel-profile "flat"

1
src/input.rs
View File

@ -1522,6 +1522,7 @@ pub fn apply_libinput_settings(config: &niri_config::Input, device: &mut input::
let c = &config.touchpad; let c = &config.touchpad;
let _ = device.config_tap_set_enabled(c.tap); let _ = device.config_tap_set_enabled(c.tap);
let _ = device.config_dwt_set_enabled(c.dwt); let _ = device.config_dwt_set_enabled(c.dwt);
let _ = device.config_dwtp_set_enabled(c.dwtp);
let _ = device.config_scroll_set_natural_scroll_enabled(c.natural_scroll); let _ = device.config_scroll_set_natural_scroll_enabled(c.natural_scroll);
let _ = device.config_accel_set_speed(c.accel_speed); let _ = device.config_accel_set_speed(c.accel_speed);