gui-cs
diff --git a/‎Examples/UICatalog/Scenarios/VkeyPacketSimulator.cs
Lines changed: 0 additions & 1 deletion b/‎Examples/UICatalog/Scenarios/VkeyPacketSimulator.cs
Lines changed: 0 additions & 1 deletion
diff --git a/‎Terminal.Gui/Application/Application.Run.cs
Lines changed: 9 additions & 11 deletions b/‎Terminal.Gui/Application/Application.Run.cs
Lines changed: 9 additions & 11 deletions
diff --git a/‎Terminal.Gui/Application/Application.Toplevel.cs
Lines changed: 15 additions & 1 deletion b/‎Terminal.Gui/Application/Application.Toplevel.cs
Lines changed: 15 additions & 1 deletion
diff --git a/‎Terminal.Gui/Configuration/ConfigurationManager.cs
Lines changed: 11 additions & 10 deletions b/‎Terminal.Gui/Configuration/ConfigurationManager.cs
Lines changed: 11 additions & 10 deletions
diff --git a/‎Terminal.Gui/Configuration/DeepCloner.cs
Lines changed: 22 additions & 11 deletions b/‎Terminal.Gui/Configuration/DeepCloner.cs
Lines changed: 22 additions & 11 deletions
diff --git a/‎Terminal.Gui/Configuration/SourcesManager.cs
Lines changed: 1 addition & 1 deletion b/‎Terminal.Gui/Configuration/SourcesManager.cs
Lines changed: 1 addition & 1 deletion
diff --git a/‎Terminal.Gui/Configuration/ThemeManager.cs
Lines changed: 4 additions & 0 deletions b/‎Terminal.Gui/Configuration/ThemeManager.cs
Lines changed: 4 additions & 0 deletions
diff --git a/‎Terminal.Gui/ConsoleDrivers/ConsoleKeyMapping.cs
Lines changed: 1 addition & 1 deletion b/‎Terminal.Gui/ConsoleDrivers/ConsoleKeyMapping.cs
Lines changed: 1 addition & 1 deletion
diff --git a/‎Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs
Lines changed: 0 additions & 1 deletion b/‎Terminal.Gui/ConsoleDrivers/CursesDriver/CursesDriver.cs
Lines changed: 0 additions & 1 deletion
diff --git a/‎Terminal.Gui/ConsoleDrivers/EscSeqUtils/EscSeqUtils.cs
Lines changed: 7 additions & 8 deletions b/‎Terminal.Gui/ConsoleDrivers/EscSeqUtils/EscSeqUtils.cs
Lines changed: 7 additions & 8 deletions
@@ -3,7 +3,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Terminal.Gui;
-using Terminal.Gui.ConsoleDrivers;
 
 namespace UICatalog.Scenarios;
 
 
@@ -150,10 +150,10 @@ public static RunState Begin (Toplevel toplevel)
                 }
             }
 
-            if (TopLevels.FindDuplicates (new ToplevelEqualityComparer ()).Count > 0)
-            {
-                throw new ArgumentException ("There are duplicates Toplevel IDs");
-            }
+            //if (TopLevels.FindDuplicates (new ToplevelEqualityComparer ()).Count > 0)
+            //{
+            //    throw new ArgumentException ("There are duplicates Toplevel IDs");
+            //}
         }
 
         if (Top is null)
@@ -588,25 +588,23 @@ public static void End (RunState runState)
 
         // End the RunState.Toplevel
         // First, take it off the Toplevel Stack
-        if (TopLevels.Count > 0)
+        if (TopLevels.TryPop (out Toplevel? topOfStack))
         {
-            if (TopLevels.Peek () != runState.Toplevel)
+            if (topOfStack != runState.Toplevel)
             {
                 // If the top of the stack is not the RunState.Toplevel then
                 // this call to End is not balanced with the call to Begin that started the RunState
                 throw new ArgumentException ("End must be balanced with calls to Begin");
             }
-
-            TopLevels.Pop ();
         }
 
         // Notify that it is closing
         runState.Toplevel?.OnClosed (runState.Toplevel);
 
-        if (TopLevels.Count > 0)
+        if (TopLevels.TryPeek (out Toplevel? newTop))
         {
-            Top = TopLevels.Peek ();
-            Top.SetNeedsDraw ();
+            Top = newTop;
+            Top?.SetNeedsDraw ();
         }
 
         if (runState.Toplevel is { HasFocus: true })
 
