From ee0e2c7f1b4edae42d2f1b05466adbdffe156e61 Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Thu, 13 Mar 2025 21:37:52 +0300
Subject: Try default when configured xkb keymap fails to compile

Fixes panic at startup.
---
 src/niri.rs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/niri.rs b/src/niri.rs
index 308a21ac..b7829d0e 100644
--- a/src/niri.rs
+++ b/src/niri.rs
@@ -1965,12 +1965,23 @@ impl Niri {
         let single_pixel_buffer_state = SinglePixelBufferState::new::<State>(&display_handle);
 
         let mut seat: Seat<State> = seat_state.new_wl_seat(&display_handle, backend.seat_name());
-        seat.add_keyboard(
+        if let Err(err) = seat.add_keyboard(
             config_.input.keyboard.xkb.to_xkb_config(),
             config_.input.keyboard.repeat_delay.into(),
             config_.input.keyboard.repeat_rate.into(),
-        )
-        .unwrap();
+        ) {
+            if let smithay::input::keyboard::Error::BadKeymap = err {
+                warn!("error loading the configured xkb keymap, trying default");
+            } else {
+                warn!("error adding keyboard: {err:?}");
+            }
+            seat.add_keyboard(
+                Default::default(),
+                config_.input.keyboard.repeat_delay.into(),
+                config_.input.keyboard.repeat_rate.into(),
+            )
+            .unwrap();
+        }
         seat.add_pointer();
 
         let cursor_shape_manager_state = CursorShapeManagerState::new::<State>(&display_handle);
-- 
cgit