Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2026-01-01 16:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP Building after merge conflict resolved - but does it work?

Browse Source
This commit is contained in:
tznind
2024-11-27 12:59:05 +00:00
parent 42ff86f68a
commit 27b15ec8ee
10 changed files with 99 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
Terminal.Gui/ConsoleDrivers/WindowsDriver/WindowsDriver.cs
View File

@@ -20,6 +20,7 @@ using System.ComponentModel;
using System.Diagnostics;
using System.Runtime.InteropServices;
using static Terminal.Gui.ConsoleDrivers.ConsoleKeyMapping;
using static Terminal.Gui.SpinnerStyle;
namespace Terminal.Gui;
@@ -187,7 +188,14 @@ internal class WindowsDriver : ConsoleDriver
}
}
public override void WriteRaw (string ansi) { WinConsole?.WriteANSI (ansi); }
/// <inheritdoc />
internal override IAnsiResponseParser GetParser () => _parser;
public override void WriteRaw (string str)
{
WinConsole?.WriteANSI (str);
}
#region Not Implemented
@@ -217,11 +225,6 @@ internal class WindowsDriver : ConsoleDriver
public override void UpdateCursor ()
{
if (RunningUnitTests)
{
return;
}
if (Col < 0 || Row < 0 || Col >= Cols || Row >= Rows)
{
GetCursorVisibility (out CursorVisibility cursorVisibility);
@@ -480,14 +483,25 @@ internal class WindowsDriver : ConsoleDriver
if (!RunningUnitTests)
{
WinConsole?.SetInitialCursorVisibility ();
WinConsole?.SetInitialCursorVisibility ();
}
return new MainLoop (_mainLoopDriver);
}
private AnsiResponseParser<WindowsConsole.InputRecord> _parser = new ();
internal void ProcessInput (WindowsConsole.InputRecord inputEvent)
{
foreach (var e in Parse (inputEvent))
{
ProcessInputAfterParsing (e);
}
}
internal void ProcessInputAfterParsing (WindowsConsole.InputRecord inputEvent)
{
switch (inputEvent.EventType)
{
case WindowsConsole.EventType.Key:
@@ -510,22 +524,16 @@ internal class WindowsDriver : ConsoleDriver
break;
}
if (inputEvent.KeyEvent.bKeyDown)
{
// Avoid sending repeat key down events
OnKeyDown (new Key (map));
}
else
{
OnKeyUp (new Key (map));
}
// This follows convention in NetDriver
OnKeyDown (new Key (map));
OnKeyUp (new Key (map));
break;
case WindowsConsole.EventType.Mouse:
MouseEventArgs me = ToDriverMouse (inputEvent.MouseEvent);
if (me.Flags == MouseFlags.None)
if (me is null || me.Flags == MouseFlags.None)
{
break;
}
@@ -563,6 +571,43 @@ internal class WindowsDriver : ConsoleDriver
}
}
private IEnumerable<WindowsConsole.InputRecord> Parse (WindowsConsole.InputRecord inputEvent)
{
if (inputEvent.EventType != WindowsConsole.EventType.Key)
{
yield return inputEvent;
yield break;
}
// Swallow key up events - they are unreliable
if (!inputEvent.KeyEvent.bKeyDown)
{
yield break;
}
foreach (var i in ShouldRelease ())
{
yield return i;
}
foreach (Tuple<char, WindowsConsole.InputRecord> output in
_parser.ProcessInput (Tuple.Create (inputEvent.KeyEvent.UnicodeChar, inputEvent)))
{
yield return output.Item2;
}
}
public IEnumerable<WindowsConsole.InputRecord> ShouldRelease ()
{
if (_parser.State == AnsiResponseParserState.ExpectingBracket &&
DateTime.Now - _parser.StateChangedAt > EscTimeout)
{
return _parser.Release ().Select (o => o.Item2);
}
return [];
}
#if HACK_CHECK_WINCHANGED
private void ChangeWin (object s, SizeChangedEventArgs e)
{
@@ -661,13 +706,13 @@ internal class WindowsDriver : ConsoleDriver
if (keyInfo.KeyChar == 0)
{
// If the keyChar is 0, keyInfo.Key value is not a printable character.
// If the keyChar is 0, keyInfo.Key value is not a printable character.
// Dead keys (diacritics) are indicated by setting the top bit of the return value.
// Dead keys (diacritics) are indicated by setting the top bit of the return value.
if ((mapResult & 0x80000000) != 0)
{
// Dead key (e.g. Oem2 '~'/'^' on POR keyboard)
// Option 1: Throw it out.
// Option 1: Throw it out.
// - Apps will never see the dead keys
// - If user presses a key that can be combined with the dead key ('a'), the right thing happens (app will see '<27>').
// - NOTE: With Dead Keys, KeyDown != KeyUp. The KeyUp event will have just the base char ('a').
@@ -688,7 +733,7 @@ internal class WindowsDriver : ConsoleDriver
if (keyInfo.Modifiers != 0)
{
// These Oem keys have well-defined chars. We ensure the representative char is used.
// If we don't do this, then on some keyboard layouts the wrong char is
// If we don't do this, then on some keyboard layouts the wrong char is
// returned (e.g. on ENG OemPlus un-shifted is =, not +). This is important
// for key persistence ("Ctrl++" vs. "Ctrl+=").
mappedChar = keyInfo.Key switch
@@ -754,11 +799,11 @@ internal class WindowsDriver : ConsoleDriver
if (keyInfo.KeyChar <= 'Z')
{
return (KeyCode)keyInfo.Key | KeyCode.ShiftMask;
}
}
// Always return the KeyChar because it may be an Á, À with Oem1, etc
return (KeyCode)keyInfo.KeyChar;
}
}
}
if (keyInfo.KeyChar <= 'z')
@@ -947,12 +992,12 @@ internal class WindowsDriver : ConsoleDriver
{
// TODO: This makes IConsoleDriver dependent on Application, which is not ideal. This should be moved to Application.
Application.MainLoop!.AddIdle (
() =>
{
Task.Run (async () => await ProcessButtonDoubleClickedAsync ());
() =>
{
Task.Run (async () => await ProcessButtonDoubleClickedAsync ());
return false;
});
return false;
});
}
// The ButtonState member of the MouseEvent structure has bit corresponding to each mouse button.
@@ -1019,12 +1064,12 @@ internal class WindowsDriver : ConsoleDriver
{
// TODO: This makes IConsoleDriver dependent on Application, which is not ideal. This should be moved to Application.
Application.MainLoop!.AddIdle (
() =>
{
Task.Run (async () => await ProcessContinuousButtonPressedAsync (mouseFlag));
() =>
{
Task.Run (async () => await ProcessContinuousButtonPressedAsync (mouseFlag));
return false;
});
return false;
});
}
}
else if (_lastMouseButtonPressed != null
@@ -1187,4 +1232,4 @@ internal class WindowsDriver : ConsoleDriver
Flags = mouseFlag
};
}
}
}