minor changes

2 files changed, 133 insertions, 1 deletions

diff --git a/ShiftOS.Main/Terminal/TerminalBackend.cs b/ShiftOS.Main/Terminal/TerminalBackend.cs
index 7904718..b697ef8 100644
--- a/ShiftOS.Main/Terminal/TerminalBackend.cs
+++ b/ShiftOS.Main/Terminal/TerminalBackend.cs
@@ -45,7 +45,7 @@ namespace ShiftOS.Main.Terminal
             }
               if(!complete)
               {
-                  Array.Find(trm.ToArray(), w => w.TerminalID == TermID).termmain.AppendText($"\nsbash: {command.Split(' ').First()}: invalid command");
+                  Array.Find(trm.ToArray(), w => w.TerminalID == TermID).termmain.AppendText($"\n sbash: invalid command: {command.Split(' ').First()}");
                   return;
               }
 
diff --git a/shiftos.main/shiftos/apps/terminal.cs b/shiftos.main/shiftos/apps/terminal.cs
new file mode 100644
index 0000000..28e301c
--- /dev/null
+++ b/shiftos.main/shiftos/apps/terminal.cs
@@ -0,0 +1,132 @@
+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 = "";
+
+		// The below variables makes the terminal... a terminal!
+		string OldText = "";
+
+		int TrackingPosition;
+
+		public Terminal()
+		{
+			InitializeComponent();
+
+			termmain.ContextMenuStrip = new ContextMenuStrip(); // Disables the right click of a richtextbox!
+
+            TerminalBackend.trm.Add(this);
+        }
+
+        void Print()
+        {
+            termmain.AppendText($"\n {defaulttextResult}");
+            TrackingPosition = termmain.Text.Length;
+        }
+
+        void Print(string text)
+		{
+			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;
+            termmain.Select(termmain.TextLength, 1);
+        }
+
+        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...
+
+			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)
+			{
+				TerminalBackend.RunCommand(termmain.Text.Substring(TrackingPosition, termmain.Text.Length - TrackingPosition), TerminalID); // The most horrific line in the entire application!
+                Print();
+				e.Handled = true;
+			}
+		}
+	}
+}