@@ -1,12 +1,26 @@
 #nullable enable
+using System.Collections.Concurrent;
+
 namespace Terminal.Gui;
 
 public static partial class Application // Toplevel handling
 {
     // BUGBUG: Technically, this is not the full lst of TopLevels. There be dragons here, e.g. see how Toplevel.Id is used. What
 
+    private static readonly ConcurrentStack<Toplevel> _topLevels = new ();
+    private static readonly object _topLevelsLock = new ();
+
     /// <summary>Holds the stack of TopLevel views.</summary>
-    internal static Stack<Toplevel> TopLevels { get; } = new ();
+    internal static ConcurrentStack<Toplevel> TopLevels
+    {
+        get
+        {
+            lock (_topLevelsLock)
+            {
+                return _topLevels;
+            }
+        }
+    }
 
     /// <summary>The <see cref="Toplevel"/> that is currently active.</summary>
     /// <value>The top.</value>
 
@@ -8,7 +8,6 @@
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Terminal.Gui.Configuration;
 
 namespace Terminal.Gui;
 
@@ -150,7 +149,7 @@ internal static bool IsInitialized ()
     private static ImmutableSortedDictionary<string, ConfigProperty>? _uninitializedConfigPropertiesCache;
 
 #pragma warning disable IDE1006 // Naming Styles
-    private static readonly object __uninitializedConfigPropertiesCacheCacheLock = new ();
+    private static readonly object _uninitializedConfigPropertiesCacheCacheLock = new ();
 #pragma warning restore IDE1006 // Naming Styles
 
     /// <summary>
@@ -181,7 +180,7 @@ internal static void Initialize ()
         ConfigProperty.Initialize ();
 
         // Cache all configuration properties
-        lock (__uninitializedConfigPropertiesCacheCacheLock)
+        lock (_uninitializedConfigPropertiesCacheCacheLock)
         {
             // _allConfigProperties: for ordered, iterable access (LINQ-friendly)
             // _frozenConfigPropertyCache: for high-speed key lookup (frozen)
@@ -777,15 +776,17 @@ public static string GetHardCodedConfig ()
             return _uninitializedConfigPropertiesCache;
         }
 
-        // Filter properties by scope using the cached ScopeType property instead of reflection
-        IEnumerable<KeyValuePair<string, ConfigProperty>>? filtered = _uninitializedConfigPropertiesCache?.Where (cp => cp.Value.ScopeType == scopeType);
-
-        Debug.Assert (filtered is { });
+        lock (_uninitializedConfigPropertiesCacheCacheLock)
+        {
+            // Filter properties by scope using the cached ScopeType property instead of reflection
+            IEnumerable<KeyValuePair<string, ConfigProperty>>? filtered = _uninitializedConfigPropertiesCache?.Where (cp => cp.Value.ScopeType == scopeType);
 
-        IEnumerable<KeyValuePair<string, ConfigProperty>> configPropertiesByScope = filtered as KeyValuePair<string, ConfigProperty> [] ?? filtered.ToArray ();
-        Debug.Assert (configPropertiesByScope.All (v => !v.Value.HasValue));
+            Debug.Assert (filtered is { });
 
-        return configPropertiesByScope;
+            IEnumerable<KeyValuePair<string, ConfigProperty>> configPropertiesByScope = filtered as KeyValuePair<string, ConfigProperty> [] ?? filtered.ToArray ();
+            Debug.Assert (configPropertiesByScope.All (v => !v.Value.HasValue));
+            return configPropertiesByScope;
+        }
     }
 
     /// <summary>
 
