From bca879db94bc6395dbfa77628747080311fdb226 Mon Sep 17 00:00:00 2001
From: Richie Moch <littlewiggle6@gmail.com>
Date: Sun, 23 Dec 2018 19:15:07 -0600
Subject: started work on the pong, implemented "ShiftToolStrip". (note: pong
 is very buggy)

---
 ShiftOS.Main/Terminal/Commands/startx.cs | 16 ++++++++++------
 ShiftOS.Main/Terminal/TerminalBackend.cs |  3 ++-
 ShiftOS.Main/Terminal/TerminalCommand.cs |  6 +++---
 3 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'ShiftOS.Main/Terminal')

diff --git a/ShiftOS.Main/Terminal/Commands/startx.cs b/ShiftOS.Main/Terminal/Commands/startx.cs
index 38a8fdf..5b2feb4 100644
--- a/ShiftOS.Main/Terminal/Commands/startx.cs
+++ b/ShiftOS.Main/Terminal/Commands/startx.cs
@@ -7,7 +7,8 @@ using System.Threading.Tasks;
 using ShiftOS.Engine;
 using static ShiftOS.Engine.CodepointUpgrade;
 using static ShiftOS.Engine.SaveSystem;
-
+using ShiftOS.Main;
+using System.Windows.Forms;
 
 namespace ShiftOS.Main.Terminal.Commands
 {
@@ -15,12 +16,12 @@ namespace ShiftOS.Main.Terminal.Commands
     {
         private bool hasGUI = false;
         private bool autostart = false;
+        private Timer timer = new Timer();
         public override string Name { get; } = "startx";
         public override string Summary { get; } = "Starts the ShiftX driver.";
         public override string Usage { get; } = "startx";
         public override bool Unlocked { get; set; } = false;
         public int codePoints { get; set; } = 150;
-
         public override void Run(params string[] args)
         {
             if (args.Length > 0)
@@ -43,13 +44,16 @@ namespace ShiftOS.Main.Terminal.Commands
             }
             if (!hasGUI)
             {
-                var d = new Desktop();
-                d.Show();
+                WriteLine("[startx] starting driver...");
+                new System.Threading.ManualResetEvent(false).WaitOne(1500);
+
+                new Desktop().Show();
                 hasGUI = true;
+                return;
             }
-           if (hasGUI == true)
+            if (hasGUI)
             {
-                WriteLine("The ShiftX driver has already been intialized.");
+                WriteLine("startx: the ShiftX driver has already been intialized.");
                 return;
             } 
         }
diff --git a/ShiftOS.Main/Terminal/TerminalBackend.cs b/ShiftOS.Main/Terminal/TerminalBackend.cs
index 36d4036..bb3faaa 100644
--- a/ShiftOS.Main/Terminal/TerminalBackend.cs
+++ b/ShiftOS.Main/Terminal/TerminalBackend.cs
@@ -5,6 +5,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using ShiftOS.Main.Apps;
 
 namespace ShiftOS.Main.Terminal
 {
@@ -15,7 +16,7 @@ namespace ShiftOS.Main.Terminal
                         .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 List<Main.Apps.Terminal> trm = new List<Main.Apps.Terminal>();
         public static int trmTopID = 0;
         public static Stack<string> commandBuffer = new Stack<string>();
         /// <summary>
diff --git a/ShiftOS.Main/Terminal/TerminalCommand.cs b/ShiftOS.Main/Terminal/TerminalCommand.cs
index 1aeb845..6e4b81b 100644
--- a/ShiftOS.Main/Terminal/TerminalCommand.cs
+++ b/ShiftOS.Main/Terminal/TerminalCommand.cs
@@ -43,7 +43,7 @@ namespace ShiftOS.Main.Terminal
         /// <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);
+            Main.Apps.Terminal trm = Array.Find(TerminalBackend.trm.ToArray(), w => w.TerminalID == TermID);
 
             int startPoint = trm.termmain.Text.Length;
             trm.termmain.AppendText($" {value} \n");
@@ -59,7 +59,7 @@ namespace ShiftOS.Main.Terminal
         public virtual void Write(string value, Color textClr)
         {
 
-            ShiftOS.Apps.Terminal trm = Array.Find(TerminalBackend.trm.ToArray(), w => w.TerminalID == TermID);
+            Main.Apps.Terminal trm = Array.Find(TerminalBackend.trm.ToArray(), w => w.TerminalID == TermID);
 
             int startPoint = trm.termmain.Text.Length;
             trm.termmain.AppendText($" {value}");
@@ -94,7 +94,7 @@ namespace ShiftOS.Main.Terminal
         /// </summary>
         public virtual void Clear()
         {
-            ShiftOS.Apps.Terminal trm = Array.Find(TerminalBackend.trm.ToArray(), w => w.TerminalID == TermID);
+            Main.Apps.Terminal trm = Array.Find(TerminalBackend.trm.ToArray(), w => w.TerminalID == TermID);
 
             trm.Clear();
         }
-- 
cgit v1.2.3