Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-26 15:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Windows: fix cursor position movement

Browse Source
This commit is contained in:
Nick Van Dyck
2018-05-13 16:57:10 +01:00
parent e576379786
commit ead3ddaaac
3 changed files with 90 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Terminal.Gui/Core.cs
View File

@@ -1599,7 +1599,7 @@ namespace Terminal.Gui {
else
Driver = new CursesDriver ();
Driver.Init (TerminalResized);
MainLoop = new Mono.Terminal.MainLoop (Driver is CursesDriver);
MainLoop = new Mono.Terminal.MainLoop (Driver is CursesDriver, UseSystemConsole);
SynchronizationContext.SetSynchronizationContext (new MainLoopSyncContext (MainLoop));
Top = Toplevel.Create ();
Current = Top;

155
Terminal.Gui/Drivers/WindowsDriver.cs
View File

@@ -23,11 +23,11 @@ namespace Terminal.Gui {
public CharInfo[] OriginalStdOutChars;
public bool WriteToConsole(CharInfo[] charInfoBuffer, Coord coords, SmallRect window)
public bool WriteToConsole (CharInfo[] charInfoBuffer, Coord coords, SmallRect window)
{
if (ScreenBuffer == IntPtr.Zero)
{
ScreenBuffer = CreateConsoleScreenBuffer(
ScreenBuffer = CreateConsoleScreenBuffer (
DesiredAccess.GenericRead | DesiredAccess.GenericWrite,
ShareMode.FileShareRead | ShareMode.FileShareWrite,
IntPtr.Zero,
@@ -35,23 +35,22 @@ namespace Terminal.Gui {
IntPtr.Zero
);
var err = Marshal.GetLastWin32Error();
var err = Marshal.GetLastWin32Error ();
if (err != 0)
{
Console.WriteLine("Error: {0}", err);
throw new System.ComponentModel.Win32Exception(err);
}
if (!SetConsoleActiveScreenBuffer(ScreenBuffer))
if (!SetConsoleActiveScreenBuffer (ScreenBuffer))
{
err = Marshal.GetLastWin32Error();
Console.WriteLine("Error: {0}", err);
throw new System.ComponentModel.Win32Exception(err);
}
OriginalStdOutChars = new CharInfo[Console.WindowHeight * Console.WindowWidth];
ReadConsoleOutput(
ReadConsoleOutput (
OutputHandle,
OriginalStdOutChars,
coords,
@@ -60,7 +59,7 @@ namespace Terminal.Gui {
);
}
return WriteConsoleOutput(
return WriteConsoleOutput (
ScreenBuffer,
charInfoBuffer,
coords,
@@ -69,6 +68,68 @@ namespace Terminal.Gui {
);
}
public bool SetCursorPosition(Coord position)
{
return SetConsoleCursorPosition (ScreenBuffer, position);
}
public void PollEvents (Action<InputRecord> inputEventHandler)
{
if (OriginalConsoleMode != 0)
return;
OriginalConsoleMode = ConsoleMode;
ConsoleMode |= (uint)ConsoleModes.EnableMouseInput;
ConsoleMode &= ~(uint)ConsoleModes.EnableQuickEditMode;
ConsoleMode |= (uint)ConsoleModes.EnableExtendedFlags;
Task.Run (() =>
{
uint numberEventsRead = 0;
uint length = 1;
InputRecord[] records = new InputRecord[length];
while (
ContinueListeningForConsoleEvents &&
ReadConsoleInput(InputHandle, records, length, out numberEventsRead) &&
numberEventsRead > 0
)
{
inputEventHandler (records[0]);
}
});
}
public void Cleanup ()
{
ContinueListeningForConsoleEvents = false;
ConsoleMode = OriginalConsoleMode;
OriginalConsoleMode = 0;
if (!SetConsoleActiveScreenBuffer (OutputHandle))
{
var err = Marshal.GetLastWin32Error ();
Console.WriteLine("Error: {0}", err);
}
}
private bool ContinueListeningForConsoleEvents = true;
private uint OriginalConsoleMode = 0;
public uint ConsoleMode {
get {
uint v;
GetConsoleMode (InputHandle, out v);
return v;
}
set {
SetConsoleMode (InputHandle, value);
}
}
[Flags]
public enum ConsoleModes : uint
{
@@ -218,63 +279,6 @@ namespace Terminal.Gui {
}
};
public void PollEvents(Action<InputRecord> inputEventHandler)
{
if (OriginalConsoleMode != 0)
return;
OriginalConsoleMode = ConsoleMode;
ConsoleMode |= (uint)ConsoleModes.EnableMouseInput;
ConsoleMode &= ~(uint)ConsoleModes.EnableQuickEditMode;
ConsoleMode |= (uint)ConsoleModes.EnableExtendedFlags;
Task.Run(() =>
{
uint numberEventsRead = 0;
uint length = 1;
InputRecord[] records = new InputRecord[length];
while (
ContinueListeningForConsoleEvents &&
ReadConsoleInput(InputHandle, records, length, out numberEventsRead) &&
numberEventsRead > 0
)
{
inputEventHandler(records[0]);
}
});
}
public void Cleanup()
{
ContinueListeningForConsoleEvents = false;
ConsoleMode = OriginalConsoleMode;
OriginalConsoleMode = 0;
if (!SetConsoleActiveScreenBuffer(OutputHandle))
{
var err = Marshal.GetLastWin32Error();
Console.WriteLine("Error: {0}", err);
}
}
private bool ContinueListeningForConsoleEvents = true;
private uint OriginalConsoleMode = 0;
public uint ConsoleMode {
get {
uint v;
GetConsoleMode (InputHandle, out v);
return v;
}
set {
SetConsoleMode (InputHandle, value);
}
}
[Flags]
enum ShareMode : uint
{
@@ -363,9 +367,13 @@ namespace Terminal.Gui {
ref SmallRect lpWriteRegion
);
[DllImport ("kernel32.dll")]
static extern bool SetConsoleCursorPosition(IntPtr hConsoleOutput, Coord dwCursorPosition);
[DllImport ("kernel32.dll")]
static extern bool GetConsoleMode (IntPtr hConsoleHandle, out uint lpMode);
[DllImport ("kernel32.dll")]
static extern bool SetConsoleMode (IntPtr hConsoleHandle, uint dwMode);
@@ -685,6 +693,7 @@ namespace Terminal.Gui {
Bottom = (short)Clip.Bottom
};
UpdateCursor();
WinConsole.WriteToConsole (OutputBuffer, bufferCoords, window);
}
@@ -704,8 +713,19 @@ namespace Terminal.Gui {
Bottom = (short)Clip.Bottom
};
UpdateCursor();
WinConsole.WriteToConsole (OutputBuffer, bufferCoords, window);
}
public override void UpdateCursor()
{
var position = new WindowsConsole.Coord()
{
X = (short)ccol,
Y = (short)crow
};
WinConsole.SetCursorPosition(position);
}
public override void End ()
{
WinConsole.Cleanup();
@@ -716,11 +736,6 @@ namespace Terminal.Gui {
{
}
public override void UpdateCursor()
{
}
public override void SetColors (short foregroundColorId, short backgroundColorId)
{
}

5
Terminal.Gui/MonoCurses/mainloop.cs
View File

@@ -119,7 +119,7 @@ namespace Mono.Terminal {
{
}
public MainLoop (bool useUnix)
public MainLoop (bool useUnix, bool useNet=false)
{
this.useUnix = useUnix;
if (useUnix) {
@@ -128,6 +128,9 @@ namespace Mono.Terminal {
read (wakeupPipes [0], ignore, (IntPtr)1);
return true;
});
} else if (useNet) {
Thread readThread = new Thread (WindowsKeyReader);
readThread.Start ();
}
}