@@ -285,21 +285,32 @@ private static object CloneDictionary (object source, ConcurrentDictionary<objec
         IDictionary tempDict = CreateDictionaryInstance (dictType, comparer);
         visited.TryAdd (source, tempDict);
 
-        // Clone all key-value pairs
-        foreach (object? key in sourceDict.Keys)
-        {
-            object? clonedKey = DeepCloneInternal (key, visited);
-            object? clonedValue = DeepCloneInternal (sourceDict [key], visited);
 
-            if (tempDict.Contains (clonedKey!))
-            {
-                tempDict [clonedKey!] = clonedValue;
-            }
-            else
+        object? lastKey = null;
+        try
+        {
+            // Clone all key-value pairs
+            foreach (object? key in sourceDict.Keys)
             {
-                tempDict.Add (clonedKey!, clonedValue);
+                lastKey = key;
+                object? clonedKey = DeepCloneInternal (key, visited);
+                object? clonedValue = DeepCloneInternal (sourceDict [key], visited);
+
+                if (tempDict.Contains (clonedKey!))
+                {
+                    tempDict [clonedKey!] = clonedValue;
+                }
+                else
+                {
+                    tempDict.Add (clonedKey!, clonedValue);
+                }
             }
         }
+        catch (InvalidOperationException ex)
+        {
+            // Handle cases where the dictionary is modified during enumeration
+            throw new InvalidOperationException ($"Error cloning dictionary ({source}) (last key was \"{lastKey}\"). Ensure the source dictionary is not modified during cloning.", ex);
+        }
 
         // If the original dictionary type has a parameterless constructor, create a new instance
         if (type.GetConstructor (Type.EmptyTypes) != null)
 
@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Text.Json;
 
-namespace Terminal.Gui.Configuration;
+namespace Terminal.Gui;
 
 /// <summary>
 ///    Manages the <see cref="ConfigurationManager"/> Sources and provides the API for loading them. Source is a location where a configuration can be stored. Sources are defined in <see cref="ConfigLocations"/>.
 
@@ -101,6 +101,10 @@ public static ImmutableList<string> GetThemeNames ()
     /// <returns></returns>
     public static string GetCurrentThemeName () { return Theme!; }
 
+    // TODO: Add a lock around Theme and Themes
+    // TODO: For now, this test can't run in parallel with other tests that access Theme or Themes.
+    // TODO: ThemeScopeList_WithThemes_ClonesSuccessfully
+
     /// <summary>
     ///     Gets the Themes dictionary. <see cref="GetThemes"/> is preferred.
     ///     The backing store is <c><see cref="ConfigurationManager.Settings"/> ["Themes"]</c>.
 
@@ -1,7 +1,7 @@
 using System.Globalization;
 using System.Runtime.InteropServices;
 
-namespace Terminal.Gui.ConsoleDrivers;
+namespace Terminal.Gui;
 
 // QUESTION: This class combines Windows specific code with cross-platform code. Should this be split into two classes?
 /// <summary>Helper class to handle the scan code and virtual key from a <see cref="ConsoleKey"/>.</summary>
 
@@ -4,7 +4,6 @@
 //
 
 using System.Runtime.InteropServices;
-using Terminal.Gui.ConsoleDrivers;
 using Unix.Terminal;
 
 namespace Terminal.Gui;
 
@@ -1,6 +1,5 @@
 #nullable enable
 using System.Globalization;
-using static Terminal.Gui.ConsoleDrivers.ConsoleKeyMapping;
 
 namespace Terminal.Gui;
 
@@ -1159,7 +1158,7 @@ public static ConsoleKeyInfo MapConsoleKeyInfo (ConsoleKeyInfo consoleKeyInfo)
 
                 break;
             default:
-                uint ck = MapKeyCodeToConsoleKey ((KeyCode)consoleKeyInfo.KeyChar, out bool isConsoleKey);
+                uint ck = ConsoleKeyMapping.MapKeyCodeToConsoleKey ((KeyCode)consoleKeyInfo.KeyChar, out bool isConsoleKey);
 
                 if (isConsoleKey)
                 {
@@ -1415,12 +1414,12 @@ internal static KeyCode MapKey (ConsoleKeyInfo keyInfo)
                 if (keyInfo.Modifiers != ConsoleModifiers.Shift)
                 {
                     // If Shift wasn't down we don't need to do anything but return the keyInfo.KeyChar
-                    return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);
+                    return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);
                 }
 
                 // Strip off Shift - We got here because they KeyChar from Windows is the shifted char (e.g. "Ç")
                 // and passing on Shift would be redundant.
-                return MapToKeyCodeModifiers (keyInfo.Modifiers & ~ConsoleModifiers.Shift, (KeyCode)keyInfo.KeyChar);
+                return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers & ~ConsoleModifiers.Shift, (KeyCode)keyInfo.KeyChar);
         }
 
         // Handle control keys whose VK codes match the related ASCII value (those below ASCII 33) like ESC
@@ -1431,14 +1430,14 @@ internal static KeyCode MapKey (ConsoleKeyInfo keyInfo)
                 return KeyCode.Tab;
             }
 
