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

input: Don't ignore keyboard init failures

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-09-23 18:22:37 +02:00
parent 88c502527e
commit 1dbd53b8b3
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/input/mod.rs
View file

@ -13,7 +13,7 @@ use smithay::{
}, },
desktop::{layer_map_for_output, Kind, WindowSurfaceType}, desktop::{layer_map_for_output, Kind, WindowSurfaceType},
input::{ input::{
keyboard::{keysyms, FilterResult, KeysymHandle}, keyboard::{keysyms, FilterResult, KeysymHandle, XkbConfig},
pointer::{AxisFrame, ButtonEvent, CursorImageStatus, MotionEvent}, pointer::{AxisFrame, ButtonEvent, CursorImageStatus, MotionEvent},
Seat, SeatState, Seat, SeatState,
}, },
@ -124,8 +124,15 @@ pub fn add_seat(
// So instead of doing the right thing (and initialize these capabilities as matching // So instead of doing the right thing (and initialize these capabilities as matching
// devices appear), we have to surrender to reality and just always expose a keyboard and pointer. // devices appear), we have to surrender to reality and just always expose a keyboard and pointer.
let conf = config.xkb_config(); let conf = config.xkb_config();
let _ = seat.add_keyboard((&conf).into(), 200, 25); if let Err(err) = seat.add_keyboard((&conf).into(), 200, 25) {
let _ = seat.add_pointer(); slog_scope::warn!(
"Failed to load provided xkb config: {}. Trying default...",
err
);
seat.add_keyboard(XkbConfig::default(), 200, 25)
.expect("Failed to load xkb configuration files");
}
seat.add_pointer();
seat seat
} }