From 07ba4b2f70e62b1887c1b738c5a67524e1fd208b Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Wed, 14 Jun 2023 09:32:34 +0200
Subject: [PATCH 01/17] update all examples as I could

---
 crates/bevy_input/src/common_conditions.rs    |  4 +-
 examples/2d/bloom_2d.rs                       | 34 +++++++--------
 examples/2d/rotation.rs                       |  8 ++--
 examples/3d/3d_gizmos.rs                      | 10 ++---
 examples/3d/anti_aliasing.rs                  | 36 ++++++++--------
 examples/3d/atmospheric_fog.rs                |  6 +--
 examples/3d/blend_modes.rs                    | 16 ++++----
 examples/3d/bloom_3d.rs                       | 34 +++++++--------
 examples/3d/fog.rs                            | 41 ++++++++++---------
 examples/3d/lighting.rs                       | 10 ++---
 examples/3d/shadow_biases.rs                  |  4 +-
 examples/3d/shadow_caster_receiver.rs         | 10 ++---
 examples/3d/skybox.rs                         |  7 ++--
 examples/3d/spotlight.rs                      | 14 +++----
 examples/3d/tonemapping.rs                    | 26 ++++++------
 examples/animation/animated_fox.rs            | 14 +++----
 examples/audio/audio_control.rs               |  4 +-
 examples/ecs/generic_system.rs                |  4 +-
 examples/ecs/run_conditions.rs                |  6 +--
 examples/ecs/state.rs                         | 10 ++---
 examples/games/alien_cake_addict.rs           | 14 +++----
 examples/games/breakout.rs                    |  6 +--
 examples/input/keyboard_modifiers.rs          |  8 ++--
 examples/input/mouse_grab.rs                  |  4 +-
 examples/input/text_input.rs                  |  6 +--
 examples/shader/shader_prepass.rs             |  4 +-
 examples/stress_tests/many_foxes.rs           | 22 +++++-----
 examples/stress_tests/many_gizmos.rs          |  8 ++--
 .../tools/scene_viewer/scene_viewer_plugin.rs | 18 ++++----
 examples/ui/overflow_debug.rs                 | 19 +++------
 examples/ui/ui_scaling.rs                     |  6 +--
 examples/ui/window_fallthrough.rs             |  4 +-
 examples/window/clear_color.rs                |  4 +-
 examples/window/low_power.rs                  |  7 +---
 examples/window/scale_factor_override.rs      | 10 ++---
 examples/window/screenshot.rs                 |  4 +-
 examples/window/window_settings.rs            | 16 ++++----
 37 files changed, 225 insertions(+), 233 deletions(-)

diff --git a/crates/bevy_input/src/common_conditions.rs b/crates/bevy_input/src/common_conditions.rs
index 8b85b8a858f44..e7f571dc003d6 100644
--- a/crates/bevy_input/src/common_conditions.rs
+++ b/crates/bevy_input/src/common_conditions.rs
@@ -83,9 +83,9 @@ where
 /// ```
 pub fn input_just_pressed<T>(input: T) -> impl FnMut(Res<Input<T>>) -> bool + Clone
 where
-    T: Copy + Eq + Hash + Send + Sync + 'static,
+    T: Clone + Eq + Hash + Send + Sync + 'static,
 {
-    move |inputs: Res<Input<T>>| inputs.just_pressed(input)
+    move |inputs: Res<Input<T>>| inputs.just_pressed(input.clone())
 }
 
 /// Run condition that is active if [`Input::just_released`] is true for the given input.
diff --git a/examples/2d/bloom_2d.rs b/examples/2d/bloom_2d.rs
index e386611ff226e..050539ee6a801 100644
--- a/examples/2d/bloom_2d.rs
+++ b/examples/2d/bloom_2d.rs
@@ -92,7 +92,7 @@ fn update_bloom_settings(
     mut camera: Query<(Entity, Option<&mut BloomSettings>), With<Camera>>,
     mut text: Query<&mut Text>,
     mut commands: Commands,
-    keycode: Res<Input<KeyCode>>,
+    key: Res<Input<Key>>,
     time: Res<Time>,
 ) {
     let bloom_settings = camera.single_mut();
@@ -131,65 +131,65 @@ fn update_bloom_settings(
                 bloom_settings.prefilter_settings.threshold_softness
             ));
 