-            return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)(uint)keyInfo.Key);
+            return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)(uint)keyInfo.Key);
         }
 
         // Handle control keys (e.g. CursorUp)
         if (keyInfo.Key != ConsoleKey.None
             && Enum.IsDefined (typeof (KeyCode), (uint)keyInfo.Key + (uint)KeyCode.MaxCodePoint))
         {
-            return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)((uint)keyInfo.Key + (uint)KeyCode.MaxCodePoint));
+            return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)((uint)keyInfo.Key + (uint)KeyCode.MaxCodePoint));
         }
 
         if ((ConsoleKey)keyInfo.KeyChar is >= ConsoleKey.A and <= ConsoleKey.Z)
@@ -1469,7 +1468,7 @@ internal static KeyCode MapKey (ConsoleKeyInfo keyInfo)
                 || keyInfo.Modifiers.HasFlag (ConsoleModifiers.Control))
             {
                 // NetDriver doesn't support Shift-Ctrl/Shift-Alt combos
-                return MapToKeyCodeModifiers (keyInfo.Modifiers & ~ConsoleModifiers.Shift, (KeyCode)keyInfo.Key);
+                return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers & ~ConsoleModifiers.Shift, (KeyCode)keyInfo.Key);
             }
 
             if (keyInfo.Modifiers == ConsoleModifiers.Shift)
@@ -1484,7 +1483,7 @@ internal static KeyCode MapKey (ConsoleKeyInfo keyInfo)
             return (KeyCode)keyInfo.Key;
         }
 
-        return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);
+        return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);
     }
 
     private static async Task ProcessButtonClickedAsync ()
Original file line number	Diff line number	Diff line change
`@@ -150,10 +150,10 @@ public static RunState Begin (Toplevel toplevel)`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`
`153`		`- if (TopLevels.FindDuplicates (new ToplevelEqualityComparer ()).Count > 0)`
`154`		`- {`
`155`		`- throw new ArgumentException ("There are duplicates Toplevel IDs");`
`156`		`- }`
	`153`	`+ //if (TopLevels.FindDuplicates (new ToplevelEqualityComparer ()).Count > 0)`
	`154`	`+ //{`
	`155`	`+ // throw new ArgumentException ("There are duplicates Toplevel IDs");`
	`156`	`+ //}`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`if (Top is null)`
`@@ -588,25 +588,23 @@ public static void End (RunState runState)`
`588`	`588`
`589`	`589`	`// End the RunState.Toplevel`
`590`	`590`	`// First, take it off the Toplevel Stack`
`591`		`- if (TopLevels.Count > 0)`
	`591`	`+ if (TopLevels.TryPop (out Toplevel? topOfStack))`
`592`	`592`	`{`
`593`		`- if (TopLevels.Peek () != runState.Toplevel)`
	`593`	`+ if (topOfStack != runState.Toplevel)`
`594`	`594`	`{`
`595`	`595`	`// If the top of the stack is not the RunState.Toplevel then`
`596`	`596`	`// this call to End is not balanced with the call to Begin that started the RunState`
`597`	`597`	`throw new ArgumentException ("End must be balanced with calls to Begin");`
`598`	`598`	`}`
`599`		`-`
`600`		`- TopLevels.Pop ();`
`601`	`599`	`}`
`602`	`600`
`603`	`601`	`// Notify that it is closing`
`604`	`602`	`runState.Toplevel?.OnClosed (runState.Toplevel);`
`605`	`603`
`606`		`- if (TopLevels.Count > 0)`
	`604`	`+ if (TopLevels.TryPeek (out Toplevel? newTop))`
`607`	`605`	`{`
`608`		`- Top = TopLevels.Peek ();`
`609`		`- Top.SetNeedsDraw ();`
	`606`	`+ Top = newTop;`
	`607`	`+ Top?.SetNeedsDraw ();`
`610`	`608`	`}`
`611`	`609`
`612`	`610`	`if (runState.Toplevel is { HasFocus: true })`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`#nullable enable`
`2`	`2`	`using System.Globalization;`
`3`		`-using static Terminal.Gui.ConsoleDrivers.ConsoleKeyMapping;`
`4`	`3`
`5`	`4`	`namespace Terminal.Gui;`
`6`	`5`
`@@ -1159,7 +1158,7 @@ public static ConsoleKeyInfo MapConsoleKeyInfo (ConsoleKeyInfo consoleKeyInfo)`
`1159`	`1158`
`1160`	`1159`	`break;`
`1161`	`1160`	`default:`
`1162`		`- uint ck = MapKeyCodeToConsoleKey ((KeyCode)consoleKeyInfo.KeyChar, out bool isConsoleKey);`
	`1161`	`+ uint ck = ConsoleKeyMapping.MapKeyCodeToConsoleKey ((KeyCode)consoleKeyInfo.KeyChar, out bool isConsoleKey);`
