diff options
Diffstat (limited to 'ShiftOS.Main')
| -rw-r--r-- | ShiftOS.Main/ShiftOS.Main.csproj | 6 | ||||
| -rw-r--r-- | ShiftOS.Main/ShiftOS/Apps/Terminal.Designer.cs | 2 | ||||
| -rw-r--r-- | ShiftOS.Main/ShiftOS/Apps/Terminal.cs | 89 | ||||
| -rw-r--r-- | ShiftOS.Main/ShiftOS/Desktop.cs | 10 | ||||
| -rw-r--r-- | ShiftOS.Main/Terminal/Commands/Hello.cs | 23 | ||||
| -rw-r--r-- | ShiftOS.Main/Terminal/TerminalBackend.cs | 48 | ||||
| -rw-r--r-- | ShiftOS.Main/Terminal/TerminalCommand.cs | 92 |
7 files changed, 267 insertions, 3 deletions
diff --git a/ShiftOS.Main/ShiftOS.Main.csproj b/ShiftOS.Main/ShiftOS.Main.csproj index 6f712cc..f7d8dc0 100644 --- a/ShiftOS.Main/ShiftOS.Main.csproj +++ b/ShiftOS.Main/ShiftOS.Main.csproj @@ -99,6 +99,12 @@ <Compile Include="ShiftOS\Desktop.Designer.cs"> <DependentUpon>Desktop.cs</DependentUpon> </Compile> + <Compile Include="Terminal\Commands\Hello.cs" /> + <Compile Include="Terminal\TerminalBackend.cs" /> + <Compile Include="Terminal\TerminalCommand.cs" /> + <EmbeddedResource Include="HijackScreen.resx"> + <DependentUpon>HijackScreen.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="Properties\Resources.resx"> <Generator>ResXFileCodeGenerator</Generator> <LastGenOutput>Resources.Designer.cs</LastGenOutput> diff --git a/ShiftOS.Main/ShiftOS/Apps/Terminal.Designer.cs b/ShiftOS.Main/ShiftOS/Apps/Terminal.Designer.cs index e92cdb4..b514bbf 100644 --- a/ShiftOS.Main/ShiftOS/Apps/Terminal.Designer.cs +++ b/ShiftOS.Main/ShiftOS/Apps/Terminal.Designer.cs @@ -60,6 +60,6 @@ #endregion - private System.Windows.Forms.RichTextBox termmain; + public System.Windows.Forms.RichTextBox termmain; } } diff --git a/ShiftOS.Main/ShiftOS/Apps/Terminal.cs b/ShiftOS.Main/ShiftOS/Apps/Terminal.cs index 4c11136..a5c5a11 100644 --- a/ShiftOS.Main/ShiftOS/Apps/Terminal.cs +++ b/ShiftOS.Main/ShiftOS/Apps/Terminal.cs @@ -1,5 +1,19 @@ using System; using System.Windows.Forms; +using ShiftOS.Engine; +using ShiftOS.Main.Terminal; + +namespace ShiftOS.Main.ShiftOS.Apps +{ + public partial class Terminal : UserControl + { + public int TerminalID = TerminalBackend.trmTopID++; // Used so that we can have multiple instances of the terminal whilst the command begin run knowing what terminal to send the text to - very complicated ;) + public string defaulttextBefore = "user> "; + public string defaulttextResult = "user@shiftos> "; // NOT YET IMPLEMENTED!!! + public bool DoClear = false; + public bool RunningCommand = false; + public bool WaitingResponse = false; + public string InputReturnText = ""; using ShiftOS.Engine.Terminal; namespace ShiftOS.Main.ShiftOS.Apps @@ -15,6 +29,10 @@ namespace ShiftOS.Main.ShiftOS.Apps int TrackingPosition; + termmain.ContextMenuStrip = new ContextMenuStrip(); // Disables the right click of a richtextbox! + + TerminalBackend.trm.Add(this); // Makes the commands run! + } public Terminal() { InitializeComponent(); @@ -27,7 +45,76 @@ namespace ShiftOS.Main.ShiftOS.Apps termmain.AppendText($"\n {text} \n {DefaulttextResult}"); TrackingPosition = termmain.Text.Length; } + if (e.Control && e.KeyCode == Keys.V) + { + //if (Clipboard.ContainsText()) + // termmain.Paste(DataFormats.GetFormat(DataFormats.Text)); + e.Handled = true; + } else if (e.KeyCode == Keys.Enter) { + RunningCommand = true; + TerminalBackend.RunCommand(termmain.Text.Substring(TrackingPosition, termmain.Text.Length - TrackingPosition), TerminalID); // The most horrific line in the entire application! + RunningCommand = false; + termmain.AppendText($"\n {defaulttextResult}"); + TrackingPosition = termmain.Text.Length; + e.Handled = true; + } + } + + private void termmain_TextChanged(object sender, EventArgs e) + { + if (!RunningCommand) + { + if (termmain.SelectionStart < TrackingPosition) + { + if (!DoClear) // If it's not clearing the terminal + { + termmain.Text = OldText; + termmain.Select(termmain.Text.Length, 0); + } + } + else + { + OldText = termmain.Text; + } + } + } + + private void termmain_SelectionChanged(object sender, EventArgs e) + { + if (!RunningCommand) + { + if (termmain.SelectionStart < TrackingPosition) + { + termmain.Text = OldText; + termmain.Select(termmain.Text.Length, 0); + } + } + } + + private void Terminal_Load(object sender, EventArgs e) + { + termmain.Text = $"\n {defaulttextResult}"; + TrackingPosition = termmain.Text.Length; + } + + public void Input(string request) + { + InputReturnText = ""; + RunningCommand = false; + + termmain.AppendText($"\n {request} "); + TrackingPosition = termmain.Text.Length; + } + public void Clear() + { + DoClear = true; + termmain.Text = $"\n {defaulttextResult}"; + TrackingPosition = termmain.Text.Length; + DoClear = false; + } + } +} void termmain_KeyDown(object sender, KeyEventArgs e) { // The below code disables the ability to paste anything other then text... @@ -77,4 +164,4 @@ namespace ShiftOS.Main.ShiftOS.Apps Print("\n"); } } -}
\ No newline at end of file +} diff --git a/ShiftOS.Main/ShiftOS/Desktop.cs b/ShiftOS.Main/ShiftOS/Desktop.cs index 95e4d26..10eea41 100644 --- a/ShiftOS.Main/ShiftOS/Desktop.cs +++ b/ShiftOS.Main/ShiftOS/Desktop.cs @@ -54,6 +54,14 @@ namespace ShiftOS.Main.ShiftOS void timer1_Tick(object sender, EventArgs e) => taskbarClock.Text = $"{DateTime.Now:t}"; + private void terminalToolStripMenuItem_Click(object sender, EventArgs e) + { + Apps.Terminal trm = new Apps.Terminal(); + + ShiftWM.Init(trm, "Terminal", null, false, true); + } + } +} void terminalToolStripMenuItem_Click(object sender, EventArgs e) { var trm = new Terminal(); @@ -72,4 +80,4 @@ namespace ShiftOS.Main.ShiftOS ShiftWM.Init(fs, "File Skimmer", Resources.iconFileSkimmer); } } -}
\ No newline at end of file +} diff --git a/ShiftOS.Main/Terminal/Commands/Hello.cs b/ShiftOS.Main/Terminal/Commands/Hello.cs new file mode 100644 index 0000000..a826532 --- /dev/null +++ b/ShiftOS.Main/Terminal/Commands/Hello.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ShiftOS.Main.Terminal.Commands +{ + public class Hello : TerminalCommand + { + public override string Name { get; } = "Hello"; + public override string Summary { get; } = "Just an example command."; + public override string Usage { get; } = "Hello <NAME>."; + public override bool Unlocked { get; set; } = false; + + public override void Run(params string[] parameters) + { + string name = string.Join(" ", parameters); + WriteLine($"Oh, hello, {name}."); + } + } +} diff --git a/ShiftOS.Main/Terminal/TerminalBackend.cs b/ShiftOS.Main/Terminal/TerminalBackend.cs new file mode 100644 index 0000000..02c9cd0 --- /dev/null +++ b/ShiftOS.Main/Terminal/TerminalBackend.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace ShiftOS.Main.Terminal +{ + public static class TerminalBackend + { + // The line below gets all the terminal commands in... well... the entire ShiftOS.Engine + public static IEnumerable<TerminalCommand> instances = Assembly.GetExecutingAssembly().GetTypes() + .Where(t => t.IsSubclassOf(typeof(TerminalCommand)) && t.GetConstructor(Type.EmptyTypes) != null) + .Select(t => Activator.CreateInstance(t) as TerminalCommand); + + public static List<ShiftOS.Apps.Terminal> trm = new List<ShiftOS.Apps.Terminal>(); + public static int trmTopID = 0; + /// <summary> + /// Runs a terminal command. + /// </summary> + /// <param name="command"></param> + /// <param name="rtb"><summary>The rich text box that the text will be written to.</summary></param> + public static void RunCommand(string command, int TermID) + { + string name; + try { name = command.Split(' ')[0]; } catch { name = command; } + + var theParams = new string[command.Split(' ').Length - 1]; + Array.Copy(command.Split(' '), 1, theParams, 0, command.Split(' ').Length - 1); + + foreach (TerminalCommand instance in instances) + { + if (instance.Name.ToLower() == name.ToLower()) + { + instance.TermID = TermID; + // Add a new line! + Array.Find(trm.ToArray(), w => w.TerminalID == TermID).termmain.AppendText("\n"); + instance.Run(theParams); + return; + } + } + + Array.Find(trm.ToArray(), w => w.TerminalID == TermID).termmain.Text += " \n The command cannot be found. \n"; + } + } +} diff --git a/ShiftOS.Main/Terminal/TerminalCommand.cs b/ShiftOS.Main/Terminal/TerminalCommand.cs new file mode 100644 index 0000000..5f313be --- /dev/null +++ b/ShiftOS.Main/Terminal/TerminalCommand.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace ShiftOS.Main.Terminal +{ + public class TerminalCommand + { + public int TermID { get; set; } + + public virtual string Name { get; } + public virtual string Summary { get; } + public virtual string Usage { get; } + public virtual bool Unlocked { get; set; } + + public virtual void Run(params string[] parameters) { } + + /// <summary> + /// Writes a blank line in the terminal. + /// </summary> + public virtual void WriteLine() + { + WriteLine(""); + } + + /// <summary> + /// Writes specified text in the terminal and starts a new line. + /// </summary> + /// <param name="value"><summary>The text to write before the new line is made.</summary></param> + public virtual void WriteLine(string value) + { + Array.Find(TerminalBackend.trm.ToArray(), w => w.TerminalID == TermID).termmain.AppendText($"{value} \n"); + } + + /// <summary> + /// Writes specified text in the terminal in the specified color and starts a new line. + /// </summary> + /// <param name="value"><summary>The text to write before the new line is made.</summary></param> + /// <param name="textClr"><summary>The color the text is written in.</summary></param> + public virtual void WriteLine(string value, Color textClr) + { + ShiftOS.Apps.Terminal trm = Array.Find(TerminalBackend.trm.ToArray(), w => w.TerminalID == TermID); + + int startPoint = trm.termmain.Text.Length; + trm.termmain.AppendText($"{value} \n"); + trm.termmain.Select(startPoint, $"{value} \n".Length); + trm.termmain.SelectionColor = textClr; + } + + /// <summary> + /// Writes specified text in the terminal. + /// </summary> + /// <param name="value"><summary>The text to write.</summary></param> + /// <param name="textClr"><summary>The color the text is written in.</summary></param> + public virtual void Write(string value, Color textClr) + { + + ShiftOS.Apps.Terminal trm = Array.Find(TerminalBackend.trm.ToArray(), w => w.TerminalID == TermID); + + int startPoint = trm.termmain.Text.Length; + trm.termmain.AppendText($"{value}"); + trm.termmain.Select(startPoint, $"{value}".Length); + trm.termmain.SelectionColor = textClr; + } + + /// <summary> + /// Writes specified text in the terminal. + /// </summary> + /// <param name="value"><summary>The text to say before requesting text. </summary></param> + //public virtual Task<string> Input(string value = "") + //{ + // ShiftOS.Apps.Terminal trm = Array.Find(TerminalBackend.trm.ToArray(), w => w.TerminalID == TermID); + // trm.Input(value); + + // Task<string> Input = new Task<string>(() => + // { + // while (true) + // if (trm.InputReturnText != "") break; + + // // The terminal has finally decided! + + // return trm.InputReturnText; + // }); + // Input.Start(); + // return Input; + //} + } +} |