-            if keycode.just_pressed(KeyCode::Space) {
+            if key.just_pressed(Key::Space) {
                 commands.entity(entity).remove::<BloomSettings>();
             }
 
             let dt = time.delta_seconds();
 
-            if keycode.pressed(KeyCode::KeyA) {
+            if key.pressed(Key::Character("a".into())) {
                 bloom_settings.intensity -= dt / 10.0;
             }
-            if keycode.pressed(KeyCode::KeyQ) {
+            if key.pressed(Key::Character("q".into())) {
                 bloom_settings.intensity += dt / 10.0;
             }
             bloom_settings.intensity = bloom_settings.intensity.clamp(0.0, 1.0);
 
-            if keycode.pressed(KeyCode::KeyS) {
+            if key.pressed(Key::Character("s".into())) {
                 bloom_settings.low_frequency_boost -= dt / 10.0;
             }
-            if keycode.pressed(KeyCode::KeyW) {
+            if key.pressed(Key::Character("w".into())) {
                 bloom_settings.low_frequency_boost += dt / 10.0;
             }
             bloom_settings.low_frequency_boost = bloom_settings.low_frequency_boost.clamp(0.0, 1.0);
 
-            if keycode.pressed(KeyCode::KeyD) {
+            if key.pressed(Key::Character("d".into())) {
                 bloom_settings.low_frequency_boost_curvature -= dt / 10.0;
             }
-            if keycode.pressed(KeyCode::KeyE) {
+            if key.pressed(Key::Character("e".into())) {
                 bloom_settings.low_frequency_boost_curvature += dt / 10.0;
             }
             bloom_settings.low_frequency_boost_curvature =
                 bloom_settings.low_frequency_boost_curvature.clamp(0.0, 1.0);
 
-            if keycode.pressed(KeyCode::KeyF) {
+            if key.pressed(Key::Character("f".into())) {
                 bloom_settings.high_pass_frequency -= dt / 10.0;
             }
-            if keycode.pressed(KeyCode::KeyR) {
+            if key.pressed(Key::Character("r".into())) {
                 bloom_settings.high_pass_frequency += dt / 10.0;
             }
             bloom_settings.high_pass_frequency = bloom_settings.high_pass_frequency.clamp(0.0, 1.0);
 
-            if keycode.pressed(KeyCode::KeyG) {
+            if key.pressed(Key::Character("g".into())) {
                 bloom_settings.composite_mode = BloomCompositeMode::Additive;
             }
-            if keycode.pressed(KeyCode::KeyT) {
+            if key.pressed(Key::Character("t".into())) {
                 bloom_settings.composite_mode = BloomCompositeMode::EnergyConserving;
             }
 
-            if keycode.pressed(KeyCode::KeyH) {
+            if key.pressed(Key::Character("h".into())) {
                 bloom_settings.prefilter_settings.threshold -= dt;
             }
-            if keycode.pressed(KeyCode::KeyY) {
+            if key.pressed(Key::Character("y".into())) {
                 bloom_settings.prefilter_settings.threshold += dt;
             }
             bloom_settings.prefilter_settings.threshold =
                 bloom_settings.prefilter_settings.threshold.max(0.0);
 
-            if keycode.pressed(KeyCode::KeyJ) {
+            if key.pressed(Key::Character("j".into())) {
                 bloom_settings.prefilter_settings.threshold_softness -= dt / 10.0;
             }
-            if keycode.pressed(KeyCode::KeyU) {
+            if key.pressed(Key::Character("u".into())) {
                 bloom_settings.prefilter_settings.threshold_softness += dt / 10.0;
             }
             bloom_settings.prefilter_settings.threshold_softness = bloom_settings
@@ -201,7 +201,7 @@ fn update_bloom_settings(
         (entity, None) => {
             *text = "Bloom: Off (Toggle: Space)".to_string();
 
-            if keycode.just_pressed(KeyCode::Space) {
+            if key.just_pressed(Key::Space) {
                 commands.entity(entity).insert(BloomSettings::default());
             }
         }
diff --git a/examples/2d/rotation.rs b/examples/2d/rotation.rs
index fb649eb514e81..9151447f3340d 100644
--- a/examples/2d/rotation.rs
+++ b/examples/2d/rotation.rs
@@ -117,7 +117,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
 
 /// Demonstrates applying rotation and movement based on keyboard input.
 fn player_movement_system(
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<Input<Key>>,
     mut query: Query<(&Player, &mut Transform)>,
 ) {
     let (ship, mut transform) = query.single_mut();
@@ -125,15 +125,15 @@ fn player_movement_system(
     let mut rotation_factor = 0.0;
     let mut movement_factor = 0.0;
 
-    if keyboard_input.pressed(KeyCode::ArrowLeft) {
+    if keyboard_input.pressed(Key::ArrowLeft) {
         rotation_factor += 1.0;
     }
 
-    if keyboard_input.pressed(KeyCode::ArrowRight) {
+    if keyboard_input.pressed(Key::ArrowRight) {
         rotation_factor -= 1.0;
     }
 
-    if keyboard_input.pressed(KeyCode::ArrowUp) {
+    if keyboard_input.pressed(Key::ArrowUp) {
         movement_factor += 1.0;
     }
 
diff --git a/examples/3d/3d_gizmos.rs b/examples/3d/3d_gizmos.rs
index 8e3c380640372..daa75841fe6a2 100644
--- a/examples/3d/3d_gizmos.rs
+++ b/examples/3d/3d_gizmos.rs
@@ -104,21 +104,21 @@ fn rotate_camera(mut query: Query<&mut Transform, With<Camera>>, time: Res<Time>
     transform.rotate_around(Vec3::ZERO, Quat::from_rotation_y(time.delta_seconds() / 2.));
 }
 
-fn update_config(mut config: ResMut<GizmoConfig>, keyboard: Res<Input<KeyCode>>, time: Res<Time>) {
-    if keyboard.just_pressed(KeyCode::KeyD) {
+fn update_config(mut config: ResMut<GizmoConfig>, keyboard: Res<Input<Key>>, time: Res<Time>) {
+    if keyboard.just_pressed(Key::Character("d".into())) {
         config.depth_bias = if config.depth_bias == 0. { -1. } else { 0. };
     }
-    if keyboard.just_pressed(KeyCode::KeyP) {
+    if keyboard.just_pressed(Key::Character("p".into())) {
         // Toggle line_perspective
         config.line_perspective ^= true;
         // Increase the line width when line_perspective is on
         config.line_width *= if config.line_perspective { 5. } else { 1. / 5. };
     }
 
-    if keyboard.pressed(KeyCode::ArrowRight) {
+    if keyboard.pressed(Key::ArrowRight) {
         config.line_width += 5. * time.delta_seconds();
     }
-    if keyboard.pressed(KeyCode::ArrowLeft) {
+    if keyboard.pressed(Key::ArrowLeft) {
         config.line_width -= 5. * time.delta_seconds();
     }
 }
diff --git a/examples/3d/anti_aliasing.rs b/examples/3d/anti_aliasing.rs
index 0e527ccdf235f..5409d8c3ed42d 100644
--- a/examples/3d/anti_aliasing.rs
+++ b/examples/3d/anti_aliasing.rs
@@ -29,7 +29,7 @@ fn main() {
 }
 
 fn modify_aa(
-    keys: Res<Input<KeyCode>>,
+    keys: Res<Input<Key>>,
     mut camera: Query<
         (
             Entity,
@@ -45,14 +45,14 @@ fn modify_aa(
     let mut camera = commands.entity(camera_entity);
 
     // No AA
-    if keys.just_pressed(KeyCode::Digit1) {
+    if keys.just_pressed(Key::Character("1".into())) {
         *msaa = Msaa::Off;
         camera.remove::<Fxaa>();
         camera.remove::<TemporalAntiAliasBundle>();
     }
 
     // MSAA
-    if keys.just_pressed(KeyCode::Digit2) && *msaa == Msaa::Off {
+    if keys.just_pressed(Key::Character("2".into())) && *msaa == Msaa::Off {
         camera.remove::<Fxaa>();
         camera.remove::<TemporalAntiAliasBundle>();
 
@@ -61,19 +61,19 @@ fn modify_aa(
 
     // MSAA Sample Count
     if *msaa != Msaa::Off {
-        if keys.just_pressed(KeyCode::KeyQ) {
+        if keys.just_pressed(Key::Character("q".into())) {
             *msaa = Msaa::Sample2;
         }
-        if keys.just_pressed(KeyCode::KeyW) {
+        if keys.just_pressed(Key::Character("w".into())) {
             *msaa = Msaa::Sample4;
         }
-        if keys.just_pressed(KeyCode::KeyE) {
+        if keys.just_pressed(Key::Character("e".into())) {
             *msaa = Msaa::Sample8;
         }
     }
 
     // FXAA
-    if keys.just_pressed(KeyCode::Digit3) && fxaa.is_none() {
+    if keys.just_pressed(Key::Character("3".into())) && fxaa.is_none() {
         *msaa = Msaa::Off;
         camera.remove::<TemporalAntiAliasBundle>();
 
@@ -82,30 +82,30 @@ fn modify_aa(
 
     // FXAA Settings
     if let Some(mut fxaa) = fxaa {
-        if keys.just_pressed(KeyCode::KeyQ) {
+        if keys.just_pressed(Key::Character("q".into())) {
             fxaa.edge_threshold = Sensitivity::Low;
             fxaa.edge_threshold_min = Sensitivity::Low;
         }
-        if keys.just_pressed(KeyCode::KeyW) {
+        if keys.just_pressed(Key::Character("w".into())) {
             fxaa.edge_threshold = Sensitivity::Medium;
             fxaa.edge_threshold_min = Sensitivity::Medium;
         }
-        if keys.just_pressed(KeyCode::KeyE) {
+        if keys.just_pressed(Key::Character("e".into())) {
             fxaa.edge_threshold = Sensitivity::High;
             fxaa.edge_threshold_min = Sensitivity::High;
         }
-        if keys.just_pressed(KeyCode::KeyR) {
+        if keys.just_pressed(Key::Character("r".into())) {
             fxaa.edge_threshold = Sensitivity::Ultra;
             fxaa.edge_threshold_min = Sensitivity::Ultra;
         }
-        if keys.just_pressed(KeyCode::KeyT) {
+        if keys.just_pressed(Key::Character("t".into())) {
             fxaa.edge_threshold = Sensitivity::Extreme;
             fxaa.edge_threshold_min = Sensitivity::Extreme;
         }
     }
 
     // TAA
-    if keys.just_pressed(KeyCode::Digit4) && taa.is_none() {
+    if keys.just_pressed(Key::Character("4".into())) && taa.is_none() {
         *msaa = Msaa::Off;
         camera.remove::<Fxaa>();
 
@@ -114,23 +114,23 @@ fn modify_aa(
 }
 
 fn modify_sharpening(
-    keys: Res<Input<KeyCode>>,
+    keys: Res<Input<Key>>,
     mut query: Query<&mut ContrastAdaptiveSharpeningSettings>,
 ) {
     for mut cas in &mut query {
-        if keys.just_pressed(KeyCode::Digit0) {
+        if keys.just_pressed(Key::Character("0".into())) {
             cas.enabled = !cas.enabled;
         }
         if cas.enabled {
-            if keys.just_pressed(KeyCode::Minus) {
+            if keys.just_pressed(Key::Character("-".into())) {
                 cas.sharpening_strength -= 0.1;
                 cas.sharpening_strength = cas.sharpening_strength.clamp(0.0, 1.0);
             }
-            if keys.just_pressed(KeyCode::Equal) {
+            if keys.just_pressed(Key::Character("+".into())) {
                 cas.sharpening_strength += 0.1;
                 cas.sharpening_strength = cas.sharpening_strength.clamp(0.0, 1.0);
             }
-            if keys.just_pressed(KeyCode::KeyD) {
+            if keys.just_pressed(Key::Character("d".into())) {
                 cas.denoise = !cas.denoise;
             }
         }
diff --git a/examples/3d/atmospheric_fog.rs b/examples/3d/atmospheric_fog.rs
index ce6140b133df2..2ea0bd9d5869e 100644
--- a/examples/3d/atmospheric_fog.rs
+++ b/examples/3d/atmospheric_fog.rs
@@ -110,15 +110,15 @@ fn setup_instructions(mut commands: Commands) {
     }),));
 }
 
-fn toggle_system(keycode: Res<Input<KeyCode>>, mut fog: Query<&mut FogSettings>) {
+fn toggle_system(key: Res<Input<Key>>, mut fog: Query<&mut FogSettings>) {
     let mut fog_settings = fog.single_mut();
 
-    if keycode.just_pressed(KeyCode::Space) {
+    if key.just_pressed(Key::Space) {
         let a = fog_settings.color.a();
         fog_settings.color.set_a(1.0 - a);
     }
 
-    if keycode.just_pressed(KeyCode::KeyS) {
+    if key.just_pressed(Key::Character("s".into())) {
         let a = fog_settings.directional_light_color.a();
         fog_settings.directional_light_color.set_a(0.5 - a);
     }
diff --git a/examples/3d/blend_modes.rs b/examples/3d/blend_modes.rs
index f6dbd05e8691d..774b076287655 100644
--- a/examples/3d/blend_modes.rs
+++ b/examples/3d/blend_modes.rs
@@ -287,19 +287,19 @@ fn example_control_system(
     labelled: Query<&GlobalTransform>,
     mut state: Local<ExampleState>,
     time: Res<Time>,
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<Key>>,
 ) {
-    if input.pressed(KeyCode::ArrowUp) {
+    if input.pressed(Key::ArrowUp) {
         state.alpha = (state.alpha + time.delta_seconds()).min(1.0);
-    } else if input.pressed(KeyCode::ArrowDown) {
+    } else if input.pressed(Key::ArrowDown) {
         state.alpha = (state.alpha - time.delta_seconds()).max(0.0);
     }
 
-    if input.just_pressed(KeyCode::Space) {
+    if input.just_pressed(Key::Space) {
         state.unlit = !state.unlit;
     }
 
-    let randomize_colors = input.just_pressed(KeyCode::KeyC);
+    let randomize_colors = input.just_pressed(Key::Character("c".into()));
 
     for (material_handle, controls) in &controllable {
         let material = materials.get_mut(material_handle).unwrap();
@@ -317,13 +317,13 @@ fn example_control_system(
 
     let (mut camera, mut camera_transform, camera_global_transform) = camera.single_mut();
 
-    if input.just_pressed(KeyCode::KeyH) {
+    if input.just_pressed(Key::Character("h".into())) {
         camera.hdr = !camera.hdr;
     }
 
-    let rotation = if input.pressed(KeyCode::ArrowLeft) {
+    let rotation = if input.pressed(Key::ArrowLeft) {
         time.delta_seconds()
-    } else if input.pressed(KeyCode::ArrowRight) {
+    } else if input.pressed(Key::ArrowRight) {
         -time.delta_seconds()
     } else {
         0.0
diff --git a/examples/3d/bloom_3d.rs b/examples/3d/bloom_3d.rs
index 171c07dcf4678..8174a9059849e 100644
--- a/examples/3d/bloom_3d.rs
+++ b/examples/3d/bloom_3d.rs
@@ -116,7 +116,7 @@ fn update_bloom_settings(
     mut camera: Query<(Entity, Option<&mut BloomSettings>), With<Camera>>,
     mut text: Query<&mut Text>,
     mut commands: Commands,
-    keycode: Res<Input<KeyCode>>,
+    key: Res<Input<Key>>,
     time: Res<Time>,
 ) {
     let bloom_settings = camera.single_mut();
@@ -155,65 +155,65 @@ fn update_bloom_settings(
                 bloom_settings.prefilter_settings.threshold_softness
             ));
 
-            if keycode.just_pressed(KeyCode::Space) {
+            if key.just_pressed(Key::Space) {
                 commands.entity(entity).remove::<BloomSettings>();
             }
 
             let dt = time.delta_seconds();
 
-            if keycode.pressed(KeyCode::KeyA) {
+            if key.pressed(Key::Character("a".into())) {
                 bloom_settings.intensity -= dt / 10.0;
             }
-            if keycode.pressed(KeyCode::KeyQ) {
+            if key.pressed(Key::Character("q".into())) {
                 bloom_settings.intensity += dt / 10.0;
             }
             bloom_settings.intensity = bloom_settings.intensity.clamp(0.0, 1.0);
 
-            if keycode.pressed(KeyCode::KeyS) {
+            if key.pressed(Key::Character("s".into())) {
                 bloom_settings.low_frequency_boost -= dt / 10.0;
             }
-            if keycode.pressed(KeyCode::KeyW) {
+            if key.pressed(Key::Character("w".into())) {
                 bloom_settings.low_frequency_boost += dt / 10.0;
             }
             bloom_settings.low_frequency_boost = bloom_settings.low_frequency_boost.clamp(0.0, 1.0);
 
-            if keycode.pressed(KeyCode::KeyD) {
+            if key.pressed(Key::Character("d".into())) {
                 bloom_settings.low_frequency_boost_curvature -= dt / 10.0;
             }
-            if keycode.pressed(KeyCode::KeyE) {
+            if key.pressed(Key::Character("e".into())) {
                 bloom_settings.low_frequency_boost_curvature += dt / 10.0;
             }
             bloom_settings.low_frequency_boost_curvature =
                 bloom_settings.low_frequency_boost_curvature.clamp(0.0, 1.0);
 
-            if keycode.pressed(KeyCode::KeyF) {
+            if key.pressed(Key::Character("f".into())) {
                 bloom_settings.high_pass_frequency -= dt / 10.0;
             }
-            if keycode.pressed(KeyCode::KeyR) {
+            if key.pressed(Key::Character("r".into())) {
                 bloom_settings.high_pass_frequency += dt / 10.0;
             }
             bloom_settings.high_pass_frequency = bloom_settings.high_pass_frequency.clamp(0.0, 1.0);
 
-            if keycode.pressed(KeyCode::KeyG) {
+            if key.pressed(Key::Character("g".into())) {
                 bloom_settings.composite_mode = BloomCompositeMode::Additive;
             }
-            if keycode.pressed(KeyCode::KeyT) {
+            if key.pressed(Key::Character("t".into())) {
                 bloom_settings.composite_mode = BloomCompositeMode::EnergyConserving;
             }
 
-            if keycode.pressed(KeyCode::KeyH) {
+            if key.pressed(Key::Character("h".into())) {
                 bloom_settings.prefilter_settings.threshold -= dt;
             }
-            if keycode.pressed(KeyCode::KeyY) {
+            if key.pressed(Key::Character("y".into())) {
                 bloom_settings.prefilter_settings.threshold += dt;
             }
             bloom_settings.prefilter_settings.threshold =
                 bloom_settings.prefilter_settings.threshold.max(0.0);
 
-            if keycode.pressed(KeyCode::KeyJ) {
+            if key.pressed(Key::Character("j".into())) {
                 bloom_settings.prefilter_settings.threshold_softness -= dt / 10.0;
             }
-            if keycode.pressed(KeyCode::KeyU) {
+            if key.pressed(Key::Character("u".into())) {
                 bloom_settings.prefilter_settings.threshold_softness += dt / 10.0;
             }
             bloom_settings.prefilter_settings.threshold_softness = bloom_settings
@@ -225,7 +225,7 @@ fn update_bloom_settings(
         (entity, None) => {
             *text = "Bloom: Off (Toggle: Space)".to_string();
 
-            if keycode.just_pressed(KeyCode::Space) {
+            if key.just_pressed(Key::Space) {
                 commands.entity(entity).insert(BloomSettings::default());
             }
         }
diff --git a/examples/3d/fog.rs b/examples/3d/fog.rs
index b87eb28d8a651..2ae210bf76f87 100644
--- a/examples/3d/fog.rs
+++ b/examples/3d/fog.rs
@@ -159,7 +159,8 @@ fn update_system(
     mut camera: Query<(&mut FogSettings, &mut Transform)>,
     mut text: Query<&mut Text>,
     time: Res<Time>,
-    keycode: Res<Input<KeyCode>>,
+    key: Res<Input<Key>>,
+    key_code: Res<Input<KeyCode>>,
 ) {
     let now = time.elapsed_seconds();
     let delta = time.delta_seconds();
@@ -184,7 +185,7 @@ fn update_system(
         .value
         .push_str("\n\n1 / 2 / 3 - Fog Falloff Mode");
 
-    if keycode.pressed(KeyCode::Digit1) {
+    if key.just_pressed(Key::Character("1".into())) {
         if let FogFalloff::Linear { .. } = fog.falloff {
             // No change
         } else {
@@ -195,7 +196,7 @@ fn update_system(
         };
     }
 
-    if keycode.pressed(KeyCode::Digit2) {
+    if key_code.pressed(KeyCode::Digit2) {
         if let FogFalloff::Exponential { .. } = fog.falloff {
             // No change
         } else if let FogFalloff::ExponentialSquared { density } = fog.falloff {
@@ -205,7 +206,7 @@ fn update_system(
         };
     }
 
-    if keycode.pressed(KeyCode::Digit3) {
+    if key_code.pressed(KeyCode::Digit3) {
         if let FogFalloff::Exponential { density } = fog.falloff {
             fog.falloff = FogFalloff::ExponentialSquared { density };
         } else if let FogFalloff::ExponentialSquared { .. } = fog.falloff {
@@ -225,16 +226,16 @@ fn update_system(
             .value
             .push_str("\nA / S - Move Start Distance\nZ / X - Move End Distance");
 
-        if keycode.pressed(KeyCode::KeyA) {
+        if key.pressed(Key::Character("a".into())) {
             *start -= delta * 3.0;
         }
-        if keycode.pressed(KeyCode::KeyS) {
+        if key.pressed(Key::Character("s".into())) {
             *start += delta * 3.0;
         }
-        if keycode.pressed(KeyCode::KeyZ) {
+        if key.pressed(Key::Character("z".into())) {
             *end -= delta * 3.0;
         }
-        if keycode.pressed(KeyCode::KeyX) {
+        if key.pressed(Key::Character("x".into())) {
             *end += delta * 3.0;
         }
     }
@@ -243,13 +244,13 @@ fn update_system(
     if let FogFalloff::Exponential { ref mut density } = &mut fog.falloff {
         text.sections[0].value.push_str("\nA / S - Change Density");
 
-        if keycode.pressed(KeyCode::KeyA) {
+        if key.pressed(Key::Character("a".into())) {
             *density -= delta * 0.5 * *density;
             if *density < 0.0 {
                 *density = 0.0;
             }
         }
-        if keycode.pressed(KeyCode::KeyS) {
+        if key.pressed(Key::Character("s".into())) {
             *density += delta * 0.5 * *density;
         }
     }
@@ -258,13 +259,13 @@ fn update_system(
     if let FogFalloff::ExponentialSquared { ref mut density } = &mut fog.falloff {
         text.sections[0].value.push_str("\nA / S - Change Density");
 
-        if keycode.pressed(KeyCode::KeyA) {
+        if key.pressed(Key::Character("a".into())) {
             *density -= delta * 0.5 * *density;
             if *density < 0.0 {
                 *density = 0.0;
             }
         }
-        if keycode.pressed(KeyCode::KeyS) {
+        if key.pressed(Key::Character("s".into())) {
             *density += delta * 0.5 * *density;
         }
     }
@@ -274,42 +275,42 @@ fn update_system(
         .value
         .push_str("\n\n- / = - Red\n[ / ] - Green\n; / ' - Blue\n. / ? - Alpha");
 
-    if keycode.pressed(KeyCode::Minus) {
+    if key.pressed(Key::Character("-".into())) {
         let r = (fog.color.r() - 0.1 * delta).max(0.0);
         fog.color.set_r(r);
     }
 
-    if keycode.any_pressed([KeyCode::Equal, KeyCode::NumpadEqual]) {
+    if key.pressed(Key::Character("=".into())) {
         let r = (fog.color.r() + 0.1 * delta).min(1.0);
         fog.color.set_r(r);
     }
 
-    if keycode.pressed(KeyCode::BracketLeft) {
+    if key.pressed(Key::Character("[".into())) {
         let g = (fog.color.g() - 0.1 * delta).max(0.0);
         fog.color.set_g(g);
     }
 
-    if keycode.pressed(KeyCode::BracketRight) {
+    if key.pressed(Key::Character("]".into())) {
         let g = (fog.color.g() + 0.1 * delta).min(1.0);
         fog.color.set_g(g);
     }
 
-    if keycode.pressed(KeyCode::Semicolon) {
+    if key.pressed(Key::Character(";".into())) {
         let b = (fog.color.b() - 0.1 * delta).max(0.0);
         fog.color.set_b(b);
     }
 
-    if keycode.pressed(KeyCode::Quote) {
+    if key.pressed(Key::Character("'".into())) {
         let b = (fog.color.b() + 0.1 * delta).min(1.0);
         fog.color.set_b(b);
     }
 
-    if keycode.pressed(KeyCode::Period) {
+    if key.pressed(Key::Character(".".into())) {
         let a = (fog.color.a() - 0.1 * delta).max(0.0);
         fog.color.set_a(a);
     }
 
-    if keycode.pressed(KeyCode::Slash) {
+    if key.pressed(Key::Character("?".into())) {
         let a = (fog.color.a() + 0.1 * delta).min(1.0);
         fog.color.set_a(a);
     }
diff --git a/examples/3d/lighting.rs b/examples/3d/lighting.rs
index bc23c040e705f..e572fda46f203 100644
--- a/examples/3d/lighting.rs
+++ b/examples/3d/lighting.rs
@@ -261,22 +261,22 @@ fn animate_light_direction(
 }
 
 fn movement(
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<Key>>,
     time: Res<Time>,
     mut query: Query<&mut Transform, With<Movable>>,
 ) {
     for mut transform in &mut query {
         let mut direction = Vec3::ZERO;
-        if input.pressed(KeyCode::ArrowUp) {
+        if input.pressed(Key::ArrowUp) {
             direction.y += 1.0;
         }
-        if input.pressed(KeyCode::ArrowDown) {
+        if input.pressed(Key::ArrowDown) {
             direction.y -= 1.0;
         }
-        if input.pressed(KeyCode::ArrowLeft) {
+        if input.pressed(Key::ArrowLeft) {
             direction.x -= 1.0;
         }
-        if input.pressed(KeyCode::ArrowRight) {
+        if input.pressed(Key::ArrowRight) {
             direction.x += 1.0;
         }
 
diff --git a/examples/3d/shadow_biases.rs b/examples/3d/shadow_biases.rs
index 6cdc5fd1732a5..b08d5e07e9018 100644
--- a/examples/3d/shadow_biases.rs
+++ b/examples/3d/shadow_biases.rs
@@ -141,12 +141,12 @@ fn setup(
 }
 
 fn toggle_light(
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<Key>>,
     mut point_lights: Query<&mut PointLight>,
     mut directional_lights: Query<&mut DirectionalLight>,
     mut example_text: Query<&mut Text>,
 ) {
-    if input.just_pressed(KeyCode::KeyL) {
+    if input.just_pressed(Key::Character("l".into())) {
         for mut light in &mut point_lights {
             light.intensity = if light.intensity == 0.0 {
                 example_text.single_mut().sections[4].value = "PointLight".to_string();
diff --git a/examples/3d/shadow_caster_receiver.rs b/examples/3d/shadow_caster_receiver.rs
index f1e134b141e42..c2b6fcbeed659 100644
--- a/examples/3d/shadow_caster_receiver.rs
+++ b/examples/3d/shadow_caster_receiver.rs
@@ -126,11 +126,11 @@ fn setup(
 }
 
 fn toggle_light(
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<Key>>,
     mut point_lights: Query<&mut PointLight>,
     mut directional_lights: Query<&mut DirectionalLight>,
 ) {
-    if input.just_pressed(KeyCode::KeyL) {
+    if input.just_pressed(Key::Character("l".into())) {
         for mut light in &mut point_lights {
             light.intensity = if light.intensity == 0.0 {
                 println!("Using PointLight");
@@ -152,7 +152,7 @@ fn toggle_light(
 
 fn toggle_shadows(
     mut commands: Commands,
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<Key>>,
     mut queries: ParamSet<(
         Query<Entity, (With<Handle<Mesh>>, With<NotShadowCaster>)>,
         Query<Entity, (With<Handle<Mesh>>, With<NotShadowReceiver>)>,
@@ -160,7 +160,7 @@ fn toggle_shadows(
         Query<Entity, (With<Handle<Mesh>>, Without<NotShadowReceiver>)>,
     )>,
 ) {
-    if input.just_pressed(KeyCode::KeyC) {
+    if input.just_pressed(Key::Character("c".into())) {
         println!("Toggling casters");
         for entity in queries.p0().iter() {
             commands.entity(entity).remove::<NotShadowCaster>();
@@ -169,7 +169,7 @@ fn toggle_shadows(
             commands.entity(entity).insert(NotShadowCaster);
         }
     }
-    if input.just_pressed(KeyCode::KeyR) {
+    if input.just_pressed(Key::Character("r".into())) {
         println!("Toggling receivers");
         for entity in queries.p1().iter() {
             commands.entity(entity).remove::<NotShadowReceiver>();
diff --git a/examples/3d/skybox.rs b/examples/3d/skybox.rs
index 3e0dc03d29394..a38ab8d8b5d2f 100644
--- a/examples/3d/skybox.rs
+++ b/examples/3d/skybox.rs
@@ -188,7 +188,7 @@ pub struct CameraController {
     pub key_down: KeyCode,
     pub key_run: KeyCode,
     pub mouse_key_enable_mouse: MouseButton,
-    pub keyboard_key_enable_mouse: KeyCode,
+    pub keyboard_key_enable_mouse: Key,
     pub walk_speed: f32,
     pub run_speed: f32,
     pub friction: f32,
@@ -211,7 +211,7 @@ impl Default for CameraController {
             key_down: KeyCode::KeyQ,
             key_run: KeyCode::ShiftLeft,
             mouse_key_enable_mouse: MouseButton::Left,
-            keyboard_key_enable_mouse: KeyCode::KeyM,
+            keyboard_key_enable_mouse: Key::Character("m".into()),
             walk_speed: 2.0,
             run_speed: 6.0,
             friction: 0.5,
@@ -227,6 +227,7 @@ pub fn camera_controller(
     mut mouse_events: EventReader<MouseMotion>,
     mouse_button_input: Res<Input<MouseButton>>,
     key_input: Res<Input<KeyCode>>,
+    key_input_logic: Res<Input<Key>>,
     mut move_toggled: Local<bool>,
     mut query: Query<(&mut Transform, &mut CameraController), With<Camera>>,
 ) {
@@ -263,7 +264,7 @@ pub fn camera_controller(
         if key_input.pressed(options.key_down) {
             axis_input.y -= 1.0;
         }
-        if key_input.just_pressed(options.keyboard_key_enable_mouse) {
+        if key_input_logic.just_pressed(options.keyboard_key_enable_mouse.clone()) {
             *move_toggled = !*move_toggled;
         }
 
diff --git a/examples/3d/spotlight.rs b/examples/3d/spotlight.rs
index 050c8cd1b7eb9..b30c0cd4c90cc 100644
--- a/examples/3d/spotlight.rs
+++ b/examples/3d/spotlight.rs
@@ -137,28 +137,28 @@ fn light_sway(time: Res<Time>, mut query: Query<(&mut Transform, &mut SpotLight)
 }
 
 fn movement(
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<Key>>,
     time: Res<Time>,
     mut query: Query<&mut Transform, With<Movable>>,
 ) {
     for mut transform in &mut query {
         let mut direction = Vec3::ZERO;
-        if input.pressed(KeyCode::ArrowUp) {
+        if input.pressed(Key::ArrowUp) {
             direction.z -= 1.0;
         }
-        if input.pressed(KeyCode::ArrowDown) {
+        if input.pressed(Key::ArrowDown) {
             direction.z += 1.0;
         }
-        if input.pressed(KeyCode::ArrowLeft) {
+        if input.pressed(Key::ArrowLeft) {
             direction.x -= 1.0;
         }
-        if input.pressed(KeyCode::ArrowRight) {
+        if input.pressed(Key::ArrowRight) {
             direction.x += 1.0;
         }
-        if input.pressed(KeyCode::PageUp) {
+        if input.pressed(Key::PageUp) {
             direction.y += 1.0;
         }
-        if input.pressed(KeyCode::PageDown) {
+        if input.pressed(Key::PageDown) {
             direction.y -= 1.0;
         }
 
diff --git a/examples/3d/tonemapping.rs b/examples/3d/tonemapping.rs
index 74ee3b1e4b57c..c6e376718ea7b 100644
--- a/examples/3d/tonemapping.rs
+++ b/examples/3d/tonemapping.rs
@@ -347,16 +347,16 @@ fn update_image_viewer(
 }
 
 fn toggle_scene(
-    keys: Res<Input<KeyCode>>,
+    keys: Res<Input<Key>>,
     mut query: Query<(&mut Visibility, &SceneNumber)>,
     mut current_scene: ResMut<CurrentScene>,
 ) {
     let mut pressed = None;
-    if keys.just_pressed(KeyCode::KeyQ) {
+    if keys.just_pressed(Key::Character("q".into())) {
         pressed = Some(1);
-    } else if keys.just_pressed(KeyCode::KeyW) {
+    } else if keys.just_pressed(Key::Character("w".into())) {
         pressed = Some(2);
-    } else if keys.just_pressed(KeyCode::KeyE) {
+    } else if keys.just_pressed(Key::Character("e".into())) {
         pressed = Some(3);
     }
 
@@ -422,7 +422,7 @@ impl SelectedParameter {
 }
 
 fn update_color_grading_settings(
-    keys: Res<Input<KeyCode>>,
+    keys: Res<Input<Key>>,
     time: Res<Time>,
     mut per_method_settings: ResMut<PerMethodSettings>,
     tonemapping: Query<&Tonemapping>,
@@ -432,17 +432,17 @@ fn update_color_grading_settings(
     let method = tonemapping.single();
     let color_grading = per_method_settings.settings.get_mut(method).unwrap();
     let mut dt = time.delta_seconds() * 0.25;
-    if keys.pressed(KeyCode::ArrowLeft) {
+    if keys.pressed(Key::ArrowLeft) {
         dt = -dt;
     }
 
-    if keys.just_pressed(KeyCode::ArrowDown) {
+    if keys.just_pressed(Key::ArrowDown) {
         selected_parameter.next();
     }
-    if keys.just_pressed(KeyCode::ArrowUp) {
+    if keys.just_pressed(Key::ArrowUp) {
         selected_parameter.prev();
     }
-    if keys.pressed(KeyCode::ArrowLeft) || keys.pressed(KeyCode::ArrowRight) {
+    if keys.pressed(Key::ArrowLeft) || keys.pressed(Key::ArrowRight) {
         match selected_parameter.value {
             0 => {
                 color_grading.exposure += dt;
@@ -460,13 +460,13 @@ fn update_color_grading_settings(
         }
     }
 
-    if keys.just_pressed(KeyCode::Space) {
+    if keys.just_pressed(Key::Space) {
         for (_, grading) in per_method_settings.settings.iter_mut() {
             *grading = ColorGrading::default();
         }
     }
 
-    if keys.just_pressed(KeyCode::Enter) && current_scene.0 == 1 {
+    if keys.just_pressed(Key::Enter) && current_scene.0 == 1 {
         for (mapper, grading) in per_method_settings.settings.iter_mut() {
             *grading = PerMethodSettings::basic_scene_recommendation(*mapper);
         }
@@ -479,7 +479,7 @@ fn update_ui(
     current_scene: Res<CurrentScene>,
     selected_parameter: Res<SelectedParameter>,
     mut hide_ui: Local<bool>,
-    keys: Res<Input<KeyCode>>,
+    keys: Res<Input<Key>>,
 ) {
     let (method, color_grading) = settings.single();
     let method = *method;
@@ -487,7 +487,7 @@ fn update_ui(
     let mut text = text.single_mut();
     let text = &mut text.sections[0].value;
 
-    if keys.just_pressed(KeyCode::KeyH) {
+    if keys.just_pressed(Key::Character("h".into())) {
         *hide_ui = !*hide_ui;
     }
     text.clear();
diff --git a/examples/animation/animated_fox.rs b/examples/animation/animated_fox.rs
index fff8089c8c019..f01cbefb4afb0 100644
--- a/examples/animation/animated_fox.rs
+++ b/examples/animation/animated_fox.rs
@@ -95,13 +95,13 @@ fn setup_scene_once_loaded(
 }
 
 fn keyboard_animation_control(
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<Input<Key>>,
     mut animation_player: Query<&mut AnimationPlayer>,
     animations: Res<Animations>,
     mut current_animation: Local<usize>,
 ) {
     if let Ok(mut player) = animation_player.get_single_mut() {
-        if keyboard_input.just_pressed(KeyCode::Space) {
+        if keyboard_input.just_pressed(Key::Space) {
             if player.is_paused() {
                 player.resume();
             } else {
@@ -109,27 +109,27 @@ fn keyboard_animation_control(
             }
         }
 
-        if keyboard_input.just_pressed(KeyCode::ArrowUp) {
+        if keyboard_input.just_pressed(Key::ArrowUp) {
             let speed = player.speed();
             player.set_speed(speed * 1.2);
         }
 
-        if keyboard_input.just_pressed(KeyCode::ArrowDown) {
+        if keyboard_input.just_pressed(Key::ArrowDown) {
             let speed = player.speed();
             player.set_speed(speed * 0.8);
         }
 
-        if keyboard_input.just_pressed(KeyCode::ArrowLeft) {
+        if keyboard_input.just_pressed(Key::ArrowLeft) {
             let elapsed = player.elapsed();
             player.set_elapsed(elapsed - 0.1);
         }
 
-        if keyboard_input.just_pressed(KeyCode::ArrowRight) {
+        if keyboard_input.just_pressed(Key::ArrowRight) {
             let elapsed = player.elapsed();
             player.set_elapsed(elapsed + 0.1);
         }
 
-        if keyboard_input.just_pressed(KeyCode::Enter) {
+        if keyboard_input.just_pressed(Key::Enter) {
             *current_animation = (*current_animation + 1) % animations.0.len();
             player
                 .play_with_transition(
diff --git a/examples/audio/audio_control.rs b/examples/audio/audio_control.rs
index c4f76c69fef43..c3621a880d4b9 100644
--- a/examples/audio/audio_control.rs
+++ b/examples/audio/audio_control.rs
@@ -35,11 +35,11 @@ fn update_speed(
 }
 
 fn pause(
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<Input<Key>>,
     audio_sinks: Res<Assets<AudioSink>>,
     music_controller: Res<MusicController>,
 ) {
-    if keyboard_input.just_pressed(KeyCode::Space) {
+    if keyboard_input.just_pressed(Key::Space) {
         if let Some(sink) = audio_sinks.get(&music_controller.0) {
             sink.toggle();
         }
diff --git a/examples/ecs/generic_system.rs b/examples/ecs/generic_system.rs
index aac3444855f25..70d65057fa5bd 100644
--- a/examples/ecs/generic_system.rs
+++ b/examples/ecs/generic_system.rs
@@ -73,9 +73,9 @@ fn print_text_system(time: Res<Time>, mut query: Query<(&mut PrinterTick, &TextT
 
 fn transition_to_in_game_system(
     mut next_state: ResMut<NextState<AppState>>,
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<Input<Key>>,
 ) {
-    if keyboard_input.pressed(KeyCode::Space) {
+    if keyboard_input.pressed(Key::Space) {
         next_state.set(AppState::InGame);
     }
 }
diff --git a/examples/ecs/run_conditions.rs b/examples/ecs/run_conditions.rs
index 9e816c7efe0d3..4d6667fe78e00 100644
--- a/examples/ecs/run_conditions.rs
+++ b/examples/ecs/run_conditions.rs
@@ -64,12 +64,12 @@ struct Unused;
 /// they are read only (except for local parameters which can be mutable).
 /// It returns a bool which determines if the system should run.
 fn has_user_input(
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<Input<Key>>,
     mouse_button_input: Res<Input<MouseButton>>,
     touch_input: Res<Touches>,
 ) -> bool {
-    keyboard_input.just_pressed(KeyCode::Space)
-        || keyboard_input.just_pressed(KeyCode::Enter)
+    keyboard_input.just_pressed(Key::Space)
+        || keyboard_input.just_pressed(Key::Enter)
         || mouse_button_input.just_pressed(MouseButton::Left)
         || mouse_button_input.just_pressed(MouseButton::Right)
         || touch_input.any_just_pressed()
diff --git a/examples/ecs/state.rs b/examples/ecs/state.rs
index 549908c7d817f..fbaebfff5729d 100644
--- a/examples/ecs/state.rs
+++ b/examples/ecs/state.rs
@@ -127,21 +127,21 @@ fn setup_game(mut commands: Commands, asset_server: Res<AssetServer>) {
 const SPEED: f32 = 100.0;
 fn movement(
     time: Res<Time>,
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<Key>>,
     mut query: Query<&mut Transform, With<Sprite>>,
 ) {
     for mut transform in &mut query {
         let mut direction = Vec3::ZERO;
-        if input.pressed(KeyCode::ArrowLeft) {
+        if input.pressed(Key::ArrowLeft) {
             direction.x -= 1.0;
         }
-        if input.pressed(KeyCode::ArrowRight) {
+        if input.pressed(Key::ArrowRight) {
             direction.x += 1.0;
         }
-        if input.pressed(KeyCode::ArrowUp) {
+        if input.pressed(Key::ArrowUp) {
             direction.y += 1.0;
         }
-        if input.pressed(KeyCode::ArrowDown) {
+        if input.pressed(Key::ArrowDown) {
             direction.y -= 1.0;
         }
 
diff --git a/examples/games/alien_cake_addict.rs b/examples/games/alien_cake_addict.rs
index b68008cfaeaa3..5bfe1558e990a 100644
--- a/examples/games/alien_cake_addict.rs
+++ b/examples/games/alien_cake_addict.rs
@@ -192,7 +192,7 @@ fn teardown(mut commands: Commands, entities: Query<Entity, (Without<Camera>, Wi
 // control the game character
 fn move_player(
     mut commands: Commands,
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<Input<Key>>,
     mut game: ResMut<Game>,
     mut transforms: Query<&mut Transform>,
     time: Res<Time>,
@@ -201,28 +201,28 @@ fn move_player(
         let mut moved = false;
         let mut rotation = 0.0;
 
-        if keyboard_input.pressed(KeyCode::ArrowUp) {
+        if keyboard_input.pressed(Key::ArrowUp) {
             if game.player.i < BOARD_SIZE_I - 1 {
                 game.player.i += 1;
             }
             rotation = -PI / 2.;
             moved = true;
         }
-        if keyboard_input.pressed(KeyCode::ArrowDown) {
+        if keyboard_input.pressed(Key::ArrowDown) {
             if game.player.i > 0 {
                 game.player.i -= 1;
             }
             rotation = PI / 2.;
             moved = true;
         }
-        if keyboard_input.pressed(KeyCode::ArrowRight) {
+        if keyboard_input.pressed(Key::ArrowRight) {
             if game.player.j < BOARD_SIZE_J - 1 {
                 game.player.j += 1;
             }
             rotation = PI;
             moved = true;
         }
-        if keyboard_input.pressed(KeyCode::ArrowLeft) {
+        if keyboard_input.pressed(Key::ArrowLeft) {
             if game.player.j > 0 {
                 game.player.j -= 1;
             }
@@ -376,9 +376,9 @@ fn scoreboard_system(game: Res<Game>, mut query: Query<&mut Text>) {
 // restart the game when pressing spacebar
 fn gameover_keyboard(
     mut next_state: ResMut<NextState<GameState>>,
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<Input<Key>>,
 ) {
-    if keyboard_input.just_pressed(KeyCode::Space) {
+    if keyboard_input.just_pressed(Key::Space) {
         next_state.set(GameState::Playing);
     }
 }
diff --git a/examples/games/breakout.rs b/examples/games/breakout.rs
index 1e81b6d1e8f41..0fe303b338bc3 100644
--- a/examples/games/breakout.rs
+++ b/examples/games/breakout.rs
@@ -309,18 +309,18 @@ fn setup(
 }
 
 fn move_paddle(
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<Input<Key>>,
     mut query: Query<&mut Transform, With<Paddle>>,
     time_step: Res<FixedTime>,
 ) {
     let mut paddle_transform = query.single_mut();
     let mut direction = 0.0;
 
-    if keyboard_input.pressed(KeyCode::ArrowLeft) {
+    if keyboard_input.pressed(Key::ArrowLeft) {
         direction -= 1.0;
     }
 
-    if keyboard_input.pressed(KeyCode::ArrowRight) {
+    if keyboard_input.pressed(Key::ArrowRight) {
         direction += 1.0;
     }
 
diff --git a/examples/input/keyboard_modifiers.rs b/examples/input/keyboard_modifiers.rs
index 64df72676f43c..2f5f4d0ed08b6 100644
--- a/examples/input/keyboard_modifiers.rs
+++ b/examples/input/keyboard_modifiers.rs
@@ -10,11 +10,11 @@ fn main() {
 }
 
 /// This system prints when `Ctrl + Shift + A` is pressed
-fn keyboard_input_system(input: Res<Input<KeyCode>>) {
-    let shift = input.any_pressed([KeyCode::ShiftLeft, KeyCode::ShiftRight]);
-    let ctrl = input.any_pressed([KeyCode::ControlLeft, KeyCode::ControlRight]);
+fn keyboard_input_system(input: Res<Input<Key>>) {
+    let shift = input.pressed(Key::Shift);
+    let ctrl = input.pressed(Key::Control);
 
-    if ctrl && shift && input.just_pressed(KeyCode::KeyA) {
+    if ctrl && shift && input.just_pressed(Key::Character("a".into())) {
         info!("Just pressed Ctrl + Shift + A!");
     }
 }
diff --git a/examples/input/mouse_grab.rs b/examples/input/mouse_grab.rs
index 33e2574180e5e..019157121dcae 100644
--- a/examples/input/mouse_grab.rs
+++ b/examples/input/mouse_grab.rs
@@ -14,7 +14,7 @@ fn main() {
 fn grab_mouse(
     mut windows: Query<&mut Window>,
     mouse: Res<Input<MouseButton>>,
-    key: Res<Input<KeyCode>>,
+    key: Res<Input<Key>>,
 ) {
     let mut window = windows.single_mut();
 
@@ -23,7 +23,7 @@ fn grab_mouse(
         window.cursor.grab_mode = CursorGrabMode::Locked;
     }
 
-    if key.just_pressed(KeyCode::Escape) {
+    if key.just_pressed(Key::Escape) {
         window.cursor.visible = true;
         window.cursor.grab_mode = CursorGrabMode::None;
     }
diff --git a/examples/input/text_input.rs b/examples/input/text_input.rs
index 4230ea17a07b0..8743d3909fa45 100644
--- a/examples/input/text_input.rs
+++ b/examples/input/text_input.rs
@@ -179,8 +179,8 @@ fn listen_keyboard_input_events(
     mut edit_text: Query<(Entity, &mut Text), (Without<Node>, Without<Bubble>)>,
 ) {
     for event in events.iter() {
-        match event.key_code {
-            KeyCode::Enter => {
+        match event.logical_key {
+            Key::Enter => {
                 let (entity, text) = edit_text.single();
                 commands.entity(entity).insert(Bubble {
                     timer: Timer::from_seconds(5.0, TimerMode::Once),
@@ -191,7 +191,7 @@ fn listen_keyboard_input_events(
                     ..default()
                 });
             }
-            KeyCode::Backspace => {
+            Key::Backspace => {
                 edit_text.single_mut().1.sections[0].value.pop();
             }
             _ => continue,
diff --git a/examples/shader/shader_prepass.rs b/examples/shader/shader_prepass.rs
index 6d771628390c1..66293ce8a3c12 100644
--- a/examples/shader/shader_prepass.rs
+++ b/examples/shader/shader_prepass.rs
@@ -225,12 +225,12 @@ impl Material for PrepassOutputMaterial {
 /// Every time you press space, it will cycle between transparent, depth and normals view
 fn toggle_prepass_view(
     mut prepass_view: Local<u32>,
-    keycode: Res<Input<KeyCode>>,
+    key: Res<Input<Key>>,
     material_handle: Query<&Handle<PrepassOutputMaterial>>,
     mut materials: ResMut<Assets<PrepassOutputMaterial>>,
     mut text: Query<&mut Text>,
 ) {
-    if keycode.just_pressed(KeyCode::Space) {
+    if key.just_pressed(Key::Space) {
         *prepass_view = (*prepass_view + 1) % 4;
 
         let label = match *prepass_view {
diff --git a/examples/stress_tests/many_foxes.rs b/examples/stress_tests/many_foxes.rs
index 3ca7518e33ad4..802aef3c628bb 100644
--- a/examples/stress_tests/many_foxes.rs
+++ b/examples/stress_tests/many_foxes.rs
@@ -226,30 +226,30 @@ fn update_fox_rings(
 }
 
 fn keyboard_animation_control(
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<Input<Key>>,
     mut animation_player: Query<&mut AnimationPlayer>,
     animations: Res<Animations>,
     mut current_animation: Local<usize>,
     mut foxes: ResMut<Foxes>,
 ) {
-    if keyboard_input.just_pressed(KeyCode::Space) {
+    if keyboard_input.just_pressed(Key::Space) {
         foxes.moving = !foxes.moving;
     }
 
-    if keyboard_input.just_pressed(KeyCode::ArrowUp) {
+    if keyboard_input.just_pressed(Key::ArrowUp) {
         foxes.speed *= 1.25;
     }
 
-    if keyboard_input.just_pressed(KeyCode::ArrowDown) {
+    if keyboard_input.just_pressed(Key::ArrowDown) {
         foxes.speed *= 0.8;
     }
 
-    if keyboard_input.just_pressed(KeyCode::Enter) {
+    if keyboard_input.just_pressed(Key::Enter) {
         *current_animation = (*current_animation + 1) % animations.0.len();
     }
 
     for mut player in &mut animation_player {
-        if keyboard_input.just_pressed(KeyCode::Space) {
+        if keyboard_input.just_pressed(Key::Space) {
             if player.is_paused() {
                 player.resume();
             } else {
@@ -257,27 +257,27 @@ fn keyboard_animation_control(
             }
         }
 
-        if keyboard_input.just_pressed(KeyCode::ArrowUp) {
+        if keyboard_input.just_pressed(Key::ArrowUp) {
             let speed = player.speed();
             player.set_speed(speed * 1.25);
         }
 
-        if keyboard_input.just_pressed(KeyCode::ArrowDown) {
+        if keyboard_input.just_pressed(Key::ArrowDown) {
             let speed = player.speed();
             player.set_speed(speed * 0.8);
         }
 
-        if keyboard_input.just_pressed(KeyCode::ArrowLeft) {
+        if keyboard_input.just_pressed(Key::ArrowLeft) {
             let elapsed = player.elapsed();
             player.set_elapsed(elapsed - 0.1);
         }
 
-        if keyboard_input.just_pressed(KeyCode::ArrowRight) {
+        if keyboard_input.just_pressed(Key::ArrowRight) {
             let elapsed = player.elapsed();
             player.set_elapsed(elapsed + 0.1);
         }
 
-        if keyboard_input.just_pressed(KeyCode::Enter) {
+        if keyboard_input.just_pressed(Key::Enter) {
             player
                 .play_with_transition(
                     animations.0[*current_animation].clone_weak(),
diff --git a/examples/stress_tests/many_gizmos.rs b/examples/stress_tests/many_gizmos.rs
index 0efc4b52a62ba..c472eb4b4e4d4 100644
--- a/examples/stress_tests/many_gizmos.rs
+++ b/examples/stress_tests/many_gizmos.rs
@@ -39,14 +39,14 @@ struct Config {
     fancy: bool,
 }
 
-fn input(mut config: ResMut<Config>, input: Res<Input<KeyCode>>) {
-    if input.just_pressed(KeyCode::ArrowUp) {
+fn input(mut config: ResMut<Config>, input: Res<Input<Key>>) {
+    if input.just_pressed(Key::ArrowUp) {
         config.line_count += 10_000;
     }
-    if input.just_pressed(KeyCode::ArrowDown) {
+    if input.just_pressed(Key::ArrowDown) {
         config.line_count = config.line_count.saturating_sub(10_000);
     }
-    if input.just_pressed(KeyCode::Space) {
+    if input.just_pressed(Key::Space) {
         config.fancy = !config.fancy;
     }
 }
diff --git a/examples/tools/scene_viewer/scene_viewer_plugin.rs b/examples/tools/scene_viewer/scene_viewer_plugin.rs
index 483f57ece2752..20358aff98e00 100644
--- a/examples/tools/scene_viewer/scene_viewer_plugin.rs
+++ b/examples/tools/scene_viewer/scene_viewer_plugin.rs
@@ -67,7 +67,7 @@ impl Plugin for SceneViewerPlugin {
                 (
                     update_lights,
                     camera_tracker,
-                    toggle_bounding_boxes.run_if(input_just_pressed(KeyCode::KeyB)),
+                    toggle_bounding_boxes.run_if(input_just_pressed(Key::Character("b".into()))),
                     #[cfg(feature = "animation")]
                     (start_animation, keyboard_animation_control),
                 ),
@@ -170,7 +170,7 @@ fn start_animation(
 
 #[cfg(feature = "animation")]
 fn keyboard_animation_control(
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<Input<Key>>,
     mut animation_player: Query<&mut AnimationPlayer>,
     scene_handle: Res<SceneHandle>,
     mut current_animation: Local<usize>,
@@ -181,7 +181,7 @@ fn keyboard_animation_control(
     }
 
     if let Ok(mut player) = animation_player.get_single_mut() {
-        if keyboard_input.just_pressed(KeyCode::Space) {
+        if keyboard_input.just_pressed(Key::Space) {
             if player.is_paused() {
                 player.resume();
             } else {
@@ -198,7 +198,7 @@ fn keyboard_animation_control(
             *changing = false;
         }
 
-        if keyboard_input.just_pressed(KeyCode::Enter) {
+        if keyboard_input.just_pressed(Key::Enter) {
             // delay the animation change for one frame
             *changing = true;
             // set the current animation to its start and pause it to reset to its starting state
@@ -208,18 +208,18 @@ fn keyboard_animation_control(
 }
 
 fn update_lights(
-    key_input: Res<Input<KeyCode>>,
+    key_input: Res<Input<Key>>,
     time: Res<Time>,
     mut query: Query<(&mut Transform, &mut DirectionalLight)>,
     mut animate_directional_light: Local<bool>,
 ) {
     for (_, mut light) in &mut query {
-        if key_input.just_pressed(KeyCode::KeyU) {
+        if key_input.just_pressed(Key::Character("u".into())) {
             light.shadows_enabled = !light.shadows_enabled;
         }
     }
 
-    if key_input.just_pressed(KeyCode::KeyL) {
+    if key_input.just_pressed(Key::Character("l".into())) {
         *animate_directional_light = !*animate_directional_light;
     }
     if *animate_directional_light {
@@ -265,7 +265,7 @@ impl CameraTracker {
 
 fn camera_tracker(
     mut camera_tracker: ResMut<CameraTracker>,
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<Input<Key>>,
     mut queries: ParamSet<(
         Query<(Entity, &mut Camera), (Added<Camera>, Without<CameraController>)>,
         Query<(Entity, &mut Camera), (Added<Camera>, With<CameraController>)>,
@@ -283,7 +283,7 @@ fn camera_tracker(
         camera.is_active = camera_tracker.track_camera(entity);
     }
 
-    if keyboard_input.just_pressed(KeyCode::KeyC) {
+    if keyboard_input.just_pressed(Key::Character("c".into())) {
         // disable currently active camera
         if let Some(e) = camera_tracker.active_camera() {
             if let Ok(mut camera) = queries.p2().get_mut(e) {
diff --git a/examples/ui/overflow_debug.rs b/examples/ui/overflow_debug.rs
index 6b2132f5337a1..39fd3c1df535c 100644
--- a/examples/ui/overflow_debug.rs
+++ b/examples/ui/overflow_debug.rs
@@ -237,14 +237,10 @@ fn spawn_container(
         });
 }
 
-fn update_animation(
-    mut animation: ResMut<AnimationState>,
-    time: Res<Time>,
-    keys: Res<Input<KeyCode>>,
-) {
+fn update_animation(mut animation: ResMut<AnimationState>, time: Res<Time>, keys: Res<Input<Key>>) {
     let time = time.elapsed_seconds();
 
-    if keys.just_pressed(KeyCode::Space) {
+    if keys.just_pressed(Key::Space) {
         animation.playing = !animation.playing;
 
         if !animation.playing {
@@ -271,8 +267,8 @@ fn update_transform<T: UpdateTransform + Component>(
     }
 }
 
-fn toggle_overflow(keys: Res<Input<KeyCode>>, mut containers: Query<&mut Style, With<Container>>) {
-    if keys.just_pressed(KeyCode::KeyO) {
+fn toggle_overflow(keys: Res<Input<Key>>, mut containers: Query<&mut Style, With<Container>>) {
+    if keys.just_pressed(Key::Character("o".into())) {
         for mut style in &mut containers {
             style.overflow = match style.overflow {
                 Overflow {
@@ -293,11 +289,8 @@ fn toggle_overflow(keys: Res<Input<KeyCode>>, mut containers: Query<&mut Style,
     }
 }
 
-fn next_container_size(
-    keys: Res<Input<KeyCode>>,
-    mut containers: Query<(&mut Style, &mut Container)>,
-) {
-    if keys.just_pressed(KeyCode::KeyS) {
+fn next_container_size(keys: Res<Input<Key>>, mut containers: Query<(&mut Style, &mut Container)>) {
+    if keys.just_pressed(Key::Character("s".into())) {
         for (mut style, mut container) in &mut containers {
             container.0 = (container.0 + 1) % 3;
 
diff --git a/examples/ui/ui_scaling.rs b/examples/ui/ui_scaling.rs
index fe93451b28089..aeb135c8c5b49 100644
--- a/examples/ui/ui_scaling.rs
+++ b/examples/ui/ui_scaling.rs
@@ -84,13 +84,13 @@ fn setup(mut commands: Commands, asset_server: ResMut<AssetServer>) {
 }
 
 /// System that changes the scale of the ui when pressing up or down on the keyboard.
-fn change_scaling(input: Res<Input<KeyCode>>, mut ui_scale: ResMut<TargetScale>) {
-    if input.just_pressed(KeyCode::ArrowUp) {
+fn change_scaling(input: Res<Input<Key>>, mut ui_scale: ResMut<TargetScale>) {
+    if input.just_pressed(Key::ArrowUp) {
         let scale = (ui_scale.target_scale * 2.0).min(8.);
         ui_scale.set_scale(scale);
         info!("Scaling up! Scale: {}", ui_scale.target_scale);
     }
-    if input.just_pressed(KeyCode::ArrowDown) {
+    if input.just_pressed(Key::ArrowDown) {
         let scale = (ui_scale.target_scale / 2.0).max(1. / 8.);
         ui_scale.set_scale(scale);
         info!("Scaling down! Scale: {}", ui_scale.target_scale);
diff --git a/examples/ui/window_fallthrough.rs b/examples/ui/window_fallthrough.rs
index d6835855ff2a6..5c30589e5edfb 100644
--- a/examples/ui/window_fallthrough.rs
+++ b/examples/ui/window_fallthrough.rs
@@ -47,8 +47,8 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
     ));
 }
 // A simple system to handle some keyboard input and toggle on/off the hittest.
-fn toggle_mouse_passthrough(keyboard_input: Res<Input<KeyCode>>, mut windows: Query<&mut Window>) {
-    if keyboard_input.just_pressed(KeyCode::KeyP) {
+fn toggle_mouse_passthrough(keyboard_input: Res<Input<Key>>, mut windows: Query<&mut Window>) {
+    if keyboard_input.just_pressed(Key::Character("p".into())) {
         let mut window = windows.single_mut();
         window.cursor.hit_test = !window.cursor.hit_test;
     }
diff --git a/examples/window/clear_color.rs b/examples/window/clear_color.rs
index dc136e3a3b28d..117b10cf7b784 100644
--- a/examples/window/clear_color.rs
+++ b/examples/window/clear_color.rs
@@ -17,8 +17,8 @@ fn setup(mut commands: Commands) {
     commands.spawn(Camera2dBundle::default());
 }
 
-fn change_clear_color(input: Res<Input<KeyCode>>, mut clear_color: ResMut<ClearColor>) {
-    if input.just_pressed(KeyCode::Space) {
+fn change_clear_color(input: Res<Input<Key>>, mut clear_color: ResMut<ClearColor>) {
+    if input.just_pressed(Key::Space) {
         clear_color.0 = Color::PURPLE;
     }
 }
diff --git a/examples/window/low_power.rs b/examples/window/low_power.rs
index ba890e7ec9d4b..87bcd006078fc 100644
--- a/examples/window/low_power.rs
+++ b/examples/window/low_power.rs
@@ -96,11 +96,8 @@ pub(crate) mod test_setup {
     use bevy::{prelude::*, window::RequestRedraw};
 
     /// Switch between update modes when the mouse is clicked.
-    pub(crate) fn cycle_modes(
-        mut mode: ResMut<ExampleMode>,
-        mouse_button_input: Res<Input<KeyCode>>,
-    ) {
-        if mouse_button_input.just_pressed(KeyCode::Space) {
+    pub(crate) fn cycle_modes(mut mode: ResMut<ExampleMode>, mouse_button_input: Res<Input<Key>>) {
+        if mouse_button_input.just_pressed(Key::Space) {
             *mode = match *mode {
                 ExampleMode::Game => ExampleMode::Application,
                 ExampleMode::Application => ExampleMode::ApplicationWithRedraw,
diff --git a/examples/window/scale_factor_override.rs b/examples/window/scale_factor_override.rs
index 0296e988252f2..c7a816615b2e6 100644
--- a/examples/window/scale_factor_override.rs
+++ b/examples/window/scale_factor_override.rs
@@ -76,10 +76,10 @@ fn display_override(mut windows: Query<&mut Window>) {
 }
 
 /// This system toggles scale factor overrides when enter is pressed
-fn toggle_override(input: Res<Input<KeyCode>>, mut windows: Query<&mut Window>) {
+fn toggle_override(input: Res<Input<Key>>, mut windows: Query<&mut Window>) {
     let mut window = windows.single_mut();
 
-    if input.just_pressed(KeyCode::Enter) {
+    if input.just_pressed(Key::Enter) {
         let scale_factor_override = window.resolution.scale_factor_override();
         window
             .resolution
@@ -88,14 +88,14 @@ fn toggle_override(input: Res<Input<KeyCode>>, mut windows: Query<&mut Window>)
 }
 
 /// This system changes the scale factor override when up or down is pressed
-fn change_scale_factor(input: Res<Input<KeyCode>>, mut windows: Query<&mut Window>) {
+fn change_scale_factor(input: Res<Input<Key>>, mut windows: Query<&mut Window>) {
     let mut window = windows.single_mut();
     let scale_factor_override = window.resolution.scale_factor_override();
-    if input.just_pressed(KeyCode::ArrowUp) {
+    if input.just_pressed(Key::ArrowUp) {
         window
             .resolution
             .set_scale_factor_override(scale_factor_override.map(|n| n + 1.0));
-    } else if input.just_pressed(KeyCode::ArrowDown) {
+    } else if input.just_pressed(Key::ArrowDown) {
         window
             .resolution
             .set_scale_factor_override(scale_factor_override.map(|n| (n - 1.0).max(1.0)));
diff --git a/examples/window/screenshot.rs b/examples/window/screenshot.rs
index 4b9eda146d813..603d16e0f027a 100644
--- a/examples/window/screenshot.rs
+++ b/examples/window/screenshot.rs
@@ -13,12 +13,12 @@ fn main() {
 }
 
 fn screenshot_on_spacebar(
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<Key>>,
     main_window: Query<Entity, With<PrimaryWindow>>,
     mut screenshot_manager: ResMut<ScreenshotManager>,
     mut counter: Local<u32>,
 ) {
-    if input.just_pressed(KeyCode::Space) {
+    if input.just_pressed(Key::Space) {
         let path = format!("./screenshot-{}.png", *counter);
         *counter += 1;
         screenshot_manager
diff --git a/examples/window/window_settings.rs b/examples/window/window_settings.rs
index 8819e143c40a6..758be45e693a0 100644
--- a/examples/window/window_settings.rs
+++ b/examples/window/window_settings.rs
@@ -41,8 +41,8 @@ fn main() {
 
 /// This system toggles the vsync mode when pressing the button V.
 /// You'll see fps increase displayed in the console.
-fn toggle_vsync(input: Res<Input<KeyCode>>, mut windows: Query<&mut Window>) {
-    if input.just_pressed(KeyCode::KeyV) {
+fn toggle_vsync(input: Res<Input<Key>>, mut windows: Query<&mut Window>) {
+    if input.just_pressed(Key::Character("v".into())) {
         let mut window = windows.single_mut();
 
         window.present_mode = if matches!(window.present_mode, PresentMode::AutoVsync) {
@@ -61,8 +61,8 @@ fn toggle_vsync(input: Res<Input<KeyCode>>, mut windows: Query<&mut Window>) {
 /// This feature only works on some platforms. Please check the
 /// [documentation](https://docs.rs/bevy/latest/bevy/prelude/struct.Window.html#structfield.window_level)
 /// for more details.
-fn switch_level(input: Res<Input<KeyCode>>, mut windows: Query<&mut Window>) {
-    if input.just_pressed(KeyCode::KeyT) {
+fn switch_level(input: Res<Input<Key>>, mut windows: Query<&mut Window>) {
+    if input.just_pressed(Key::Character("t".into())) {
         let mut window = windows.single_mut();
 
         window.window_level = match window.window_level {
@@ -83,8 +83,8 @@ fn change_title(mut windows: Query<&mut Window>, time: Res<Time>) {
     );
 }
 
-fn toggle_cursor(mut windows: Query<&mut Window>, input: Res<Input<KeyCode>>) {
-    if input.just_pressed(KeyCode::Space) {
+fn toggle_cursor(mut windows: Query<&mut Window>, input: Res<Input<Key>>) {
+    if input.just_pressed(Key::Space) {
         let mut window = windows.single_mut();
 
         window.cursor.visible = !window.cursor.visible;
@@ -96,8 +96,8 @@ fn toggle_cursor(mut windows: Query<&mut Window>, input: Res<Input<KeyCode>>) {
 }
 
 // This system will toggle the color theme used by the window
-fn toggle_theme(mut windows: Query<&mut Window>, input: Res<Input<KeyCode>>) {
-    if input.just_pressed(KeyCode::KeyF) {
+fn toggle_theme(mut windows: Query<&mut Window>, input: Res<Input<Key>>) {
+    if input.just_pressed(Key::Character("f".into())) {
         let mut window = windows.single_mut();
 
         if let Some(current_theme) = window.window_theme {

From 58249c182729c3ff752271549bdd3f24df38b162 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Wed, 14 Jun 2023 17:25:20 +0200
Subject: [PATCH 02/17] from<&str> for Key::Character + input methods taking
 into<T>

---
 crates/bevy_input/src/input.rs                | 73 ++++++++++---------
 crates/bevy_input/src/keyboard.rs             |  6 ++
 examples/2d/2d_gizmos.rs                      |  4 +-
 examples/2d/bloom_2d.rs                       | 28 +++----
 examples/3d/3d_gizmos.rs                      |  4 +-
 examples/3d/anti_aliasing.rs                  | 32 ++++----
 examples/3d/atmospheric_fog.rs                |  2 +-
 examples/3d/blend_modes.rs                    |  4 +-
 examples/3d/bloom_3d.rs                       | 28 +++----
 examples/3d/fog.rs                            | 34 ++++-----
 examples/3d/shadow_biases.rs                  |  2 +-
 examples/3d/shadow_caster_receiver.rs         |  6 +-
 examples/3d/skybox.rs                         |  2 +-
 examples/3d/tonemapping.rs                    |  8 +-
 examples/input/keyboard_input.rs              |  6 +-
 examples/input/keyboard_modifiers.rs          |  2 +-
 .../tools/scene_viewer/scene_viewer_plugin.rs |  8 +-
 examples/ui/overflow_debug.rs                 |  4 +-
 examples/ui/window_fallthrough.rs             |  2 +-
 examples/window/window_settings.rs            |  6 +-
 20 files changed, 135 insertions(+), 126 deletions(-)

diff --git a/crates/bevy_input/src/input.rs b/crates/bevy_input/src/input.rs
index 2cb295c3e467b..e65dc76db7902 100644
--- a/crates/bevy_input/src/input.rs
+++ b/crates/bevy_input/src/input.rs
@@ -67,7 +67,8 @@ where
     T: Clone + Eq + Hash + Send + Sync + 'static,
 {
     /// Registers a press for the given `input`.
-    pub fn press(&mut self, input: T) {
+    pub fn press<I: Into<T>>(&mut self, input: I) {
+        let input = input.into();
         // Returns `true` if the `input` wasn't pressed.
         if self.pressed.insert(input.clone()) {
             self.just_pressed.insert(input);
@@ -75,17 +76,18 @@ where
     }
 
     /// Returns `true` if the `input` has been pressed.
-    pub fn pressed(&self, input: T) -> bool {
-        self.pressed.contains(&input)
+    pub fn pressed<I: Into<T>>(&self, input: I) -> bool {
+        self.pressed.contains(&input.into())
     }
 
     /// Returns `true` if any item in `inputs` has been pressed.
-    pub fn any_pressed(&self, inputs: impl IntoIterator<Item = T>) -> bool {
+    pub fn any_pressed<I: Into<T>>(&self, inputs: impl IntoIterator<Item = I>) -> bool {
         inputs.into_iter().any(|it| self.pressed(it))
     }
 
     /// Registers a release for the given `input`.
-    pub fn release(&mut self, input: T) {
+    pub fn release<I: Into<T>>(&mut self, input: I) {
+        let input = input.into();
         // Returns `true` if the `input` was pressed.
         if self.pressed.remove(&input) {
             self.just_released.insert(input);
@@ -99,41 +101,42 @@ where
     }
 
     /// Returns `true` if the `input` has just been pressed.
-    pub fn just_pressed(&self, input: T) -> bool {
-        self.just_pressed.contains(&input)
+    pub fn just_pressed<I: Into<T>>(&self, input: I) -> bool {
+        self.just_pressed.contains(&input.into())
     }
 
     /// Returns `true` if any item in `inputs` has just been pressed.
-    pub fn any_just_pressed(&self, inputs: impl IntoIterator<Item = T>) -> bool {
+    pub fn any_just_pressed<I: Into<T>>(&self, inputs: impl IntoIterator<Item = I>) -> bool {
         inputs.into_iter().any(|it| self.just_pressed(it))
     }
 
     /// Clears the `just_pressed` state of the `input` and returns `true` if the `input` has just been pressed.
     ///
     /// Future calls to [`Input::just_pressed`] for the given input will return false until a new press event occurs.
-    pub fn clear_just_pressed(&mut self, input: T) -> bool {
-        self.just_pressed.remove(&input)
+    pub fn clear_just_pressed<I: Into<T>>(&mut self, input: I) -> bool {
+        self.just_pressed.remove(&input.into())
     }
 
     /// Returns `true` if the `input` has just been released.
-    pub fn just_released(&self, input: T) -> bool {
-        self.just_released.contains(&input)
+    pub fn just_released<I: Into<T>>(&self, input: I) -> bool {
+        self.just_released.contains(&input.into())
     }
 
     /// Returns `true` if any item in `inputs` has just been released.
-    pub fn any_just_released(&self, inputs: impl IntoIterator<Item = T>) -> bool {
+    pub fn any_just_released<I: Into<T>>(&self, inputs: impl IntoIterator<Item = I>) -> bool {
         inputs.into_iter().any(|it| self.just_released(it))
     }
 
     /// Clears the `just_released` state of the `input` and returns `true` if the `input` has just been released.
     ///
     /// Future calls to [`Input::just_released`] for the given input will return false until a new release event occurs.
-    pub fn clear_just_released(&mut self, input: T) -> bool {
-        self.just_released.remove(&input)
+    pub fn clear_just_released<I: Into<T>>(&mut self, input: I) -> bool {
+        self.just_released.remove(&input.into())
     }
 
     /// Clears the `pressed`, `just_pressed` and `just_released` data of the `input`.
-    pub fn reset(&mut self, input: T) {
+    pub fn reset<I: Into<T>>(&mut self, input: I) {
+        let input = input.into();
         self.pressed.remove(&input);
         self.just_pressed.remove(&input);
         self.just_released.remove(&input);
@@ -187,7 +190,7 @@ mod test {
 
     #[test]
     fn test_press() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
         assert!(!input.pressed.contains(&DummyInput::Input1));
         assert!(!input.just_pressed.contains(&DummyInput::Input1));
         input.press(DummyInput::Input1);
@@ -197,7 +200,7 @@ mod test {
 
     #[test]
     fn test_pressed() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
         assert!(!input.pressed(DummyInput::Input1));
         input.press(DummyInput::Input1);
         assert!(input.pressed(DummyInput::Input1));
@@ -205,7 +208,7 @@ mod test {
 
     #[test]
     fn test_any_pressed() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
         assert!(!input.any_pressed([DummyInput::Input1]));
         assert!(!input.any_pressed([DummyInput::Input2]));
         assert!(!input.any_pressed([DummyInput::Input1, DummyInput::Input2]));
@@ -217,7 +220,7 @@ mod test {
 
     #[test]
     fn test_release() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
         input.press(DummyInput::Input1);
         assert!(input.pressed.contains(&DummyInput::Input1));
         assert!(!input.just_released.contains(&DummyInput::Input1));
@@ -228,7 +231,7 @@ mod test {
 
     #[test]
     fn test_release_all() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
         input.press(DummyInput::Input1);
         input.press(DummyInput::Input2);
         input.release_all();
@@ -239,7 +242,7 @@ mod test {
 
     #[test]
     fn test_just_pressed() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
         assert!(!input.just_pressed(DummyInput::Input1));
         input.press(DummyInput::Input1);
         assert!(input.just_pressed(DummyInput::Input1));
@@ -247,7 +250,7 @@ mod test {
 
     #[test]
     fn test_any_just_pressed() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
         assert!(!input.any_just_pressed([DummyInput::Input1]));
         assert!(!input.any_just_pressed([DummyInput::Input2]));
         assert!(!input.any_just_pressed([DummyInput::Input1, DummyInput::Input2]));
@@ -259,7 +262,7 @@ mod test {
 
     #[test]
     fn test_clear_just_pressed() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
         input.press(DummyInput::Input1);
         assert!(input.just_pressed(DummyInput::Input1));
         input.clear_just_pressed(DummyInput::Input1);
@@ -268,7 +271,7 @@ mod test {
 
     #[test]
     fn test_just_released() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
         input.press(DummyInput::Input1);
         assert!(!input.just_released(DummyInput::Input1));
         input.release(DummyInput::Input1);
@@ -277,7 +280,7 @@ mod test {
 
     #[test]
     fn test_any_just_released() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
         input.press(DummyInput::Input1);
         assert!(!input.any_just_released([DummyInput::Input1]));
         assert!(!input.any_just_released([DummyInput::Input2]));
@@ -290,7 +293,7 @@ mod test {
 
     #[test]
     fn test_clear_just_released() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
         input.press(DummyInput::Input1);
         input.release(DummyInput::Input1);
         assert!(input.just_released(DummyInput::Input1));
@@ -300,7 +303,7 @@ mod test {
 
     #[test]
     fn test_reset() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
 
         // Pressed
         input.press(DummyInput::Input1);
@@ -326,7 +329,7 @@ mod test {
 
     #[test]
     fn test_reset_all() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
 
         input.press(DummyInput::Input1);
         input.press(DummyInput::Input2);
@@ -342,7 +345,7 @@ mod test {
 
     #[test]
     fn test_clear() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
 
         // Pressed
         input.press(DummyInput::Input1);
@@ -368,7 +371,7 @@ mod test {
 
     #[test]
     fn test_get_pressed() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
         input.press(DummyInput::Input1);
         input.press(DummyInput::Input2);
         let pressed = input.get_pressed();
@@ -380,7 +383,7 @@ mod test {
 
     #[test]
     fn test_get_just_pressed() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
         input.press(DummyInput::Input1);
         input.press(DummyInput::Input2);
         let just_pressed = input.get_just_pressed();
@@ -392,7 +395,7 @@ mod test {
 
     #[test]
     fn test_get_just_released() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
         input.press(DummyInput::Input1);
         input.press(DummyInput::Input2);
         input.release(DummyInput::Input1);
@@ -406,7 +409,7 @@ mod test {
 
     #[test]
     fn test_general_input_handling() {
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
 
         // Test pressing
         input.press(DummyInput::Input1);
@@ -451,7 +454,7 @@ mod test {
         assert!(!input.just_released(DummyInput::Input2));
 
         // Set up an `Input` to test resetting
-        let mut input = Input::default();
+        let mut input = Input::<DummyInput>::default();
 
         input.press(DummyInput::Input1);
         input.release(DummyInput::Input2);
diff --git a/crates/bevy_input/src/keyboard.rs b/crates/bevy_input/src/keyboard.rs
index 19f03835d44ba..250a96b04361b 100644
--- a/crates/bevy_input/src/keyboard.rs
+++ b/crates/bevy_input/src/keyboard.rs
@@ -1336,3 +1336,9 @@ pub enum Key {
     /// General-purpose function key.
     F35,
 }
+
+impl From<&str> for Key {
+    fn from(value: &str) -> Self {
+        Key::Character(value.into())
+    }
+}
diff --git a/examples/2d/2d_gizmos.rs b/examples/2d/2d_gizmos.rs
index da7a639ba06be..19a9ae327c35b 100644
--- a/examples/2d/2d_gizmos.rs
+++ b/examples/2d/2d_gizmos.rs
@@ -56,10 +56,10 @@ fn system(mut gizmos: Gizmos, time: Res<Time>) {
 }
 
 fn update_config(mut config: ResMut<GizmoConfig>, keyboard: Res<Input<KeyCode>>, time: Res<Time>) {
-    if keyboard.pressed(KeyCode::Right) {
+    if keyboard.pressed(KeyCode::ArrowRight) {
         config.line_width += 5. * time.delta_seconds();
     }
-    if keyboard.pressed(KeyCode::Left) {
+    if keyboard.pressed(KeyCode::ArrowLeft) {
         config.line_width -= 5. * time.delta_seconds();
     }
 }
diff --git a/examples/2d/bloom_2d.rs b/examples/2d/bloom_2d.rs
index 050539ee6a801..eccc7a1766ecb 100644
--- a/examples/2d/bloom_2d.rs
+++ b/examples/2d/bloom_2d.rs
@@ -137,59 +137,59 @@ fn update_bloom_settings(
 
             let dt = time.delta_seconds();
 
-            if key.pressed(Key::Character("a".into())) {
+            if key.pressed("a") {
                 bloom_settings.intensity -= dt / 10.0;
             }
-            if key.pressed(Key::Character("q".into())) {
+            if key.pressed("q") {
                 bloom_settings.intensity += dt / 10.0;
             }
             bloom_settings.intensity = bloom_settings.intensity.clamp(0.0, 1.0);
 
-            if key.pressed(Key::Character("s".into())) {
+            if key.pressed("s") {
                 bloom_settings.low_frequency_boost -= dt / 10.0;
             }
-            if key.pressed(Key::Character("w".into())) {
+            if key.pressed("w") {
                 bloom_settings.low_frequency_boost += dt / 10.0;
             }
             bloom_settings.low_frequency_boost = bloom_settings.low_frequency_boost.clamp(0.0, 1.0);
 
-            if key.pressed(Key::Character("d".into())) {
+            if key.pressed("d") {
                 bloom_settings.low_frequency_boost_curvature -= dt / 10.0;
             }
-            if key.pressed(Key::Character("e".into())) {
+            if key.pressed("e") {
                 bloom_settings.low_frequency_boost_curvature += dt / 10.0;
             }
             bloom_settings.low_frequency_boost_curvature =
                 bloom_settings.low_frequency_boost_curvature.clamp(0.0, 1.0);
 
-            if key.pressed(Key::Character("f".into())) {
+            if key.pressed("f") {
                 bloom_settings.high_pass_frequency -= dt / 10.0;
             }
-            if key.pressed(Key::Character("r".into())) {
+            if key.pressed("r") {
                 bloom_settings.high_pass_frequency += dt / 10.0;
             }
             bloom_settings.high_pass_frequency = bloom_settings.high_pass_frequency.clamp(0.0, 1.0);
 
-            if key.pressed(Key::Character("g".into())) {
+            if key.pressed("g") {
                 bloom_settings.composite_mode = BloomCompositeMode::Additive;
             }
-            if key.pressed(Key::Character("t".into())) {
+            if key.pressed("t") {
                 bloom_settings.composite_mode = BloomCompositeMode::EnergyConserving;
             }
 
-            if key.pressed(Key::Character("h".into())) {
+            if key.pressed("h") {
                 bloom_settings.prefilter_settings.threshold -= dt;
             }
-            if key.pressed(Key::Character("y".into())) {
+            if key.pressed("y") {
                 bloom_settings.prefilter_settings.threshold += dt;
             }
             bloom_settings.prefilter_settings.threshold =
                 bloom_settings.prefilter_settings.threshold.max(0.0);
 
-            if key.pressed(Key::Character("j".into())) {
+            if key.pressed("j") {
                 bloom_settings.prefilter_settings.threshold_softness -= dt / 10.0;
             }
-            if key.pressed(Key::Character("u".into())) {
+            if key.pressed("u") {
                 bloom_settings.prefilter_settings.threshold_softness += dt / 10.0;
             }
             bloom_settings.prefilter_settings.threshold_softness = bloom_settings
diff --git a/examples/3d/3d_gizmos.rs b/examples/3d/3d_gizmos.rs
index daa75841fe6a2..c67e8c7a64a2f 100644
--- a/examples/3d/3d_gizmos.rs
+++ b/examples/3d/3d_gizmos.rs
@@ -105,10 +105,10 @@ fn rotate_camera(mut query: Query<&mut Transform, With<Camera>>, time: Res<Time>
 }
 
 fn update_config(mut config: ResMut<GizmoConfig>, keyboard: Res<Input<Key>>, time: Res<Time>) {
-    if keyboard.just_pressed(Key::Character("d".into())) {
+    if keyboard.just_pressed("d") {
         config.depth_bias = if config.depth_bias == 0. { -1. } else { 0. };
     }
-    if keyboard.just_pressed(Key::Character("p".into())) {
+    if keyboard.just_pressed("p") {
         // Toggle line_perspective
         config.line_perspective ^= true;
         // Increase the line width when line_perspective is on
diff --git a/examples/3d/anti_aliasing.rs b/examples/3d/anti_aliasing.rs
index 5409d8c3ed42d..a8d109508b00d 100644
--- a/examples/3d/anti_aliasing.rs
+++ b/examples/3d/anti_aliasing.rs
@@ -45,14 +45,14 @@ fn modify_aa(
     let mut camera = commands.entity(camera_entity);
 
     // No AA
-    if keys.just_pressed(Key::Character("1".into())) {
+    if keys.just_pressed("1") {
         *msaa = Msaa::Off;
         camera.remove::<Fxaa>();
         camera.remove::<TemporalAntiAliasBundle>();
     }
 
     // MSAA
-    if keys.just_pressed(Key::Character("2".into())) && *msaa == Msaa::Off {
+    if keys.just_pressed("2") && *msaa == Msaa::Off {
         camera.remove::<Fxaa>();
         camera.remove::<TemporalAntiAliasBundle>();
 
@@ -61,19 +61,19 @@ fn modify_aa(
 
     // MSAA Sample Count
     if *msaa != Msaa::Off {
-        if keys.just_pressed(Key::Character("q".into())) {
+        if keys.just_pressed("q") {
             *msaa = Msaa::Sample2;
         }
-        if keys.just_pressed(Key::Character("w".into())) {
+        if keys.just_pressed("w") {
             *msaa = Msaa::Sample4;
         }
-        if keys.just_pressed(Key::Character("e".into())) {
+        if keys.just_pressed("e") {
             *msaa = Msaa::Sample8;
         }
     }
 
     // FXAA
-    if keys.just_pressed(Key::Character("3".into())) && fxaa.is_none() {
+    if keys.just_pressed("3") && fxaa.is_none() {
         *msaa = Msaa::Off;
         camera.remove::<TemporalAntiAliasBundle>();
 
@@ -82,30 +82,30 @@ fn modify_aa(
 
     // FXAA Settings
     if let Some(mut fxaa) = fxaa {
-        if keys.just_pressed(Key::Character("q".into())) {
+        if keys.just_pressed("q") {
             fxaa.edge_threshold = Sensitivity::Low;
             fxaa.edge_threshold_min = Sensitivity::Low;
         }
-        if keys.just_pressed(Key::Character("w".into())) {
+        if keys.just_pressed("w") {
             fxaa.edge_threshold = Sensitivity::Medium;
             fxaa.edge_threshold_min = Sensitivity::Medium;
         }
-        if keys.just_pressed(Key::Character("e".into())) {
+        if keys.just_pressed("e") {
             fxaa.edge_threshold = Sensitivity::High;
             fxaa.edge_threshold_min = Sensitivity::High;
         }
-        if keys.just_pressed(Key::Character("r".into())) {
+        if keys.just_pressed("r") {
             fxaa.edge_threshold = Sensitivity::Ultra;
             fxaa.edge_threshold_min = Sensitivity::Ultra;
         }
-        if keys.just_pressed(Key::Character("t".into())) {
+        if keys.just_pressed("t") {
             fxaa.edge_threshold = Sensitivity::Extreme;
             fxaa.edge_threshold_min = Sensitivity::Extreme;
         }
     }
 
     // TAA
-    if keys.just_pressed(Key::Character("4".into())) && taa.is_none() {
+    if keys.just_pressed("4") && taa.is_none() {
         *msaa = Msaa::Off;
         camera.remove::<Fxaa>();
 
@@ -118,19 +118,19 @@ fn modify_sharpening(
     mut query: Query<&mut ContrastAdaptiveSharpeningSettings>,
 ) {
     for mut cas in &mut query {
-        if keys.just_pressed(Key::Character("0".into())) {
+        if keys.just_pressed("0") {
             cas.enabled = !cas.enabled;
         }
         if cas.enabled {
-            if keys.just_pressed(Key::Character("-".into())) {
+            if keys.just_pressed("-") {
                 cas.sharpening_strength -= 0.1;
                 cas.sharpening_strength = cas.sharpening_strength.clamp(0.0, 1.0);
             }
-            if keys.just_pressed(Key::Character("+".into())) {
+            if keys.just_pressed("+") {
                 cas.sharpening_strength += 0.1;
                 cas.sharpening_strength = cas.sharpening_strength.clamp(0.0, 1.0);
             }
-            if keys.just_pressed(Key::Character("d".into())) {
+            if keys.just_pressed("d") {
                 cas.denoise = !cas.denoise;
             }
         }
diff --git a/examples/3d/atmospheric_fog.rs b/examples/3d/atmospheric_fog.rs
index 2ea0bd9d5869e..6a1de2d977a4b 100644
--- a/examples/3d/atmospheric_fog.rs
+++ b/examples/3d/atmospheric_fog.rs
@@ -118,7 +118,7 @@ fn toggle_system(key: Res<Input<Key>>, mut fog: Query<&mut FogSettings>) {
         fog_settings.color.set_a(1.0 - a);
     }
 
-    if key.just_pressed(Key::Character("s".into())) {
+    if key.just_pressed("s") {
         let a = fog_settings.directional_light_color.a();
         fog_settings.directional_light_color.set_a(0.5 - a);
     }
diff --git a/examples/3d/blend_modes.rs b/examples/3d/blend_modes.rs
index 774b076287655..5611e6d8c2480 100644
--- a/examples/3d/blend_modes.rs
+++ b/examples/3d/blend_modes.rs
@@ -299,7 +299,7 @@ fn example_control_system(
         state.unlit = !state.unlit;
     }
 
-    let randomize_colors = input.just_pressed(Key::Character("c".into()));
+    let randomize_colors = input.just_pressed("c");
 
     for (material_handle, controls) in &controllable {
         let material = materials.get_mut(material_handle).unwrap();
@@ -317,7 +317,7 @@ fn example_control_system(
 
     let (mut camera, mut camera_transform, camera_global_transform) = camera.single_mut();
 
-    if input.just_pressed(Key::Character("h".into())) {
+    if input.just_pressed("h") {
         camera.hdr = !camera.hdr;
     }
 
diff --git a/examples/3d/bloom_3d.rs b/examples/3d/bloom_3d.rs
index 8174a9059849e..ed2056f93cc2b 100644
--- a/examples/3d/bloom_3d.rs
+++ b/examples/3d/bloom_3d.rs
@@ -161,59 +161,59 @@ fn update_bloom_settings(
 
             let dt = time.delta_seconds();
 
-            if key.pressed(Key::Character("a".into())) {
+            if key.pressed("a") {
                 bloom_settings.intensity -= dt / 10.0;
             }
-            if key.pressed(Key::Character("q".into())) {
+            if key.pressed("q") {
                 bloom_settings.intensity += dt / 10.0;
             }
             bloom_settings.intensity = bloom_settings.intensity.clamp(0.0, 1.0);
 
-            if key.pressed(Key::Character("s".into())) {
+            if key.pressed("s") {
                 bloom_settings.low_frequency_boost -= dt / 10.0;
             }
-            if key.pressed(Key::Character("w".into())) {
+            if key.pressed("w") {
                 bloom_settings.low_frequency_boost += dt / 10.0;
             }
             bloom_settings.low_frequency_boost = bloom_settings.low_frequency_boost.clamp(0.0, 1.0);
 
-            if key.pressed(Key::Character("d".into())) {
+            if key.pressed("d") {
                 bloom_settings.low_frequency_boost_curvature -= dt / 10.0;
             }
-            if key.pressed(Key::Character("e".into())) {
+            if key.pressed("e") {
                 bloom_settings.low_frequency_boost_curvature += dt / 10.0;
             }
             bloom_settings.low_frequency_boost_curvature =
                 bloom_settings.low_frequency_boost_curvature.clamp(0.0, 1.0);
 
-            if key.pressed(Key::Character("f".into())) {
+            if key.pressed("f") {
                 bloom_settings.high_pass_frequency -= dt / 10.0;
             }
-            if key.pressed(Key::Character("r".into())) {
+            if key.pressed("r") {
                 bloom_settings.high_pass_frequency += dt / 10.0;
             }
             bloom_settings.high_pass_frequency = bloom_settings.high_pass_frequency.clamp(0.0, 1.0);
 
-            if key.pressed(Key::Character("g".into())) {
+            if key.pressed("g") {
                 bloom_settings.composite_mode = BloomCompositeMode::Additive;
             }
-            if key.pressed(Key::Character("t".into())) {
+            if key.pressed("t") {
                 bloom_settings.composite_mode = BloomCompositeMode::EnergyConserving;
             }
 
-            if key.pressed(Key::Character("h".into())) {
+            if key.pressed("h") {
                 bloom_settings.prefilter_settings.threshold -= dt;
             }
-            if key.pressed(Key::Character("y".into())) {
+            if key.pressed("y") {
                 bloom_settings.prefilter_settings.threshold += dt;
             }
             bloom_settings.prefilter_settings.threshold =
                 bloom_settings.prefilter_settings.threshold.max(0.0);
 
-            if key.pressed(Key::Character("j".into())) {
+            if key.pressed("j") {
                 bloom_settings.prefilter_settings.threshold_softness -= dt / 10.0;
             }
-            if key.pressed(Key::Character("u".into())) {
+            if key.pressed("u") {
                 bloom_settings.prefilter_settings.threshold_softness += dt / 10.0;
             }
             bloom_settings.prefilter_settings.threshold_softness = bloom_settings
diff --git a/examples/3d/fog.rs b/examples/3d/fog.rs
index 2ae210bf76f87..71220ec04133a 100644
--- a/examples/3d/fog.rs
+++ b/examples/3d/fog.rs
@@ -185,7 +185,7 @@ fn update_system(
         .value
         .push_str("\n\n1 / 2 / 3 - Fog Falloff Mode");
 
-    if key.just_pressed(Key::Character("1".into())) {
+    if key.just_pressed("1") {
         if let FogFalloff::Linear { .. } = fog.falloff {
             // No change
         } else {
@@ -226,16 +226,16 @@ fn update_system(
             .value
             .push_str("\nA / S - Move Start Distance\nZ / X - Move End Distance");
 
-        if key.pressed(Key::Character("a".into())) {
+        if key.pressed("a") {
             *start -= delta * 3.0;
         }
-        if key.pressed(Key::Character("s".into())) {
+        if key.pressed("s") {
             *start += delta * 3.0;
         }
-        if key.pressed(Key::Character("z".into())) {
+        if key.pressed("z") {
             *end -= delta * 3.0;
         }
-        if key.pressed(Key::Character("x".into())) {
+        if key.pressed("x") {
             *end += delta * 3.0;
         }
     }
@@ -244,13 +244,13 @@ fn update_system(
     if let FogFalloff::Exponential { ref mut density } = &mut fog.falloff {
         text.sections[0].value.push_str("\nA / S - Change Density");
 
-        if key.pressed(Key::Character("a".into())) {
+        if key.pressed("a") {
             *density -= delta * 0.5 * *density;
             if *density < 0.0 {
                 *density = 0.0;
             }
         }
-        if key.pressed(Key::Character("s".into())) {
+        if key.pressed("s") {
             *density += delta * 0.5 * *density;
         }
     }
@@ -259,13 +259,13 @@ fn update_system(
     if let FogFalloff::ExponentialSquared { ref mut density } = &mut fog.falloff {
         text.sections[0].value.push_str("\nA / S - Change Density");
 
-        if key.pressed(Key::Character("a".into())) {
+        if key.pressed("a") {
             *density -= delta * 0.5 * *density;
             if *density < 0.0 {
                 *density = 0.0;
             }
         }
-        if key.pressed(Key::Character("s".into())) {
+        if key.pressed("s") {
             *density += delta * 0.5 * *density;
         }
     }
@@ -275,42 +275,42 @@ fn update_system(
         .value
         .push_str("\n\n- / = - Red\n[ / ] - Green\n; / ' - Blue\n. / ? - Alpha");
 
-    if key.pressed(Key::Character("-".into())) {
+    if key.pressed("-") {
         let r = (fog.color.r() - 0.1 * delta).max(0.0);
         fog.color.set_r(r);
     }
 
-    if key.pressed(Key::Character("=".into())) {
+    if key.pressed("=") {
         let r = (fog.color.r() + 0.1 * delta).min(1.0);
         fog.color.set_r(r);
     }
 
-    if key.pressed(Key::Character("[".into())) {
+    if key.pressed("[") {
         let g = (fog.color.g() - 0.1 * delta).max(0.0);
         fog.color.set_g(g);
     }
 
-    if key.pressed(Key::Character("]".into())) {
+    if key.pressed("]") {
         let g = (fog.color.g() + 0.1 * delta).min(1.0);
         fog.color.set_g(g);
     }
 
-    if key.pressed(Key::Character(";".into())) {
+    if key.pressed(";") {
         let b = (fog.color.b() - 0.1 * delta).max(0.0);
         fog.color.set_b(b);
     }
 
-    if key.pressed(Key::Character("'".into())) {
+    if key.pressed("'") {
         let b = (fog.color.b() + 0.1 * delta).min(1.0);
         fog.color.set_b(b);
     }
 
-    if key.pressed(Key::Character(".".into())) {
+    if key.pressed(".") {
         let a = (fog.color.a() - 0.1 * delta).max(0.0);
         fog.color.set_a(a);
     }
 
-    if key.pressed(Key::Character("?".into())) {
+    if key.pressed("?") {
         let a = (fog.color.a() + 0.1 * delta).min(1.0);
         fog.color.set_a(a);
     }
diff --git a/examples/3d/shadow_biases.rs b/examples/3d/shadow_biases.rs
index b08d5e07e9018..3a45f19ba9a9b 100644
--- a/examples/3d/shadow_biases.rs
+++ b/examples/3d/shadow_biases.rs
@@ -146,7 +146,7 @@ fn toggle_light(
     mut directional_lights: Query<&mut DirectionalLight>,
     mut example_text: Query<&mut Text>,
 ) {
-    if input.just_pressed(Key::Character("l".into())) {
+    if input.just_pressed("l") {
         for mut light in &mut point_lights {
             light.intensity = if light.intensity == 0.0 {
                 example_text.single_mut().sections[4].value = "PointLight".to_string();
diff --git a/examples/3d/shadow_caster_receiver.rs b/examples/3d/shadow_caster_receiver.rs
index c2b6fcbeed659..334ce76b9822f 100644
--- a/examples/3d/shadow_caster_receiver.rs
+++ b/examples/3d/shadow_caster_receiver.rs
@@ -130,7 +130,7 @@ fn toggle_light(
     mut point_lights: Query<&mut PointLight>,
     mut directional_lights: Query<&mut DirectionalLight>,
 ) {
-    if input.just_pressed(Key::Character("l".into())) {
+    if input.just_pressed("l") {
         for mut light in &mut point_lights {
             light.intensity = if light.intensity == 0.0 {
                 println!("Using PointLight");
@@ -160,7 +160,7 @@ fn toggle_shadows(
         Query<Entity, (With<Handle<Mesh>>, Without<NotShadowReceiver>)>,
     )>,
 ) {
-    if input.just_pressed(Key::Character("c".into())) {
+    if input.just_pressed("c") {
         println!("Toggling casters");
         for entity in queries.p0().iter() {
             commands.entity(entity).remove::<NotShadowCaster>();
@@ -169,7 +169,7 @@ fn toggle_shadows(
             commands.entity(entity).insert(NotShadowCaster);
         }
     }
-    if input.just_pressed(Key::Character("r".into())) {
+    if input.just_pressed("r") {
         println!("Toggling receivers");
         for entity in queries.p1().iter() {
             commands.entity(entity).remove::<NotShadowReceiver>();
diff --git a/examples/3d/skybox.rs b/examples/3d/skybox.rs
index a38ab8d8b5d2f..0668192511b34 100644
--- a/examples/3d/skybox.rs
+++ b/examples/3d/skybox.rs
@@ -211,7 +211,7 @@ impl Default for CameraController {
             key_down: KeyCode::KeyQ,
             key_run: KeyCode::ShiftLeft,
             mouse_key_enable_mouse: MouseButton::Left,
-            keyboard_key_enable_mouse: Key::Character("m".into()),
+            keyboard_key_enable_mouse: "m".into(),
             walk_speed: 2.0,
             run_speed: 6.0,
             friction: 0.5,
diff --git a/examples/3d/tonemapping.rs b/examples/3d/tonemapping.rs
index c6e376718ea7b..e6170d56c9c3b 100644
--- a/examples/3d/tonemapping.rs
+++ b/examples/3d/tonemapping.rs
@@ -352,11 +352,11 @@ fn toggle_scene(
     mut current_scene: ResMut<CurrentScene>,
 ) {
     let mut pressed = None;
-    if keys.just_pressed(Key::Character("q".into())) {
+    if keys.just_pressed("q") {
         pressed = Some(1);
-    } else if keys.just_pressed(Key::Character("w".into())) {
+    } else if keys.just_pressed("w") {
         pressed = Some(2);
-    } else if keys.just_pressed(Key::Character("e".into())) {
+    } else if keys.just_pressed("e") {
         pressed = Some(3);
     }
 
@@ -487,7 +487,7 @@ fn update_ui(
     let mut text = text.single_mut();
     let text = &mut text.sections[0].value;
 
-    if keys.just_pressed(Key::Character("h".into())) {
+    if keys.just_pressed("h") {
         *hide_ui = !*hide_ui;
     }
     text.clear();
diff --git a/examples/input/keyboard_input.rs b/examples/input/keyboard_input.rs
index 07bc59b49b5c9..80511b2f41164 100644
--- a/examples/input/keyboard_input.rs
+++ b/examples/input/keyboard_input.rs
@@ -11,15 +11,15 @@ fn main() {
 
 /// This system prints 'A' key state
 fn keyboard_input_system(keyboard_input: Res<Input<Key>>) {
-    if keyboard_input.pressed(Key::Character("a".into())) {
+    if keyboard_input.pressed("a") {
         info!("'A' currently pressed");
     }
 
-    if keyboard_input.just_pressed(Key::Character("a".into())) {
+    if keyboard_input.just_pressed("a") {
         info!("'A' just pressed");
     }
 
-    if keyboard_input.just_released(Key::Character("a".into())) {
+    if keyboard_input.just_released("a") {
         info!("'A' just released");
     }
 }
diff --git a/examples/input/keyboard_modifiers.rs b/examples/input/keyboard_modifiers.rs
index 2f5f4d0ed08b6..0499ca7c36f31 100644
--- a/examples/input/keyboard_modifiers.rs
+++ b/examples/input/keyboard_modifiers.rs
@@ -14,7 +14,7 @@ fn keyboard_input_system(input: Res<Input<Key>>) {
     let shift = input.pressed(Key::Shift);
     let ctrl = input.pressed(Key::Control);
 
-    if ctrl && shift && input.just_pressed(Key::Character("a".into())) {
+    if ctrl && shift && input.just_pressed("a") {
         info!("Just pressed Ctrl + Shift + A!");
     }
 }
diff --git a/examples/tools/scene_viewer/scene_viewer_plugin.rs b/examples/tools/scene_viewer/scene_viewer_plugin.rs
index 20358aff98e00..04a807bb009dd 100644
--- a/examples/tools/scene_viewer/scene_viewer_plugin.rs
+++ b/examples/tools/scene_viewer/scene_viewer_plugin.rs
@@ -67,7 +67,7 @@ impl Plugin for SceneViewerPlugin {
                 (
                     update_lights,
                     camera_tracker,
-                    toggle_bounding_boxes.run_if(input_just_pressed(Key::Character("b".into()))),
+                    toggle_bounding_boxes.run_if(input_just_pressed("b")),
                     #[cfg(feature = "animation")]
                     (start_animation, keyboard_animation_control),
                 ),
@@ -214,12 +214,12 @@ fn update_lights(
     mut animate_directional_light: Local<bool>,
 ) {
     for (_, mut light) in &mut query {
-        if key_input.just_pressed(Key::Character("u".into())) {
+        if key_input.just_pressed("u") {
             light.shadows_enabled = !light.shadows_enabled;
         }
     }
 
-    if key_input.just_pressed(Key::Character("l".into())) {
+    if key_input.just_pressed("l") {
         *animate_directional_light = !*animate_directional_light;
     }
     if *animate_directional_light {
@@ -283,7 +283,7 @@ fn camera_tracker(
         camera.is_active = camera_tracker.track_camera(entity);
     }
 
-    if keyboard_input.just_pressed(Key::Character("c".into())) {
+    if keyboard_input.just_pressed("c") {
         // disable currently active camera
         if let Some(e) = camera_tracker.active_camera() {
             if let Ok(mut camera) = queries.p2().get_mut(e) {
diff --git a/examples/ui/overflow_debug.rs b/examples/ui/overflow_debug.rs
index 39fd3c1df535c..b5f6286419fbf 100644
--- a/examples/ui/overflow_debug.rs
+++ b/examples/ui/overflow_debug.rs
@@ -268,7 +268,7 @@ fn update_transform<T: UpdateTransform + Component>(
 }
 
 fn toggle_overflow(keys: Res<Input<Key>>, mut containers: Query<&mut Style, With<Container>>) {
-    if keys.just_pressed(Key::Character("o".into())) {
+    if keys.just_pressed("o") {
         for mut style in &mut containers {
             style.overflow = match style.overflow {
                 Overflow {
@@ -290,7 +290,7 @@ fn toggle_overflow(keys: Res<Input<Key>>, mut containers: Query<&mut Style, With
 }
 
 fn next_container_size(keys: Res<Input<Key>>, mut containers: Query<(&mut Style, &mut Container)>) {
-    if keys.just_pressed(Key::Character("s".into())) {
+    if keys.just_pressed("s") {
         for (mut style, mut container) in &mut containers {
             container.0 = (container.0 + 1) % 3;
 
diff --git a/examples/ui/window_fallthrough.rs b/examples/ui/window_fallthrough.rs
index 5c30589e5edfb..6ad857bbd83bd 100644
--- a/examples/ui/window_fallthrough.rs
+++ b/examples/ui/window_fallthrough.rs
@@ -48,7 +48,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
 }
 // A simple system to handle some keyboard input and toggle on/off the hittest.
 fn toggle_mouse_passthrough(keyboard_input: Res<Input<Key>>, mut windows: Query<&mut Window>) {
-    if keyboard_input.just_pressed(Key::Character("p".into())) {
+    if keyboard_input.just_pressed("p") {
         let mut window = windows.single_mut();
         window.cursor.hit_test = !window.cursor.hit_test;
     }
diff --git a/examples/window/window_settings.rs b/examples/window/window_settings.rs
index 758be45e693a0..8a4f53e71fa8b 100644
--- a/examples/window/window_settings.rs
+++ b/examples/window/window_settings.rs
@@ -42,7 +42,7 @@ fn main() {
 /// This system toggles the vsync mode when pressing the button V.
 /// You'll see fps increase displayed in the console.
 fn toggle_vsync(input: Res<Input<Key>>, mut windows: Query<&mut Window>) {
-    if input.just_pressed(Key::Character("v".into())) {
+    if input.just_pressed("v") {
         let mut window = windows.single_mut();
 
         window.present_mode = if matches!(window.present_mode, PresentMode::AutoVsync) {
@@ -62,7 +62,7 @@ fn toggle_vsync(input: Res<Input<Key>>, mut windows: Query<&mut Window>) {
 /// [documentation](https://docs.rs/bevy/latest/bevy/prelude/struct.Window.html#structfield.window_level)
 /// for more details.
 fn switch_level(input: Res<Input<Key>>, mut windows: Query<&mut Window>) {
-    if input.just_pressed(Key::Character("t".into())) {
+    if input.just_pressed("t") {
         let mut window = windows.single_mut();
 
         window.window_level = match window.window_level {
@@ -97,7 +97,7 @@ fn toggle_cursor(mut windows: Query<&mut Window>, input: Res<Input<Key>>) {
 
 // This system will toggle the color theme used by the window
 fn toggle_theme(mut windows: Query<&mut Window>, input: Res<Input<Key>>) {
-    if input.just_pressed(Key::Character("f".into())) {
+    if input.just_pressed("f") {
         let mut window = windows.single_mut();
 
         if let Some(current_theme) = window.window_theme {

From 4676e2ca2d21889ed051c99c53d2d9433ccbd518 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Thu, 15 Jun 2023 09:50:41 +0200
Subject: [PATCH 03/17] add an example input for a letter with shift, causing a
 bug where pressed doesn't go back to false

---
 crates/bevy_winit/Cargo.toml     | 2 +-
 examples/input/keyboard_input.rs | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/crates/bevy_winit/Cargo.toml b/crates/bevy_winit/Cargo.toml
index 9f909cd6befe1..bd590cd0aaf24 100644
--- a/crates/bevy_winit/Cargo.toml
+++ b/crates/bevy_winit/Cargo.toml
@@ -28,6 +28,7 @@ bevy_utils = { path = "../bevy_utils", version = "0.11.0-dev" }
 bevy_tasks = { path = "../bevy_tasks", version = "0.11.0-dev" }
 
 # other
+# Tested on rev = 6300cf91
 winit = { git = "https://github.com/rust-windowing/winit.git", branch = "master", default-features = false }
 accesskit_winit = { git = "https://github.com/Vrixyz/accesskit.git", branch = "winit-main-after-0.28", default-features = false, features = [
     "async-io",
@@ -36,7 +37,6 @@ approx = { version = "0.5", default-features = false }
 raw-window-handle = "0.5"
 
 [target.'cfg(target_os = "android")'.dependencies]
-# Tested on rev = b5785ba785f3c1278344bcc545a954f0b5464d28
 winit = { git = "https://github.com/rust-windowing/winit.git", branch = "master", default-features = false, features = [
     "android-native-activity",
 ] }
diff --git a/examples/input/keyboard_input.rs b/examples/input/keyboard_input.rs
index 80511b2f41164..99158b68ec783 100644
--- a/examples/input/keyboard_input.rs
+++ b/examples/input/keyboard_input.rs
@@ -22,4 +22,7 @@ fn keyboard_input_system(keyboard_input: Res<Input<Key>>) {
     if keyboard_input.just_released("a") {
         info!("'A' just released");
     }
+    if keyboard_input.pressed("A") {
+        info!("capital 'A' is being pressed");
+    }
 }

From ea9339c66bb0b48749687dc6e1b15536123b1040 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Fri, 16 Jun 2023 09:34:06 +0200
Subject: [PATCH 04/17] dynamic key mapping to rely on physical key rather than
 logical key

---
 crates/bevy_input/src/input.rs                | 42 +++++++++++++---
 crates/bevy_input/src/keyboard.rs             | 50 +++++++++++++++++--
 crates/bevy_input/src/lib.rs                  |  6 +--
 crates/bevy_winit/src/lib.rs                  |  3 +-
 examples/2d/bloom_2d.rs                       |  2 +-
 examples/2d/rotation.rs                       |  2 +-
 examples/3d/3d_gizmos.rs                      |  2 +-
 examples/3d/anti_aliasing.rs                  |  4 +-
 examples/3d/atmospheric_fog.rs                |  2 +-
 examples/3d/blend_modes.rs                    |  2 +-
 examples/3d/bloom_3d.rs                       |  2 +-
 examples/3d/fog.rs                            |  2 +-
 examples/3d/lighting.rs                       |  2 +-
 examples/3d/shadow_biases.rs                  |  2 +-
 examples/3d/shadow_caster_receiver.rs         |  4 +-
 examples/3d/skybox.rs                         |  2 +-
 examples/3d/spotlight.rs                      |  2 +-
 examples/3d/tonemapping.rs                    |  6 +--
 examples/animation/animated_fox.rs            |  2 +-
 examples/audio/audio_control.rs               |  2 +-
 examples/ecs/generic_system.rs                |  2 +-
 examples/ecs/run_conditions.rs                |  2 +-
 examples/ecs/state.rs                         |  2 +-
 examples/games/alien_cake_addict.rs           |  4 +-
 examples/games/breakout.rs                    |  2 +-
 examples/input/keyboard_input.rs              | 17 +++++--
 examples/input/keyboard_modifiers.rs          |  2 +-
 examples/input/mouse_grab.rs                  |  2 +-
 examples/shader/shader_prepass.rs             |  2 +-
 examples/stress_tests/many_foxes.rs           |  2 +-
 examples/stress_tests/many_gizmos.rs          |  2 +-
 .../tools/scene_viewer/scene_viewer_plugin.rs |  6 +--
 examples/ui/overflow_debug.rs                 | 13 +++--
 examples/ui/ui_scaling.rs                     |  2 +-
 examples/ui/window_fallthrough.rs             |  2 +-
 examples/window/clear_color.rs                |  2 +-
 examples/window/low_power.rs                  |  5 +-
 examples/window/scale_factor_override.rs      |  4 +-
 examples/window/screenshot.rs                 |  2 +-
 examples/window/window_settings.rs            |  8 +--
 40 files changed, 156 insertions(+), 68 deletions(-)

diff --git a/crates/bevy_input/src/input.rs b/crates/bevy_input/src/input.rs
index e65dc76db7902..2c0c21dabc9b8 100644
--- a/crates/bevy_input/src/input.rs
+++ b/crates/bevy_input/src/input.rs
@@ -1,6 +1,6 @@
 use bevy_ecs::system::Resource;
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
-use bevy_utils::HashSet;
+use bevy_utils::{HashMap, HashSet};
 use std::hash::Hash;
 
 // unused import, but needed for intra doc link to work
@@ -50,6 +50,8 @@ pub struct Input<T: Clone + Eq + Hash + Send + Sync + 'static> {
     just_pressed: HashSet<T>,
     /// A collection of every button that has just been released.
     just_released: HashSet<T>,
+    /// To map logical keys with their respecting physical keys for reliability.
+    dynamic_map_value: HashMap<T, T>,
 }
 
 impl<T: Clone + Eq + Hash + Send + Sync + 'static> Default for Input<T> {
@@ -58,6 +60,7 @@ impl<T: Clone + Eq + Hash + Send + Sync + 'static> Default for Input<T> {
             pressed: Default::default(),
             just_pressed: Default::default(),
             just_released: Default::default(),
+            dynamic_map_value: HashMap::default(),
         }
     }
 }
@@ -66,6 +69,16 @@ impl<T> Input<T>
 where
     T: Clone + Eq + Hash + Send + Sync + 'static,
 {
+    pub fn add_dynamic_mapping<I: Into<T>>(&mut self, user_visible: I, stored: I) {
+        self.dynamic_map_value
+            .insert(user_visible.into(), stored.into());
+    }
+    pub fn release_dynamic_mapping<I: Into<T>>(&mut self, key: I) {
+        let to_remove = key.into();
+        self.dynamic_map_value
+            .retain(|k, v| k != &to_remove && v != &to_remove);
+    }
+
     /// Registers a press for the given `input`.
     pub fn press<I: Into<T>>(&mut self, input: I) {
         let input = input.into();
@@ -77,7 +90,9 @@ where
 
     /// Returns `true` if the `input` has been pressed.
     pub fn pressed<I: Into<T>>(&self, input: I) -> bool {
-        self.pressed.contains(&input.into())
+        let input = input.into();
+        let input = self.dynamic_map_value.get(&input).unwrap_or(&input).clone();
+        self.pressed.contains(&input)
     }
 
     /// Returns `true` if any item in `inputs` has been pressed.
@@ -88,9 +103,10 @@ where
     /// Registers a release for the given `input`.
     pub fn release<I: Into<T>>(&mut self, input: I) {
         let input = input.into();
+        let input = self.dynamic_map_value.get(&input).unwrap_or(&input).clone();
         // Returns `true` if the `input` was pressed.
         if self.pressed.remove(&input) {
-            self.just_released.insert(input);
+            self.just_released.insert(input.clone());
         }
     }
 
@@ -102,7 +118,9 @@ where
 
     /// Returns `true` if the `input` has just been pressed.
     pub fn just_pressed<I: Into<T>>(&self, input: I) -> bool {
-        self.just_pressed.contains(&input.into())
+        let input = input.into();
+        let input = self.dynamic_map_value.get(&input).unwrap_or(&input).clone();
+        self.just_pressed.contains(&input)
     }
 
     /// Returns `true` if any item in `inputs` has just been pressed.
@@ -119,7 +137,9 @@ where
 
     /// Returns `true` if the `input` has just been released.
     pub fn just_released<I: Into<T>>(&self, input: I) -> bool {
-        self.just_released.contains(&input.into())
+        let input = input.into();
+        let input = self.dynamic_map_value.get(&input).unwrap_or(&input).clone();
+        self.just_released.contains(&input)
     }
 
     /// Returns `true` if any item in `inputs` has just been released.
@@ -131,7 +151,10 @@ where
     ///
     /// Future calls to [`Input::just_released`] for the given input will return false until a new release event occurs.
     pub fn clear_just_released<I: Into<T>>(&mut self, input: I) -> bool {
-        self.just_released.remove(&input.into())
+        let input = input.into();
+        let input = self.dynamic_map_value.get(&input).unwrap_or(&input).clone();
+        self.release_dynamic_mapping(input.clone());
+        self.just_released.remove(&input)
     }
 
     /// Clears the `pressed`, `just_pressed` and `just_released` data of the `input`.
@@ -140,6 +163,7 @@ where
         self.pressed.remove(&input);
         self.just_pressed.remove(&input);
         self.just_released.remove(&input);
+        self.dynamic_map_value.clear();
     }
 
     /// Clears the `pressed`, `just_pressed`, and `just_released` data for every input.
@@ -149,6 +173,7 @@ where
         self.pressed.clear();
         self.just_pressed.clear();
         self.just_released.clear();
+        self.dynamic_map_value.clear();
     }
 
     /// Clears the `just pressed` and `just released` data for every input.
@@ -156,7 +181,10 @@ where
     /// See also [`Input::reset_all`] for a full reset.
     pub fn clear(&mut self) {
         self.just_pressed.clear();
-        self.just_released.clear();
+        let inputs_to_release = self.just_released.drain().collect::<Vec<_>>();
+        for r in inputs_to_release {
+            self.release_dynamic_mapping(r);
+        }
     }
 
     /// An iterator visiting every pressed input in arbitrary order.
diff --git a/crates/bevy_input/src/keyboard.rs b/crates/bevy_input/src/keyboard.rs
index 250a96b04361b..5df94de80c13c 100644
--- a/crates/bevy_input/src/keyboard.rs
+++ b/crates/bevy_input/src/keyboard.rs
@@ -38,6 +38,42 @@ pub struct KeyboardInput {
     pub state: ButtonState,
 }
 
+/// The stored logical key code for `Res<Input<KeyLogic>>`
+///
+/// We need to store the corresponding `KeyCode` because when modifiers are applied,
+/// the released logical key might be different from the pressed.
+/// For example, the sequence of physical keys:
+/// - Press shift
+/// - Press 'a'
+/// - Release shift
+/// - Release 'a',
+///
+/// Leads to the following underlying logical events:
+/// - Press shift
+/// - Press logic character key 'A'
+/// - Release shift
+/// - Release logic character key 'a'
+/// Note the different capitalization.
+#[derive(Debug, Clone, Eq, PartialEq, Hash, Reflect, FromReflect)]
+#[cfg_attr(
+    feature = "serialize",
+    derive(serde::Serialize, serde::Deserialize),
+    reflect(Serialize, Deserialize)
+)]
+pub enum KeyLogic {
+    Logic(Key),
+    Physical(KeyCode),
+}
+
+impl<I> From<I> for KeyLogic
+where
+    I: Into<Key>,
+{
+    fn from(value: I) -> Self {
+        KeyLogic::Logic(value.into())
+    }
+}
+
 /// Updates the [`Input<KeyCode>`] resource with the latest [`KeyboardInput`] events.
 ///
 /// ## Differences
@@ -45,7 +81,7 @@ pub struct KeyboardInput {
 /// The main difference between the [`KeyboardInput`] event and the [`Input<KeyCode>`] or [`Input<ScanCode>`] resources is that
 /// the latter have convenient functions such as [`Input::pressed`], [`Input::just_pressed`] and [`Input::just_released`].
 pub fn keyboard_input_system(
-    mut logical_key_input: ResMut<Input<Key>>,
+    mut logical_key_input: ResMut<Input<KeyLogic>>,
     mut key_input: ResMut<Input<KeyCode>>,
     mut keyboard_input_events: EventReader<KeyboardInput>,
 ) {
@@ -63,9 +99,13 @@ pub fn keyboard_input_system(
             ButtonState::Pressed => key_input.press(*key_code),
             ButtonState::Released => key_input.release(*key_code),
         }
+        let logic = KeyLogic::Logic(logical_key.clone());
         match state {
-            ButtonState::Pressed => logical_key_input.press(logical_key.clone()),
-            ButtonState::Released => logical_key_input.release(logical_key.clone()),
+            ButtonState::Pressed => {
+                logical_key_input.add_dynamic_mapping(logic.clone(), KeyLogic::Physical(*key_code));
+                logical_key_input.press(KeyLogic::Physical(*key_code));
+            }
+            ButtonState::Released => logical_key_input.release(KeyLogic::Physical(*key_code)),
         }
     }
 }
@@ -599,7 +639,9 @@ pub enum NativeKey {
 ///
 /// ## Usage
 ///
-/// It is used as the generic `T` value of an [`Input`](crate::Input) to create a `Res<Input<Key>>`.
+/// It is used as the generic `T` value of an [`Input`](crate::Input) to create a `Res<Input<KeyLogic>>`,
+/// storing a `Key` and its corresponding `KeyCode`.
+///
 /// The resource values are mapped to the current layout of the keyboard and correlate to a [`KeyCode`](KeyCode).
 ///
 /// ## Updating
diff --git a/crates/bevy_input/src/lib.rs b/crates/bevy_input/src/lib.rs
index d330d8f44e573..c63eba9d399ce 100644
--- a/crates/bevy_input/src/lib.rs
+++ b/crates/bevy_input/src/lib.rs
@@ -19,7 +19,7 @@ pub mod prelude {
         gamepad::{
             Gamepad, GamepadAxis, GamepadAxisType, GamepadButton, GamepadButtonType, Gamepads,
         },
-        keyboard::{Key, KeyCode},
+        keyboard::{Key, KeyCode, KeyLogic},
         mouse::MouseButton,
         touch::{TouchInput, Touches},
         Axis, Input,
@@ -29,7 +29,7 @@ pub mod prelude {
 use bevy_app::prelude::*;
 use bevy_ecs::prelude::*;
 use bevy_reflect::{FromReflect, Reflect};
-use keyboard::{keyboard_input_system, Key, KeyCode, KeyboardInput, NativeKey};
+use keyboard::{keyboard_input_system, Key, KeyCode, KeyLogic, KeyboardInput, NativeKey};
 use mouse::{
     mouse_button_input_system, MouseButton, MouseButtonInput, MouseMotion, MouseScrollUnit,
     MouseWheel,
@@ -61,7 +61,7 @@ impl Plugin for InputPlugin {
             // keyboard
             .add_event::<KeyboardInput>()
             .init_resource::<Input<KeyCode>>()
-            .init_resource::<Input<Key>>()
+            .init_resource::<Input<KeyLogic>>()
             .add_systems(PreUpdate, keyboard_input_system.in_set(InputSystem))
             // mouse
             .add_event::<MouseButtonInput>()
diff --git a/crates/bevy_winit/src/lib.rs b/crates/bevy_winit/src/lib.rs
index 7e307386a2bfe..7913c17a299d1 100644
--- a/crates/bevy_winit/src/lib.rs
+++ b/crates/bevy_winit/src/lib.rs
@@ -450,7 +450,8 @@ pub fn winit_runner(mut app: App) {
                     }
                     WindowEvent::KeyboardInput { ref event, .. } => {
                         let keyboard_event = converters::convert_keyboard_input(event);
-                        if let bevy_input::keyboard::Key::Character(c) = &keyboard_event.logical_key
+                        if let bevy_input::keyboard::Key::Character(c) =
+                            converters::convert_logical_key_code(&event.logical_key)
                         {
                             if let Some(first_char) = c.chars().next() {
                                 input_events.character_input.send(ReceivedCharacter {
diff --git a/examples/2d/bloom_2d.rs b/examples/2d/bloom_2d.rs
index eccc7a1766ecb..0e113a596cdc0 100644
--- a/examples/2d/bloom_2d.rs
+++ b/examples/2d/bloom_2d.rs
@@ -92,7 +92,7 @@ fn update_bloom_settings(
     mut camera: Query<(Entity, Option<&mut BloomSettings>), With<Camera>>,
     mut text: Query<&mut Text>,
     mut commands: Commands,
-    key: Res<Input<Key>>,
+    key: Res<Input<KeyLogic>>,
     time: Res<Time>,
 ) {
     let bloom_settings = camera.single_mut();
diff --git a/examples/2d/rotation.rs b/examples/2d/rotation.rs
index 9151447f3340d..121c0debb3ae9 100644
--- a/examples/2d/rotation.rs
+++ b/examples/2d/rotation.rs
@@ -117,7 +117,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
 
 /// Demonstrates applying rotation and movement based on keyboard input.
 fn player_movement_system(
-    keyboard_input: Res<Input<Key>>,
+    keyboard_input: Res<Input<KeyLogic>>,
     mut query: Query<(&Player, &mut Transform)>,
 ) {
     let (ship, mut transform) = query.single_mut();
diff --git a/examples/3d/3d_gizmos.rs b/examples/3d/3d_gizmos.rs
index c67e8c7a64a2f..b48c0435db948 100644
--- a/examples/3d/3d_gizmos.rs
+++ b/examples/3d/3d_gizmos.rs
@@ -104,7 +104,7 @@ fn rotate_camera(mut query: Query<&mut Transform, With<Camera>>, time: Res<Time>
     transform.rotate_around(Vec3::ZERO, Quat::from_rotation_y(time.delta_seconds() / 2.));
 }
 
-fn update_config(mut config: ResMut<GizmoConfig>, keyboard: Res<Input<Key>>, time: Res<Time>) {
+fn update_config(mut config: ResMut<GizmoConfig>, keyboard: Res<Input<KeyLogic>>, time: Res<Time>) {
     if keyboard.just_pressed("d") {
         config.depth_bias = if config.depth_bias == 0. { -1. } else { 0. };
     }
diff --git a/examples/3d/anti_aliasing.rs b/examples/3d/anti_aliasing.rs
index a8d109508b00d..b26610cf3b714 100644
--- a/examples/3d/anti_aliasing.rs
+++ b/examples/3d/anti_aliasing.rs
@@ -29,7 +29,7 @@ fn main() {
 }
 
 fn modify_aa(
-    keys: Res<Input<Key>>,
+    keys: Res<Input<KeyLogic>>,
     mut camera: Query<
         (
             Entity,
@@ -114,7 +114,7 @@ fn modify_aa(
 }
 
 fn modify_sharpening(
-    keys: Res<Input<Key>>,
+    keys: Res<Input<KeyLogic>>,
     mut query: Query<&mut ContrastAdaptiveSharpeningSettings>,
 ) {
     for mut cas in &mut query {
diff --git a/examples/3d/atmospheric_fog.rs b/examples/3d/atmospheric_fog.rs
index 6a1de2d977a4b..1c87762aee1bc 100644
--- a/examples/3d/atmospheric_fog.rs
+++ b/examples/3d/atmospheric_fog.rs
@@ -110,7 +110,7 @@ fn setup_instructions(mut commands: Commands) {
     }),));
 }
 
-fn toggle_system(key: Res<Input<Key>>, mut fog: Query<&mut FogSettings>) {
+fn toggle_system(key: Res<Input<KeyLogic>>, mut fog: Query<&mut FogSettings>) {
     let mut fog_settings = fog.single_mut();
 
     if key.just_pressed(Key::Space) {
diff --git a/examples/3d/blend_modes.rs b/examples/3d/blend_modes.rs
index 5611e6d8c2480..29d067a20c218 100644
--- a/examples/3d/blend_modes.rs
+++ b/examples/3d/blend_modes.rs
@@ -287,7 +287,7 @@ fn example_control_system(
     labelled: Query<&GlobalTransform>,
     mut state: Local<ExampleState>,
     time: Res<Time>,
-    input: Res<Input<Key>>,
+    input: Res<Input<KeyLogic>>,
 ) {
     if input.pressed(Key::ArrowUp) {
         state.alpha = (state.alpha + time.delta_seconds()).min(1.0);
diff --git a/examples/3d/bloom_3d.rs b/examples/3d/bloom_3d.rs
index ed2056f93cc2b..64feb54ef1e32 100644
--- a/examples/3d/bloom_3d.rs
+++ b/examples/3d/bloom_3d.rs
@@ -116,7 +116,7 @@ fn update_bloom_settings(
     mut camera: Query<(Entity, Option<&mut BloomSettings>), With<Camera>>,
     mut text: Query<&mut Text>,
     mut commands: Commands,
-    key: Res<Input<Key>>,
+    key: Res<Input<KeyLogic>>,
     time: Res<Time>,
 ) {
     let bloom_settings = camera.single_mut();
diff --git a/examples/3d/fog.rs b/examples/3d/fog.rs
index 71220ec04133a..9d6bb37869edc 100644
--- a/examples/3d/fog.rs
+++ b/examples/3d/fog.rs
@@ -159,7 +159,7 @@ fn update_system(
     mut camera: Query<(&mut FogSettings, &mut Transform)>,
     mut text: Query<&mut Text>,
     time: Res<Time>,
-    key: Res<Input<Key>>,
+    key: Res<Input<KeyLogic>>,
     key_code: Res<Input<KeyCode>>,
 ) {
     let now = time.elapsed_seconds();
diff --git a/examples/3d/lighting.rs b/examples/3d/lighting.rs
index e572fda46f203..7be0fffd2a866 100644
--- a/examples/3d/lighting.rs
+++ b/examples/3d/lighting.rs
@@ -261,7 +261,7 @@ fn animate_light_direction(
 }
 
 fn movement(
-    input: Res<Input<Key>>,
+    input: Res<Input<KeyLogic>>,
     time: Res<Time>,
     mut query: Query<&mut Transform, With<Movable>>,
 ) {
diff --git a/examples/3d/shadow_biases.rs b/examples/3d/shadow_biases.rs
index 3a45f19ba9a9b..21c17cfff0892 100644
--- a/examples/3d/shadow_biases.rs
+++ b/examples/3d/shadow_biases.rs
@@ -141,7 +141,7 @@ fn setup(
 }
 
 fn toggle_light(
-    input: Res<Input<Key>>,
+    input: Res<Input<KeyLogic>>,
     mut point_lights: Query<&mut PointLight>,
     mut directional_lights: Query<&mut DirectionalLight>,
     mut example_text: Query<&mut Text>,
diff --git a/examples/3d/shadow_caster_receiver.rs b/examples/3d/shadow_caster_receiver.rs
index 334ce76b9822f..d7c8f1747c993 100644
--- a/examples/3d/shadow_caster_receiver.rs
+++ b/examples/3d/shadow_caster_receiver.rs
@@ -126,7 +126,7 @@ fn setup(
 }
 
 fn toggle_light(
-    input: Res<Input<Key>>,
+    input: Res<Input<KeyLogic>>,
     mut point_lights: Query<&mut PointLight>,
     mut directional_lights: Query<&mut DirectionalLight>,
 ) {
@@ -152,7 +152,7 @@ fn toggle_light(
 
 fn toggle_shadows(
     mut commands: Commands,
-    input: Res<Input<Key>>,
+    input: Res<Input<KeyLogic>>,
     mut queries: ParamSet<(
         Query<Entity, (With<Handle<Mesh>>, With<NotShadowCaster>)>,
         Query<Entity, (With<Handle<Mesh>>, With<NotShadowReceiver>)>,
diff --git a/examples/3d/skybox.rs b/examples/3d/skybox.rs
index 0668192511b34..b53a5ba416ee2 100644
--- a/examples/3d/skybox.rs
+++ b/examples/3d/skybox.rs
@@ -227,7 +227,7 @@ pub fn camera_controller(
     mut mouse_events: EventReader<MouseMotion>,
     mouse_button_input: Res<Input<MouseButton>>,
     key_input: Res<Input<KeyCode>>,
-    key_input_logic: Res<Input<Key>>,
+    key_input_logic: Res<Input<KeyLogic>>,
     mut move_toggled: Local<bool>,
     mut query: Query<(&mut Transform, &mut CameraController), With<Camera>>,
 ) {
diff --git a/examples/3d/spotlight.rs b/examples/3d/spotlight.rs
index b30c0cd4c90cc..94552294f909f 100644
--- a/examples/3d/spotlight.rs
+++ b/examples/3d/spotlight.rs
@@ -137,7 +137,7 @@ fn light_sway(time: Res<Time>, mut query: Query<(&mut Transform, &mut SpotLight)
 }
 
 fn movement(
-    input: Res<Input<Key>>,
+    input: Res<Input<KeyLogic>>,
     time: Res<Time>,
     mut query: Query<&mut Transform, With<Movable>>,
 ) {
diff --git a/examples/3d/tonemapping.rs b/examples/3d/tonemapping.rs
index e6170d56c9c3b..a4852ec007a41 100644
--- a/examples/3d/tonemapping.rs
+++ b/examples/3d/tonemapping.rs
@@ -347,7 +347,7 @@ fn update_image_viewer(
 }
 
 fn toggle_scene(
-    keys: Res<Input<Key>>,
+    keys: Res<Input<KeyLogic>>,
     mut query: Query<(&mut Visibility, &SceneNumber)>,
     mut current_scene: ResMut<CurrentScene>,
 ) {
@@ -422,7 +422,7 @@ impl SelectedParameter {
 }
 
 fn update_color_grading_settings(
-    keys: Res<Input<Key>>,
+    keys: Res<Input<KeyLogic>>,
     time: Res<Time>,
     mut per_method_settings: ResMut<PerMethodSettings>,
     tonemapping: Query<&Tonemapping>,
@@ -479,7 +479,7 @@ fn update_ui(
     current_scene: Res<CurrentScene>,
     selected_parameter: Res<SelectedParameter>,
     mut hide_ui: Local<bool>,
-    keys: Res<Input<Key>>,
+    keys: Res<Input<KeyLogic>>,
 ) {
     let (method, color_grading) = settings.single();
     let method = *method;
diff --git a/examples/animation/animated_fox.rs b/examples/animation/animated_fox.rs
index f01cbefb4afb0..79ce4678b1509 100644
--- a/examples/animation/animated_fox.rs
+++ b/examples/animation/animated_fox.rs
@@ -95,7 +95,7 @@ fn setup_scene_once_loaded(
 }
 
 fn keyboard_animation_control(
-    keyboard_input: Res<Input<Key>>,
+    keyboard_input: Res<Input<KeyLogic>>,
     mut animation_player: Query<&mut AnimationPlayer>,
     animations: Res<Animations>,
     mut current_animation: Local<usize>,
diff --git a/examples/audio/audio_control.rs b/examples/audio/audio_control.rs
index c3621a880d4b9..e715b7a9ffa8b 100644
--- a/examples/audio/audio_control.rs
+++ b/examples/audio/audio_control.rs
@@ -35,7 +35,7 @@ fn update_speed(
 }
 
 fn pause(
-    keyboard_input: Res<Input<Key>>,
+    keyboard_input: Res<Input<KeyLogic>>,
     audio_sinks: Res<Assets<AudioSink>>,
     music_controller: Res<MusicController>,
 ) {
diff --git a/examples/ecs/generic_system.rs b/examples/ecs/generic_system.rs
index 70d65057fa5bd..901f239ed2644 100644
--- a/examples/ecs/generic_system.rs
+++ b/examples/ecs/generic_system.rs
@@ -73,7 +73,7 @@ fn print_text_system(time: Res<Time>, mut query: Query<(&mut PrinterTick, &TextT
 
 fn transition_to_in_game_system(
     mut next_state: ResMut<NextState<AppState>>,
-    keyboard_input: Res<Input<Key>>,
+    keyboard_input: Res<Input<KeyLogic>>,
 ) {
     if keyboard_input.pressed(Key::Space) {
         next_state.set(AppState::InGame);
diff --git a/examples/ecs/run_conditions.rs b/examples/ecs/run_conditions.rs
index 4d6667fe78e00..e75b166a9e7c2 100644
--- a/examples/ecs/run_conditions.rs
+++ b/examples/ecs/run_conditions.rs
@@ -64,7 +64,7 @@ struct Unused;
 /// they are read only (except for local parameters which can be mutable).
 /// It returns a bool which determines if the system should run.
 fn has_user_input(
-    keyboard_input: Res<Input<Key>>,
+    keyboard_input: Res<Input<KeyLogic>>,
     mouse_button_input: Res<Input<MouseButton>>,
     touch_input: Res<Touches>,
 ) -> bool {
diff --git a/examples/ecs/state.rs b/examples/ecs/state.rs
index fbaebfff5729d..6b05a2e6c7fba 100644
--- a/examples/ecs/state.rs
+++ b/examples/ecs/state.rs
@@ -127,7 +127,7 @@ fn setup_game(mut commands: Commands, asset_server: Res<AssetServer>) {
 const SPEED: f32 = 100.0;
 fn movement(
     time: Res<Time>,
-    input: Res<Input<Key>>,
+    input: Res<Input<KeyLogic>>,
     mut query: Query<&mut Transform, With<Sprite>>,
 ) {
     for mut transform in &mut query {
diff --git a/examples/games/alien_cake_addict.rs b/examples/games/alien_cake_addict.rs
index 5bfe1558e990a..2d526ccf6f97c 100644
--- a/examples/games/alien_cake_addict.rs
+++ b/examples/games/alien_cake_addict.rs
@@ -192,7 +192,7 @@ fn teardown(mut commands: Commands, entities: Query<Entity, (Without<Camera>, Wi
 // control the game character
 fn move_player(
     mut commands: Commands,
-    keyboard_input: Res<Input<Key>>,
+    keyboard_input: Res<Input<KeyLogic>>,
     mut game: ResMut<Game>,
     mut transforms: Query<&mut Transform>,
     time: Res<Time>,
@@ -376,7 +376,7 @@ fn scoreboard_system(game: Res<Game>, mut query: Query<&mut Text>) {
 // restart the game when pressing spacebar
 fn gameover_keyboard(
     mut next_state: ResMut<NextState<GameState>>,
-    keyboard_input: Res<Input<Key>>,
+    keyboard_input: Res<Input<KeyLogic>>,
 ) {
     if keyboard_input.just_pressed(Key::Space) {
         next_state.set(GameState::Playing);
diff --git a/examples/games/breakout.rs b/examples/games/breakout.rs
index 0fe303b338bc3..a1b85c0a80b1c 100644
--- a/examples/games/breakout.rs
+++ b/examples/games/breakout.rs
@@ -309,7 +309,7 @@ fn setup(
 }
 
 fn move_paddle(
-    keyboard_input: Res<Input<Key>>,
+    keyboard_input: Res<Input<KeyLogic>>,
     mut query: Query<&mut Transform, With<Paddle>>,
     time_step: Res<FixedTime>,
 ) {
diff --git a/examples/input/keyboard_input.rs b/examples/input/keyboard_input.rs
index 99158b68ec783..d0dfc47d467c4 100644
--- a/examples/input/keyboard_input.rs
+++ b/examples/input/keyboard_input.rs
@@ -10,19 +10,26 @@ fn main() {
 }
 
 /// This system prints 'A' key state
-fn keyboard_input_system(keyboard_input: Res<Input<Key>>) {
+fn keyboard_input_system(keyboard_input: Res<Input<KeyLogic>>) {
     if keyboard_input.pressed("a") {
-        info!("'A' currently pressed");
+        info!("'a' currently pressed");
     }
 
     if keyboard_input.just_pressed("a") {
-        info!("'A' just pressed");
+        info!("'a' just pressed");
     }
 
     if keyboard_input.just_released("a") {
-        info!("'A' just released");
+        info!("'a' just released");
     }
+
     if keyboard_input.pressed("A") {
-        info!("capital 'A' is being pressed");
+        info!("capital 'A' currently pressed");
+    }
+    if keyboard_input.just_pressed("A") {
+        info!("capital 'A' just pressed");
+    }
+    if keyboard_input.just_released("A") {
+        info!("capital 'A' just released");
     }
 }
diff --git a/examples/input/keyboard_modifiers.rs b/examples/input/keyboard_modifiers.rs
index 0499ca7c36f31..bdb6afd4868d8 100644
--- a/examples/input/keyboard_modifiers.rs
+++ b/examples/input/keyboard_modifiers.rs
@@ -10,7 +10,7 @@ fn main() {
 }
 
 /// This system prints when `Ctrl + Shift + A` is pressed
-fn keyboard_input_system(input: Res<Input<Key>>) {
+fn keyboard_input_system(input: Res<Input<KeyLogic>>) {
     let shift = input.pressed(Key::Shift);
     let ctrl = input.pressed(Key::Control);
 
diff --git a/examples/input/mouse_grab.rs b/examples/input/mouse_grab.rs
index 019157121dcae..28cf197f45c88 100644
--- a/examples/input/mouse_grab.rs
+++ b/examples/input/mouse_grab.rs
@@ -14,7 +14,7 @@ fn main() {
 fn grab_mouse(
     mut windows: Query<&mut Window>,
     mouse: Res<Input<MouseButton>>,
-    key: Res<Input<Key>>,
+    key: Res<Input<KeyLogic>>,
 ) {
     let mut window = windows.single_mut();
 
diff --git a/examples/shader/shader_prepass.rs b/examples/shader/shader_prepass.rs
index 66293ce8a3c12..2425d16a66914 100644
--- a/examples/shader/shader_prepass.rs
+++ b/examples/shader/shader_prepass.rs
@@ -225,7 +225,7 @@ impl Material for PrepassOutputMaterial {
 /// Every time you press space, it will cycle between transparent, depth and normals view
 fn toggle_prepass_view(
     mut prepass_view: Local<u32>,
-    key: Res<Input<Key>>,
+    key: Res<Input<KeyLogic>>,
     material_handle: Query<&Handle<PrepassOutputMaterial>>,
     mut materials: ResMut<Assets<PrepassOutputMaterial>>,
     mut text: Query<&mut Text>,
diff --git a/examples/stress_tests/many_foxes.rs b/examples/stress_tests/many_foxes.rs
index 802aef3c628bb..b2b8ea31a453d 100644
--- a/examples/stress_tests/many_foxes.rs
+++ b/examples/stress_tests/many_foxes.rs
@@ -226,7 +226,7 @@ fn update_fox_rings(
 }
 
 fn keyboard_animation_control(
-    keyboard_input: Res<Input<Key>>,
+    keyboard_input: Res<Input<KeyLogic>>,
     mut animation_player: Query<&mut AnimationPlayer>,
     animations: Res<Animations>,
     mut current_animation: Local<usize>,
diff --git a/examples/stress_tests/many_gizmos.rs b/examples/stress_tests/many_gizmos.rs
index c472eb4b4e4d4..249717b58f210 100644
--- a/examples/stress_tests/many_gizmos.rs
+++ b/examples/stress_tests/many_gizmos.rs
@@ -39,7 +39,7 @@ struct Config {
     fancy: bool,
 }
 
-fn input(mut config: ResMut<Config>, input: Res<Input<Key>>) {
+fn input(mut config: ResMut<Config>, input: Res<Input<KeyLogic>>) {
     if input.just_pressed(Key::ArrowUp) {
         config.line_count += 10_000;
     }
diff --git a/examples/tools/scene_viewer/scene_viewer_plugin.rs b/examples/tools/scene_viewer/scene_viewer_plugin.rs
index 04a807bb009dd..59906fccb77f7 100644
--- a/examples/tools/scene_viewer/scene_viewer_plugin.rs
+++ b/examples/tools/scene_viewer/scene_viewer_plugin.rs
@@ -170,7 +170,7 @@ fn start_animation(
 
 #[cfg(feature = "animation")]
 fn keyboard_animation_control(
-    keyboard_input: Res<Input<Key>>,
+    keyboard_input: Res<Input<KeyLogic>>,
     mut animation_player: Query<&mut AnimationPlayer>,
     scene_handle: Res<SceneHandle>,
     mut current_animation: Local<usize>,
@@ -208,7 +208,7 @@ fn keyboard_animation_control(
 }
 
 fn update_lights(
-    key_input: Res<Input<Key>>,
+    key_input: Res<Input<KeyLogic>>,
     time: Res<Time>,
     mut query: Query<(&mut Transform, &mut DirectionalLight)>,
     mut animate_directional_light: Local<bool>,
@@ -265,7 +265,7 @@ impl CameraTracker {
 
 fn camera_tracker(
     mut camera_tracker: ResMut<CameraTracker>,
-    keyboard_input: Res<Input<Key>>,
+    keyboard_input: Res<Input<KeyLogic>>,
     mut queries: ParamSet<(
         Query<(Entity, &mut Camera), (Added<Camera>, Without<CameraController>)>,
         Query<(Entity, &mut Camera), (Added<Camera>, With<CameraController>)>,
diff --git a/examples/ui/overflow_debug.rs b/examples/ui/overflow_debug.rs
index b5f6286419fbf..f4536cf657970 100644
--- a/examples/ui/overflow_debug.rs
+++ b/examples/ui/overflow_debug.rs
@@ -237,7 +237,11 @@ fn spawn_container(
         });
 }
 
-fn update_animation(mut animation: ResMut<AnimationState>, time: Res<Time>, keys: Res<Input<Key>>) {
+fn update_animation(
+    mut animation: ResMut<AnimationState>,
+    time: Res<Time>,
+    keys: Res<Input<KeyLogic>>,
+) {
     let time = time.elapsed_seconds();
 
     if keys.just_pressed(Key::Space) {
@@ -267,7 +271,7 @@ fn update_transform<T: UpdateTransform + Component>(
     }
 }
 
-fn toggle_overflow(keys: Res<Input<Key>>, mut containers: Query<&mut Style, With<Container>>) {
+fn toggle_overflow(keys: Res<Input<KeyLogic>>, mut containers: Query<&mut Style, With<Container>>) {
     if keys.just_pressed("o") {
         for mut style in &mut containers {
             style.overflow = match style.overflow {
@@ -289,7 +293,10 @@ fn toggle_overflow(keys: Res<Input<Key>>, mut containers: Query<&mut Style, With
     }
 }
 
-fn next_container_size(keys: Res<Input<Key>>, mut containers: Query<(&mut Style, &mut Container)>) {
+fn next_container_size(
+    keys: Res<Input<KeyLogic>>,
+    mut containers: Query<(&mut Style, &mut Container)>,
+) {
     if keys.just_pressed("s") {
         for (mut style, mut container) in &mut containers {
             container.0 = (container.0 + 1) % 3;
diff --git a/examples/ui/ui_scaling.rs b/examples/ui/ui_scaling.rs
index aeb135c8c5b49..b16dceb887b80 100644
--- a/examples/ui/ui_scaling.rs
+++ b/examples/ui/ui_scaling.rs
@@ -84,7 +84,7 @@ fn setup(mut commands: Commands, asset_server: ResMut<AssetServer>) {
 }
 
 /// System that changes the scale of the ui when pressing up or down on the keyboard.
-fn change_scaling(input: Res<Input<Key>>, mut ui_scale: ResMut<TargetScale>) {
+fn change_scaling(input: Res<Input<KeyLogic>>, mut ui_scale: ResMut<TargetScale>) {
     if input.just_pressed(Key::ArrowUp) {
         let scale = (ui_scale.target_scale * 2.0).min(8.);
         ui_scale.set_scale(scale);
diff --git a/examples/ui/window_fallthrough.rs b/examples/ui/window_fallthrough.rs
index 6ad857bbd83bd..7e2775fb73a03 100644
--- a/examples/ui/window_fallthrough.rs
+++ b/examples/ui/window_fallthrough.rs
@@ -47,7 +47,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
     ));
 }
 // A simple system to handle some keyboard input and toggle on/off the hittest.
-fn toggle_mouse_passthrough(keyboard_input: Res<Input<Key>>, mut windows: Query<&mut Window>) {
+fn toggle_mouse_passthrough(keyboard_input: Res<Input<KeyLogic>>, mut windows: Query<&mut Window>) {
     if keyboard_input.just_pressed("p") {
         let mut window = windows.single_mut();
         window.cursor.hit_test = !window.cursor.hit_test;
diff --git a/examples/window/clear_color.rs b/examples/window/clear_color.rs
index 117b10cf7b784..e805ff2bcff4d 100644
--- a/examples/window/clear_color.rs
+++ b/examples/window/clear_color.rs
@@ -17,7 +17,7 @@ fn setup(mut commands: Commands) {
     commands.spawn(Camera2dBundle::default());
 }
 
-fn change_clear_color(input: Res<Input<Key>>, mut clear_color: ResMut<ClearColor>) {
+fn change_clear_color(input: Res<Input<KeyLogic>>, mut clear_color: ResMut<ClearColor>) {
     if input.just_pressed(Key::Space) {
         clear_color.0 = Color::PURPLE;
     }
diff --git a/examples/window/low_power.rs b/examples/window/low_power.rs
index 87bcd006078fc..be1eee8cc58a7 100644
--- a/examples/window/low_power.rs
+++ b/examples/window/low_power.rs
@@ -96,7 +96,10 @@ pub(crate) mod test_setup {
     use bevy::{prelude::*, window::RequestRedraw};
 
     /// Switch between update modes when the mouse is clicked.
-    pub(crate) fn cycle_modes(mut mode: ResMut<ExampleMode>, mouse_button_input: Res<Input<Key>>) {
+    pub(crate) fn cycle_modes(
+        mut mode: ResMut<ExampleMode>,
+        mouse_button_input: Res<Input<KeyLogic>>,
+    ) {
         if mouse_button_input.just_pressed(Key::Space) {
             *mode = match *mode {
                 ExampleMode::Game => ExampleMode::Application,
diff --git a/examples/window/scale_factor_override.rs b/examples/window/scale_factor_override.rs
index c7a816615b2e6..30c4fd2038e46 100644
--- a/examples/window/scale_factor_override.rs
+++ b/examples/window/scale_factor_override.rs
@@ -76,7 +76,7 @@ fn display_override(mut windows: Query<&mut Window>) {
 }
 
 /// This system toggles scale factor overrides when enter is pressed
-fn toggle_override(input: Res<Input<Key>>, mut windows: Query<&mut Window>) {
+fn toggle_override(input: Res<Input<KeyLogic>>, mut windows: Query<&mut Window>) {
     let mut window = windows.single_mut();
 
     if input.just_pressed(Key::Enter) {
@@ -88,7 +88,7 @@ fn toggle_override(input: Res<Input<Key>>, mut windows: Query<&mut Window>) {
 }
 
 /// This system changes the scale factor override when up or down is pressed
-fn change_scale_factor(input: Res<Input<Key>>, mut windows: Query<&mut Window>) {
+fn change_scale_factor(input: Res<Input<KeyLogic>>, mut windows: Query<&mut Window>) {
     let mut window = windows.single_mut();
     let scale_factor_override = window.resolution.scale_factor_override();
     if input.just_pressed(Key::ArrowUp) {
diff --git a/examples/window/screenshot.rs b/examples/window/screenshot.rs
index 603d16e0f027a..fb74fc7a99b51 100644
--- a/examples/window/screenshot.rs
+++ b/examples/window/screenshot.rs
@@ -13,7 +13,7 @@ fn main() {
 }
 
 fn screenshot_on_spacebar(
-    input: Res<Input<Key>>,
+    input: Res<Input<KeyLogic>>,
     main_window: Query<Entity, With<PrimaryWindow>>,
     mut screenshot_manager: ResMut<ScreenshotManager>,
     mut counter: Local<u32>,
diff --git a/examples/window/window_settings.rs b/examples/window/window_settings.rs
index 8a4f53e71fa8b..d6ade17a965ad 100644
--- a/examples/window/window_settings.rs
+++ b/examples/window/window_settings.rs
@@ -41,7 +41,7 @@ fn main() {
 
 /// This system toggles the vsync mode when pressing the button V.
 /// You'll see fps increase displayed in the console.
-fn toggle_vsync(input: Res<Input<Key>>, mut windows: Query<&mut Window>) {
+fn toggle_vsync(input: Res<Input<KeyLogic>>, mut windows: Query<&mut Window>) {
     if input.just_pressed("v") {
         let mut window = windows.single_mut();
 
@@ -61,7 +61,7 @@ fn toggle_vsync(input: Res<Input<Key>>, mut windows: Query<&mut Window>) {
 /// This feature only works on some platforms. Please check the
 /// [documentation](https://docs.rs/bevy/latest/bevy/prelude/struct.Window.html#structfield.window_level)
 /// for more details.
-fn switch_level(input: Res<Input<Key>>, mut windows: Query<&mut Window>) {
+fn switch_level(input: Res<Input<KeyLogic>>, mut windows: Query<&mut Window>) {
     if input.just_pressed("t") {
         let mut window = windows.single_mut();
 
@@ -83,7 +83,7 @@ fn change_title(mut windows: Query<&mut Window>, time: Res<Time>) {
     );
 }
 
-fn toggle_cursor(mut windows: Query<&mut Window>, input: Res<Input<Key>>) {
+fn toggle_cursor(mut windows: Query<&mut Window>, input: Res<Input<KeyLogic>>) {
     if input.just_pressed(Key::Space) {
         let mut window = windows.single_mut();
 
@@ -96,7 +96,7 @@ fn toggle_cursor(mut windows: Query<&mut Window>, input: Res<Input<Key>>) {
 }
 
 // This system will toggle the color theme used by the window
-fn toggle_theme(mut windows: Query<&mut Window>, input: Res<Input<Key>>) {
+fn toggle_theme(mut windows: Query<&mut Window>, input: Res<Input<KeyLogic>>) {
     if input.just_pressed("f") {
         let mut window = windows.single_mut();
 

From 3e4c560b0e9fc6d0a04b11369f63b5dbcff6c876 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Thu, 29 Jun 2023 16:02:30 +0200
Subject: [PATCH 05/17] fix bevy_input test

---
 crates/bevy_input/src/input.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_input/src/input.rs b/crates/bevy_input/src/input.rs
index d33b498814d47..21963f76bc3bd 100644
--- a/crates/bevy_input/src/input.rs
+++ b/crates/bevy_input/src/input.rs
@@ -205,12 +205,13 @@ where
 
 #[cfg(test)]
 mod test {
-    use bevy_reflect::TypePath;
+    use bevy_reflect::{FromReflect, Reflect};
 
     use crate::Input;
 
     /// Used for testing the functionality of [`Input`].
-    #[derive(TypePath, Copy, Clone, Eq, PartialEq, Hash)]
+    #[derive(Copy, Clone, Eq, PartialEq, Hash, Reflect, FromReflect)]
+    #[reflect_value]
     enum DummyInput {
         Input1,
         Input2,

From efc40a15c33806fe514da79c823eb7662818b311 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Thu, 20 Jul 2023 18:07:15 +0200
Subject: [PATCH 06/17] fix merge error

---
 examples/animation/animated_fox.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/animation/animated_fox.rs b/examples/animation/animated_fox.rs
index f2b419ffba550..c7d5ca8bef178 100644
--- a/examples/animation/animated_fox.rs
+++ b/examples/animation/animated_fox.rs
@@ -92,7 +92,7 @@ fn setup_scene_once_loaded(
 
 fn keyboard_animation_control(
     keyboard_input: Res<Input<Key>>,
-    mut animation_player: Query<&mut AnimationPlayer>,
+    mut animation_players: Query<&mut AnimationPlayer>,
     animations: Res<Animations>,
     mut current_animation: Local<usize>,
 ) {

From 45527464969de9b2f95c5c5c07c9e0df77c86352 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Tue, 26 Sep 2023 11:48:13 +0200
Subject: [PATCH 07/17] only use Input<KeyLogic> ; but examples still use
 KeyCode for minimal changes

---
 crates/bevy_input/src/common_conditions.rs    |  2 +-
 crates/bevy_input/src/input.rs                |  6 +++-
 crates/bevy_input/src/keyboard.rs             | 29 +++++++--------
 crates/bevy_window/src/system.rs              |  7 ++--
 crates/bevy_winit/src/lib.rs                  |  1 -
 examples/2d/2d_gizmos.rs                      |  2 +-
 examples/2d/bloom_2d.rs                       | 30 ++++++++--------
 examples/2d/rotation.rs                       |  6 ++--
 examples/3d/3d_gizmos.rs                      |  8 ++---
 examples/3d/anti_aliasing.rs                  | 32 ++++++++---------
 examples/3d/atmospheric_fog.rs                |  4 +--
 examples/3d/blend_modes.rs                    | 14 ++++----
 examples/3d/bloom_3d.rs                       | 32 ++++++++---------
 examples/3d/fog.rs                            | 36 +++++++++----------
 examples/3d/generate_custom_mesh.rs           |  2 +-
 examples/3d/lighting.rs                       |  8 ++---
 examples/3d/parallax_mapping.rs               |  6 ++--
 examples/3d/shadow_biases.rs                  |  8 ++---
 examples/3d/shadow_caster_receiver.rs         |  6 ++--
 examples/3d/skybox.rs                         |  2 +-
 examples/3d/spotlight.rs                      | 12 +++----
 examples/3d/ssao.rs                           |  2 +-
 examples/3d/tonemapping.rs                    | 22 ++++++------
 examples/animation/animated_fox.rs            | 16 ++++-----
 examples/app/return_after_run.rs              |  1 -
 examples/audio/audio_control.rs               |  5 ++-
 examples/audio/pitch.rs                       |  6 ++--
 examples/ecs/generic_system.rs                |  2 +-
 examples/ecs/run_conditions.rs                |  4 +--
 examples/ecs/state.rs                         |  8 ++---
 examples/games/alien_cake_addict.rs           | 10 +++---
 examples/games/breakout.rs                    |  4 +--
 examples/input/keyboard_input.rs              | 14 ++++----
 examples/input/keyboard_modifiers.rs          |  6 ++--
 examples/input/mouse_grab.rs                  |  2 +-
 examples/shader/shader_prepass.rs             |  2 +-
 examples/stress_tests/many_foxes.rs           | 16 ++++-----
 examples/stress_tests/many_gizmos.rs          |  6 ++--
 .../tools/scene_viewer/animation_plugin.rs    |  2 +-
 .../scene_viewer/camera_controller_plugin.rs  |  2 +-
 .../tools/scene_viewer/morph_viewer_plugin.rs |  4 +--
 .../tools/scene_viewer/scene_viewer_plugin.rs |  6 ++--
 examples/ui/overflow_debug.rs                 |  6 ++--
 examples/ui/ui_scaling.rs                     |  4 +--
 examples/ui/ui_texture_atlas.rs               |  2 +-
 examples/ui/window_fallthrough.rs             |  2 +-
 examples/window/clear_color.rs                |  2 +-
 examples/window/low_power.rs                  |  2 +-
 examples/window/scale_factor_override.rs      |  6 ++--
 examples/window/screenshot.rs                 |  2 +-
 examples/window/window_resizing.rs            |  2 +-
 examples/window/window_settings.rs            | 16 ++++-----
 tests/how_to_test_systems.rs                  |  8 ++---
 53 files changed, 227 insertions(+), 218 deletions(-)

diff --git a/crates/bevy_input/src/common_conditions.rs b/crates/bevy_input/src/common_conditions.rs
index 75bbb37c3ad80..60204e70a8652 100644
--- a/crates/bevy_input/src/common_conditions.rs
+++ b/crates/bevy_input/src/common_conditions.rs
@@ -38,7 +38,7 @@ use std::hash::Hash;
 ///         .run();
 /// }
 ///
-/// fn update_pause_state(mut paused: ResMut<Paused>, input: Input<KeyCode>) {
+/// fn update_pause_state(mut paused: ResMut<Paused>, input: Input<KeyLogic>) {
 ///   if input.just_pressed(KeyCode::Escape) {
 ///     paused.0 = !paused.0;
 ///   }
diff --git a/crates/bevy_input/src/input.rs b/crates/bevy_input/src/input.rs
index a8e46aea6169f..38e1aeec60ffe 100644
--- a/crates/bevy_input/src/input.rs
+++ b/crates/bevy_input/src/input.rs
@@ -72,10 +72,14 @@ impl<T> Input<T>
 where
     T: FromReflect + Clone + Eq + Hash + Send + Sync + 'static,
 {
-    pub fn add_dynamic_mapping<I: Into<T>>(&mut self, user_visible: I, stored: I) {
+    /// When user adds modifiers to a keypress, the underlying Logical key might change.<br />
+    /// Use this to store a reference to the original LogicalKey.
+    pub fn add_dynamic_mapping<V: Into<T>, S: Into<T>>(&mut self, user_visible: V, stored: S) {
         self.dynamic_map_value
             .insert(user_visible.into(), stored.into());
     }
+
+    /// To call when a dynamic key mapping is not longer needed.
     pub fn release_dynamic_mapping<I: Into<T>>(&mut self, key: I) {
         let to_remove = key.into();
         self.dynamic_map_value
diff --git a/crates/bevy_input/src/keyboard.rs b/crates/bevy_input/src/keyboard.rs
index 74a7dd75f1852..66a7ceda8b802 100644
--- a/crates/bevy_input/src/keyboard.rs
+++ b/crates/bevy_input/src/keyboard.rs
@@ -23,7 +23,7 @@ use serde::{Deserialize, Serialize};
 /// ## Usage
 ///
 /// The event is consumed inside of the [`keyboard_input_system`](crate::keyboard::keyboard_input_system)
-/// to update the [`Input<KeyCode>`](crate::Input<KeyCode>) resource.
+/// to update the [`Input<KLogic>`](crate::Input<KeyLogic>) resource.
 #[derive(Event, Debug, Clone, PartialEq, Eq, Reflect)]
 #[reflect(Debug, PartialEq)]
 #[cfg_attr(
@@ -66,7 +66,9 @@ pub struct KeyboardInput {
     reflect(Serialize, Deserialize)
 )]
 pub enum KeyLogic {
+    /// Represents the logical key, typically what's visible on the keyboard.
     Logic(Key),
+    /// Represents the ScanCode
     Physical(KeyCode),
 }
 
@@ -79,19 +81,23 @@ where
     }
 }
 
-/// Updates the [`Input<KeyCode>`] resource with the latest [`KeyboardInput`] events.
+impl From<KeyCode> for KeyLogic {
+    fn from(value: KeyCode) -> Self {
+        KeyLogic::Physical(value)
+    }
+}
+
+/// Updates the [`Input<KeyLogic>`] resource with the latest [`KeyboardInput`] events.
 ///
 /// ## Differences
 ///
-/// The main difference between the [`KeyboardInput`] event and the [`Input<KeyCode>`] or [`Input<ScanCode>`] resources is that
+/// The main difference between the [`KeyboardInput`] event and the [`Input<KeyLogic>`] resources is that
 /// the latter have convenient functions such as [`Input::pressed`], [`Input::just_pressed`] and [`Input::just_released`].
 pub fn keyboard_input_system(
-    mut logical_key_input: ResMut<Input<KeyLogic>>,
-    mut key_input: ResMut<Input<KeyCode>>,
+    mut key_input: ResMut<Input<KeyLogic>>,
     mut keyboard_input_events: EventReader<KeyboardInput>,
 ) {
     // Avoid clearing if it's not empty to ensure change detection is not triggered.
-    logical_key_input.bypass_change_detection().clear();
     key_input.bypass_change_detection().clear();
     for event in keyboard_input_events.read() {
         let KeyboardInput {
@@ -100,17 +106,12 @@ pub fn keyboard_input_system(
             state,
             ..
         } = event;
-        match state {
-            ButtonState::Pressed => key_input.press(*key_code),
-            ButtonState::Released => key_input.release(*key_code),
-        }
-        let logic = KeyLogic::Logic(logical_key.clone());
         match state {
             ButtonState::Pressed => {
-                logical_key_input.add_dynamic_mapping(logic.clone(), KeyLogic::Physical(*key_code));
-                logical_key_input.press(KeyLogic::Physical(*key_code));
+                key_input.add_dynamic_mapping(logical_key.clone(), *key_code);
+                key_input.press(*key_code);
             }
-            ButtonState::Released => logical_key_input.release(KeyLogic::Physical(*key_code)),
+            ButtonState::Released => key_input.release(*key_code),
         }
     }
 }
diff --git a/crates/bevy_window/src/system.rs b/crates/bevy_window/src/system.rs
index b7dec35a102eb..9d4351643e0d9 100644
--- a/crates/bevy_window/src/system.rs
+++ b/crates/bevy_window/src/system.rs
@@ -2,7 +2,10 @@ use crate::{PrimaryWindow, Window, WindowCloseRequested};
 
 use bevy_app::AppExit;
 use bevy_ecs::prelude::*;
-use bevy_input::{keyboard::KeyCode, Input};
+use bevy_input::{
+    keyboard::{KeyCode, KeyLogic},
+    Input,
+};
 
 /// Exit the application when there are no open windows.
 ///
@@ -52,7 +55,7 @@ pub fn close_when_requested(mut commands: Commands, mut closed: EventReader<Wind
 pub fn close_on_esc(
     mut commands: Commands,
     focused_windows: Query<(Entity, &Window)>,
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<KeyLogic>>,
 ) {
     for (window, focus) in focused_windows.iter() {
         if !focus.focused {
diff --git a/crates/bevy_winit/src/lib.rs b/crates/bevy_winit/src/lib.rs
index 045208eb4f5c3..5a359470e3b63 100644
--- a/crates/bevy_winit/src/lib.rs
+++ b/crates/bevy_winit/src/lib.rs
@@ -503,7 +503,6 @@ pub fn winit_runner(mut app: App) {
                             converters::convert_logical_key_code(&event.logical_key)
                         {
                             if let Some(first_char) = c.chars().next() {
-                                dbg!(&first_char);
                                 event_writers.character_input.send(ReceivedCharacter {
                                     window: window_entity,
                                     char: first_char,
diff --git a/examples/2d/2d_gizmos.rs b/examples/2d/2d_gizmos.rs
index a70cd250a2976..624b130232291 100644
--- a/examples/2d/2d_gizmos.rs
+++ b/examples/2d/2d_gizmos.rs
@@ -55,7 +55,7 @@ fn system(mut gizmos: Gizmos, time: Res<Time>) {
     gizmos.arc_2d(Vec2::ZERO, sin / 10., PI / 2., 350., Color::ORANGE_RED);
 }
 
-fn update_config(mut config: ResMut<GizmoConfig>, keyboard: Res<Input<KeyCode>>, time: Res<Time>) {
+fn update_config(mut config: ResMut<GizmoConfig>, keyboard: Res<Input<KeyLogic>>, time: Res<Time>) {
     if keyboard.pressed(KeyCode::ArrowRight) {
         config.line_width += 5. * time.delta_seconds();
     }
diff --git a/examples/2d/bloom_2d.rs b/examples/2d/bloom_2d.rs
index 0e113a596cdc0..6bdf58a247501 100644
--- a/examples/2d/bloom_2d.rs
+++ b/examples/2d/bloom_2d.rs
@@ -131,65 +131,65 @@ fn update_bloom_settings(
                 bloom_settings.prefilter_settings.threshold_softness
             ));
 
-            if key.just_pressed(Key::Space) {
+            if key.just_pressed(KeyCode::Space) {
                 commands.entity(entity).remove::<BloomSettings>();
             }
 
             let dt = time.delta_seconds();
 
-            if key.pressed("a") {
+            if key.pressed(KeyCode::KeyA) {
                 bloom_settings.intensity -= dt / 10.0;
             }
-            if key.pressed("q") {
+            if key.pressed(KeyCode::KeyQ) {
                 bloom_settings.intensity += dt / 10.0;
             }
             bloom_settings.intensity = bloom_settings.intensity.clamp(0.0, 1.0);
 
-            if key.pressed("s") {
+            if key.pressed(KeyCode::KeyS) {
                 bloom_settings.low_frequency_boost -= dt / 10.0;
             }
-            if key.pressed("w") {
+            if key.pressed(KeyCode::KeyW) {
                 bloom_settings.low_frequency_boost += dt / 10.0;
             }
             bloom_settings.low_frequency_boost = bloom_settings.low_frequency_boost.clamp(0.0, 1.0);
 
-            if key.pressed("d") {
+            if key.pressed(KeyCode::KeyD) {
                 bloom_settings.low_frequency_boost_curvature -= dt / 10.0;
             }
-            if key.pressed("e") {
+            if key.pressed(KeyCode::KeyE) {
                 bloom_settings.low_frequency_boost_curvature += dt / 10.0;
             }
             bloom_settings.low_frequency_boost_curvature =
                 bloom_settings.low_frequency_boost_curvature.clamp(0.0, 1.0);
 
-            if key.pressed("f") {
+            if key.pressed(KeyCode::KeyF) {
                 bloom_settings.high_pass_frequency -= dt / 10.0;
             }
-            if key.pressed("r") {
+            if key.pressed(KeyCode::KeyR) {
                 bloom_settings.high_pass_frequency += dt / 10.0;
             }
             bloom_settings.high_pass_frequency = bloom_settings.high_pass_frequency.clamp(0.0, 1.0);
 
-            if key.pressed("g") {
+            if key.pressed(KeyCode::KeyG) {
                 bloom_settings.composite_mode = BloomCompositeMode::Additive;
             }
-            if key.pressed("t") {
+            if key.pressed(KeyCode::KeyT) {
                 bloom_settings.composite_mode = BloomCompositeMode::EnergyConserving;
             }
 
-            if key.pressed("h") {
+            if key.pressed(KeyCode::KeyH) {
                 bloom_settings.prefilter_settings.threshold -= dt;
             }
-            if key.pressed("y") {
+            if key.pressed(KeyCode::KeyY) {
                 bloom_settings.prefilter_settings.threshold += dt;
             }
             bloom_settings.prefilter_settings.threshold =
                 bloom_settings.prefilter_settings.threshold.max(0.0);
 
-            if key.pressed("j") {
+            if key.pressed(KeyCode::KeyJ) {
                 bloom_settings.prefilter_settings.threshold_softness -= dt / 10.0;
             }
-            if key.pressed("u") {
+            if key.pressed(KeyCode::KeyU) {
                 bloom_settings.prefilter_settings.threshold_softness += dt / 10.0;
             }
             bloom_settings.prefilter_settings.threshold_softness = bloom_settings
diff --git a/examples/2d/rotation.rs b/examples/2d/rotation.rs
index 78b6dfd4e201a..9803aa013bcf2 100644
--- a/examples/2d/rotation.rs
+++ b/examples/2d/rotation.rs
@@ -125,15 +125,15 @@ fn player_movement_system(
     let mut rotation_factor = 0.0;
     let mut movement_factor = 0.0;
 
-    if keyboard_input.pressed(Key::ArrowLeft) {
+    if keyboard_input.pressed(KeyCode::ArrowLeft) {
         rotation_factor += 1.0;
     }
 
-    if keyboard_input.pressed(Key::ArrowRight) {
+    if keyboard_input.pressed(KeyCode::ArrowRight) {
         rotation_factor -= 1.0;
     }
 
-    if keyboard_input.pressed(Key::ArrowUp) {
+    if keyboard_input.pressed(KeyCode::ArrowUp) {
         movement_factor += 1.0;
     }
 
diff --git a/examples/3d/3d_gizmos.rs b/examples/3d/3d_gizmos.rs
index b48c0435db948..d797245341afb 100644
--- a/examples/3d/3d_gizmos.rs
+++ b/examples/3d/3d_gizmos.rs
@@ -105,20 +105,20 @@ fn rotate_camera(mut query: Query<&mut Transform, With<Camera>>, time: Res<Time>
 }
 
 fn update_config(mut config: ResMut<GizmoConfig>, keyboard: Res<Input<KeyLogic>>, time: Res<Time>) {
-    if keyboard.just_pressed("d") {
+    if keyboard.just_pressed(KeyCode::KeyD) {
         config.depth_bias = if config.depth_bias == 0. { -1. } else { 0. };
     }
-    if keyboard.just_pressed("p") {
+    if keyboard.just_pressed(KeyCode::KeyP) {
         // Toggle line_perspective
         config.line_perspective ^= true;
         // Increase the line width when line_perspective is on
         config.line_width *= if config.line_perspective { 5. } else { 1. / 5. };
     }
 
-    if keyboard.pressed(Key::ArrowRight) {
+    if keyboard.pressed(KeyCode::ArrowRight) {
         config.line_width += 5. * time.delta_seconds();
     }
-    if keyboard.pressed(Key::ArrowLeft) {
+    if keyboard.pressed(KeyCode::ArrowLeft) {
         config.line_width -= 5. * time.delta_seconds();
     }
 }
diff --git a/examples/3d/anti_aliasing.rs b/examples/3d/anti_aliasing.rs
index 32bee6a13400d..7caf4373c71c8 100644
--- a/examples/3d/anti_aliasing.rs
+++ b/examples/3d/anti_aliasing.rs
@@ -44,14 +44,14 @@ fn modify_aa(
     let mut camera = commands.entity(camera_entity);
 
     // No AA
-    if keys.just_pressed("1") {
+    if keys.just_pressed(KeyCode::Digit1) {
         *msaa = Msaa::Off;
         camera.remove::<Fxaa>();
         camera.remove::<TemporalAntiAliasBundle>();
     }
 
     // MSAA
-    if keys.just_pressed("2") && *msaa == Msaa::Off {
+    if keys.just_pressed(KeyCode::Digit2) && *msaa == Msaa::Off {
         camera.remove::<Fxaa>();
         camera.remove::<TemporalAntiAliasBundle>();
 
@@ -60,19 +60,19 @@ fn modify_aa(
 
     // MSAA Sample Count
     if *msaa != Msaa::Off {
-        if keys.just_pressed("q") {
+        if keys.just_pressed(KeyCode::KeyQ) {
             *msaa = Msaa::Sample2;
         }
-        if keys.just_pressed("w") {
+        if keys.just_pressed(KeyCode::KeyW) {
             *msaa = Msaa::Sample4;
         }
-        if keys.just_pressed("e") {
+        if keys.just_pressed(KeyCode::KeyE) {
             *msaa = Msaa::Sample8;
         }
     }
 
     // FXAA
-    if keys.just_pressed("3") && fxaa.is_none() {
+    if keys.just_pressed(KeyCode::Digit3) && fxaa.is_none() {
         *msaa = Msaa::Off;
         camera.remove::<TemporalAntiAliasBundle>();
 
@@ -81,30 +81,30 @@ fn modify_aa(
 
     // FXAA Settings
     if let Some(mut fxaa) = fxaa {
-        if keys.just_pressed("q") {
+        if keys.just_pressed(KeyCode::KeyQ) {
             fxaa.edge_threshold = Sensitivity::Low;
             fxaa.edge_threshold_min = Sensitivity::Low;
         }
-        if keys.just_pressed("w") {
+        if keys.just_pressed(KeyCode::KeyW) {
             fxaa.edge_threshold = Sensitivity::Medium;
             fxaa.edge_threshold_min = Sensitivity::Medium;
         }
-        if keys.just_pressed("e") {
+        if keys.just_pressed(KeyCode::KeyE) {
             fxaa.edge_threshold = Sensitivity::High;
             fxaa.edge_threshold_min = Sensitivity::High;
         }
-        if keys.just_pressed("r") {
+        if keys.just_pressed(KeyCode::KeyR) {
             fxaa.edge_threshold = Sensitivity::Ultra;
             fxaa.edge_threshold_min = Sensitivity::Ultra;
         }
-        if keys.just_pressed("t") {
+        if keys.just_pressed(KeyCode::KeyT) {
             fxaa.edge_threshold = Sensitivity::Extreme;
             fxaa.edge_threshold_min = Sensitivity::Extreme;
         }
     }
 
     // TAA
-    if keys.just_pressed("4") && taa.is_none() {
+    if keys.just_pressed(KeyCode::Digit4) && taa.is_none() {
         *msaa = Msaa::Off;
         camera.remove::<Fxaa>();
 
@@ -117,19 +117,19 @@ fn modify_sharpening(
     mut query: Query<&mut ContrastAdaptiveSharpeningSettings>,
 ) {
     for mut cas in &mut query {
-        if keys.just_pressed("0") {
+        if keys.just_pressed(KeyCode::Digit0) {
             cas.enabled = !cas.enabled;
         }
         if cas.enabled {
-            if keys.just_pressed("-") {
+            if keys.just_pressed(KeyCode::Minus) {
                 cas.sharpening_strength -= 0.1;
                 cas.sharpening_strength = cas.sharpening_strength.clamp(0.0, 1.0);
             }
-            if keys.just_pressed("+") {
+            if keys.just_pressed(KeyCode::Equal) {
                 cas.sharpening_strength += 0.1;
                 cas.sharpening_strength = cas.sharpening_strength.clamp(0.0, 1.0);
             }
-            if keys.just_pressed("d") {
+            if keys.just_pressed(KeyCode::KeyD) {
                 cas.denoise = !cas.denoise;
             }
         }
diff --git a/examples/3d/atmospheric_fog.rs b/examples/3d/atmospheric_fog.rs
index 74902dc606e66..b152222b10610 100644
--- a/examples/3d/atmospheric_fog.rs
+++ b/examples/3d/atmospheric_fog.rs
@@ -115,12 +115,12 @@ fn setup_instructions(mut commands: Commands) {
 fn toggle_system(key: Res<Input<KeyLogic>>, mut fog: Query<&mut FogSettings>) {
     let mut fog_settings = fog.single_mut();
 
-    if key.just_pressed(Key::Space) {
+    if key.just_pressed(KeyCode::Space) {
         let a = fog_settings.color.a();
         fog_settings.color.set_a(1.0 - a);
     }
 
-    if key.just_pressed("s") {
+    if key.just_pressed(KeyCode::ShiftLeft) {
         let a = fog_settings.directional_light_color.a();
         fog_settings.directional_light_color.set_a(0.5 - a);
     }
diff --git a/examples/3d/blend_modes.rs b/examples/3d/blend_modes.rs
index 29d4d79116d15..4b15d7b456e4b 100644
--- a/examples/3d/blend_modes.rs
+++ b/examples/3d/blend_modes.rs
@@ -292,17 +292,17 @@ fn example_control_system(
     time: Res<Time>,
     input: Res<Input<KeyLogic>>,
 ) {
-    if input.pressed(Key::ArrowUp) {
+    if input.pressed(KeyCode::ArrowUp) {
         state.alpha = (state.alpha + time.delta_seconds()).min(1.0);
-    } else if input.pressed(Key::ArrowDown) {
+    } else if input.pressed(KeyCode::ArrowDown) {
         state.alpha = (state.alpha - time.delta_seconds()).max(0.0);
     }
 
-    if input.just_pressed(Key::Space) {
+    if input.just_pressed(KeyCode::Space) {
         state.unlit = !state.unlit;
     }
 
-    let randomize_colors = input.just_pressed("c");
+    let randomize_colors = input.just_pressed(KeyCode::KeyC);
 
     for (material_handle, controls) in &controllable {
         let material = materials.get_mut(material_handle).unwrap();
@@ -320,13 +320,13 @@ fn example_control_system(
 
     let (mut camera, mut camera_transform, camera_global_transform) = camera.single_mut();
 
-    if input.just_pressed("h") {
+    if input.just_pressed(KeyCode::KeyH) {
         camera.hdr = !camera.hdr;
     }
 
-    let rotation = if input.pressed(Key::ArrowLeft) {
+    let rotation = if input.pressed(KeyCode::ArrowLeft) {
         time.delta_seconds()
-    } else if input.pressed(Key::ArrowRight) {
+    } else if input.pressed(KeyCode::ArrowRight) {
         -time.delta_seconds()
     } else {
         0.0
diff --git a/examples/3d/bloom_3d.rs b/examples/3d/bloom_3d.rs
index 37f3c4e41246d..517945592c2ee 100644
--- a/examples/3d/bloom_3d.rs
+++ b/examples/3d/bloom_3d.rs
@@ -155,65 +155,65 @@ fn update_bloom_settings(
                 bloom_settings.prefilter_settings.threshold_softness
             ));
 
-            if key.just_pressed(Key::Space) {
+            if key.just_pressed(KeyCode::Space) {
                 commands.entity(entity).remove::<BloomSettings>();
             }
 
             let dt = time.delta_seconds();
 
-            if key.pressed("a") {
+            if key.pressed(KeyCode::KeyA) {
                 bloom_settings.intensity -= dt / 10.0;
             }
-            if key.pressed("q") {
+            if key.pressed(KeyCode::KeyQ) {
                 bloom_settings.intensity += dt / 10.0;
             }
             bloom_settings.intensity = bloom_settings.intensity.clamp(0.0, 1.0);
 
-            if key.pressed("s") {
+            if key.pressed(KeyCode::KeyS) {
                 bloom_settings.low_frequency_boost -= dt / 10.0;
             }
-            if key.pressed("w") {
+            if key.pressed(KeyCode::KeyW) {
                 bloom_settings.low_frequency_boost += dt / 10.0;
             }
             bloom_settings.low_frequency_boost = bloom_settings.low_frequency_boost.clamp(0.0, 1.0);
 
-            if key.pressed("d") {
+            if key.pressed(KeyCode::KeyD) {
                 bloom_settings.low_frequency_boost_curvature -= dt / 10.0;
             }
-            if key.pressed("e") {
+            if key.pressed(KeyCode::KeyE) {
                 bloom_settings.low_frequency_boost_curvature += dt / 10.0;
             }
             bloom_settings.low_frequency_boost_curvature =
                 bloom_settings.low_frequency_boost_curvature.clamp(0.0, 1.0);
 
-            if key.pressed("f") {
+            if key.pressed(KeyCode::KeyF) {
                 bloom_settings.high_pass_frequency -= dt / 10.0;
             }
-            if key.pressed("r") {
+            if key.pressed(KeyCode::KeyR) {
                 bloom_settings.high_pass_frequency += dt / 10.0;
             }
             bloom_settings.high_pass_frequency = bloom_settings.high_pass_frequency.clamp(0.0, 1.0);
 
-            if key.pressed("g") {
+            if key.pressed(KeyCode::KeyG) {
                 bloom_settings.composite_mode = BloomCompositeMode::Additive;
             }
-            if key.pressed("t") {
+            if key.pressed(KeyCode::KeyT) {
                 bloom_settings.composite_mode = BloomCompositeMode::EnergyConserving;
             }
 
-            if key.pressed("h") {
+            if key.pressed(KeyCode::KeyH) {
                 bloom_settings.prefilter_settings.threshold -= dt;
             }
-            if key.pressed("y") {
+            if key.pressed(KeyCode::KeyY) {
                 bloom_settings.prefilter_settings.threshold += dt;
             }
             bloom_settings.prefilter_settings.threshold =
                 bloom_settings.prefilter_settings.threshold.max(0.0);
 
-            if key.pressed("j") {
+            if key.pressed(KeyCode::KeyJ) {
                 bloom_settings.prefilter_settings.threshold_softness -= dt / 10.0;
             }
-            if key.pressed("u") {
+            if key.pressed(KeyCode::KeyU) {
                 bloom_settings.prefilter_settings.threshold_softness += dt / 10.0;
             }
             bloom_settings.prefilter_settings.threshold_softness = bloom_settings
@@ -225,7 +225,7 @@ fn update_bloom_settings(
         (entity, None) => {
             *text = "Bloom: Off (Toggle: Space)".to_string();
 
-            if key.just_pressed(Key::Space) {
+            if key.just_pressed(KeyCode::Space) {
                 commands.entity(entity).insert(BloomSettings::default());
             }
         }
diff --git a/examples/3d/fog.rs b/examples/3d/fog.rs
index 9d6bb37869edc..681e60ec5168e 100644
--- a/examples/3d/fog.rs
+++ b/examples/3d/fog.rs
@@ -160,7 +160,7 @@ fn update_system(
     mut text: Query<&mut Text>,
     time: Res<Time>,
     key: Res<Input<KeyLogic>>,
-    key_code: Res<Input<KeyCode>>,
+    key_code: Res<Input<KeyLogic>>,
 ) {
     let now = time.elapsed_seconds();
     let delta = time.delta_seconds();
@@ -185,7 +185,7 @@ fn update_system(
         .value
         .push_str("\n\n1 / 2 / 3 - Fog Falloff Mode");
 
-    if key.just_pressed("1") {
+    if key.just_pressed(KeyCode::Digit1) {
         if let FogFalloff::Linear { .. } = fog.falloff {
             // No change
         } else {
@@ -226,16 +226,16 @@ fn update_system(
             .value
             .push_str("\nA / S - Move Start Distance\nZ / X - Move End Distance");
 
-        if key.pressed("a") {
+        if key.pressed(KeyCode::KeyA) {
             *start -= delta * 3.0;
         }
-        if key.pressed("s") {
+        if key.pressed(KeyCode::KeyS) {
             *start += delta * 3.0;
         }
-        if key.pressed("z") {
+        if key.pressed(KeyCode::KeyZ) {
             *end -= delta * 3.0;
         }
-        if key.pressed("x") {
+        if key.pressed(KeyCode::KeyX) {
             *end += delta * 3.0;
         }
     }
@@ -244,13 +244,13 @@ fn update_system(
     if let FogFalloff::Exponential { ref mut density } = &mut fog.falloff {
         text.sections[0].value.push_str("\nA / S - Change Density");
 
-        if key.pressed("a") {
+        if key.pressed(KeyCode::KeyA) {
             *density -= delta * 0.5 * *density;
             if *density < 0.0 {
                 *density = 0.0;
             }
         }
-        if key.pressed("s") {
+        if key.pressed(KeyCode::KeyS) {
             *density += delta * 0.5 * *density;
         }
     }
@@ -259,13 +259,13 @@ fn update_system(
     if let FogFalloff::ExponentialSquared { ref mut density } = &mut fog.falloff {
         text.sections[0].value.push_str("\nA / S - Change Density");
 
-        if key.pressed("a") {
+        if key.pressed(KeyCode::KeyA) {
             *density -= delta * 0.5 * *density;
             if *density < 0.0 {
                 *density = 0.0;
             }
         }
-        if key.pressed("s") {
+        if key.pressed(KeyCode::KeyS) {
             *density += delta * 0.5 * *density;
         }
     }
@@ -275,42 +275,42 @@ fn update_system(
         .value
         .push_str("\n\n- / = - Red\n[ / ] - Green\n; / ' - Blue\n. / ? - Alpha");
 
-    if key.pressed("-") {
+    if key.pressed(KeyCode::Minus) {
         let r = (fog.color.r() - 0.1 * delta).max(0.0);
         fog.color.set_r(r);
     }
 
-    if key.pressed("=") {
+    if key.pressed(KeyCode::Equal) {
         let r = (fog.color.r() + 0.1 * delta).min(1.0);
         fog.color.set_r(r);
     }
 
-    if key.pressed("[") {
+    if key.pressed(KeyCode::BracketLeft) {
         let g = (fog.color.g() - 0.1 * delta).max(0.0);
         fog.color.set_g(g);
     }
 
-    if key.pressed("]") {
+    if key.pressed(KeyCode::BracketRight) {
         let g = (fog.color.g() + 0.1 * delta).min(1.0);
         fog.color.set_g(g);
     }
 
-    if key.pressed(";") {
+    if key.pressed(KeyCode::Semicolon) {
         let b = (fog.color.b() - 0.1 * delta).max(0.0);
         fog.color.set_b(b);
     }
 
-    if key.pressed("'") {
+    if key.pressed(KeyCode::Quote) {
         let b = (fog.color.b() + 0.1 * delta).min(1.0);
         fog.color.set_b(b);
     }
 
-    if key.pressed(".") {
+    if key.pressed(KeyCode::Period) {
         let a = (fog.color.a() - 0.1 * delta).max(0.0);
         fog.color.set_a(a);
     }
 
-    if key.pressed("?") {
+    if key.pressed(KeyCode::Slash) {
         let a = (fog.color.a() + 0.1 * delta).min(1.0);
         fog.color.set_a(a);
     }
diff --git a/examples/3d/generate_custom_mesh.rs b/examples/3d/generate_custom_mesh.rs
index 2161d038dc9b4..6886607e909e1 100644
--- a/examples/3d/generate_custom_mesh.rs
+++ b/examples/3d/generate_custom_mesh.rs
@@ -85,7 +85,7 @@ fn setup(
 // System to receive input from the user,
 // check out examples/input/ for more examples about user input.
 fn input_handler(
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<Input<KeyLogic>>,
     mesh_query: Query<&Handle<Mesh>, With<CustomUV>>,
     mut meshes: ResMut<Assets<Mesh>>,
     mut query: Query<&mut Transform, With<CustomUV>>,
diff --git a/examples/3d/lighting.rs b/examples/3d/lighting.rs
index 7be0fffd2a866..35869fd8d6f47 100644
--- a/examples/3d/lighting.rs
+++ b/examples/3d/lighting.rs
@@ -267,16 +267,16 @@ fn movement(
 ) {
     for mut transform in &mut query {
         let mut direction = Vec3::ZERO;
-        if input.pressed(Key::ArrowUp) {
+        if input.pressed(KeyCode::ArrowUp) {
             direction.y += 1.0;
         }
-        if input.pressed(Key::ArrowDown) {
+        if input.pressed(KeyCode::ArrowDown) {
             direction.y -= 1.0;
         }
-        if input.pressed(Key::ArrowLeft) {
+        if input.pressed(KeyCode::ArrowLeft) {
             direction.x -= 1.0;
         }
-        if input.pressed(Key::ArrowRight) {
+        if input.pressed(KeyCode::ArrowRight) {
             direction.x += 1.0;
         }
 
diff --git a/examples/3d/parallax_mapping.rs b/examples/3d/parallax_mapping.rs
index 882620fcab4dc..1c8891669cfd4 100644
--- a/examples/3d/parallax_mapping.rs
+++ b/examples/3d/parallax_mapping.rs
@@ -79,7 +79,7 @@ impl CurrentMethod {
 }
 
 fn update_parallax_depth_scale(
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<KeyLogic>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
     mut target_depth: Local<TargetDepth>,
     mut depth_update: Local<bool>,
@@ -111,7 +111,7 @@ fn update_parallax_depth_scale(
 }
 
 fn switch_method(
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<KeyLogic>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
     mut text: Query<&mut Text>,
     mut current: Local<CurrentMethod>,
@@ -130,7 +130,7 @@ fn switch_method(
 }
 
 fn update_parallax_layers(
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<KeyLogic>>,
     mut materials: ResMut<Assets<StandardMaterial>>,
     mut target_layers: Local<TargetLayers>,
     mut text: Query<&mut Text>,
diff --git a/examples/3d/shadow_biases.rs b/examples/3d/shadow_biases.rs
index 12232eed8ab81..49ccc8190ae96 100644
--- a/examples/3d/shadow_biases.rs
+++ b/examples/3d/shadow_biases.rs
@@ -146,7 +146,7 @@ fn toggle_light(
     mut directional_lights: Query<&mut DirectionalLight>,
     mut example_text: Query<&mut Text>,
 ) {
-    if input.just_pressed("l") {
+    if input.just_pressed(KeyCode::KeyL) {
         for mut light in &mut point_lights {
             light.intensity = if light.intensity == 0.0 {
                 example_text.single_mut().sections[4].value = "PointLight".to_string();
@@ -167,7 +167,7 @@ fn toggle_light(
 }
 
 fn adjust_point_light_biases(
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<KeyLogic>>,
     mut query: Query<&mut PointLight>,
     mut example_text: Query<&mut Text>,
 ) {
@@ -196,7 +196,7 @@ fn adjust_point_light_biases(
 }
 
 fn adjust_directional_light_biases(
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<KeyLogic>>,
     mut query: Query<&mut DirectionalLight>,
     mut example_text: Query<&mut Text>,
 ) {
@@ -270,7 +270,7 @@ impl Default for CameraController {
 fn camera_controller(
     time: Res<Time>,
     mut mouse_events: EventReader<MouseMotion>,
-    key_input: Res<Input<KeyCode>>,
+    key_input: Res<Input<KeyLogic>>,
     mut query: Query<(&mut Transform, &mut CameraController), With<Camera>>,
 ) {
     let dt = time.delta_seconds();
diff --git a/examples/3d/shadow_caster_receiver.rs b/examples/3d/shadow_caster_receiver.rs
index d7c8f1747c993..c56572ecef1bb 100644
--- a/examples/3d/shadow_caster_receiver.rs
+++ b/examples/3d/shadow_caster_receiver.rs
@@ -130,7 +130,7 @@ fn toggle_light(
     mut point_lights: Query<&mut PointLight>,
     mut directional_lights: Query<&mut DirectionalLight>,
 ) {
-    if input.just_pressed("l") {
+    if input.just_pressed(KeyCode::KeyL) {
         for mut light in &mut point_lights {
             light.intensity = if light.intensity == 0.0 {
                 println!("Using PointLight");
@@ -160,7 +160,7 @@ fn toggle_shadows(
         Query<Entity, (With<Handle<Mesh>>, Without<NotShadowReceiver>)>,
     )>,
 ) {
-    if input.just_pressed("c") {
+    if input.just_pressed(KeyCode::KeyC) {
         println!("Toggling casters");
         for entity in queries.p0().iter() {
             commands.entity(entity).remove::<NotShadowCaster>();
@@ -169,7 +169,7 @@ fn toggle_shadows(
             commands.entity(entity).insert(NotShadowCaster);
         }
     }
-    if input.just_pressed("r") {
+    if input.just_pressed(KeyCode::KeyR) {
         println!("Toggling receivers");
         for entity in queries.p1().iter() {
             commands.entity(entity).remove::<NotShadowReceiver>();
diff --git a/examples/3d/skybox.rs b/examples/3d/skybox.rs
index da89c7b84270c..bcfb6db05bfa4 100644
--- a/examples/3d/skybox.rs
+++ b/examples/3d/skybox.rs
@@ -223,7 +223,7 @@ pub fn camera_controller(
     time: Res<Time>,
     mut mouse_events: EventReader<MouseMotion>,
     mouse_button_input: Res<Input<MouseButton>>,
-    key_input: Res<Input<KeyCode>>,
+    key_input: Res<Input<KeyLogic>>,
     key_input_logic: Res<Input<KeyLogic>>,
     mut move_toggled: Local<bool>,
     mut query: Query<(&mut Transform, &mut CameraController), With<Camera>>,
diff --git a/examples/3d/spotlight.rs b/examples/3d/spotlight.rs
index a98413a74da22..8f2a04b7c563a 100644
--- a/examples/3d/spotlight.rs
+++ b/examples/3d/spotlight.rs
@@ -151,22 +151,22 @@ fn movement(
 ) {
     for mut transform in &mut query {
         let mut direction = Vec3::ZERO;
-        if input.pressed(Key::ArrowUp) {
+        if input.pressed(KeyCode::ArrowUp) {
             direction.z -= 1.0;
         }
-        if input.pressed(Key::ArrowDown) {
+        if input.pressed(KeyCode::ArrowDown) {
             direction.z += 1.0;
         }
-        if input.pressed(Key::ArrowLeft) {
+        if input.pressed(KeyCode::ArrowLeft) {
             direction.x -= 1.0;
         }
-        if input.pressed(Key::ArrowRight) {
+        if input.pressed(KeyCode::ArrowRight) {
             direction.x += 1.0;
         }
-        if input.pressed(Key::PageUp) {
+        if input.pressed(KeyCode::PageUp) {
             direction.y += 1.0;
         }
-        if input.pressed(Key::PageDown) {
+        if input.pressed(KeyCode::PageDown) {
             direction.y -= 1.0;
         }
 
diff --git a/examples/3d/ssao.rs b/examples/3d/ssao.rs
index 81ace63297caa..c84afb6b2039f 100644
--- a/examples/3d/ssao.rs
+++ b/examples/3d/ssao.rs
@@ -127,7 +127,7 @@ fn update(
     mut text: Query<&mut Text>,
     mut sphere: Query<&mut Transform, With<SphereMarker>>,
     mut commands: Commands,
-    keycode: Res<Input<KeyCode>>,
+    keycode: Res<Input<KeyLogic>>,
     time: Res<Time>,
 ) {
     let mut sphere = sphere.single_mut();
diff --git a/examples/3d/tonemapping.rs b/examples/3d/tonemapping.rs
index 1e6c9a1499698..20f7f2a4f64f2 100644
--- a/examples/3d/tonemapping.rs
+++ b/examples/3d/tonemapping.rs
@@ -354,11 +354,11 @@ fn toggle_scene(
     mut current_scene: ResMut<CurrentScene>,
 ) {
     let mut pressed = None;
-    if keys.just_pressed("q") {
+    if keys.just_pressed(KeyCode::KeyQ) {
         pressed = Some(1);
-    } else if keys.just_pressed("w") {
+    } else if keys.just_pressed(KeyCode::KeyW) {
         pressed = Some(2);
-    } else if keys.just_pressed("e") {
+    } else if keys.just_pressed(KeyCode::KeyE) {
         pressed = Some(3);
     }
 
@@ -376,7 +376,7 @@ fn toggle_scene(
 }
 
 fn toggle_tonemapping_method(
-    keys: Res<Input<KeyCode>>,
+    keys: Res<Input<KeyLogic>>,
     mut tonemapping: Query<&mut Tonemapping>,
     mut color_grading: Query<&mut ColorGrading>,
     per_method_settings: Res<PerMethodSettings>,
@@ -434,17 +434,17 @@ fn update_color_grading_settings(
     let method = tonemapping.single();
     let color_grading = per_method_settings.settings.get_mut(method).unwrap();
     let mut dt = time.delta_seconds() * 0.25;
-    if keys.pressed(Key::ArrowLeft) {
+    if keys.pressed(KeyCode::ArrowLeft) {
         dt = -dt;
     }
 
-    if keys.just_pressed(Key::ArrowDown) {
+    if keys.just_pressed(KeyCode::ArrowDown) {
         selected_parameter.next();
     }
-    if keys.just_pressed(Key::ArrowUp) {
+    if keys.just_pressed(KeyCode::ArrowUp) {
         selected_parameter.prev();
     }
-    if keys.pressed(Key::ArrowLeft) || keys.pressed(Key::ArrowRight) {
+    if keys.pressed(KeyCode::ArrowLeft) || keys.pressed(KeyCode::ArrowRight) {
         match selected_parameter.value {
             0 => {
                 color_grading.exposure += dt;
@@ -462,13 +462,13 @@ fn update_color_grading_settings(
         }
     }
 
-    if keys.just_pressed(Key::Space) {
+    if keys.just_pressed(KeyCode::Space) {
         for (_, grading) in per_method_settings.settings.iter_mut() {
             *grading = ColorGrading::default();
         }
     }
 
-    if keys.just_pressed(Key::Enter) && current_scene.0 == 1 {
+    if keys.just_pressed(KeyCode::Enter) && current_scene.0 == 1 {
         for (mapper, grading) in per_method_settings.settings.iter_mut() {
             *grading = PerMethodSettings::basic_scene_recommendation(*mapper);
         }
@@ -489,7 +489,7 @@ fn update_ui(
     let mut text = text.single_mut();
     let text = &mut text.sections[0].value;
 
-    if keys.just_pressed("h") {
+    if keys.just_pressed(KeyCode::KeyH) {
         *hide_ui = !*hide_ui;
     }
     text.clear();
diff --git a/examples/animation/animated_fox.rs b/examples/animation/animated_fox.rs
index db6fe1d342831..0302b89e2fb6e 100644
--- a/examples/animation/animated_fox.rs
+++ b/examples/animation/animated_fox.rs
@@ -98,7 +98,7 @@ fn keyboard_animation_control(
     mut current_animation: Local<usize>,
 ) {
     for mut player in &mut animation_players {
-        if keyboard_input.just_pressed(Key::Space) {
+        if keyboard_input.just_pressed(KeyCode::Space) {
             if player.is_paused() {
                 player.resume();
             } else {
@@ -106,12 +106,12 @@ fn keyboard_animation_control(
             }
         }
 
-        if keyboard_input.just_pressed(Key::ArrowUp) {
+        if keyboard_input.just_pressed(KeyCode::ArrowUp) {
             let speed = player.speed();
             player.set_speed(speed * 1.2);
         }
 
-        if keyboard_input.just_pressed(Key::ArrowDown) {
+        if keyboard_input.just_pressed(KeyCode::ArrowDown) {
             let speed = player.speed();
             player.set_speed(speed * 0.8);
         }
@@ -126,7 +126,7 @@ fn keyboard_animation_control(
             player.seek_to(elapsed + 0.1);
         }
 
-        if keyboard_input.just_pressed(Key::Enter) {
+        if keyboard_input.just_pressed(KeyCode::Enter) {
             *current_animation = (*current_animation + 1) % animations.0.len();
             player
                 .play_with_transition(
@@ -136,22 +136,22 @@ fn keyboard_animation_control(
                 .repeat();
         }
 
-        if keyboard_input.just_pressed(KeyCode::Key1) {
+        if keyboard_input.just_pressed(KeyCode::Digit1) {
             player.set_repeat(RepeatAnimation::Count(1));
             player.replay();
         }
 
-        if keyboard_input.just_pressed(KeyCode::Key3) {
+        if keyboard_input.just_pressed(KeyCode::Digit3) {
             player.set_repeat(RepeatAnimation::Count(3));
             player.replay();
         }
 
-        if keyboard_input.just_pressed(KeyCode::Key5) {
+        if keyboard_input.just_pressed(KeyCode::Digit5) {
             player.set_repeat(RepeatAnimation::Count(5));
             player.replay();
         }
 
-        if keyboard_input.just_pressed(KeyCode::L) {
+        if keyboard_input.just_pressed(KeyCode::KeyL) {
             player.set_repeat(RepeatAnimation::Forever);
         }
     }
diff --git a/examples/app/return_after_run.rs b/examples/app/return_after_run.rs
index 0f1f80a82cff8..eb5bae6d3caa5 100644
--- a/examples/app/return_after_run.rs
+++ b/examples/app/return_after_run.rs
@@ -6,7 +6,6 @@
 //! - It is not possible to recreate a window afer the event loop has been terminated.
 
 use bevy::{prelude::*, window::WindowPlugin};
-use bevy_internal::log::LogPlugin;
 
 fn main() {
     println!("Running Bevy App");
diff --git a/examples/audio/audio_control.rs b/examples/audio/audio_control.rs
index f0574c02b1de3..6666ad55e3591 100644
--- a/examples/audio/audio_control.rs
+++ b/examples/audio/audio_control.rs
@@ -37,7 +37,10 @@ fn pause(keyboard_input: Res<Input<KeyLogic>>, music_controller: Query<&AudioSin
     }
 }
 
-fn volume(keyboard_input: Res<Input<KeyCode>>, music_controller: Query<&AudioSink, With<MyMusic>>) {
+fn volume(
+    keyboard_input: Res<Input<KeyLogic>>,
+    music_controller: Query<&AudioSink, With<MyMusic>>,
+) {
     if let Ok(sink) = music_controller.get_single() {
         if keyboard_input.just_pressed(KeyCode::NumpadAdd) {
             sink.set_volume(sink.volume() + 0.1);
diff --git a/examples/audio/pitch.rs b/examples/audio/pitch.rs
index 218ae5500f602..c75c08f8275bf 100644
--- a/examples/audio/pitch.rs
+++ b/examples/audio/pitch.rs
@@ -39,14 +39,14 @@ fn play_pitch(
 }
 
 fn keyboard_input_system(
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<Input<KeyLogic>>,
     mut frequency: ResMut<PitchFrequency>,
     mut events: EventWriter<PlayPitch>,
 ) {
-    if keyboard_input.just_pressed(KeyCode::Up) {
+    if keyboard_input.just_pressed(KeyCode::ArrowUp) {
         frequency.0 *= 2.0f32.powf(1.0 / 12.0);
     }
-    if keyboard_input.just_pressed(KeyCode::Down) {
+    if keyboard_input.just_pressed(KeyCode::ArrowDown) {
         frequency.0 /= 2.0f32.powf(1.0 / 12.0);
     }
     if keyboard_input.just_pressed(KeyCode::Space) {
diff --git a/examples/ecs/generic_system.rs b/examples/ecs/generic_system.rs
index 901f239ed2644..2e0c64fa1e444 100644
--- a/examples/ecs/generic_system.rs
+++ b/examples/ecs/generic_system.rs
@@ -75,7 +75,7 @@ fn transition_to_in_game_system(
     mut next_state: ResMut<NextState<AppState>>,
     keyboard_input: Res<Input<KeyLogic>>,
 ) {
-    if keyboard_input.pressed(Key::Space) {
+    if keyboard_input.pressed(KeyCode::Space) {
         next_state.set(AppState::InGame);
     }
 }
diff --git a/examples/ecs/run_conditions.rs b/examples/ecs/run_conditions.rs
index e75b166a9e7c2..6a77ab9b1c5ee 100644
--- a/examples/ecs/run_conditions.rs
+++ b/examples/ecs/run_conditions.rs
@@ -68,8 +68,8 @@ fn has_user_input(
     mouse_button_input: Res<Input<MouseButton>>,
     touch_input: Res<Touches>,
 ) -> bool {
-    keyboard_input.just_pressed(Key::Space)
-        || keyboard_input.just_pressed(Key::Enter)
+    keyboard_input.just_pressed(KeyCode::Space)
+        || keyboard_input.just_pressed(KeyCode::Enter)
         || mouse_button_input.just_pressed(MouseButton::Left)
         || mouse_button_input.just_pressed(MouseButton::Right)
         || touch_input.any_just_pressed()
diff --git a/examples/ecs/state.rs b/examples/ecs/state.rs
index 508f9bcc62044..0e13122adae2d 100644
--- a/examples/ecs/state.rs
+++ b/examples/ecs/state.rs
@@ -133,16 +133,16 @@ fn movement(
 ) {
     for mut transform in &mut query {
         let mut direction = Vec3::ZERO;
-        if input.pressed(Key::ArrowLeft) {
+        if input.pressed(KeyCode::ArrowLeft) {
             direction.x -= 1.0;
         }
-        if input.pressed(Key::ArrowRight) {
+        if input.pressed(KeyCode::ArrowRight) {
             direction.x += 1.0;
         }
-        if input.pressed(Key::ArrowUp) {
+        if input.pressed(KeyCode::ArrowUp) {
             direction.y += 1.0;
         }
-        if input.pressed(Key::ArrowDown) {
+        if input.pressed(KeyCode::ArrowDown) {
             direction.y -= 1.0;
         }
 
diff --git a/examples/games/alien_cake_addict.rs b/examples/games/alien_cake_addict.rs
index 2d526ccf6f97c..495f2b81698e0 100644
--- a/examples/games/alien_cake_addict.rs
+++ b/examples/games/alien_cake_addict.rs
@@ -201,28 +201,28 @@ fn move_player(
         let mut moved = false;
         let mut rotation = 0.0;
 
-        if keyboard_input.pressed(Key::ArrowUp) {
+        if keyboard_input.pressed(KeyCode::ArrowUp) {
             if game.player.i < BOARD_SIZE_I - 1 {
                 game.player.i += 1;
             }
             rotation = -PI / 2.;
             moved = true;
         }
-        if keyboard_input.pressed(Key::ArrowDown) {
+        if keyboard_input.pressed(KeyCode::ArrowDown) {
             if game.player.i > 0 {
                 game.player.i -= 1;
             }
             rotation = PI / 2.;
             moved = true;
         }
-        if keyboard_input.pressed(Key::ArrowRight) {
+        if keyboard_input.pressed(KeyCode::ArrowRight) {
             if game.player.j < BOARD_SIZE_J - 1 {
                 game.player.j += 1;
             }
             rotation = PI;
             moved = true;
         }
-        if keyboard_input.pressed(Key::ArrowLeft) {
+        if keyboard_input.pressed(KeyCode::ArrowLeft) {
             if game.player.j > 0 {
                 game.player.j -= 1;
             }
@@ -378,7 +378,7 @@ fn gameover_keyboard(
     mut next_state: ResMut<NextState<GameState>>,
     keyboard_input: Res<Input<KeyLogic>>,
 ) {
-    if keyboard_input.just_pressed(Key::Space) {
+    if keyboard_input.just_pressed(KeyCode::Space) {
         next_state.set(GameState::Playing);
     }
 }
diff --git a/examples/games/breakout.rs b/examples/games/breakout.rs
index f5172f354a4c9..3efe377cfbe0e 100644
--- a/examples/games/breakout.rs
+++ b/examples/games/breakout.rs
@@ -311,11 +311,11 @@ fn move_paddle(
     let mut paddle_transform = query.single_mut();
     let mut direction = 0.0;
 
-    if keyboard_input.pressed(Key::ArrowLeft) {
+    if keyboard_input.pressed(KeyCode::ArrowLeft) {
         direction -= 1.0;
     }
 
-    if keyboard_input.pressed(Key::ArrowRight) {
+    if keyboard_input.pressed(KeyCode::ArrowRight) {
         direction += 1.0;
     }
 
diff --git a/examples/input/keyboard_input.rs b/examples/input/keyboard_input.rs
index d0dfc47d467c4..8f8933ea93d82 100644
--- a/examples/input/keyboard_input.rs
+++ b/examples/input/keyboard_input.rs
@@ -9,27 +9,27 @@ fn main() {
         .run();
 }
 
-/// This system prints 'A' key state
+/// This system prints 'A' character key state
 fn keyboard_input_system(keyboard_input: Res<Input<KeyLogic>>) {
     if keyboard_input.pressed("a") {
-        info!("'a' currently pressed");
+        info!("Character lowercase 'a' currently pressed");
     }
 
     if keyboard_input.just_pressed("a") {
-        info!("'a' just pressed");
+        info!("Character lowercase 'a' just pressed");
     }
 
     if keyboard_input.just_released("a") {
-        info!("'a' just released");
+        info!("Character lowercase 'a' just released");
     }
 
     if keyboard_input.pressed("A") {
-        info!("capital 'A' currently pressed");
+        info!("Character uppercase 'A' currently pressed");
     }
     if keyboard_input.just_pressed("A") {
-        info!("capital 'A' just pressed");
+        info!("Character uppercase 'A' just pressed");
     }
     if keyboard_input.just_released("A") {
-        info!("capital 'A' just released");
+        info!("Character uppercase 'A' just released");
     }
 }
diff --git a/examples/input/keyboard_modifiers.rs b/examples/input/keyboard_modifiers.rs
index bdb6afd4868d8..536a80390b44d 100644
--- a/examples/input/keyboard_modifiers.rs
+++ b/examples/input/keyboard_modifiers.rs
@@ -11,10 +11,10 @@ fn main() {
 
 /// This system prints when `Ctrl + Shift + A` is pressed
 fn keyboard_input_system(input: Res<Input<KeyLogic>>) {
-    let shift = input.pressed(Key::Shift);
-    let ctrl = input.pressed(Key::Control);
+    let shift = input.any_pressed([KeyCode::ShiftLeft, KeyCode::ShiftRight]);
+    let ctrl = input.any_pressed([KeyCode::ControlLeft, KeyCode::ControlRight]);
 
-    if ctrl && shift && input.just_pressed("a") {
+    if ctrl && shift && input.just_pressed(KeyCode::KeyA) {
         info!("Just pressed Ctrl + Shift + A!");
     }
 }
diff --git a/examples/input/mouse_grab.rs b/examples/input/mouse_grab.rs
index 28cf197f45c88..103f822316ba1 100644
--- a/examples/input/mouse_grab.rs
+++ b/examples/input/mouse_grab.rs
@@ -23,7 +23,7 @@ fn grab_mouse(
         window.cursor.grab_mode = CursorGrabMode::Locked;
     }
 
-    if key.just_pressed(Key::Escape) {
+    if key.just_pressed(KeyCode::Escape) {
         window.cursor.visible = true;
         window.cursor.grab_mode = CursorGrabMode::None;
     }
diff --git a/examples/shader/shader_prepass.rs b/examples/shader/shader_prepass.rs
index 38baa7316b989..97e13b4b60ce0 100644
--- a/examples/shader/shader_prepass.rs
+++ b/examples/shader/shader_prepass.rs
@@ -230,7 +230,7 @@ fn toggle_prepass_view(
     mut materials: ResMut<Assets<PrepassOutputMaterial>>,
     mut text: Query<&mut Text>,
 ) {
-    if key.just_pressed(Key::Space) {
+    if key.just_pressed(KeyCode::Space) {
         *prepass_view = (*prepass_view + 1) % 4;
 
         let label = match *prepass_view {
diff --git a/examples/stress_tests/many_foxes.rs b/examples/stress_tests/many_foxes.rs
index 4234b85e6cc99..fd7ae0f8f0c45 100644
--- a/examples/stress_tests/many_foxes.rs
+++ b/examples/stress_tests/many_foxes.rs
@@ -234,24 +234,24 @@ fn keyboard_animation_control(
     mut current_animation: Local<usize>,
     mut foxes: ResMut<Foxes>,
 ) {
-    if keyboard_input.just_pressed(Key::Space) {
+    if keyboard_input.just_pressed(KeyCode::Space) {
         foxes.moving = !foxes.moving;
     }
 
-    if keyboard_input.just_pressed(Key::ArrowUp) {
+    if keyboard_input.just_pressed(KeyCode::ArrowUp) {
         foxes.speed *= 1.25;
     }
 
-    if keyboard_input.just_pressed(Key::ArrowDown) {
+    if keyboard_input.just_pressed(KeyCode::ArrowDown) {
         foxes.speed *= 0.8;
     }
 
-    if keyboard_input.just_pressed(Key::Enter) {
+    if keyboard_input.just_pressed(KeyCode::Enter) {
         *current_animation = (*current_animation + 1) % animations.0.len();
     }
 
     for mut player in &mut animation_player {
-        if keyboard_input.just_pressed(Key::Space) {
+        if keyboard_input.just_pressed(KeyCode::Space) {
             if player.is_paused() {
                 player.resume();
             } else {
@@ -259,12 +259,12 @@ fn keyboard_animation_control(
             }
         }
 
-        if keyboard_input.just_pressed(Key::ArrowUp) {
+        if keyboard_input.just_pressed(KeyCode::ArrowUp) {
             let speed = player.speed();
             player.set_speed(speed * 1.25);
         }
 
-        if keyboard_input.just_pressed(Key::ArrowDown) {
+        if keyboard_input.just_pressed(KeyCode::ArrowDown) {
             let speed = player.speed();
             player.set_speed(speed * 0.8);
         }
@@ -279,7 +279,7 @@ fn keyboard_animation_control(
             player.seek_to(elapsed + 0.1);
         }
 
-        if keyboard_input.just_pressed(Key::Enter) {
+        if keyboard_input.just_pressed(KeyCode::Enter) {
             player
                 .play_with_transition(
                     animations.0[*current_animation].clone_weak(),
diff --git a/examples/stress_tests/many_gizmos.rs b/examples/stress_tests/many_gizmos.rs
index 5a8f6666162e0..1d572c6a92426 100644
--- a/examples/stress_tests/many_gizmos.rs
+++ b/examples/stress_tests/many_gizmos.rs
@@ -42,13 +42,13 @@ struct Config {
 }
 
 fn input(mut config: ResMut<Config>, input: Res<Input<KeyLogic>>) {
-    if input.just_pressed(Key::ArrowUp) {
+    if input.just_pressed(KeyCode::ArrowUp) {
         config.line_count += 10_000;
     }
-    if input.just_pressed(Key::ArrowDown) {
+    if input.just_pressed(KeyCode::ArrowDown) {
         config.line_count = config.line_count.saturating_sub(10_000);
     }
-    if input.just_pressed(Key::Space) {
+    if input.just_pressed(KeyCode::Space) {
         config.fancy = !config.fancy;
     }
 }
diff --git a/examples/tools/scene_viewer/animation_plugin.rs b/examples/tools/scene_viewer/animation_plugin.rs
index c6483c00d6b7e..fec2af2a69e20 100644
--- a/examples/tools/scene_viewer/animation_plugin.rs
+++ b/examples/tools/scene_viewer/animation_plugin.rs
@@ -66,7 +66,7 @@ fn assign_clips(
 }
 
 fn handle_inputs(
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<Input<KeyLogic>>,
     mut animation_player: Query<(&mut AnimationPlayer, &mut Clips, Entity, Option<&Name>)>,
 ) {
     for (mut player, mut clips, entity, name) in &mut animation_player {
diff --git a/examples/tools/scene_viewer/camera_controller_plugin.rs b/examples/tools/scene_viewer/camera_controller_plugin.rs
index ebd7979563927..76112a10b7e47 100644
--- a/examples/tools/scene_viewer/camera_controller_plugin.rs
+++ b/examples/tools/scene_viewer/camera_controller_plugin.rs
@@ -100,7 +100,7 @@ fn camera_controller(
     mut windows: Query<&mut Window>,
     mut mouse_events: EventReader<MouseMotion>,
     mouse_button_input: Res<Input<MouseButton>>,
-    key_input: Res<Input<KeyCode>>,
+    key_input: Res<Input<KeyLogic>>,
     mut move_toggled: Local<bool>,
     mut query: Query<(&mut Transform, &mut CameraController), With<Camera>>,
 ) {
diff --git a/examples/tools/scene_viewer/morph_viewer_plugin.rs b/examples/tools/scene_viewer/morph_viewer_plugin.rs
index e5d124200de43..79fe324cc1213 100644
--- a/examples/tools/scene_viewer/morph_viewer_plugin.rs
+++ b/examples/tools/scene_viewer/morph_viewer_plugin.rs
@@ -166,7 +166,7 @@ impl MorphKey {
             key,
         }
     }
-    fn active(&self, inputs: &Input<KeyCode>) -> bool {
+    fn active(&self, inputs: &Input<KeyLogic>) -> bool {
         let mut modifier = self.modifiers.iter();
         let mut non_modifier = ALL_MODIFIERS.iter().filter(|m| !self.modifiers.contains(m));
 
@@ -202,7 +202,7 @@ fn update_text(
 fn update_morphs(
     controls: Option<ResMut<WeightsControl>>,
     mut morphs: Query<&mut MorphWeights>,
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<KeyLogic>>,
     time: Res<Time>,
 ) {
     let Some(mut controls) = controls else {
diff --git a/examples/tools/scene_viewer/scene_viewer_plugin.rs b/examples/tools/scene_viewer/scene_viewer_plugin.rs
index 855278be150bf..a6e01ce689ddb 100644
--- a/examples/tools/scene_viewer/scene_viewer_plugin.rs
+++ b/examples/tools/scene_viewer/scene_viewer_plugin.rs
@@ -147,12 +147,12 @@ fn update_lights(
     mut animate_directional_light: Local<bool>,
 ) {
     for (_, mut light) in &mut query {
-        if key_input.just_pressed("u") {
+        if key_input.just_pressed(KeyCode::KeyU) {
             light.shadows_enabled = !light.shadows_enabled;
         }
     }
 
-    if key_input.just_pressed("l") {
+    if key_input.just_pressed(KeyCode::KeyL) {
         *animate_directional_light = !*animate_directional_light;
     }
     if *animate_directional_light {
@@ -216,7 +216,7 @@ fn camera_tracker(
         camera.is_active = camera_tracker.track_camera(entity);
     }
 
-    if keyboard_input.just_pressed("c") {
+    if keyboard_input.just_pressed(KeyCode::KeyC) {
         // disable currently active camera
         if let Some(e) = camera_tracker.active_camera() {
             if let Ok(mut camera) = queries.p2().get_mut(e) {
diff --git a/examples/ui/overflow_debug.rs b/examples/ui/overflow_debug.rs
index a1ba0de49e0e7..b9ee46ab27d1d 100644
--- a/examples/ui/overflow_debug.rs
+++ b/examples/ui/overflow_debug.rs
@@ -243,7 +243,7 @@ fn update_animation(
 ) {
     let time = time.elapsed_seconds();
 
-    if keys.just_pressed(Key::Space) {
+    if keys.just_pressed(KeyCode::Space) {
         animation.playing = !animation.playing;
 
         if !animation.playing {
@@ -271,7 +271,7 @@ fn update_transform<T: UpdateTransform + Component>(
 }
 
 fn toggle_overflow(keys: Res<Input<KeyLogic>>, mut containers: Query<&mut Style, With<Container>>) {
-    if keys.just_pressed("o") {
+    if keys.just_pressed(KeyCode::KeyO) {
         for mut style in &mut containers {
             style.overflow = match style.overflow {
                 Overflow {
@@ -296,7 +296,7 @@ fn next_container_size(
     keys: Res<Input<KeyLogic>>,
     mut containers: Query<(&mut Style, &mut Container)>,
 ) {
-    if keys.just_pressed("s") {
+    if keys.just_pressed(KeyCode::KeyS) {
         for (mut style, mut container) in &mut containers {
             container.0 = (container.0 + 1) % 3;
 
diff --git a/examples/ui/ui_scaling.rs b/examples/ui/ui_scaling.rs
index 71410e84c5092..b48944735c72a 100644
--- a/examples/ui/ui_scaling.rs
+++ b/examples/ui/ui_scaling.rs
@@ -85,12 +85,12 @@ fn setup(mut commands: Commands, asset_server: ResMut<AssetServer>) {
 
 /// System that changes the scale of the ui when pressing up or down on the keyboard.
 fn change_scaling(input: Res<Input<KeyLogic>>, mut ui_scale: ResMut<TargetScale>) {
-    if input.just_pressed(Key::ArrowUp) {
+    if input.just_pressed(KeyCode::ArrowUp) {
         let scale = (ui_scale.target_scale * 2.0).min(8.);
         ui_scale.set_scale(scale);
         info!("Scaling up! Scale: {}", ui_scale.target_scale);
     }
-    if input.just_pressed(Key::ArrowDown) {
+    if input.just_pressed(KeyCode::ArrowDown) {
         let scale = (ui_scale.target_scale / 2.0).max(1. / 8.);
         ui_scale.set_scale(scale);
         info!("Scaling down! Scale: {}", ui_scale.target_scale);
diff --git a/examples/ui/ui_texture_atlas.rs b/examples/ui/ui_texture_atlas.rs
index 8609288bf790a..596b41b335e9f 100644
--- a/examples/ui/ui_texture_atlas.rs
+++ b/examples/ui/ui_texture_atlas.rs
@@ -77,7 +77,7 @@ fn setup(
 
 fn increment_atlas_index(
     mut atlas_images: Query<&mut UiTextureAtlasImage>,
-    keyboard: Res<Input<KeyCode>>,
+    keyboard: Res<Input<KeyLogic>>,
 ) {
     if keyboard.just_pressed(KeyCode::Space) {
         for mut atlas_image in &mut atlas_images {
diff --git a/examples/ui/window_fallthrough.rs b/examples/ui/window_fallthrough.rs
index 7e2775fb73a03..7877dadff89ee 100644
--- a/examples/ui/window_fallthrough.rs
+++ b/examples/ui/window_fallthrough.rs
@@ -48,7 +48,7 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
 }
 // A simple system to handle some keyboard input and toggle on/off the hittest.
 fn toggle_mouse_passthrough(keyboard_input: Res<Input<KeyLogic>>, mut windows: Query<&mut Window>) {
-    if keyboard_input.just_pressed("p") {
+    if keyboard_input.just_pressed(KeyCode::KeyP) {
         let mut window = windows.single_mut();
         window.cursor.hit_test = !window.cursor.hit_test;
     }
diff --git a/examples/window/clear_color.rs b/examples/window/clear_color.rs
index e805ff2bcff4d..8a6b007c2f90c 100644
--- a/examples/window/clear_color.rs
+++ b/examples/window/clear_color.rs
@@ -18,7 +18,7 @@ fn setup(mut commands: Commands) {
 }
 
 fn change_clear_color(input: Res<Input<KeyLogic>>, mut clear_color: ResMut<ClearColor>) {
-    if input.just_pressed(Key::Space) {
+    if input.just_pressed(KeyCode::Space) {
         clear_color.0 = Color::PURPLE;
     }
 }
diff --git a/examples/window/low_power.rs b/examples/window/low_power.rs
index 20018a3378f57..28a8bc1233567 100644
--- a/examples/window/low_power.rs
+++ b/examples/window/low_power.rs
@@ -100,7 +100,7 @@ pub(crate) mod test_setup {
         mut mode: ResMut<ExampleMode>,
         mouse_button_input: Res<Input<KeyLogic>>,
     ) {
-        if mouse_button_input.just_pressed(Key::Space) {
+        if mouse_button_input.just_pressed(KeyCode::Space) {
             *mode = match *mode {
                 ExampleMode::Game => ExampleMode::Application,
                 ExampleMode::Application => ExampleMode::ApplicationWithRedraw,
diff --git a/examples/window/scale_factor_override.rs b/examples/window/scale_factor_override.rs
index f2447ab9c0d9f..94a9a30ccf4e7 100644
--- a/examples/window/scale_factor_override.rs
+++ b/examples/window/scale_factor_override.rs
@@ -80,7 +80,7 @@ fn display_override(mut windows: Query<&mut Window>) {
 fn toggle_override(input: Res<Input<KeyLogic>>, mut windows: Query<&mut Window>) {
     let mut window = windows.single_mut();
 
-    if input.just_pressed(Key::Enter) {
+    if input.just_pressed(KeyCode::Enter) {
         let scale_factor_override = window.resolution.scale_factor_override();
         window
             .resolution
@@ -92,11 +92,11 @@ fn toggle_override(input: Res<Input<KeyLogic>>, mut windows: Query<&mut Window>)
 fn change_scale_factor(input: Res<Input<KeyLogic>>, mut windows: Query<&mut Window>) {
     let mut window = windows.single_mut();
     let scale_factor_override = window.resolution.scale_factor_override();
-    if input.just_pressed(Key::ArrowUp) {
+    if input.just_pressed(KeyCode::ArrowUp) {
         window
             .resolution
             .set_scale_factor_override(scale_factor_override.map(|n| n + 1.0));
-    } else if input.just_pressed(Key::ArrowDown) {
+    } else if input.just_pressed(KeyCode::ArrowDown) {
         window
             .resolution
             .set_scale_factor_override(scale_factor_override.map(|n| (n - 1.0).max(1.0)));
diff --git a/examples/window/screenshot.rs b/examples/window/screenshot.rs
index fb74fc7a99b51..e3701789cf493 100644
--- a/examples/window/screenshot.rs
+++ b/examples/window/screenshot.rs
@@ -18,7 +18,7 @@ fn screenshot_on_spacebar(
     mut screenshot_manager: ResMut<ScreenshotManager>,
     mut counter: Local<u32>,
 ) {
-    if input.just_pressed(Key::Space) {
+    if input.just_pressed(KeyCode::Space) {
         let path = format!("./screenshot-{}.png", *counter);
         *counter += 1;
         screenshot_manager
diff --git a/examples/window/window_resizing.rs b/examples/window/window_resizing.rs
index 13e4c8793a746..1e0f3be5ae783 100644
--- a/examples/window/window_resizing.rs
+++ b/examples/window/window_resizing.rs
@@ -59,7 +59,7 @@ fn setup_ui(mut cmd: Commands) {
 
 /// This system shows how to request the window to a new resolution
 fn toggle_resolution(
-    keys: Res<Input<KeyCode>>,
+    keys: Res<Input<KeyLogic>>,
     mut windows: Query<&mut Window>,
     resolution: Res<ResolutionSettings>,
 ) {
diff --git a/examples/window/window_settings.rs b/examples/window/window_settings.rs
index 571df3d7d657a..bbcb701d5b9e8 100644
--- a/examples/window/window_settings.rs
+++ b/examples/window/window_settings.rs
@@ -65,7 +65,7 @@ fn make_visible(mut window: Query<&mut Window>, frames: Res<FrameCount>) {
 /// This system toggles the vsync mode when pressing the button V.
 /// You'll see fps increase displayed in the console.
 fn toggle_vsync(input: Res<Input<KeyLogic>>, mut windows: Query<&mut Window>) {
-    if input.just_pressed("v") {
+    if input.just_pressed(KeyCode::KeyV) {
         let mut window = windows.single_mut();
 
         window.present_mode = if matches!(window.present_mode, PresentMode::AutoVsync) {
@@ -85,7 +85,7 @@ fn toggle_vsync(input: Res<Input<KeyLogic>>, mut windows: Query<&mut Window>) {
 /// [documentation](https://docs.rs/bevy/latest/bevy/prelude/struct.Window.html#structfield.window_level)
 /// for more details.
 fn switch_level(input: Res<Input<KeyLogic>>, mut windows: Query<&mut Window>) {
-    if input.just_pressed("t") {
+    if input.just_pressed(KeyCode::KeyT) {
         let mut window = windows.single_mut();
 
         window.window_level = match window.window_level {
@@ -102,10 +102,10 @@ fn switch_level(input: Res<Input<KeyLogic>>, mut windows: Query<&mut Window>) {
 /// This feature only works on some platforms. Please check the
 /// [documentation](https://docs.rs/bevy/latest/bevy/prelude/struct.Window.html#structfield.enabled_buttons)
 /// for more details.
-fn toggle_window_controls(input: Res<Input<KeyCode>>, mut windows: Query<&mut Window>) {
-    let toggle_minimize = input.just_pressed(KeyCode::Key1);
-    let toggle_maximize = input.just_pressed(KeyCode::Key2);
-    let toggle_close = input.just_pressed(KeyCode::Key3);
+fn toggle_window_controls(input: Res<Input<KeyLogic>>, mut windows: Query<&mut Window>) {
+    let toggle_minimize = input.just_pressed(KeyCode::Digit1);
+    let toggle_maximize = input.just_pressed(KeyCode::Digit2);
+    let toggle_close = input.just_pressed(KeyCode::Digit3);
 
     if toggle_minimize || toggle_maximize || toggle_close {
         let mut window = windows.single_mut();
@@ -132,7 +132,7 @@ fn change_title(mut windows: Query<&mut Window>, time: Res<Time>) {
 }
 
 fn toggle_cursor(mut windows: Query<&mut Window>, input: Res<Input<KeyLogic>>) {
-    if input.just_pressed(Key::Space) {
+    if input.just_pressed(KeyCode::Space) {
         let mut window = windows.single_mut();
 
         window.cursor.visible = !window.cursor.visible;
@@ -145,7 +145,7 @@ fn toggle_cursor(mut windows: Query<&mut Window>, input: Res<Input<KeyLogic>>) {
 
 // This system will toggle the color theme used by the window
 fn toggle_theme(mut windows: Query<&mut Window>, input: Res<Input<KeyLogic>>) {
-    if input.just_pressed("f") {
+    if input.just_pressed(KeyCode::KeyF) {
         let mut window = windows.single_mut();
 
         if let Some(current_theme) = window.window_theme {
diff --git a/tests/how_to_test_systems.rs b/tests/how_to_test_systems.rs
index 23b29bd550c2b..cf29f8dfe613d 100644
--- a/tests/how_to_test_systems.rs
+++ b/tests/how_to_test_systems.rs
@@ -37,7 +37,7 @@ fn hurt_enemies(mut enemies: Query<&mut Enemy>) {
     }
 }
 
-fn spawn_enemy(mut commands: Commands, keyboard_input: Res<Input<KeyCode>>) {
+fn spawn_enemy(mut commands: Commands, keyboard_input: Res<Input<KeyLogic>>) {
     if keyboard_input.just_pressed(KeyCode::Space) {
         commands.spawn(Enemy {
             hit_points: 5,
@@ -124,7 +124,7 @@ fn spawn_enemy_using_input_resource() {
     app.add_systems(Update, spawn_enemy);
 
     // Setup test resource
-    let mut input = Input::<KeyCode>::default();
+    let mut input = Input::<KeyLogic>::default();
     input.press(KeyCode::Space);
     app.insert_resource(input);
 
@@ -134,8 +134,8 @@ fn spawn_enemy_using_input_resource() {
     // Check resulting changes, one entity has been spawned with `Enemy` component
     assert_eq!(app.world.query::<&Enemy>().iter(&app.world).len(), 1);
 
-    // Clear the `just_pressed` status for all `KeyCode`s
-    app.world.resource_mut::<Input<KeyCode>>().clear();
+    // Clear the `just_pressed` status for all `KeyLogic`s
+    app.world.resource_mut::<Input<KeyLogic>>().clear();
 
     // Run systems
     app.update();

From 0aa251b325e7f5dabc512782d0b6d67be0411a16 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Tue, 26 Sep 2023 11:56:12 +0200
Subject: [PATCH 08/17] use original naming to avoid too much diff

---
 crates/bevy_input/src/lib.rs      |  1 -
 examples/2d/bloom_2d.rs           | 34 ++++++++++++-------------
 examples/3d/atmospheric_fog.rs    |  6 ++---
 examples/3d/bloom_3d.rs           | 34 ++++++++++++-------------
 examples/3d/fog.rs                | 41 +++++++++++++++----------------
 examples/3d/skybox.rs             |  4 +--
 examples/input/text_input.rs      |  6 ++---
 examples/shader/shader_prepass.rs |  4 +--
 8 files changed, 64 insertions(+), 66 deletions(-)

diff --git a/crates/bevy_input/src/lib.rs b/crates/bevy_input/src/lib.rs
index 48bb9c88644ba..c3defa0f4522c 100644
--- a/crates/bevy_input/src/lib.rs
+++ b/crates/bevy_input/src/lib.rs
@@ -70,7 +70,6 @@ impl Plugin for InputPlugin {
         app
             // keyboard
             .add_event::<KeyboardInput>()
-            .init_resource::<Input<KeyCode>>()
             .init_resource::<Input<KeyLogic>>()
             .add_systems(PreUpdate, keyboard_input_system.in_set(InputSystem))
             // mouse
diff --git a/examples/2d/bloom_2d.rs b/examples/2d/bloom_2d.rs
index 6bdf58a247501..e9d9886211f3b 100644
--- a/examples/2d/bloom_2d.rs
+++ b/examples/2d/bloom_2d.rs
@@ -92,7 +92,7 @@ fn update_bloom_settings(
     mut camera: Query<(Entity, Option<&mut BloomSettings>), With<Camera>>,
     mut text: Query<&mut Text>,
     mut commands: Commands,
-    key: Res<Input<KeyLogic>>,
+    keycode: Res<Input<KeyLogic>>,
     time: Res<Time>,
 ) {
     let bloom_settings = camera.single_mut();
@@ -131,65 +131,65 @@ fn update_bloom_settings(
                 bloom_settings.prefilter_settings.threshold_softness
             ));
 
-            if key.just_pressed(KeyCode::Space) {
+            if keycode.just_pressed(KeyCode::Space) {
                 commands.entity(entity).remove::<BloomSettings>();
             }
 
             let dt = time.delta_seconds();
 
-            if key.pressed(KeyCode::KeyA) {
+            if keycode.pressed(KeyCode::KeyA) {
                 bloom_settings.intensity -= dt / 10.0;
             }
-            if key.pressed(KeyCode::KeyQ) {
+            if keycode.pressed(KeyCode::KeyQ) {
                 bloom_settings.intensity += dt / 10.0;
             }
             bloom_settings.intensity = bloom_settings.intensity.clamp(0.0, 1.0);
 
-            if key.pressed(KeyCode::KeyS) {
+            if keycode.pressed(KeyCode::KeyS) {
                 bloom_settings.low_frequency_boost -= dt / 10.0;
             }
-            if key.pressed(KeyCode::KeyW) {
+            if keycode.pressed(KeyCode::KeyW) {
                 bloom_settings.low_frequency_boost += dt / 10.0;
             }
             bloom_settings.low_frequency_boost = bloom_settings.low_frequency_boost.clamp(0.0, 1.0);
 
-            if key.pressed(KeyCode::KeyD) {
+            if keycode.pressed(KeyCode::KeyD) {
                 bloom_settings.low_frequency_boost_curvature -= dt / 10.0;
             }
-            if key.pressed(KeyCode::KeyE) {
+            if keycode.pressed(KeyCode::KeyE) {
                 bloom_settings.low_frequency_boost_curvature += dt / 10.0;
             }
             bloom_settings.low_frequency_boost_curvature =
                 bloom_settings.low_frequency_boost_curvature.clamp(0.0, 1.0);
 
-            if key.pressed(KeyCode::KeyF) {
+            if keycode.pressed(KeyCode::KeyF) {
                 bloom_settings.high_pass_frequency -= dt / 10.0;
             }
-            if key.pressed(KeyCode::KeyR) {
+            if keycode.pressed(KeyCode::KeyR) {
                 bloom_settings.high_pass_frequency += dt / 10.0;
             }
             bloom_settings.high_pass_frequency = bloom_settings.high_pass_frequency.clamp(0.0, 1.0);
 
-            if key.pressed(KeyCode::KeyG) {
+            if keycode.pressed(KeyCode::KeyG) {
                 bloom_settings.composite_mode = BloomCompositeMode::Additive;
             }
-            if key.pressed(KeyCode::KeyT) {
+            if keycode.pressed(KeyCode::KeyT) {
                 bloom_settings.composite_mode = BloomCompositeMode::EnergyConserving;
             }
 
-            if key.pressed(KeyCode::KeyH) {
+            if keycode.pressed(KeyCode::KeyH) {
                 bloom_settings.prefilter_settings.threshold -= dt;
             }
-            if key.pressed(KeyCode::KeyY) {
+            if keycode.pressed(KeyCode::KeyY) {
                 bloom_settings.prefilter_settings.threshold += dt;
             }
             bloom_settings.prefilter_settings.threshold =
                 bloom_settings.prefilter_settings.threshold.max(0.0);
 
-            if key.pressed(KeyCode::KeyJ) {
+            if keycode.pressed(KeyCode::KeyJ) {
                 bloom_settings.prefilter_settings.threshold_softness -= dt / 10.0;
             }
-            if key.pressed(KeyCode::KeyU) {
+            if keycode.pressed(KeyCode::KeyU) {
                 bloom_settings.prefilter_settings.threshold_softness += dt / 10.0;
             }
             bloom_settings.prefilter_settings.threshold_softness = bloom_settings
@@ -201,7 +201,7 @@ fn update_bloom_settings(
         (entity, None) => {
             *text = "Bloom: Off (Toggle: Space)".to_string();
 
-            if key.just_pressed(Key::Space) {
+            if keycode.just_pressed(KeyCode::Space) {
                 commands.entity(entity).insert(BloomSettings::default());
             }
         }
diff --git a/examples/3d/atmospheric_fog.rs b/examples/3d/atmospheric_fog.rs
index b152222b10610..d9f8c0027aa5a 100644
--- a/examples/3d/atmospheric_fog.rs
+++ b/examples/3d/atmospheric_fog.rs
@@ -112,15 +112,15 @@ fn setup_instructions(mut commands: Commands) {
     );
 }
 
-fn toggle_system(key: Res<Input<KeyLogic>>, mut fog: Query<&mut FogSettings>) {
+fn toggle_system(keycode: Res<Input<KeyLogic>>, mut fog: Query<&mut FogSettings>) {
     let mut fog_settings = fog.single_mut();
 
-    if key.just_pressed(KeyCode::Space) {
+    if keycode.just_pressed(KeyCode::Space) {
         let a = fog_settings.color.a();
         fog_settings.color.set_a(1.0 - a);
     }
 
-    if key.just_pressed(KeyCode::ShiftLeft) {
+    if keycode.just_pressed(KeyCode::KeyS) {
         let a = fog_settings.directional_light_color.a();
         fog_settings.directional_light_color.set_a(0.5 - a);
     }
diff --git a/examples/3d/bloom_3d.rs b/examples/3d/bloom_3d.rs
index 517945592c2ee..c7d59c55ae108 100644
--- a/examples/3d/bloom_3d.rs
+++ b/examples/3d/bloom_3d.rs
@@ -116,7 +116,7 @@ fn update_bloom_settings(
     mut camera: Query<(Entity, Option<&mut BloomSettings>), With<Camera>>,
     mut text: Query<&mut Text>,
     mut commands: Commands,
-    key: Res<Input<KeyLogic>>,
+    keycode: Res<Input<KeyLogic>>,
     time: Res<Time>,
 ) {
     let bloom_settings = camera.single_mut();
@@ -155,65 +155,65 @@ fn update_bloom_settings(
                 bloom_settings.prefilter_settings.threshold_softness
             ));
 
-            if key.just_pressed(KeyCode::Space) {
+            if keycode.just_pressed(KeyCode::Space) {
                 commands.entity(entity).remove::<BloomSettings>();
             }
 
             let dt = time.delta_seconds();
 
-            if key.pressed(KeyCode::KeyA) {
+            if keycode.pressed(KeyCode::KeyA) {
                 bloom_settings.intensity -= dt / 10.0;
             }
-            if key.pressed(KeyCode::KeyQ) {
+            if keycode.pressed(KeyCode::KeyQ) {
                 bloom_settings.intensity += dt / 10.0;
             }
             bloom_settings.intensity = bloom_settings.intensity.clamp(0.0, 1.0);
 
-            if key.pressed(KeyCode::KeyS) {
+            if keycode.pressed(KeyCode::KeyS) {
                 bloom_settings.low_frequency_boost -= dt / 10.0;
             }
-            if key.pressed(KeyCode::KeyW) {
+            if keycode.pressed(KeyCode::KeyW) {
                 bloom_settings.low_frequency_boost += dt / 10.0;
             }
             bloom_settings.low_frequency_boost = bloom_settings.low_frequency_boost.clamp(0.0, 1.0);
 
-            if key.pressed(KeyCode::KeyD) {
+            if keycode.pressed(KeyCode::KeyD) {
                 bloom_settings.low_frequency_boost_curvature -= dt / 10.0;
             }
-            if key.pressed(KeyCode::KeyE) {
+            if keycode.pressed(KeyCode::KeyE) {
                 bloom_settings.low_frequency_boost_curvature += dt / 10.0;
             }
             bloom_settings.low_frequency_boost_curvature =
                 bloom_settings.low_frequency_boost_curvature.clamp(0.0, 1.0);
 
-            if key.pressed(KeyCode::KeyF) {
+            if keycode.pressed(KeyCode::KeyF) {
                 bloom_settings.high_pass_frequency -= dt / 10.0;
             }
-            if key.pressed(KeyCode::KeyR) {
+            if keycode.pressed(KeyCode::KeyR) {
                 bloom_settings.high_pass_frequency += dt / 10.0;
             }
             bloom_settings.high_pass_frequency = bloom_settings.high_pass_frequency.clamp(0.0, 1.0);
 
-            if key.pressed(KeyCode::KeyG) {
+            if keycode.pressed(KeyCode::KeyG) {
                 bloom_settings.composite_mode = BloomCompositeMode::Additive;
             }
-            if key.pressed(KeyCode::KeyT) {
+            if keycode.pressed(KeyCode::KeyT) {
                 bloom_settings.composite_mode = BloomCompositeMode::EnergyConserving;
             }
 
-            if key.pressed(KeyCode::KeyH) {
+            if keycode.pressed(KeyCode::KeyH) {
                 bloom_settings.prefilter_settings.threshold -= dt;
             }
-            if key.pressed(KeyCode::KeyY) {
+            if keycode.pressed(KeyCode::KeyY) {
                 bloom_settings.prefilter_settings.threshold += dt;
             }
             bloom_settings.prefilter_settings.threshold =
                 bloom_settings.prefilter_settings.threshold.max(0.0);
 
-            if key.pressed(KeyCode::KeyJ) {
+            if keycode.pressed(KeyCode::KeyJ) {
                 bloom_settings.prefilter_settings.threshold_softness -= dt / 10.0;
             }
-            if key.pressed(KeyCode::KeyU) {
+            if keycode.pressed(KeyCode::KeyU) {
                 bloom_settings.prefilter_settings.threshold_softness += dt / 10.0;
             }
             bloom_settings.prefilter_settings.threshold_softness = bloom_settings
@@ -225,7 +225,7 @@ fn update_bloom_settings(
         (entity, None) => {
             *text = "Bloom: Off (Toggle: Space)".to_string();
 
-            if key.just_pressed(KeyCode::Space) {
+            if keycode.just_pressed(KeyCode::Space) {
                 commands.entity(entity).insert(BloomSettings::default());
             }
         }
diff --git a/examples/3d/fog.rs b/examples/3d/fog.rs
index 681e60ec5168e..bd61ff2871678 100644
--- a/examples/3d/fog.rs
+++ b/examples/3d/fog.rs
@@ -159,8 +159,7 @@ fn update_system(
     mut camera: Query<(&mut FogSettings, &mut Transform)>,
     mut text: Query<&mut Text>,
     time: Res<Time>,
-    key: Res<Input<KeyLogic>>,
-    key_code: Res<Input<KeyLogic>>,
+    keycode: Res<Input<KeyLogic>>,
 ) {
     let now = time.elapsed_seconds();
     let delta = time.delta_seconds();
@@ -185,7 +184,7 @@ fn update_system(
         .value
         .push_str("\n\n1 / 2 / 3 - Fog Falloff Mode");
 
-    if key.just_pressed(KeyCode::Digit1) {
+    if keycode.just_pressed(KeyCode::Digit1) {
         if let FogFalloff::Linear { .. } = fog.falloff {
             // No change
         } else {
@@ -196,7 +195,7 @@ fn update_system(
         };
     }
 
-    if key_code.pressed(KeyCode::Digit2) {
+    if keycode.pressed(KeyCode::Digit2) {
         if let FogFalloff::Exponential { .. } = fog.falloff {
             // No change
         } else if let FogFalloff::ExponentialSquared { density } = fog.falloff {
@@ -206,7 +205,7 @@ fn update_system(
         };
     }
 
-    if key_code.pressed(KeyCode::Digit3) {
+    if keycode.pressed(KeyCode::Digit3) {
         if let FogFalloff::Exponential { density } = fog.falloff {
             fog.falloff = FogFalloff::ExponentialSquared { density };
         } else if let FogFalloff::ExponentialSquared { .. } = fog.falloff {
@@ -226,16 +225,16 @@ fn update_system(
             .value
             .push_str("\nA / S - Move Start Distance\nZ / X - Move End Distance");
 
-        if key.pressed(KeyCode::KeyA) {
+        if keycode.pressed(KeyCode::KeyA) {
             *start -= delta * 3.0;
         }
-        if key.pressed(KeyCode::KeyS) {
+        if keycode.pressed(KeyCode::KeyS) {
             *start += delta * 3.0;
         }
-        if key.pressed(KeyCode::KeyZ) {
+        if keycode.pressed(KeyCode::KeyZ) {
             *end -= delta * 3.0;
         }
-        if key.pressed(KeyCode::KeyX) {
+        if keycode.pressed(KeyCode::KeyX) {
             *end += delta * 3.0;
         }
     }
@@ -244,13 +243,13 @@ fn update_system(
     if let FogFalloff::Exponential { ref mut density } = &mut fog.falloff {
         text.sections[0].value.push_str("\nA / S - Change Density");
 
-        if key.pressed(KeyCode::KeyA) {
+        if keycode.pressed(KeyCode::KeyA) {
             *density -= delta * 0.5 * *density;
             if *density < 0.0 {
                 *density = 0.0;
             }
         }
-        if key.pressed(KeyCode::KeyS) {
+        if keycode.pressed(KeyCode::KeyS) {
             *density += delta * 0.5 * *density;
         }
     }
@@ -259,13 +258,13 @@ fn update_system(
     if let FogFalloff::ExponentialSquared { ref mut density } = &mut fog.falloff {
         text.sections[0].value.push_str("\nA / S - Change Density");
 
-        if key.pressed(KeyCode::KeyA) {
+        if keycode.pressed(KeyCode::KeyA) {
             *density -= delta * 0.5 * *density;
             if *density < 0.0 {
                 *density = 0.0;
             }
         }
-        if key.pressed(KeyCode::KeyS) {
+        if keycode.pressed(KeyCode::KeyS) {
             *density += delta * 0.5 * *density;
         }
     }
@@ -275,42 +274,42 @@ fn update_system(
         .value
         .push_str("\n\n- / = - Red\n[ / ] - Green\n; / ' - Blue\n. / ? - Alpha");
 
-    if key.pressed(KeyCode::Minus) {
+    if keycode.pressed(KeyCode::Minus) {
         let r = (fog.color.r() - 0.1 * delta).max(0.0);
         fog.color.set_r(r);
     }
 
-    if key.pressed(KeyCode::Equal) {
+    if keycode.pressed(KeyCode::Equal) {
         let r = (fog.color.r() + 0.1 * delta).min(1.0);
         fog.color.set_r(r);
     }
 
-    if key.pressed(KeyCode::BracketLeft) {
+    if keycode.pressed(KeyCode::BracketLeft) {
         let g = (fog.color.g() - 0.1 * delta).max(0.0);
         fog.color.set_g(g);
     }
 
-    if key.pressed(KeyCode::BracketRight) {
+    if keycode.pressed(KeyCode::BracketRight) {
         let g = (fog.color.g() + 0.1 * delta).min(1.0);
         fog.color.set_g(g);
     }
 
-    if key.pressed(KeyCode::Semicolon) {
+    if keycode.pressed(KeyCode::Semicolon) {
         let b = (fog.color.b() - 0.1 * delta).max(0.0);
         fog.color.set_b(b);
     }
 
-    if key.pressed(KeyCode::Quote) {
+    if keycode.pressed(KeyCode::Quote) {
         let b = (fog.color.b() + 0.1 * delta).min(1.0);
         fog.color.set_b(b);
     }
 
-    if key.pressed(KeyCode::Period) {
+    if keycode.pressed(KeyCode::Period) {
         let a = (fog.color.a() - 0.1 * delta).max(0.0);
         fog.color.set_a(a);
     }
 
-    if key.pressed(KeyCode::Slash) {
+    if keycode.pressed(KeyCode::Slash) {
         let a = (fog.color.a() + 0.1 * delta).min(1.0);
         fog.color.set_a(a);
     }
diff --git a/examples/3d/skybox.rs b/examples/3d/skybox.rs
index bcfb6db05bfa4..0c219a7669c28 100644
--- a/examples/3d/skybox.rs
+++ b/examples/3d/skybox.rs
@@ -185,7 +185,7 @@ pub struct CameraController {
     pub key_down: KeyCode,
     pub key_run: KeyCode,
     pub mouse_key_enable_mouse: MouseButton,
-    pub keyboard_key_enable_mouse: Key,
+    pub keyboard_key_enable_mouse: KeyCode,
     pub walk_speed: f32,
     pub run_speed: f32,
     pub friction: f32,
@@ -208,7 +208,7 @@ impl Default for CameraController {
             key_down: KeyCode::KeyQ,
             key_run: KeyCode::ShiftLeft,
             mouse_key_enable_mouse: MouseButton::Left,
-            keyboard_key_enable_mouse: "m".into(),
+            keyboard_key_enable_mouse: KeyCode::KeyM,
             walk_speed: 2.0,
             run_speed: 6.0,
             friction: 0.5,
diff --git a/examples/input/text_input.rs b/examples/input/text_input.rs
index 814806a202ea9..ed9c58edf2924 100644
--- a/examples/input/text_input.rs
+++ b/examples/input/text_input.rs
@@ -179,8 +179,8 @@ fn listen_keyboard_input_events(
     mut edit_text: Query<(Entity, &mut Text), (Without<Node>, Without<Bubble>)>,
 ) {
     for event in events.read() {
-        match event.logical_key {
-            Key::Enter => {
+        match event.key_code {
+            KeyCode::Enter => {
                 let (entity, text) = edit_text.single();
                 commands.entity(entity).insert(Bubble {
                     timer: Timer::from_seconds(5.0, TimerMode::Once),
@@ -191,7 +191,7 @@ fn listen_keyboard_input_events(
                     ..default()
                 });
             }
-            Key::Backspace => {
+            KeyCode::Backspace => {
                 edit_text.single_mut().1.sections[0].value.pop();
             }
             _ => continue,
diff --git a/examples/shader/shader_prepass.rs b/examples/shader/shader_prepass.rs
index 97e13b4b60ce0..79aa70becd18f 100644
--- a/examples/shader/shader_prepass.rs
+++ b/examples/shader/shader_prepass.rs
@@ -225,12 +225,12 @@ impl Material for PrepassOutputMaterial {
 /// Every time you press space, it will cycle between transparent, depth and normals view
 fn toggle_prepass_view(
     mut prepass_view: Local<u32>,
-    key: Res<Input<KeyLogic>>,
+    keycode: Res<Input<KeyLogic>>,
     material_handle: Query<&Handle<PrepassOutputMaterial>>,
     mut materials: ResMut<Assets<PrepassOutputMaterial>>,
     mut text: Query<&mut Text>,
 ) {
-    if key.just_pressed(KeyCode::Space) {
+    if keycode.just_pressed(KeyCode::Space) {
         *prepass_view = (*prepass_view + 1) % 4;
 
         let label = match *prepass_view {

From 6a22638fe61464b243c15d06cf95b9b9c2bd9295 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Tue, 26 Sep 2023 12:14:53 +0200
Subject: [PATCH 09/17] register KeyLogic

---
 crates/bevy_input/src/lib.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/bevy_input/src/lib.rs b/crates/bevy_input/src/lib.rs
index c3defa0f4522c..181f5b0214809 100644
--- a/crates/bevy_input/src/lib.rs
+++ b/crates/bevy_input/src/lib.rs
@@ -116,6 +116,7 @@ impl Plugin for InputPlugin {
 
         // Register keyboard types
         app.register_type::<KeyboardInput>()
+            .register_type::<KeyLogic>()
             .register_type::<KeyCode>()
             .register_type::<Key>()
             .register_type::<NativeKey>();

From fcee870c753e71064dfcdbbb17dcaad1f801f57b Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Tue, 26 Sep 2023 12:15:05 +0200
Subject: [PATCH 10/17] removed useless clone

---
 examples/3d/skybox.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/3d/skybox.rs b/examples/3d/skybox.rs
index 0c219a7669c28..081d0df3dc5be 100644
--- a/examples/3d/skybox.rs
+++ b/examples/3d/skybox.rs
@@ -261,7 +261,7 @@ pub fn camera_controller(
         if key_input.pressed(options.key_down) {
             axis_input.y -= 1.0;
         }
-        if key_input_logic.just_pressed(options.keyboard_key_enable_mouse.clone()) {
+        if key_input_logic.just_pressed(options.keyboard_key_enable_mouse) {
             *move_toggled = !*move_toggled;
         }
 

From 7369322e543ccea933b71cb8d1c28015ebe404e4 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Wed, 27 Sep 2023 09:31:29 +0200
Subject: [PATCH 11/17] fix warning

---
 crates/bevy_input/src/input.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_input/src/input.rs b/crates/bevy_input/src/input.rs
index 38e1aeec60ffe..4dff2a7fcb49d 100644
--- a/crates/bevy_input/src/input.rs
+++ b/crates/bevy_input/src/input.rs
@@ -73,7 +73,7 @@ where
     T: FromReflect + Clone + Eq + Hash + Send + Sync + 'static,
 {
     /// When user adds modifiers to a keypress, the underlying Logical key might change.<br />
-    /// Use this to store a reference to the original LogicalKey.
+    /// Use this to store a reference to the original `LogicalKey`.
     pub fn add_dynamic_mapping<V: Into<T>, S: Into<T>>(&mut self, user_visible: V, stored: S) {
         self.dynamic_map_value
             .insert(user_visible.into(), stored.into());
@@ -212,12 +212,12 @@ where
 
 #[cfg(test)]
 mod test {
-    use bevy_reflect::{FromReflect, Reflect};
+    use bevy_reflect::Reflect;
 
     use crate::Input;
 
     /// Used for testing the functionality of [`Input`].
-    #[derive(Copy, Clone, Eq, PartialEq, Hash, Reflect, FromReflect)]
+    #[derive(Copy, Clone, Eq, PartialEq, Hash, Reflect)]
     #[reflect_value]
     enum DummyInput {
         Input1,

From 89103fe406747f60a8bb2ffa17be850a23e782e4 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Wed, 27 Sep 2023 10:13:59 +0200
Subject: [PATCH 12/17] fixes to examples

---
 examples/3d/fog.rs    | 4 ++--
 examples/3d/skybox.rs | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/examples/3d/fog.rs b/examples/3d/fog.rs
index bd61ff2871678..f2835f36c5eec 100644
--- a/examples/3d/fog.rs
+++ b/examples/3d/fog.rs
@@ -184,7 +184,7 @@ fn update_system(
         .value
         .push_str("\n\n1 / 2 / 3 - Fog Falloff Mode");
 
-    if keycode.just_pressed(KeyCode::Digit1) {
+    if keycode.pressed(KeyCode::Digit1) {
         if let FogFalloff::Linear { .. } = fog.falloff {
             // No change
         } else {
@@ -279,7 +279,7 @@ fn update_system(
         fog.color.set_r(r);
     }
 
-    if keycode.pressed(KeyCode::Equal) {
+    if keycode.any_pressed([KeyCode::Equal, KeyCode::NumpadEqual]) {
         let r = (fog.color.r() + 0.1 * delta).min(1.0);
         fog.color.set_r(r);
     }
diff --git a/examples/3d/skybox.rs b/examples/3d/skybox.rs
index 081d0df3dc5be..5b38ccf860680 100644
--- a/examples/3d/skybox.rs
+++ b/examples/3d/skybox.rs
@@ -224,7 +224,6 @@ pub fn camera_controller(
     mut mouse_events: EventReader<MouseMotion>,
     mouse_button_input: Res<Input<MouseButton>>,
     key_input: Res<Input<KeyLogic>>,
-    key_input_logic: Res<Input<KeyLogic>>,
     mut move_toggled: Local<bool>,
     mut query: Query<(&mut Transform, &mut CameraController), With<Camera>>,
 ) {
@@ -261,7 +260,7 @@ pub fn camera_controller(
         if key_input.pressed(options.key_down) {
             axis_input.y -= 1.0;
         }
-        if key_input_logic.just_pressed(options.keyboard_key_enable_mouse) {
+        if key_input.just_pressed(options.keyboard_key_enable_mouse) {
             *move_toggled = !*move_toggled;
         }
 

From 1a8b4ae58998bd2d9f0fc419e3f16f59aaeaba8d Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Wed, 25 Oct 2023 14:43:38 +0200
Subject: [PATCH 13/17] fix new example keys

---
 examples/3d/shadow_biases.rs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/examples/3d/shadow_biases.rs b/examples/3d/shadow_biases.rs
index af6bd760982eb..7f40f4c655fc2 100644
--- a/examples/3d/shadow_biases.rs
+++ b/examples/3d/shadow_biases.rs
@@ -218,16 +218,16 @@ fn adjust_light_position(
     mut example_text: Query<&mut Text>,
 ) {
     let mut offset = Vec3::ZERO;
-    if input.just_pressed(KeyCode::Left) {
+    if input.just_pressed(KeyCode::ArrowLeft) {
         offset.x -= 1.0;
     }
-    if input.just_pressed(KeyCode::Right) {
+    if input.just_pressed(KeyCode::ArrowRight) {
         offset.x += 1.0;
     }
-    if input.just_pressed(KeyCode::Up) {
+    if input.just_pressed(KeyCode::ArrowUp) {
         offset.z -= 1.0;
     }
-    if input.just_pressed(KeyCode::Down) {
+    if input.just_pressed(KeyCode::ArrowDown) {
         offset.z += 1.0;
     }
     if input.just_pressed(KeyCode::PageDown) {
@@ -253,7 +253,7 @@ fn cycle_filter_methods(
     mut filter_methods: Query<&mut ShadowFilteringMethod>,
     mut example_text: Query<&mut Text>,
 ) {
-    if input.just_pressed(KeyCode::F) {
+    if input.just_pressed(KeyCode::KeyF) {
         for mut filter_method in &mut filter_methods {
             let filter_method_string;
             *filter_method = match *filter_method {
@@ -295,11 +295,11 @@ fn adjust_point_light_biases(
         if input.just_pressed(KeyCode::Digit4) {
             light.shadow_normal_bias += normal_bias_step_size;
         }
-        if input.just_pressed(KeyCode::R) {
+        if input.just_pressed(KeyCode::KeyR) {
             light.shadow_depth_bias = PointLight::DEFAULT_SHADOW_DEPTH_BIAS;
             light.shadow_normal_bias = PointLight::DEFAULT_SHADOW_NORMAL_BIAS;
         }
-        if input.just_pressed(KeyCode::Z) {
+        if input.just_pressed(KeyCode::KeyZ) {
             light.shadow_depth_bias = 0.0;
             light.shadow_normal_bias = 0.0;
         }
@@ -329,11 +329,11 @@ fn adjust_directional_light_biases(
         if input.just_pressed(KeyCode::Digit8) {
             light.shadow_normal_bias += normal_bias_step_size;
         }
-        if input.just_pressed(KeyCode::R) {
+        if input.just_pressed(KeyCode::KeyR) {
             light.shadow_depth_bias = DirectionalLight::DEFAULT_SHADOW_DEPTH_BIAS;
             light.shadow_normal_bias = DirectionalLight::DEFAULT_SHADOW_NORMAL_BIAS;
         }
-        if input.just_pressed(KeyCode::Z) {
+        if input.just_pressed(KeyCode::KeyZ) {
             light.shadow_depth_bias = 0.0;
             light.shadow_normal_bias = 0.0;
         }

From d7d357eae48e5f971b1205f301acd422cd45949c Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Wed, 25 Oct 2023 14:53:01 +0200
Subject: [PATCH 14/17] fix other examples resource usage

---
 crates/bevy_input/src/keyboard.rs  |  2 +-
 examples/3d/deferred_rendering.rs  |  2 +-
 examples/3d/shadow_biases.rs       |  4 ++--
 examples/3d/wireframe.rs           |  8 ++++----
 examples/audio/spatial_audio_2d.rs | 12 ++++++------
 examples/audio/spatial_audio_3d.rs | 12 ++++++------
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/crates/bevy_input/src/keyboard.rs b/crates/bevy_input/src/keyboard.rs
index cea9ab8ed8386..0508bb6483940 100644
--- a/crates/bevy_input/src/keyboard.rs
+++ b/crates/bevy_input/src/keyboard.rs
@@ -150,7 +150,7 @@ pub enum NativeKeyCode {
 ///
 /// ## Usage
 ///
-/// It is used as the generic `T` value of an [`Input`] to create a `Res<Input<KeyCode>>`.
+/// It is used as the generic `T` value of an [`Input`] to create a `Res<Input<KeyLogic>>`.
 /// The resource values are mapped to the current layout of the keyboard and correlate to an [`ScanCode`].
 ///
 /// ## Updating
diff --git a/examples/3d/deferred_rendering.rs b/examples/3d/deferred_rendering.rs
index 951f9b0f6c1ee..45736cebd2bae 100644
--- a/examples/3d/deferred_rendering.rs
+++ b/examples/3d/deferred_rendering.rs
@@ -337,7 +337,7 @@ enum DefaultRenderMode {
 fn switch_mode(
     mut text: Query<&mut Text>,
     mut commands: Commands,
-    keys: Res<Input<KeyCode>>,
+    keys: Res<Input<KeyLogic>>,
     mut default_opaque_renderer_method: ResMut<DefaultOpaqueRendererMethod>,
     mut materials: ResMut<Assets<StandardMaterial>>,
     cameras: Query<Entity, With<Camera>>,
diff --git a/examples/3d/shadow_biases.rs b/examples/3d/shadow_biases.rs
index 7f40f4c655fc2..292a5f265822d 100644
--- a/examples/3d/shadow_biases.rs
+++ b/examples/3d/shadow_biases.rs
@@ -213,7 +213,7 @@ fn toggle_light(
 }
 
 fn adjust_light_position(
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<KeyLogic>>,
     mut lights: Query<&mut Transform, With<Lights>>,
     mut example_text: Query<&mut Text>,
 ) {
@@ -249,7 +249,7 @@ fn adjust_light_position(
 }
 
 fn cycle_filter_methods(
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<KeyLogic>>,
     mut filter_methods: Query<&mut ShadowFilteringMethod>,
     mut example_text: Query<&mut Text>,
 ) {
diff --git a/examples/3d/wireframe.rs b/examples/3d/wireframe.rs
index 8f845409b6800..6a97b2ef5d440 100644
--- a/examples/3d/wireframe.rs
+++ b/examples/3d/wireframe.rs
@@ -117,7 +117,7 @@ fn setup(
 
 /// This system let's you toggle various wireframe settings
 fn update_colors(
-    keyboard_input: Res<Input<KeyCode>>,
+    keyboard_input: Res<Input<KeyLogic>>,
     mut config: ResMut<WireframeConfig>,
     mut wireframe_colors: Query<&mut WireframeColor>,
     mut text: Query<&mut Text>,
@@ -139,12 +139,12 @@ Color: {:?}
     );
 
     // Toggle showing a wireframe on all meshes
-    if keyboard_input.just_pressed(KeyCode::Z) {
+    if keyboard_input.just_pressed(KeyCode::KeyZ) {
         config.global = !config.global;
     }
 
     // Toggle the global wireframe color
-    if keyboard_input.just_pressed(KeyCode::X) {
+    if keyboard_input.just_pressed(KeyCode::KeyX) {
         config.default_color = if config.default_color == Color::WHITE {
             Color::PINK
         } else {
@@ -153,7 +153,7 @@ Color: {:?}
     }
 
     // Toggle the color of a wireframe using WireframeColor and not the global color
-    if keyboard_input.just_pressed(KeyCode::C) {
+    if keyboard_input.just_pressed(KeyCode::KeyC) {
         for mut color in &mut wireframe_colors {
             color.color = if color.color == Color::GREEN {
                 Color::RED
diff --git a/examples/audio/spatial_audio_2d.rs b/examples/audio/spatial_audio_2d.rs
index 96534fcfb6532..d822e753ba930 100644
--- a/examples/audio/spatial_audio_2d.rs
+++ b/examples/audio/spatial_audio_2d.rs
@@ -102,7 +102,7 @@ struct Emitter {
 fn update_emitters(
     time: Res<Time>,
     mut emitters: Query<(&mut Transform, &mut Emitter), With<Emitter>>,
-    keyboard: Res<Input<KeyCode>>,
+    keyboard: Res<Input<KeyLogic>>,
 ) {
     for (mut emitter_transform, mut emitter) in emitters.iter_mut() {
         if keyboard.just_pressed(KeyCode::Space) {
@@ -116,7 +116,7 @@ fn update_emitters(
 }
 
 fn update_listener(
-    keyboard: Res<Input<KeyCode>>,
+    keyboard: Res<Input<KeyLogic>>,
     time: Res<Time>,
     mut listeners: Query<&mut Transform, With<SpatialListener>>,
 ) {
@@ -124,16 +124,16 @@ fn update_listener(
 
     let speed = 200.;
 
-    if keyboard.pressed(KeyCode::Right) {
+    if keyboard.pressed(KeyCode::ArrowRight) {
         transform.translation.x += speed * time.delta_seconds();
     }
-    if keyboard.pressed(KeyCode::Left) {
+    if keyboard.pressed(KeyCode::ArrowLeft) {
         transform.translation.x -= speed * time.delta_seconds();
     }
-    if keyboard.pressed(KeyCode::Up) {
+    if keyboard.pressed(KeyCode::ArrowUp) {
         transform.translation.y += speed * time.delta_seconds();
     }
-    if keyboard.pressed(KeyCode::Down) {
+    if keyboard.pressed(KeyCode::ArrowDown) {
         transform.translation.y -= speed * time.delta_seconds();
     }
 }
diff --git a/examples/audio/spatial_audio_3d.rs b/examples/audio/spatial_audio_3d.rs
index 7dbb512f385fa..50d68ebf54fdd 100644
--- a/examples/audio/spatial_audio_3d.rs
+++ b/examples/audio/spatial_audio_3d.rs
@@ -101,7 +101,7 @@ struct Emitter {
 fn update_positions(
     time: Res<Time>,
     mut emitters: Query<(&mut Transform, &mut Emitter), With<Emitter>>,
-    keyboard: Res<Input<KeyCode>>,
+    keyboard: Res<Input<KeyLogic>>,
 ) {
     for (mut emitter_transform, mut emitter) in emitters.iter_mut() {
         if keyboard.just_pressed(KeyCode::Space) {
@@ -116,7 +116,7 @@ fn update_positions(
 }
 
 fn update_listener(
-    keyboard: Res<Input<KeyCode>>,
+    keyboard: Res<Input<KeyLogic>>,
     time: Res<Time>,
     mut listeners: Query<&mut Transform, With<SpatialListener>>,
 ) {
@@ -124,16 +124,16 @@ fn update_listener(
 
     let speed = 2.;
 
-    if keyboard.pressed(KeyCode::Right) {
+    if keyboard.pressed(KeyCode::ArrowRight) {
         transform.translation.x += speed * time.delta_seconds();
     }
-    if keyboard.pressed(KeyCode::Left) {
+    if keyboard.pressed(KeyCode::ArrowLeft) {
         transform.translation.x -= speed * time.delta_seconds();
     }
-    if keyboard.pressed(KeyCode::Down) {
+    if keyboard.pressed(KeyCode::ArrowDown) {
         transform.translation.z += speed * time.delta_seconds();
     }
-    if keyboard.pressed(KeyCode::Up) {
+    if keyboard.pressed(KeyCode::ArrowUp) {
         transform.translation.z -= speed * time.delta_seconds();
     }
 }

From 54659699341595fb90637cbef2fa3cf8dea3bb4f Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Wed, 25 Oct 2023 18:36:34 +0200
Subject: [PATCH 15/17] update more keys api

---
 examples/3d/deferred_rendering.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/3d/deferred_rendering.rs b/examples/3d/deferred_rendering.rs
index 45736cebd2bae..5d52e75e2eaa8 100644
--- a/examples/3d/deferred_rendering.rs
+++ b/examples/3d/deferred_rendering.rs
@@ -354,7 +354,7 @@ fn switch_mode(
         pause.0 = !pause.0;
     }
 
-    if keys.just_pressed(KeyCode::Key1) {
+    if keys.just_pressed(KeyCode::Digit1) {
         *mode = DefaultRenderMode::Deferred;
         default_opaque_renderer_method.set_to_deferred();
         println!("DefaultOpaqueRendererMethod: Deferred");
@@ -366,7 +366,7 @@ fn switch_mode(
             commands.entity(camera).insert(DeferredPrepass);
         }
     }
-    if keys.just_pressed(KeyCode::Key2) {
+    if keys.just_pressed(KeyCode::Digit2) {
         *mode = DefaultRenderMode::Forward;
         default_opaque_renderer_method.set_to_forward();
         println!("DefaultOpaqueRendererMethod: Forward");
@@ -378,7 +378,7 @@ fn switch_mode(
             commands.entity(camera).remove::<DeferredPrepass>();
         }
     }
-    if keys.just_pressed(KeyCode::Key3) {
+    if keys.just_pressed(KeyCode::Digit3) {
         *mode = DefaultRenderMode::ForwardPrepass;
         default_opaque_renderer_method.set_to_forward();
         println!("DefaultOpaqueRendererMethod: Forward + Prepass");
@@ -391,7 +391,7 @@ fn switch_mode(
         }
     }
 
-    if keys.just_pressed(KeyCode::H) {
+    if keys.just_pressed(KeyCode::KeyH) {
         *hide_ui = !*hide_ui;
     }
 

From 8ec399ecf1085deee8e9b389c520d822a5e97dbe Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Wed, 8 Nov 2023 17:04:13 +0100
Subject: [PATCH 16/17] adapt transmission example with new input api

---
 examples/3d/transmission.rs | 52 ++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/examples/3d/transmission.rs b/examples/3d/transmission.rs
index 80400e662936f..5ffc5af24516a 100644
--- a/examples/3d/transmission.rs
+++ b/examples/3d/transmission.rs
@@ -442,45 +442,45 @@ fn example_control_system(
     mut display: Query<&mut Text, With<ExampleDisplay>>,
     mut state: Local<ExampleState>,
     time: Res<Time>,
-    input: Res<Input<KeyCode>>,
+    input: Res<Input<KeyLogic>>,
 ) {
-    if input.pressed(KeyCode::Key2) {
+    if input.pressed(KeyCode::Digit2) {
         state.diffuse_transmission = (state.diffuse_transmission + time.delta_seconds()).min(1.0);
-    } else if input.pressed(KeyCode::Key1) {
+    } else if input.pressed(KeyCode::Digit1) {
         state.diffuse_transmission = (state.diffuse_transmission - time.delta_seconds()).max(0.0);
     }
 
-    if input.pressed(KeyCode::W) {
+    if input.pressed(KeyCode::KeyW) {
         state.specular_transmission = (state.specular_transmission + time.delta_seconds()).min(1.0);
-    } else if input.pressed(KeyCode::Q) {
+    } else if input.pressed(KeyCode::KeyQ) {
         state.specular_transmission = (state.specular_transmission - time.delta_seconds()).max(0.0);
     }
 
-    if input.pressed(KeyCode::S) {
+    if input.pressed(KeyCode::KeyS) {
         state.thickness = (state.thickness + time.delta_seconds()).min(5.0);
-    } else if input.pressed(KeyCode::A) {
+    } else if input.pressed(KeyCode::KeyA) {
         state.thickness = (state.thickness - time.delta_seconds()).max(0.0);
     }
 
-    if input.pressed(KeyCode::X) {
+    if input.pressed(KeyCode::KeyX) {
         state.ior = (state.ior + time.delta_seconds()).min(3.0);
-    } else if input.pressed(KeyCode::Z) {
+    } else if input.pressed(KeyCode::KeyZ) {
         state.ior = (state.ior - time.delta_seconds()).max(1.0);
     }
 
-    if input.pressed(KeyCode::I) {
+    if input.pressed(KeyCode::KeyI) {
         state.reflectance = (state.reflectance + time.delta_seconds()).min(1.0);
-    } else if input.pressed(KeyCode::U) {
+    } else if input.pressed(KeyCode::KeyU) {
         state.reflectance = (state.reflectance - time.delta_seconds()).max(0.0);
     }
 
-    if input.pressed(KeyCode::R) {
+    if input.pressed(KeyCode::KeyR) {
         state.perceptual_roughness = (state.perceptual_roughness + time.delta_seconds()).min(1.0);
-    } else if input.pressed(KeyCode::E) {
+    } else if input.pressed(KeyCode::KeyE) {
         state.perceptual_roughness = (state.perceptual_roughness - time.delta_seconds()).max(0.0);
     }
 
-    let randomize_colors = input.just_pressed(KeyCode::C);
+    let randomize_colors = input.just_pressed(KeyCode::KeyC);
 
     for (material_handle, controls) in &controllable {
         let material = materials.get_mut(material_handle).unwrap();
@@ -512,12 +512,12 @@ fn example_control_system(
         temporal_jitter,
     ) = camera.single_mut();
 
-    if input.just_pressed(KeyCode::H) {
+    if input.just_pressed(KeyCode::KeyH) {
         camera.hdr = !camera.hdr;
     }
 
     #[cfg(not(all(feature = "webgl2", target_arch = "wasm32")))]
-    if input.just_pressed(KeyCode::D) {
+    if input.just_pressed(KeyCode::KeyD) {
         if depth_prepass.is_none() {
             commands.entity(camera_entity).insert(DepthPrepass);
         } else {
@@ -526,7 +526,7 @@ fn example_control_system(
     }
 
     #[cfg(not(all(feature = "webgl2", target_arch = "wasm32")))]
-    if input.just_pressed(KeyCode::T) {
+    if input.just_pressed(KeyCode::KeyT) {
         if temporal_jitter.is_none() {
             commands.entity(camera_entity).insert((
                 TemporalJitter::default(),
@@ -539,24 +539,24 @@ fn example_control_system(
         }
     }
 
-    if input.just_pressed(KeyCode::O) && camera_3d.screen_space_specular_transmission_steps > 0 {
+    if input.just_pressed(KeyCode::KeyO) && camera_3d.screen_space_specular_transmission_steps > 0 {
         camera_3d.screen_space_specular_transmission_steps -= 1;
     }
 
-    if input.just_pressed(KeyCode::P) && camera_3d.screen_space_specular_transmission_steps < 4 {
+    if input.just_pressed(KeyCode::KeyP) && camera_3d.screen_space_specular_transmission_steps < 4 {
         camera_3d.screen_space_specular_transmission_steps += 1;
     }
 
-    if input.just_pressed(KeyCode::J) {
+    if input.just_pressed(KeyCode::KeyJ) {
         camera_3d.screen_space_specular_transmission_quality = ScreenSpaceTransmissionQuality::Low;
     }
 
-    if input.just_pressed(KeyCode::K) {
+    if input.just_pressed(KeyCode::KeyK) {
         camera_3d.screen_space_specular_transmission_quality =
             ScreenSpaceTransmissionQuality::Medium;
     }
 
-    if input.just_pressed(KeyCode::L) {
+    if input.just_pressed(KeyCode::KeyL) {
         camera_3d.screen_space_specular_transmission_quality = ScreenSpaceTransmissionQuality::High;
     }
 
@@ -565,10 +565,10 @@ fn example_control_system(
             ScreenSpaceTransmissionQuality::Ultra;
     }
 
-    let rotation = if input.pressed(KeyCode::Right) {
+    let rotation = if input.pressed(KeyCode::ArrowRight) {
         state.auto_camera = false;
         time.delta_seconds()
-    } else if input.pressed(KeyCode::Left) {
+    } else if input.pressed(KeyCode::ArrowLeft) {
         state.auto_camera = false;
         -time.delta_seconds()
     } else if state.auto_camera {
@@ -578,9 +578,9 @@ fn example_control_system(
     };
 
     let distance_change =
-        if input.pressed(KeyCode::Down) && camera_transform.translation.length() < 25.0 {
+        if input.pressed(KeyCode::ArrowDown) && camera_transform.translation.length() < 25.0 {
             time.delta_seconds()
-        } else if input.pressed(KeyCode::Up) && camera_transform.translation.length() > 2.0 {
+        } else if input.pressed(KeyCode::ArrowUp) && camera_transform.translation.length() > 2.0 {
             -time.delta_seconds()
         } else {
             0.0

From 47e580c70c70db2cb95e2bf7307f408e350fa571 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Wed, 8 Nov 2023 17:51:14 +0100
Subject: [PATCH 17/17] fix virtual_time example

---
 examples/time/virtual_time.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/examples/time/virtual_time.rs b/examples/time/virtual_time.rs
index bcc41507ec18a..823468027f462 100644
--- a/examples/time/virtual_time.rs
+++ b/examples/time/virtual_time.rs
@@ -18,8 +18,7 @@ fn main() {
                 move_virtual_time_sprites,
                 move_real_time_sprites,
                 toggle_pause.run_if(input_just_pressed(KeyCode::Space)),
-                change_time_speed::<1>.run_if(input_just_pressed(KeyCode::Up)),
-                change_time_speed::<-1>.run_if(input_just_pressed(KeyCode::Down)),
+                change_time_speed::<1>.run_if(input_just_pressed(KeyCode::ArrowDown)),
                 (update_virtual_time_info_text, update_real_time_info_text)
                     // update the texts on a timer to make them more readable
                     // `on_timer` run condition uses `Virtual` time meaning it's scaled