Merge pull request #3838 from tig/v2_3807-Accents

tig · web-flow · commit f2b24c407912 · 2024-11-21T16:04:00.000-07:00
Fixes #3807 - Accents (é) don't work on `WindowsDriver`
diff --git a/Terminal.Gui/ConsoleDrivers/WindowsDriver.cs b/Terminal.Gui/ConsoleDrivers/WindowsDriver.cs
@@ -1725,8 +1725,13 @@ private KeyCode MapKey (WindowsConsole.ConsoleKeyInfoEx keyInfoEx)
                 }
             }
 
-            // Return the Key (not KeyChar!)
-            return (KeyCode)keyInfo.Key;
+            // If KeyInfo.Key is A...Z and KeyInfo.KeyChar is not a...z then we have an accent.
+            // See https://github.com/gui-cs/Terminal.Gui/issues/3807#issuecomment-2455997595
+            if (keyInfo.KeyChar <= (char)'z')
+            {
+                return (KeyCode)keyInfo.Key;
+            }
+            return (KeyCode)keyInfo.KeyChar;
         }
 
         // Handle control keys whose VK codes match the related ASCII value (those below ASCII 33) like ESC

Original file line number	Diff line number	Diff line change
`@@ -1725,8 +1725,13 @@ private KeyCode MapKey (WindowsConsole.ConsoleKeyInfoEx keyInfoEx)`
`1725`	`1725`	`}`
`1726`	`1726`	`}`
`1727`	`1727`
`1728`		`- // Return the Key (not KeyChar!)`
`1729`		`- return (KeyCode)keyInfo.Key;`
	`1728`	`+ // If KeyInfo.Key is A...Z and KeyInfo.KeyChar is not a...z then we have an accent.`
	`1729`	`+ // See https://github.com/gui-cs/Terminal.Gui/issues/3807#issuecomment-2455997595`
	`1730`	`+ if (keyInfo.KeyChar <= (char)'z')`
	`1731`	`+ {`
	`1732`	`+ return (KeyCode)keyInfo.Key;`
	`1733`	`+ }`
	`1734`	`+ return (KeyCode)keyInfo.KeyChar;`
`1730`	`1735`	`}`
`1731`	`1736`
`1732`	`1737`	`// Handle control keys whose VK codes match the related ASCII value (those below ASCII 33) like ESC`