From a531cefa00923cc89fe94750bb1b4af12a50df93 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 21 Jan 2017 16:23:10 -0500 Subject: Terminal remote control! --- ShiftOS_TheReturn/TerminalTextWriter.cs | 44 ++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 6 deletions(-) (limited to 'ShiftOS_TheReturn/TerminalTextWriter.cs') diff --git a/ShiftOS_TheReturn/TerminalTextWriter.cs b/ShiftOS_TheReturn/TerminalTextWriter.cs index 78959d5..bc242a9 100644 --- a/ShiftOS_TheReturn/TerminalTextWriter.cs +++ b/ShiftOS_TheReturn/TerminalTextWriter.cs @@ -65,20 +65,41 @@ namespace ShiftOS.Engine public override void Write(char value) { - Desktop.InvokeOnWorkerThread(new Action(() => + if (TerminalBackend.IsForwardingConsoleWrites) { - UnderlyingControl.Write(value.ToString()); - select(); - })); + ServerManager.SendMessage("write", $@"{{ + guid: ""{TerminalBackend.ForwardGUID}"", + text: ""{value}"" +}}"); + } + else + { + Desktop.InvokeOnWorkerThread(new Action(() => + { + UnderlyingControl.Write(value.ToString()); + select(); + })); + } } public override void WriteLine(string value) { - Desktop.InvokeOnWorkerThread(new Action(() => + if (TerminalBackend.IsForwardingConsoleWrites) + { + ServerManager.SendMessage("write", $@"{{ + guid: ""{TerminalBackend.ForwardGUID}"", + text: ""{value + Environment.NewLine}"" +}}"); + } + else + { + + Desktop.InvokeOnWorkerThread(new Action(() => { UnderlyingControl.WriteLine(value); select(); })); + } } public void SetLastText() @@ -87,11 +108,22 @@ namespace ShiftOS.Engine public override void Write(string value) { - Desktop.InvokeOnWorkerThread(new Action(() => + if (TerminalBackend.IsForwardingConsoleWrites) + { + ServerManager.SendMessage("write", $@"{{ + guid: ""{TerminalBackend.ForwardGUID}"", + text: ""{value}"" +}}"); + } + else + { + + Desktop.InvokeOnWorkerThread(new Action(() => { UnderlyingControl.Write(value.ToString()); select(); })); + } } -- cgit v1.2.3