Unify keyboard subscriptions into listen

examples/layout/src/main.rs

@@ -58,12 +58,20 @@ impl Layout {
     fn subscription(&self) -> Subscription<Message> {
         use keyboard::key;
 
-        keyboard::on_key_release(|key, _physical_key, _modifiers| match key {
-            keyboard::Key::Named(key::Named::ArrowLeft) => {
-                Some(Message::Previous)
+        keyboard::listen().filter_map(|event| {
+            let keyboard::Event::KeyPressed { modified_key, .. } = event else {
+                return None;
+            };
+
+            match modified_key {
+                keyboard::Key::Named(key::Named::ArrowLeft) => {
+                    Some(Message::Previous)
+                }
+                keyboard::Key::Named(key::Named::ArrowRight) => {
+                    Some(Message::Next)
+                }
+                _ => None,
             }
-            keyboard::Key::Named(key::Named::ArrowRight) => Some(Message::Next),
-            _ => None,
         })
     }
 

examples/pane_grid/src/main.rs

@@ -117,7 +117,12 @@ impl Example {
     }
 
     fn subscription(&self) -> Subscription<Message> {
-        keyboard::on_key_press(|key, _physical_key, modifiers| {
+        keyboard::listen().filter_map(|event| {
+            let keyboard::Event::KeyPressed { key, modifiers, .. } = event
+            else {
+                return None;
+            };
+
             if !modifiers.command() {
                 return None;
             }

examples/screenshot/src/main.rs

@@ -227,8 +227,12 @@ impl Example {
     fn subscription(&self) -> Subscription<Message> {
         use keyboard::key;
 
-        keyboard::on_key_press(|key, _physical_key, _modifiers| {
-            if let keyboard::Key::Named(key::Named::F5) = key {
+        keyboard::listen().filter_map(|event| {
+            if let keyboard::Event::KeyPressed {
+                modified_key: keyboard::Key::Named(key::Named::F5),
+                ..
+            } = event
+            {
                 Some(Message::Screenshot)
             } else {
                 None

examples/stopwatch/src/main.rs

@@ -65,14 +65,14 @@ impl Stopwatch {
             }
         };
 
-        fn handle_hotkey(
-            key: keyboard::Key,
-            _physical_key: keyboard::key::Physical,
-            _modifiers: keyboard::Modifiers,
-        ) -> Option<Message> {
+        fn handle_hotkey(event: keyboard::Event) -> Option<Message> {
             use keyboard::key;
 
-            match key.as_ref() {
+            let keyboard::Event::KeyPressed { modified_key, .. } = event else {
+                return None;
+            };
+
+            match modified_key.as_ref() {
                 keyboard::Key::Named(key::Named::Space) => {
                     Some(Message::Toggle)
                 }
@@ -81,7 +81,10 @@ impl Stopwatch {
             }
         }
 
-        Subscription::batch(vec![tick, keyboard::on_key_press(handle_hotkey)])
+        Subscription::batch(vec![
+            tick,
+            keyboard::listen().filter_map(handle_hotkey),
+        ])
     }
 
     fn view(&self) -> Element<'_, Message> {

examples/styling/src/main.rs

@@ -190,18 +190,25 @@ impl Styling {
     }
 
     fn subscription(&self) -> Subscription<Message> {
-        keyboard::on_key_press(|key, _physical_key, _modifiers| match key {
-            keyboard::Key::Named(
-                keyboard::key::Named::ArrowUp | keyboard::key::Named::ArrowLeft,
-            ) => Some(Message::PreviousTheme),
-            keyboard::Key::Named(
+        keyboard::listen().filter_map(|event| {
+            let keyboard::Event::KeyPressed {
+                modified_key: keyboard::Key::Named(modified_key),
+                ..
+            } = event
+            else {
+                return None;
+            };
+
+            match modified_key {
+                keyboard::key::Named::ArrowUp
+                | keyboard::key::Named::ArrowLeft => {
+                    Some(Message::PreviousTheme)
+                }
                 keyboard::key::Named::ArrowDown
-                | keyboard::key::Named::ArrowRight,
-            ) => Some(Message::NextTheme),
-            keyboard::Key::Named(keyboard::key::Named::Space) => {
-                Some(Message::ClearTheme)
+                | keyboard::key::Named::ArrowRight => Some(Message::NextTheme),
+                keyboard::key::Named::Space => Some(Message::ClearTheme),
+                _ => None,
             }
-            _ => None,
         })
     }
 

examples/todos/src/main.rs

@@ -254,12 +254,12 @@ impl Todos {
     fn subscription(&self) -> Subscription<Message> {
         use keyboard::key;
 
-        keyboard::on_key_press(|key, _physical_key, modifiers| {
-            let keyboard::Key::Named(key) = key else {
-                return None;
-            };
-
-            match (key, modifiers) {
+        keyboard::listen().filter_map(|event| match event {
+            keyboard::Event::KeyPressed {
+                key: keyboard::Key::Named(key),
+                modifiers,
+                ..
+            } => match (key, modifiers) {
                 (key::Named::Tab, _) => Some(Message::TabPressed {
                     shift: modifiers.shift(),
                 }),
@@ -270,7 +270,8 @@ impl Todos {
                     Some(Message::ToggleFullscreen(window::Mode::Windowed))
                 }
                 _ => None,
-            }
+            },
+            _ => None,
         })
     }
 }