leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Update smithay

Browse source
This commit is contained in:
Ian Douglas Scott 2026-04-24 14:14:59 -07:00 • committed by Ian Douglas Scott
parent 472ffa5f30
commit 826ad9a91a
6 changed files with 51 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/backend/kms/mod.rs
View file

@ -200,7 +200,7 @@ fn init_libinput(
.input_devices
.insert(device.name().into(), device.clone());
} else if let InputEvent::DeviceRemoved { device } = &event {
state.backend.kms().input_devices.remove(device.name());
state.backend.kms().input_devices.remove(&*device.name());
}
state.process_input_event(event);

12
src/config/input_config.rs
View file

@ -1,5 +1,5 @@
use smithay::reexports::input::{
Device as InputDevice, DeviceConfigError, ScrollMethod, SendEventsMode,
Device as InputDevice, DeviceConfigError, DragLockState, ScrollMethod, SendEventsMode,
};
use tracing::warn;
@ -210,7 +210,15 @@ pub fn update_device(
if let Err(err) = device.config_tap_set_drag_enabled(tap.drag) {
config_set_error(device, "tap-drag", tap.drag, err, is_default);
}
if let Err(err) = device.config_tap_set_drag_lock_enabled(tap.drag_lock) {
// TODO: Use `DragLockState::EnabledStick` by default on libinput 1.27.0+, but
// make it configurable:
// https://lore.freedesktop.org/wayland-devel/20241119043937.GA2118681@quokka
let drag_lock_state = if tap.drag_lock {
DragLockState::EnabledTimeout
} else {
DragLockState::Disabled
};
if let Err(err) = device.config_tap_set_drag_lock_enabled(drag_lock_state) {
config_set_error(device, "tap-drag-lock", tap.drag_lock, err, is_default);
}
}

2
src/config/mod.rs
View file

@ -646,7 +646,7 @@ impl Config {
&self.cosmic_conf.input_default
};
let mut device_config = self.cosmic_conf.input_devices.get(device.name()).cloned();
let mut device_config = self.cosmic_conf.input_devices.get(&*device.name()).cloned();
if is_touchpad && self.cosmic_conf.input_touchpad_override == TouchpadOverride::ForceDisable
{
device_config = Some({