Split off KeyboardHandle::filter callback to separate method

Cargo.toml

@@ -116,4 +116,4 @@ inherits = "release"
 lto = "fat"
 
 [patch."https://github.com/Smithay/smithay.git"]
-smithay = { git = "https://github.com/smithay//smithay", rev = "f364c73" }
+smithay = { git = "https://github.com/smithay//smithay", rev = "08d31e1" }

src/backend/kms/mod.rs

@@ -165,7 +165,7 @@ fn init_libinput(
             state.backend.kms().input_devices.remove(device.name());
         }
 
-        state.process_input_event(event, true);
+        state.process_input_event(event);
 
         for output in state.common.shell.read().unwrap().outputs() {
             state.backend.kms().schedule_render(output);

src/backend/winit.rs

@@ -320,7 +320,7 @@ impl State {
                 render_ping.ping();
             }
             WinitEvent::Redraw => render_ping.ping(),
-            WinitEvent::Input(event) => self.process_input_event(event, false),
+            WinitEvent::Input(event) => self.process_input_event(event),
             WinitEvent::CloseRequested => {
                 self.common.should_stop = true;
             }

src/backend/x11.rs

@@ -515,7 +515,7 @@ impl State {
             _ => {}
         };
 
-        self.process_input_event(event, false);
+        self.process_input_event(event);
         // TODO actually figure out the output
         for output in self.common.shell.read().unwrap().outputs() {
             self.backend.x11().schedule_render(output);

src/config/mod.rs

@@ -264,7 +264,9 @@ impl Config {
                                     .shell
                                     .write()
                                     .unwrap()
-                                    .update_tiling_exceptions(state.common.config.tiling_exceptions.iter());
+                                    .update_tiling_exceptions(
+                                        state.common.config.tiling_exceptions.iter(),
+                                    );
                             }
                             _ => (),
                         }

src/shell/layout/mod.rs

@@ -63,7 +63,7 @@ pub struct TilingExceptions {
 impl TilingExceptions {
     pub fn new<'a, I>(exceptions_config: I) -> Self
     where
-      I: Iterator<Item=&'a ApplicationException>
+        I: Iterator<Item = &'a ApplicationException>,
     {
         let mut app_ids = Vec::new();
         let mut titles = Vec::new();

src/shell/layout/tiling/grabs/swap.rs

@@ -1,6 +1,6 @@
 use cosmic_settings_config::shortcuts;
 use smithay::{
-    backend::input::KeyState,
+    backend::input::{KeyState, Keycode},
     input::{
         keyboard::{
             GrabStartData as KeyboardGrabStartData, KeyboardGrab, KeyboardInnerHandle,
@@ -10,7 +10,6 @@ use smithay::{
     },
     utils::Serial,
 };
-use xkbcommon::xkb::Keysym;
 
 use crate::{
     config::key_bindings::cosmic_modifiers_from_smithay,
@@ -34,7 +33,7 @@ impl KeyboardGrab<State> for SwapWindowGrab {
         &mut self,
         data: &mut State,
         handle: &mut KeyboardInnerHandle<'_, State>,
-        keycode: u32,
+        keycode: Keycode,
         state: KeyState,
         modifiers: Option<ModifiersState>,
         serial: Serial,
@@ -81,7 +80,7 @@ impl KeyboardGrab<State> for SwapWindowGrab {
                 modifiers: modifiers
                     .map(cosmic_modifiers_from_smithay)
                     .unwrap_or_default(),
-                key: Some(Keysym::new(keycode)),
+                key: Some(handle.keysym_handle(keycode).modified_sym()),
                 description: None,
             },
             None,