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

Update leds when devices are added

Browse source 
This fixes #1104

LEDs on keyboard will now update to match the
compositor state when they're plugged in.
This commit is contained in:
Paul Daniel Faria 2025-01-01 08:48:32 -08:00 • committed by Victoria Brekenfeld
parent 68b6156aa8
commit e5263bbad8
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/input/mod.rs
View file

@ -171,7 +171,8 @@ impl State {
InputEvent::DeviceAdded { device } => { InputEvent::DeviceAdded { device } => {
let shell = self.common.shell.read().unwrap(); let shell = self.common.shell.read().unwrap();
let seat = shell.seats.last_active(); let seat = shell.seats.last_active();
seat.devices().add_device(&device); let led_state = seat.get_keyboard().unwrap().led_state();
seat.devices().add_device(&device, led_state);
if device.has_capability(DeviceCapability::TabletTool) { if device.has_capability(DeviceCapability::TabletTool) {
seat.tablet_seat().add_tablet::<Self>( seat.tablet_seat().add_tablet::<Self>(
&self.common.display_handle, &self.common.display_handle,

10
src/shell/seats.rs
View file

@ -83,7 +83,11 @@ impl Seats {
} }
impl Devices { impl Devices {
pub fn add_device<D: Device + 'static>(&self, device: &D) -> Vec<DeviceCapability> { pub fn add_device<D: Device + 'static>(
&self,
device: &D,
led_state: LedState,
) -> Vec<DeviceCapability> {
let id = device.id(); let id = device.id();
let mut map = self.capabilities.borrow_mut(); let mut map = self.capabilities.borrow_mut();
let caps = [ let caps = [
@ -104,7 +108,9 @@ impl Devices {
if device.has_capability(DeviceCapability::Keyboard) { if device.has_capability(DeviceCapability::Keyboard) {
if let Some(device) = <dyn Any>::downcast_ref::<InputDevice>(device) { if let Some(device) = <dyn Any>::downcast_ref::<InputDevice>(device) {
self.keyboards.borrow_mut().push(device.clone()); let mut device = device.clone();
device.led_update(led_state.into());
self.keyboards.borrow_mut().push(device);
} }
} }