diff --git a/Examples/UICatalog/Scenarios/SendKeys.cs b/Examples/UICatalog/Scenarios/SendKeys.cs deleted file mode 100644 index 4e5591559b..0000000000 --- a/Examples/UICatalog/Scenarios/SendKeys.cs +++ /dev/null @@ -1,115 +0,0 @@ -using System.Text; - -namespace UICatalog.Scenarios; - -[ScenarioMetadata ("SendKeys", "SendKeys sample - Send key combinations.")] -[ScenarioCategory ("Mouse and Keyboard")] -public class SendKeys : Scenario -{ - public override void Main () - { - Application.Init (); - var win = new Window { Title = GetQuitKeyAndName () }; - var label = new Label { X = Pos.Center (), Y = Pos.Center () - 6, Text = "Insert the text to send:" }; - win.Add (label); - - var txtInput = new TextField { X = Pos.Center (), Y = Pos.Center () - 5, Width = 20, Text = "MockKeyPresses" }; - win.Add (txtInput); - - var ckbShift = new CheckBox { X = Pos.Center (), Y = Pos.Center () - 4, Text = "Shift" }; - win.Add (ckbShift); - - var ckbAlt = new CheckBox { X = Pos.Center (), Y = Pos.Center () - 3, Text = "Alt" }; - win.Add (ckbAlt); - - var ckbControl = new CheckBox { X = Pos.Center (), Y = Pos.Center () - 2, Text = "Control" }; - win.Add (ckbControl); - - label = new Label { X = Pos.Center (), Y = Pos.Center () + 1, Text = "Result keys:" }; - win.Add (label); - - var txtResult = new TextField { X = Pos.Center (), Y = Pos.Center () + 2, Width = 20 }; - win.Add (txtResult); - - var rKeys = ""; - var rControlKeys = ""; - var IsShift = false; - var IsAlt = false; - var IsCtrl = false; - - txtResult.KeyDown += (s, e) => - { - rKeys += e.ToString (); - - if (!IsShift && e.IsShift) - { - rControlKeys += " Shift "; - IsShift = true; - } - - if (!IsAlt && e.IsAlt) - { - rControlKeys += " Alt "; - IsAlt = true; - } - - if (!IsCtrl && e.IsCtrl) - { - rControlKeys += " Ctrl "; - IsCtrl = true; - } - }; - - var lblShippedKeys = new Label { X = Pos.Center (), Y = Pos.Center () + 3 }; - win.Add (lblShippedKeys); - - var lblShippedControlKeys = new Label { X = Pos.Center (), Y = Pos.Center () + 5 }; - win.Add (lblShippedControlKeys); - - var button = new Button { X = Pos.Center (), Y = Pos.Center () + 7, IsDefault = true, Text = "Process keys" }; - win.Add (button); - - void ProcessInput () - { - rKeys = ""; - rControlKeys = ""; - txtResult.Text = ""; - IsShift = false; - IsAlt = false; - IsCtrl = false; - txtResult.SetFocus (); - - foreach (char r in txtInput.Text) - { - ConsoleKeyInfo consoleKeyInfo = EscSeqUtils.MapConsoleKeyInfo (new (r, ConsoleKey.None, false, false, false)); - - Application.Driver?.SendKeys ( - r, - consoleKeyInfo.Key, - ckbShift.CheckedState == CheckState.Checked || (consoleKeyInfo.Modifiers & ConsoleModifiers.Shift) != 0, - ckbAlt.CheckedState == CheckState.Checked || (consoleKeyInfo.Modifiers & ConsoleModifiers.Alt) != 0, - ckbControl.CheckedState == CheckState.Checked || (consoleKeyInfo.Modifiers & ConsoleModifiers.Control) != 0 - ); - } - - lblShippedKeys.Text = rKeys; - lblShippedControlKeys.Text = rControlKeys; - txtInput.SetFocus (); - } - - button.Accepting += (s, e) => ProcessInput (); - - win.KeyDown += (s, e) => - { - if (e.KeyCode == KeyCode.Enter) - { - ProcessInput (); - e.Handled = true; - } - }; - - Application.Run (win); - win.Dispose (); - Application.Shutdown (); - } -} diff --git a/Examples/UICatalog/Scenarios/VkeyPacketSimulator.cs b/Examples/UICatalog/Scenarios/VkeyPacketSimulator.cs deleted file mode 100644 index f78f9e6a14..0000000000 --- a/Examples/UICatalog/Scenarios/VkeyPacketSimulator.cs +++ /dev/null @@ -1,294 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; - -namespace UICatalog.Scenarios; - -[ScenarioMetadata ("VkeyPacketSimulator", "Simulates the Virtual Key Packet")] -[ScenarioCategory ("Mouse and Keyboard")] -public class VkeyPacketSimulator : Scenario -{ - private static readonly ManualResetEventSlim _stopOutput = new (false); - private readonly List _keyboardStrokes = new (); - private bool _outputStarted; - private bool _wasUnknown; - - public override void Main () - { - Application.Init (); - var win = new Window { Title = GetQuitKeyAndName () }; - - var label = new Label { X = Pos.Center (), Text = "Input" }; - win.Add (label); - - var btnInput = new Button { X = Pos.AnchorEnd (16), Text = "Select Input" }; - win.Add (btnInput); - - const string ruler = "|123456789"; - - var inputHorizontalRuler = new Label - { - Y = Pos.Bottom (btnInput), Width = Dim.Fill (), SchemeName = "Error" - }; - win.Add (inputHorizontalRuler); - - var inputVerticalRuler = new Label - { - Y = Pos.Bottom (btnInput), - - Width = 1, - Height = Dim.Percent (50), - SchemeName = "Error", - TextDirection = TextDirection.TopBottom_LeftRight - }; - win.Add (inputVerticalRuler); - - var tvInput = new TextView - { - Title = "Input", - X = 1, - Y = Pos.Bottom (inputHorizontalRuler), - Width = Dim.Fill (), - Height = Dim.Percent (50) - 1 - }; - win.Add (tvInput); - - label = new() { X = Pos.Center (), Y = Pos.Bottom (tvInput), Text = "Output" }; - win.Add (label); - - var btnOutput = new Button { X = Pos.AnchorEnd (17), Y = Pos.Top (label), Text = "Select Output" }; - win.Add (btnOutput); - - var outputHorizontalRuler = new Label - { - Y = Pos.Bottom (btnOutput), - - Width = Dim.Fill (), - SchemeName = "Error" - }; - win.Add (outputHorizontalRuler); - - var outputVerticalRuler = new Label - { - Y = Pos.Bottom(btnOutput), - - Width = 1, - Height = Dim.Fill (), - SchemeName = "Error", - TextDirection = TextDirection.TopBottom_LeftRight - }; - win.Add (outputVerticalRuler); - - var tvOutput = new TextView - { - Title = "Output", - X = 1, - Y = Pos.Bottom (outputHorizontalRuler), - Width = Dim.Fill (), - Height = Dim.Fill (), - ReadOnly = true - }; - - // Detect unknown keys and reject them. - tvOutput.KeyDown += (s, e) => - { - //System.Diagnostics.Debug.WriteLine ($"Output - KeyDown: {e.KeyCode}"); - if (e.NoAlt.NoCtrl.NoShift == KeyCode.Null) - { - _wasUnknown = true; - e.Handled = true; - - return; - } - - //System.Diagnostics.Debug.WriteLine ($"Output - KeyPress - _keyboardStrokes: {_keyboardStrokes.Count}"); - if (_outputStarted) - { - // If the key wasn't handled by the TextView will popup a Dialog with the keys pressed. - bool? handled = tvOutput.NewKeyDownEvent (e); - - if (handled == null || handled == false) - { - if (!tvOutput.NewKeyDownEvent (e)) - { - Application.Invoke ( - () => MessageBox.Query ( - "Keys", - $"'{Key.ToString ( - e.KeyCode, - Key.Separator - )}' pressed!", - "Ok" - ) - ); - } - } - } - - e.Handled = true; - _stopOutput.Set (); - }; - - win.Add (tvOutput); - - tvInput.KeyDown += (s, e) => - { - //System.Diagnostics.Debug.WriteLine ($"Input - KeyDown: {e.KeyCode.Key}"); - if (e.KeyCode == Key.Empty) - { - _wasUnknown = true; - e.Handled = true; - } - else - { - _wasUnknown = false; - } - }; - - tvInput.KeyDownNotHandled += (s, e) => - { - Key ev = e; - - //System.Diagnostics.Debug.WriteLine ($"Input - KeyPress: {ev}"); - //System.Diagnostics.Debug.WriteLine ($"Input - KeyPress - _keyboardStrokes: {_keyboardStrokes.Count}"); - - if (!e.IsValid) - { - _wasUnknown = true; - e.Handled = true; - - return; - } - - _keyboardStrokes.Add (e.KeyCode); - }; - - tvInput.KeyUp += (s, e) => - { - //System.Diagnostics.Debug.WriteLine ($"Input - KeyUp: {e.Key}"); - e.Handled = true; - - if (!_wasUnknown && _keyboardStrokes.Count > 0) - { - _outputStarted = true; - tvOutput.ReadOnly = false; - tvOutput.SetFocus (); - tvOutput.SetNeedsDraw (); - - Task.Run ( - () => - { - while (_outputStarted) - { - try - { - while (_keyboardStrokes.Count > 0) - { - if (_keyboardStrokes [0] == KeyCode.Null) - { - continue; - } - - ConsoleKeyInfo consoleKeyInfo = - ConsoleKeyMapping.GetConsoleKeyInfoFromKeyCode (_keyboardStrokes [0]); - - char keyChar = - ConsoleKeyMapping.EncodeKeyCharForVKPacket (consoleKeyInfo); - - Application.Driver?.SendKeys ( - keyChar, - ConsoleKey.Packet, - consoleKeyInfo.Modifiers.HasFlag (ConsoleModifiers.Shift), - consoleKeyInfo.Modifiers.HasFlag (ConsoleModifiers.Alt), - consoleKeyInfo.Modifiers - .HasFlag (ConsoleModifiers.Control) - ); - - _stopOutput.Wait (); - _stopOutput.Reset (); - _keyboardStrokes.RemoveAt (0); - - Application.Invoke ( - () => - { - tvOutput.ReadOnly = true; - tvInput.SetFocus (); - } - ); - } - - _outputStarted = false; - } - catch (Exception) - { - Application.Invoke ( - () => - { - MessageBox.ErrorQuery ( - "Error", - "Couldn't send the keystrokes!", - "Ok" - ); - Application.RequestStop (); - } - ); - } - } - - //System.Diagnostics.Debug.WriteLine ($"_outputStarted: {_outputStarted}"); - } - ); - } - }; - - btnInput.Accepting += (s, e) => - { - if (!tvInput.HasFocus && _keyboardStrokes.Count == 0) - { - tvInput.SetFocus (); - } - }; - - btnOutput.Accepting += (s, e) => - { - if (!tvOutput.HasFocus && _keyboardStrokes.Count == 0) - { - tvOutput.SetFocus (); - } - }; - - tvInput.SetFocus (); - - void Win_LayoutComplete (object sender, LayoutEventArgs obj) - { - if (inputHorizontalRuler.Viewport.Width == 0 || inputVerticalRuler.Viewport.Height == 0) - { - return; - } - inputHorizontalRuler.Text = outputHorizontalRuler.Text = - ruler.Repeat ( - (int)Math.Ceiling ( - inputHorizontalRuler.Viewport.Width - / (double)ruler.Length - ) - ) [ - ..inputHorizontalRuler.Viewport.Width]; - inputVerticalRuler.Height = tvInput.Frame.Height + 1; - - inputVerticalRuler.Text = - ruler.Repeat ((int)Math.Ceiling (inputVerticalRuler.Viewport.Height / (double)ruler.Length)) [ - ..inputVerticalRuler.Viewport.Height]; - - outputVerticalRuler.Text = - ruler.Repeat ((int)Math.Ceiling (outputVerticalRuler.Viewport.Height / (double)ruler.Length)) [ - ..outputVerticalRuler.Viewport.Height]; - } - - win.SubViewsLaidOut += Win_LayoutComplete; - - Application.Run (win); - win.Dispose (); - Application.Shutdown (); - } -} diff --git a/Terminal.Gui/Drivers/ConsoleDriver.cs b/Terminal.Gui/Drivers/ConsoleDriver.cs index 5d22523370..f203b931d8 100644 --- a/Terminal.Gui/Drivers/ConsoleDriver.cs +++ b/Terminal.Gui/Drivers/ConsoleDriver.cs @@ -681,16 +681,6 @@ public void OnMouseEvent (MouseEventArgs a) /// public void OnKeyUp (Key a) { KeyUp?.Invoke (this, a); } - // TODO: Remove this API - it was needed when we didn't have a reliable way to simulate key presses. - // TODO: We now do: Application.RaiseKeyDown and Application.RaiseKeyUp - /// Simulates a key press. - /// The key character. - /// The key. - /// If simulates the Shift key being pressed. - /// If simulates the Alt key being pressed. - /// If simulates the Ctrl key being pressed. - public abstract void SendKeys (char keyChar, ConsoleKey key, bool shift, bool alt, bool ctrl); - internal char _highSurrogate = '\0'; internal bool IsValidInput (KeyCode keyCode, out KeyCode result) @@ -707,6 +697,22 @@ internal bool IsValidInput (KeyCode keyCode, out KeyCode result) if (_highSurrogate > 0 && char.IsLowSurrogate ((char)keyCode)) { result = (KeyCode)new Rune (_highSurrogate, (char)keyCode).Value; + + if ((keyCode & KeyCode.AltMask) != 0) + { + result |= KeyCode.AltMask; + } + + if ((keyCode & KeyCode.CtrlMask) != 0) + { + result |= KeyCode.CtrlMask; + } + + if ((keyCode & KeyCode.ShiftMask) != 0) + { + result |= KeyCode.ShiftMask; + } + _highSurrogate = '\0'; return true; diff --git a/Terminal.Gui/Drivers/CursesDriver/CursesDriver.cs b/Terminal.Gui/Drivers/CursesDriver/CursesDriver.cs index 09dd1e692d..19b8c4b688 100644 --- a/Terminal.Gui/Drivers/CursesDriver/CursesDriver.cs +++ b/Terminal.Gui/Drivers/CursesDriver/CursesDriver.cs @@ -61,44 +61,6 @@ public override void Move (int col, int row) } } - public override void SendKeys (char keyChar, ConsoleKey consoleKey, bool shift, bool alt, bool control) - { - KeyCode key; - - if (consoleKey == ConsoleKey.Packet) - { - //var mod = new ConsoleModifiers (); - - //if (shift) - //{ - // mod |= ConsoleModifiers.Shift; - //} - - //if (alt) - //{ - // mod |= ConsoleModifiers.Alt; - //} - - //if (control) - //{ - // mod |= ConsoleModifiers.Control; - //} - - var cKeyInfo = new ConsoleKeyInfo (keyChar, consoleKey, shift, alt, control); - cKeyInfo = ConsoleKeyMapping.DecodeVKPacketToKConsoleKeyInfo (cKeyInfo); - key = ConsoleKeyMapping.MapConsoleKeyInfoToKeyCode (cKeyInfo); - } - else - { - key = (KeyCode)keyChar; - } - - OnKeyDown (new (key)); - OnKeyUp (new (key)); - - //OnKeyPressed (new KeyEventArgsEventArgs (key)); - } - public void StartReportingMouseMoves () { if (!RunningUnitTests) @@ -638,8 +600,7 @@ internal void ProcessInput () while (wch2 == Curses.KeyMouse) { - // BUGBUG: Fix this nullable issue. - Key kea = null; + Key? kea = null; ConsoleKeyInfo [] cki = { @@ -648,8 +609,7 @@ internal void ProcessInput () new ('<', 0, false, false, false) }; code = 0; - // BUGBUG: Fix this nullable issue. - HandleEscSeqResponse (ref code, ref k, ref wch2, ref kea, ref cki); + HandleEscSeqResponse (ref code, ref k, ref wch2, ref kea!, ref cki!); } return; @@ -710,8 +670,7 @@ internal void ProcessInput () k = KeyCode.AltMask | MapCursesKey (wch); } - // BUGBUG: Fix this nullable issue. - Key key = null; + Key? key = null; if (code == 0) { @@ -741,8 +700,7 @@ internal void ProcessInput () [ new ((char)KeyCode.Esc, 0, false, false, false), new ((char)wch2, 0, false, false, false) ]; - // BUGBUG: Fix this nullable issue. - HandleEscSeqResponse (ref code, ref k, ref wch2, ref key, ref cki); + HandleEscSeqResponse (ref code, ref k, ref wch2, ref key!, ref cki!); return; } @@ -875,7 +833,7 @@ private void HandleEscSeqResponse ( ref KeyCode k, ref int wch2, ref Key keyEventArgs, - ref ConsoleKeyInfo [] cki + ref ConsoleKeyInfo []? cki ) { ConsoleKey ck = 0; @@ -899,11 +857,10 @@ ref ConsoleKeyInfo [] cki // the given terminator (e.g. mouse) or did not understand format somehow. // Carry on with the older code for processing curses escape codes - // BUGBUG: Fix this nullable issue. EscSeqUtils.DecodeEscSeq ( ref consoleKeyInfo, ref ck, - cki, + cki!, ref mod, out _, out _, @@ -923,7 +880,6 @@ ref ConsoleKeyInfo [] cki OnMouseEvent (new () { Flags = mf, Position = pos }); } - // BUGBUG: Fix this nullable issue. cki = null; if (wch2 == 27) diff --git a/Terminal.Gui/Drivers/FakeDriver/FakeDriver.cs b/Terminal.Gui/Drivers/FakeDriver/FakeDriver.cs index c377b20717..366b6ed7c5 100644 --- a/Terminal.Gui/Drivers/FakeDriver/FakeDriver.cs +++ b/Terminal.Gui/Drivers/FakeDriver/FakeDriver.cs @@ -397,11 +397,6 @@ private bool EnsureCursorVisibility () return FakeConsole.CursorVisible; } - public override void SendKeys (char keyChar, ConsoleKey key, bool shift, bool alt, bool control) - { - MockKeyPressedHandler (new ConsoleKeyInfo (keyChar, key, shift, alt, control)); - } - private AnsiResponseParser _parser = new (); /// diff --git a/Terminal.Gui/Drivers/IConsoleDriver.cs b/Terminal.Gui/Drivers/IConsoleDriver.cs index a88850c3db..c31208a143 100644 --- a/Terminal.Gui/Drivers/IConsoleDriver.cs +++ b/Terminal.Gui/Drivers/IConsoleDriver.cs @@ -251,14 +251,6 @@ public interface IConsoleDriver /// event EventHandler? KeyUp; - /// Simulates a key press. - /// The key character. - /// The key. - /// If simulates the Shift key being pressed. - /// If simulates the Alt key being pressed. - /// If simulates the Ctrl key being pressed. - void SendKeys (char keyChar, ConsoleKey key, bool shift, bool alt, bool ctrl); - /// /// Queues the given for execution /// diff --git a/Terminal.Gui/Drivers/NetDriver/NetDriver.cs b/Terminal.Gui/Drivers/NetDriver/NetDriver.cs index d11e0d3f08..68cb685abe 100644 --- a/Terminal.Gui/Drivers/NetDriver/NetDriver.cs +++ b/Terminal.Gui/Drivers/NetDriver/NetDriver.cs @@ -685,21 +685,6 @@ private MouseEventArgs ToDriverMouse (MouseEvent me) #region Keyboard Handling - public override void SendKeys (char keyChar, ConsoleKey key, bool shift, bool alt, bool control) - { - var input = new InputResult - { - EventType = EventType.Key, ConsoleKeyInfo = new (keyChar, key, shift, alt, control) - }; - - try - { - ProcessInput (input); - } - catch (OverflowException) - { } - } - //private ConsoleKeyInfo FromVKPacketToKConsoleKeyInfo (ConsoleKeyInfo consoleKeyInfo) //{ // if (consoleKeyInfo.Key != ConsoleKey.Packet) diff --git a/Terminal.Gui/Drivers/V2/ConsoleDriverFacade.cs b/Terminal.Gui/Drivers/V2/ConsoleDriverFacade.cs index 91879111f0..893164d0df 100644 --- a/Terminal.Gui/Drivers/V2/ConsoleDriverFacade.cs +++ b/Terminal.Gui/Drivers/V2/ConsoleDriverFacade.cs @@ -417,25 +417,6 @@ public Attribute MakeColor (in Color foreground, in Color background) /// Event fired when a mouse event occurs. public event EventHandler? MouseEvent; - /// Simulates a key press. - /// The key character. - /// The key. - /// If simulates the Shift key being pressed. - /// If simulates the Alt key being pressed. - /// If simulates the Ctrl key being pressed. - public void SendKeys (char keyChar, ConsoleKey key, bool shift, bool alt, bool ctrl) - { - ConsoleKeyInfo consoleKeyInfo = new (keyChar, key, shift, alt, ctrl); - - Key k = EscSeqUtils.MapKey (consoleKeyInfo); - - if (InputProcessor.IsValidInput (k, out k)) - { - InputProcessor.OnKeyDown (k); - InputProcessor.OnKeyUp (k); - } - } - /// /// Provide proper writing to send escape sequence recognized by the . /// diff --git a/Terminal.Gui/Drivers/WindowsDriver/WindowsDriver.cs b/Terminal.Gui/Drivers/WindowsDriver/WindowsDriver.cs index 19f3e4dcb7..dc3fcf61fb 100644 --- a/Terminal.Gui/Drivers/WindowsDriver/WindowsDriver.cs +++ b/Terminal.Gui/Drivers/WindowsDriver/WindowsDriver.cs @@ -118,76 +118,6 @@ public static WindowsConsole.KeyEventRecord FromVKPacketToKeyEventRecord (Window public override bool IsRuneSupported (Rune rune) { return base.IsRuneSupported (rune) && rune.IsBmp; } - public override void SendKeys (char keyChar, ConsoleKey key, bool shift, bool alt, bool control) - { - var input = new WindowsConsole.InputRecord - { - EventType = WindowsConsole.EventType.Key - }; - - var keyEvent = new WindowsConsole.KeyEventRecord - { - bKeyDown = true - }; - var controlKey = new WindowsConsole.ControlKeyState (); - - if (shift) - { - controlKey |= WindowsConsole.ControlKeyState.ShiftPressed; - keyEvent.UnicodeChar = '\0'; - keyEvent.wVirtualKeyCode = ConsoleKeyMapping.VK.SHIFT; - } - - if (alt) - { - controlKey |= WindowsConsole.ControlKeyState.LeftAltPressed; - controlKey |= WindowsConsole.ControlKeyState.RightAltPressed; - keyEvent.UnicodeChar = '\0'; - keyEvent.wVirtualKeyCode = ConsoleKeyMapping.VK.MENU; - } - - if (control) - { - controlKey |= WindowsConsole.ControlKeyState.LeftControlPressed; - controlKey |= WindowsConsole.ControlKeyState.RightControlPressed; - keyEvent.UnicodeChar = '\0'; - keyEvent.wVirtualKeyCode = ConsoleKeyMapping.VK.CONTROL; - } - - keyEvent.dwControlKeyState = controlKey; - - input.KeyEvent = keyEvent; - - if (shift || alt || control) - { - ProcessInput (input); - } - - keyEvent.UnicodeChar = keyChar; - - //if ((uint)key < 255) { - // keyEvent.wVirtualKeyCode = (ushort)key; - //} else { - // keyEvent.wVirtualKeyCode = '\0'; - //} - keyEvent.wVirtualKeyCode = (ConsoleKeyMapping.VK)key; - - input.KeyEvent = keyEvent; - - try - { - ProcessInput (input); - } - catch (OverflowException) - { } - finally - { - keyEvent.bKeyDown = false; - input.KeyEvent = keyEvent; - ProcessInput (input); - } - } - /// internal override IAnsiResponseParser GetParser () => _parser; diff --git a/Tests/UnitTests/ConsoleDrivers/V2/ApplicationV2Tests.cs b/Tests/UnitTests/ConsoleDrivers/V2/ApplicationV2Tests.cs index 29fedb6deb..5ed4a195b5 100644 --- a/Tests/UnitTests/ConsoleDrivers/V2/ApplicationV2Tests.cs +++ b/Tests/UnitTests/ConsoleDrivers/V2/ApplicationV2Tests.cs @@ -182,6 +182,7 @@ private void SetupRunInputMockMethodToBlock (Mock netInput) { netInput.Setup (r => r.Run (It.IsAny ())) @@ -361,7 +362,6 @@ public void InitRunShutdown_End_Is_Called () ApplicationImpl.ChangeInstance (orig); } - [Fact] public void InitRunShutdown_QuitKey_Quits () { @@ -407,7 +407,6 @@ public void InitRunShutdown_QuitKey_Quits () ApplicationImpl.ChangeInstance (orig); } - [Fact] public void InitRunShutdown_Generic_IdleForExit () { @@ -511,7 +510,6 @@ public void Shutdown_Called_Repeatedly_DoNotDuplicateDisposeOutput () v2.Init (null, "v2net"); - v2.Shutdown (); v2.Shutdown (); outputMock!.Verify (o => o.Dispose (), Times.Once); diff --git a/Tests/UnitTests/FileServices/FileDialogTests.cs b/Tests/UnitTests/FileServices/FileDialogTests.cs index b2cfcacef8..3aa7830111 100644 --- a/Tests/UnitTests/FileServices/FileDialogTests.cs +++ b/Tests/UnitTests/FileServices/FileDialogTests.cs @@ -22,17 +22,15 @@ public void CancelSelection (bool cancel) //pressing enter will complete the current selection // unless the event cancels the confirm - Send ('\n', ConsoleKey.Enter); + Application.RaiseKeyDownEvent (Key.Enter); Assert.Equal (cancel, dlg.Canceled); dlg.Dispose (); } - [Theory] - [InlineData ("Bob", "csv")] - [InlineData ("𝔹ob", "CSV")] + [Fact] [AutoInitShutdown] - public void DirectTyping_Allowed (string path, string extension) + public void DirectTyping_Allowed () { FileDialog dlg = GetInitializedFileDialog (); TextField tf = dlg.SubViews.OfType ().First (t => t.HasFocus); @@ -48,15 +46,15 @@ public void DirectTyping_Allowed (string path, string extension) ); // continue typing the rest of the path - Send (path); - Send ('.', ConsoleKey.OemPeriod); - Send (extension); + Send ("Bob"); + Application.RaiseKeyDownEvent ('.'); + Send ("csv"); Assert.True (dlg.Canceled); - Send ('\n', ConsoleKey.Enter); + Application.RaiseKeyDownEvent (Key.Enter); Assert.False (dlg.Canceled); - Assert.Equal ($"{path}.{extension}", Path.GetFileName (dlg.Path)); + Assert.Equal ("Bob.csv", Path.GetFileName (dlg.Path)); dlg.Dispose (); } @@ -81,14 +79,14 @@ public void DirectTyping_AutoComplete () Assert.Equal ("x", Path.GetFileName (dlg.Path)); // complete auto typing - Send ('\t', ConsoleKey.Tab); + Application.RaiseKeyDownEvent ('\t'); // but do not close dialog Assert.True (dlg.Canceled); Assert.EndsWith ("xx" + Path.DirectorySeparatorChar, dlg.Path); // press enter again to confirm the dialog - Send ('\n', ConsoleKey.Enter); + Application.RaiseKeyDownEvent (Key.Enter); Assert.False (dlg.Canceled); Assert.EndsWith ("xx" + Path.DirectorySeparatorChar, dlg.Path); dlg.Dispose (); @@ -115,15 +113,15 @@ public void DoNotConfirmSelectionWhenFindFocused () Assert.True (dlg.Canceled); //pressing enter while search focused should not confirm path - Send ('\n', ConsoleKey.Enter); + Application.RaiseKeyDownEvent (Key.Enter); Assert.True (dlg.Canceled); // tabbing out of search - Send ('\t', ConsoleKey.Tab); + Application.RaiseKeyDownEvent ('\t'); //should allow enter to confirm path - Send ('\n', ConsoleKey.Enter); + Application.RaiseKeyDownEvent (Key.Enter); // Dialog has not yet been confirmed with a choice Assert.False (dlg.Canceled); @@ -194,21 +192,21 @@ public void MultiSelectDirectory_CannotToggleDotDot (bool acceptWithEnter) Assert.IsType (dlg.MostFocused); // Try to toggle '..' - Send (' ', ConsoleKey.Spacebar); - Send ('v', ConsoleKey.DownArrow); + Application.RaiseKeyDownEvent (' '); + Application.RaiseKeyDownEvent (Key.CursorDown); // Toggle subfolder - Send (' ', ConsoleKey.Spacebar); + Application.RaiseKeyDownEvent (' '); Assert.True (dlg.Canceled); if (acceptWithEnter) { - Send ('\n', ConsoleKey.Enter); + Application.RaiseKeyDownEvent (Key.Enter); } else { - Send ('O', ConsoleKey.O, false, true); + Application.RaiseKeyDownEvent ('O'); } Assert.False (dlg.Canceled); @@ -250,20 +248,20 @@ public void MultiSelectDirectory_CanToggleThenAccept (bool acceptWithEnter) Assert.IsType (dlg.MostFocused); // Move selection to subfolder - Send ('v', ConsoleKey.DownArrow); + Application.RaiseKeyDownEvent (Key.CursorDown); // Toggle subfolder - Send (' ', ConsoleKey.Spacebar); + Application.RaiseKeyDownEvent (' '); Assert.True (dlg.Canceled); if (acceptWithEnter) { - Send ('\n', ConsoleKey.Enter); + Application.RaiseKeyDownEvent (Key.Enter); } else { - Send ('O', ConsoleKey.O, false, true); + Application.RaiseKeyDownEvent (Key.O.WithAlt); } Assert.False (dlg.Canceled); @@ -303,9 +301,9 @@ public void MultiSelectDirectory_EnterOpensFolder () Assert.IsType (dlg.MostFocused); // Move selection to subfolder - Send ('v', ConsoleKey.DownArrow); + Application.RaiseKeyDownEvent (Key.CursorDown); - Send ('\n', ConsoleKey.Enter); + Application.RaiseKeyDownEvent (Key.Enter); // Path should update to the newly opened folder AssertIsTheSubfolder (dlg.Path); @@ -347,13 +345,13 @@ public void PickDirectory_ArrowNavigation (bool openModeMixed, bool multiple) Assert.IsType (dlg.MostFocused); // Should be selecting .. - Send ('v', ConsoleKey.DownArrow); + Application.RaiseKeyDownEvent (Key.CursorDown); // Down to the directory Assert.True (dlg.Canceled); // Alt+O to open (enter would just navigate into the child dir) - Send ('O', ConsoleKey.O, false, true); + Application.RaiseKeyDownEvent (Key.O.WithAlt); Assert.False (dlg.Canceled); AssertIsTheSubfolder (dlg.Path); @@ -374,8 +372,8 @@ public void PickDirectory_DirectTyping (bool openModeMixed, bool multiple) // whe first opening the text field will have select all on // so to add to current path user must press End or right - Send ('>', ConsoleKey.LeftArrow); - Send ('>', ConsoleKey.RightArrow); + Application.RaiseKeyDownEvent (Key.CursorLeft); + Application.RaiseKeyDownEvent (Key.CursorRight); Send ("subfolder"); @@ -383,7 +381,7 @@ public void PickDirectory_DirectTyping (bool openModeMixed, bool multiple) Assert.True (dlg.Canceled); // Now it has - Send ('\n', ConsoleKey.Enter); + Application.RaiseKeyDownEvent (Key.Enter); Assert.False (dlg.Canceled); AssertIsTheSubfolder (dlg.Path); dlg.Dispose (); @@ -765,23 +763,11 @@ public void Autocomplete_AcceptSuggstion () private bool IsWindows () { return RuntimeInformation.IsOSPlatform (OSPlatform.Windows); } - private void Send (char ch, ConsoleKey ck, bool shift = false, bool alt = false, bool control = false) - { - Application.Driver?.SendKeys (ch, ck, shift, alt, control); - } - private void Send (string chars) { foreach (char ch in chars) { - ConsoleKeyInfo consoleKeyInfo = EscSeqUtils.MapConsoleKeyInfo (new (ch, ConsoleKey.None, false, false, false)); - - Application.Driver?.SendKeys ( - ch, - consoleKeyInfo.Key, - (consoleKeyInfo.Modifiers & ConsoleModifiers.Shift) != 0, - (consoleKeyInfo.Modifiers & ConsoleModifiers.Alt) != 0, - (consoleKeyInfo.Modifiers & ConsoleModifiers.Control) != 0); + Application.RaiseKeyDownEvent (ch); } } @@ -789,11 +775,11 @@ private void SendSlash () { if (Path.DirectorySeparatorChar == '/') { - Send ('/', ConsoleKey.Separator); + Application.RaiseKeyDownEvent ('/'); } else { - Send ('\\', ConsoleKey.Separator); + Application.RaiseKeyDownEvent ('\\'); } } diff --git a/Tests/UnitTests/Views/AppendAutocompleteTests.cs b/Tests/UnitTests/Views/AppendAutocompleteTests.cs index 1df422f9f0..9b3a9f62c6 100644 --- a/Tests/UnitTests/Views/AppendAutocompleteTests.cs +++ b/Tests/UnitTests/Views/AppendAutocompleteTests.cs @@ -12,7 +12,7 @@ public void TestAutoAppend_AfterCloseKey_NoAutocomplete () TextField tf = GetTextFieldsInViewSuggesting ("fish"); // f is typed and suggestion is "fish" - Application.Driver?.SendKeys ('f', ConsoleKey.F, false, false, false); + Application.RaiseKeyDownEvent ('f'); View.SetClipToScreen (); tf.Draw (); View.SetClipToScreen (); @@ -21,7 +21,7 @@ public void TestAutoAppend_AfterCloseKey_NoAutocomplete () Assert.Equal ("f", tf.Text); // When cancelling autocomplete - Application.Driver?.SendKeys ('e', ConsoleKey.Escape, false, false, false); + Application.RaiseKeyDownEvent (Key.Esc); // Suggestion should disappear tf.Draw (); @@ -33,7 +33,7 @@ public void TestAutoAppend_AfterCloseKey_NoAutocomplete () Assert.Same (tf, Application.Top.Focused); // But can tab away - Application.Driver?.SendKeys ('\t', ConsoleKey.Tab, false, false, false); + Application.RaiseKeyDownEvent ('\t'); Assert.NotSame (tf, Application.Top.Focused); Application.Top.Dispose (); } @@ -45,7 +45,7 @@ public void TestAutoAppend_AfterCloseKey_ReappearsOnLetter () TextField tf = GetTextFieldsInViewSuggesting ("fish"); // f is typed and suggestion is "fish" - Application.Driver?.SendKeys ('f', ConsoleKey.F, false, false, false); + Application.RaiseKeyDownEvent ('f'); View.SetClipToScreen (); tf.Draw (); View.SetClipToScreen (); @@ -54,7 +54,7 @@ public void TestAutoAppend_AfterCloseKey_ReappearsOnLetter () Assert.Equal ("f", tf.Text); // When cancelling autocomplete - Application.Driver?.SendKeys ('\0', ConsoleKey.Escape, false, false, false); + Application.RaiseKeyDownEvent (Key.Esc); // Suggestion should disappear tf.Draw (); @@ -62,7 +62,7 @@ public void TestAutoAppend_AfterCloseKey_ReappearsOnLetter () Assert.Equal ("f", tf.Text); // Should reappear when you press next letter - Application.Driver?.SendKeys ('i', ConsoleKey.I, false, false, false); + Application.RaiseKeyDownEvent (Key.I); View.SetClipToScreen (); tf.Draw (); View.SetClipToScreen (); @@ -74,14 +74,14 @@ public void TestAutoAppend_AfterCloseKey_ReappearsOnLetter () [Theory] [AutoInitShutdown] - [InlineData (ConsoleKey.UpArrow)] - [InlineData (ConsoleKey.DownArrow)] - public void TestAutoAppend_CycleSelections (ConsoleKey cycleKey) + [InlineData (KeyCode.CursorUp)] + [InlineData (KeyCode.CursorDown)] + public void TestAutoAppend_CycleSelections (KeyCode cycleKey) { TextField tf = GetTextFieldsInViewSuggesting ("fish", "friend"); // f is typed and suggestion is "fish" - Application.Driver?.SendKeys ('f', ConsoleKey.F, false, false, false); + Application.RaiseKeyDownEvent ('f'); View.SetClipToScreen (); tf.Draw (); View.SetClipToScreen (); @@ -90,7 +90,7 @@ public void TestAutoAppend_CycleSelections (ConsoleKey cycleKey) Assert.Equal ("f", tf.Text); // When cycling autocomplete - Application.Driver?.SendKeys (' ', cycleKey, false, false, false); + Application.RaiseKeyDownEvent (cycleKey); View.SetClipToScreen (); tf.Draw (); @@ -100,7 +100,7 @@ public void TestAutoAppend_CycleSelections (ConsoleKey cycleKey) Assert.Equal ("f", tf.Text); // Should be able to cycle in circles endlessly - Application.Driver?.SendKeys (' ', cycleKey, false, false, false); + Application.RaiseKeyDownEvent (cycleKey); View.SetClipToScreen (); tf.Draw (); View.SetClipToScreen (); @@ -117,7 +117,7 @@ public void TestAutoAppend_NoRender_WhenCursorNotAtEnd () TextField tf = GetTextFieldsInViewSuggesting ("fish"); // f is typed and suggestion is "fish" - Application.Driver?.SendKeys ('f', ConsoleKey.F, false, false, false); + Application.RaiseKeyDownEvent ('f'); View.SetClipToScreen (); tf.Draw (); View.SetClipToScreen (); @@ -126,8 +126,8 @@ public void TestAutoAppend_NoRender_WhenCursorNotAtEnd () Assert.Equal ("f", tf.Text); // add a space then go back 1 - Application.Driver?.SendKeys (' ', ConsoleKey.Spacebar, false, false, false); - Application.Driver?.SendKeys ('<', ConsoleKey.LeftArrow, false, false, false); + Application.RaiseKeyDownEvent (' '); + Application.RaiseKeyDownEvent (Key.CursorLeft); View.SetClipToScreen (); tf.Draw (); @@ -143,7 +143,7 @@ public void TestAutoAppend_NoRender_WhenNoMatch () TextField tf = GetTextFieldsInViewSuggesting ("fish"); // f is typed and suggestion is "fish" - Application.Driver?.SendKeys ('f', ConsoleKey.F, false, false, false); + Application.RaiseKeyDownEvent ('f'); View.SetClipToScreen (); tf.Draw (); View.SetClipToScreen (); @@ -152,7 +152,7 @@ public void TestAutoAppend_NoRender_WhenNoMatch () Assert.Equal ("f", tf.Text); // x is typed and suggestion should disappear - Application.Driver?.SendKeys ('x', ConsoleKey.X, false, false, false); + Application.RaiseKeyDownEvent (Key.X); View.SetClipToScreen (); tf.Draw (); DriverAssert.AssertDriverContentsAre ("fx", output); @@ -190,7 +190,7 @@ public void TestAutoAppend_ShowThenAccept_CasesDiffer () Assert.Equal ("my f", tf.Text); // When tab completing the case of the whole suggestion should be applied - Application.Driver?.SendKeys ('\t', ConsoleKey.Tab, false, false, false); + Application.RaiseKeyDownEvent ('\t'); View.SetClipToScreen (); tf.Draw (); DriverAssert.AssertDriverContentsAre ("my FISH", output); @@ -223,7 +223,7 @@ public void TestAutoAppend_ShowThenAccept_MatchCase () DriverAssert.AssertDriverContentsAre ("fish", output); Assert.Equal ("f", tf.Text); - Application.Driver?.SendKeys ('\t', ConsoleKey.Tab, false, false, false); + Application.RaiseKeyDownEvent ('\t'); View.SetClipToScreen (); tf.Draw (); @@ -234,7 +234,7 @@ public void TestAutoAppend_ShowThenAccept_MatchCase () Assert.Same (tf, Application.Top.Focused); // Second tab should move focus (nothing to autocomplete) - Application.Driver?.SendKeys ('\t', ConsoleKey.Tab, false, false, false); + Application.RaiseKeyDownEvent ('\t'); Assert.NotSame (tf, Application.Top.Focused); Application.Top.Dispose (); } @@ -249,7 +249,7 @@ public void TestAutoAppendRendering_ShouldNotOverspill (string overspillUsing, s TextField tf = GetTextFieldsInViewSuggesting (overspillUsing); // f is typed we should only see 'f' up to size of View (10) - Application.Driver?.SendKeys ('f', ConsoleKey.F, false, false, false); + Application.RaiseKeyDownEvent ('f'); View.SetClipToScreen (); tf.Draw (); View.SetClipToScreen (); diff --git a/Tests/UnitTests/Views/TextFieldTests.cs b/Tests/UnitTests/Views/TextFieldTests.cs index d582f2eec7..8618067b39 100644 --- a/Tests/UnitTests/Views/TextFieldTests.cs +++ b/Tests/UnitTests/Views/TextFieldTests.cs @@ -146,7 +146,7 @@ public void CaptionedTextField_DoesNotOverspillBounds (string caption, string ex // Caption has no effect when focused tf.Caption = caption; - Application.Driver?.SendKeys ('\t', ConsoleKey.Tab, false, false, false); + Application.RaiseKeyDownEvent ('\t'); Assert.False (tf.HasFocus); tf.Draw (); @@ -166,7 +166,7 @@ public void CaptionedTextField_DoesNotOverspillViewport_Unicode () TextField tf = GetTextFieldsInView (); tf.Caption = caption; - Application.Driver?.SendKeys ('\t', ConsoleKey.Tab, false, false, false); + Application.RaiseKeyDownEvent ('\t'); Assert.False (tf.HasFocus); tf.Draw (); @@ -186,7 +186,7 @@ public void CaptionedTextField_DoNotRenderCaption_WhenTextPresent (string conten DriverAssert.AssertDriverContentsAre ("", output); tf.Caption = "Enter txt"; - Application.Driver?.SendKeys ('\t', ConsoleKey.Tab, false, false, false); + Application.RaiseKeyDownEvent ('\t'); // Caption should appear when not focused and no text Assert.False (tf.HasFocus); @@ -218,7 +218,7 @@ public void CaptionedTextField_RendersCaption_WhenNotFocused () tf.Draw (); DriverAssert.AssertDriverContentsAre ("", output); - Application.Driver?.SendKeys ('\t', ConsoleKey.Tab, false, false, false); + Application.RaiseKeyDownEvent ('\t'); Assert.False (tf.HasFocus); View.SetClipToScreen ();