From 6ab53df2522f59d763b6c6e2f16d321a82ef8a05 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Tue, 7 Feb 2023 23:05:03 +0100
Subject: [PATCH 1/3] Fix ctrl or win interfering with character inputs

---
 src/systems.rs | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/systems.rs b/src/systems.rs
index 419f875ae..2ddc29e93 100644
--- a/src/systems.rs
+++ b/src/systems.rs
@@ -240,16 +240,14 @@ pub fn process_input_system(
         }
     }
 
-    if !ctrl && !win {
-        for event in input_events.ev_received_character.iter() {
-            if !event.char.is_control() {
-                input_resources
-                    .egui_input
-                    .get_mut(&event.id)
-                    .unwrap()
-                    .events
-                    .push(egui::Event::Text(event.char.to_string()));
-            }
+    for event in input_events.ev_received_character.iter() {
+        if !event.char.is_control() {
+            input_resources
+                .egui_input
+                .get_mut(&event.id)
+                .unwrap()
+                .events
+                .push(egui::Event::Text(event.char.to_string()));
         }
     }
 

From 4b5fe9566b16e5696a6ed47be4e7920ccbb0a711 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Fri, 24 Feb 2023 15:52:09 +0100
Subject: [PATCH 2/3] condition on mac_cmd to check for problematic hotkeys

---
 src/systems.rs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/systems.rs b/src/systems.rs
index 2ddc29e93..df78548e2 100644
--- a/src/systems.rs
+++ b/src/systems.rs
@@ -240,14 +240,16 @@ pub fn process_input_system(
         }
     }
 
-    for event in input_events.ev_received_character.iter() {
-        if !event.char.is_control() {
-            input_resources
-                .egui_input
-                .get_mut(&event.id)
-                .unwrap()
-                .events
-                .push(egui::Event::Text(event.char.to_string()));
+    if !mac_cmd {
+        for event in input_events.ev_received_character.iter() {
+            if !event.char.is_control() {
+                input_resources
+                    .egui_input
+                    .get_mut(&event.id)
+                    .unwrap()
+                    .events
+                    .push(egui::Event::Text(event.char.to_string()));
+            }
         }
     }
 

From 1fafb1454967daaea2fdbaa847c82c91bed4f922 Mon Sep 17 00:00:00 2001
From: Thierry Berger <contact@thierryberger.com>
Date: Sat, 4 Mar 2023 14:25:58 +0100
Subject: [PATCH 3/3] apply suggested logic

---
 src/systems.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/systems.rs b/src/systems.rs
index df78548e2..4ee888beb 100644
--- a/src/systems.rs
+++ b/src/systems.rs
@@ -240,7 +240,7 @@ pub fn process_input_system(
         }
     }
 
-    if !mac_cmd {
+    if !command || cfg!(target_os = "windows") && ctrl && alt {
         for event in input_events.ev_received_character.iter() {
             if !event.char.is_control() {
                 input_resources