diff --git a/Terminal.Gui/Drivers/V2/InputProcessor.cs b/Terminal.Gui/Drivers/V2/InputProcessor.cs index 50cc99404..5c10ef394 100644 --- a/Terminal.Gui/Drivers/V2/InputProcessor.cs +++ b/Terminal.Gui/Drivers/V2/InputProcessor.cs @@ -31,7 +31,7 @@ public abstract class InputProcessor : IInputProcessor public ConcurrentQueue InputBuffer { get; } /// - public string DriverName { get; init; } + public required string DriverName { get; init; } /// public IAnsiResponseParser GetParser () { return Parser; } @@ -99,8 +99,7 @@ public abstract class InputProcessor : IInputProcessor /// Key converter for translating driver specific /// class into Terminal.Gui . /// - /// - protected InputProcessor (ConcurrentQueue inputBuffer, IKeyConverter keyConverter, string driverName) + protected InputProcessor (ConcurrentQueue inputBuffer, IKeyConverter keyConverter) { InputBuffer = inputBuffer; Parser.HandleMouse = true; @@ -124,7 +123,6 @@ public abstract class InputProcessor : IInputProcessor return true; }; KeyConverter = keyConverter; - DriverName = driverName; } /// diff --git a/Terminal.Gui/Drivers/V2/NetComponentFactory.cs b/Terminal.Gui/Drivers/V2/NetComponentFactory.cs index 3b682d1fc..e84b3ef40 100644 --- a/Terminal.Gui/Drivers/V2/NetComponentFactory.cs +++ b/Terminal.Gui/Drivers/V2/NetComponentFactory.cs @@ -24,6 +24,9 @@ public class NetComponentFactory : ComponentFactory /// public override IInputProcessor CreateInputProcessor (ConcurrentQueue inputBuffer) { - return new NetInputProcessor (inputBuffer); + return new NetInputProcessor (inputBuffer) + { + DriverName = "net" + }; } } diff --git a/Terminal.Gui/Drivers/V2/NetInputProcessor.cs b/Terminal.Gui/Drivers/V2/NetInputProcessor.cs index d65987bd7..36c885e35 100644 --- a/Terminal.Gui/Drivers/V2/NetInputProcessor.cs +++ b/Terminal.Gui/Drivers/V2/NetInputProcessor.cs @@ -20,7 +20,7 @@ public class NetInputProcessor : InputProcessor #pragma warning restore CA2211 /// - public NetInputProcessor (ConcurrentQueue inputBuffer) : base (inputBuffer, new NetKeyConverter (), "net") { } + public NetInputProcessor (ConcurrentQueue inputBuffer) : base (inputBuffer, new NetKeyConverter ()) { } /// protected override void Process (ConsoleKeyInfo consoleKeyInfo) diff --git a/Terminal.Gui/Drivers/V2/UnixComponentFactory.cs b/Terminal.Gui/Drivers/V2/UnixComponentFactory.cs index c2de42696..3b2e70d6c 100644 --- a/Terminal.Gui/Drivers/V2/UnixComponentFactory.cs +++ b/Terminal.Gui/Drivers/V2/UnixComponentFactory.cs @@ -18,7 +18,10 @@ public class UnixComponentFactory : ComponentFactory /// public override IInputProcessor CreateInputProcessor (ConcurrentQueue inputBuffer) { - return new UnixInputProcessor (inputBuffer); + return new UnixInputProcessor (inputBuffer) + { + DriverName = "unix" + }; } /// diff --git a/Terminal.Gui/Drivers/V2/UnixInputProcessor.cs b/Terminal.Gui/Drivers/V2/UnixInputProcessor.cs index e6ce4d19e..a8f668191 100644 --- a/Terminal.Gui/Drivers/V2/UnixInputProcessor.cs +++ b/Terminal.Gui/Drivers/V2/UnixInputProcessor.cs @@ -8,7 +8,7 @@ namespace Terminal.Gui.Drivers; internal class UnixInputProcessor : InputProcessor { /// - public UnixInputProcessor (ConcurrentQueue inputBuffer) : base (inputBuffer, new UnixKeyConverter (), "unix") { } + public UnixInputProcessor (ConcurrentQueue inputBuffer) : base (inputBuffer, new UnixKeyConverter ()) { } /// protected override void Process (char input) diff --git a/Terminal.Gui/Drivers/V2/WindowsComponentFactory.cs b/Terminal.Gui/Drivers/V2/WindowsComponentFactory.cs index 6436ddc83..217ba482d 100644 --- a/Terminal.Gui/Drivers/V2/WindowsComponentFactory.cs +++ b/Terminal.Gui/Drivers/V2/WindowsComponentFactory.cs @@ -18,7 +18,10 @@ public class WindowsComponentFactory : ComponentFactory public override IInputProcessor CreateInputProcessor (ConcurrentQueue inputBuffer) { - return new WindowsInputProcessor (inputBuffer); + return new WindowsInputProcessor (inputBuffer) + { + DriverName = "win" + }; } /// diff --git a/Terminal.Gui/Drivers/V2/WindowsInputProcessor.cs b/Terminal.Gui/Drivers/V2/WindowsInputProcessor.cs index b56d6cf41..aa50b20b4 100644 --- a/Terminal.Gui/Drivers/V2/WindowsInputProcessor.cs +++ b/Terminal.Gui/Drivers/V2/WindowsInputProcessor.cs @@ -13,7 +13,7 @@ internal class WindowsInputProcessor : InputProcessor private readonly bool [] _lastWasPressed = new bool[4]; /// - public WindowsInputProcessor (ConcurrentQueue inputBuffer) : base (inputBuffer, new WindowsKeyConverter (), "win") { } + public WindowsInputProcessor (ConcurrentQueue inputBuffer) : base (inputBuffer, new WindowsKeyConverter ()) { } /// protected override void Process (InputRecord inputEvent)