`1163`	`1162`
`1164`	`1163`	`if (isConsoleKey)`
`1165`	`1164`	`{`
`@@ -1415,12 +1414,12 @@ internal static KeyCode MapKey (ConsoleKeyInfo keyInfo)`
`1415`	`1414`	`if (keyInfo.Modifiers != ConsoleModifiers.Shift)`
`1416`	`1415`	`{`
`1417`	`1416`	`// If Shift wasn't down we don't need to do anything but return the keyInfo.KeyChar`
`1418`		`- return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);`
	`1417`	`+ return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);`
`1419`	`1418`	`}`
`1420`	`1419`
`1421`	`1420`	`// Strip off Shift - We got here because they KeyChar from Windows is the shifted char (e.g. "Ç")`
`1422`	`1421`	`// and passing on Shift would be redundant.`
`1423`		`- return MapToKeyCodeModifiers (keyInfo.Modifiers & ~ConsoleModifiers.Shift, (KeyCode)keyInfo.KeyChar);`
	`1422`	`+ return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers & ~ConsoleModifiers.Shift, (KeyCode)keyInfo.KeyChar);`
`1424`	`1423`	`}`
`1425`	`1424`
`1426`	`1425`	`// Handle control keys whose VK codes match the related ASCII value (those below ASCII 33) like ESC`
`@@ -1431,14 +1430,14 @@ internal static KeyCode MapKey (ConsoleKeyInfo keyInfo)`
`1431`	`1430`	`return KeyCode.Tab;`
`1432`	`1431`	`}`
`1433`	`1432`
`1434`		`- return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)(uint)keyInfo.Key);`
	`1433`	`+ return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)(uint)keyInfo.Key);`
`1435`	`1434`	`}`
`1436`	`1435`
`1437`	`1436`	`// Handle control keys (e.g. CursorUp)`
`1438`	`1437`	`if (keyInfo.Key != ConsoleKey.None`
`1439`	`1438`	`&& Enum.IsDefined (typeof (KeyCode), (uint)keyInfo.Key + (uint)KeyCode.MaxCodePoint))`
`1440`	`1439`	`{`
`1441`		`- return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)((uint)keyInfo.Key + (uint)KeyCode.MaxCodePoint));`
	`1440`	`+ return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)((uint)keyInfo.Key + (uint)KeyCode.MaxCodePoint));`
`1442`	`1441`	`}`
`1443`	`1442`
`1444`	`1443`	`if ((ConsoleKey)keyInfo.KeyChar is >= ConsoleKey.A and <= ConsoleKey.Z)`
`@@ -1469,7 +1468,7 @@ internal static KeyCode MapKey (ConsoleKeyInfo keyInfo)`
`1469`	`1468`	`\|\| keyInfo.Modifiers.HasFlag (ConsoleModifiers.Control))`
`1470`	`1469`	`{`
`1471`	`1470`	`// NetDriver doesn't support Shift-Ctrl/Shift-Alt combos`
`1472`		`- return MapToKeyCodeModifiers (keyInfo.Modifiers & ~ConsoleModifiers.Shift, (KeyCode)keyInfo.Key);`
	`1471`	`+ return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers & ~ConsoleModifiers.Shift, (KeyCode)keyInfo.Key);`
`1473`	`1472`	`}`
`1474`	`1473`
`1475`	`1474`	`if (keyInfo.Modifiers == ConsoleModifiers.Shift)`
`@@ -1484,7 +1483,7 @@ internal static KeyCode MapKey (ConsoleKeyInfo keyInfo)`
`1484`	`1483`	`return (KeyCode)keyInfo.Key;`
`1485`	`1484`	`}`
`1486`	`1485`
`1487`		`- return MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);`
	`1486`	`+ return ConsoleKeyMapping.MapToKeyCodeModifiers (keyInfo.Modifiers, (KeyCode)keyInfo.KeyChar);`
`1488`	`1487`	`}`
`1489`	`1488`
`1490`	`1489`	`private static async Task ProcessButtonClickedAsync ()`