Merge remote-tracking branch 'refs/remotes/shiftos-game/master'

1 files changed, 138 insertions, 3 deletions

diff --git a/ShiftOS.WinForms/Controls/TerminalBox.cs b/ShiftOS.WinForms/Controls/TerminalBox.cs
index cdb0965..c188321 100644
--- a/ShiftOS.WinForms/Controls/TerminalBox.cs
+++ b/ShiftOS.WinForms/Controls/TerminalBox.cs
@@ -64,9 +64,9 @@ namespace ShiftOS.WinForms.Controls
         public void Write(string text)
         {
             this.HideSelection = true;
-            this.SelectionFont = ConstructFont();
             this.SelectionColor = ControlManager.ConvertColor(ConsoleEx.ForegroundColor);
             this.SelectionBackColor = ControlManager.ConvertColor(ConsoleEx.BackgroundColor);
+            this.SelectionFont = ConstructFont();
             this.AppendText(Localization.Parse(text));
             this.HideSelection = false;
         }
@@ -86,17 +86,20 @@ namespace ShiftOS.WinForms.Controls
 
         public void WriteLine(string text)
         {
+            Engine.AudioManager.PlayStream(Properties.Resources.writesound);
             this.HideSelection = true;
-            this.Select(this.TextLength, 0);
-            this.SelectionFont = ConstructFont();
             this.SelectionColor = ControlManager.ConvertColor(ConsoleEx.ForegroundColor);
             this.SelectionBackColor = ControlManager.ConvertColor(ConsoleEx.BackgroundColor);
+            this.SelectionFont = ConstructFont();
+            this.Select(this.TextLength, 0);
             this.AppendText(Localization.Parse(text) + Environment.NewLine);
             this.HideSelection = false;
         }
 
         bool quickCopying = false;
 
+        bool busy = false;
+
         protected override void OnMouseDown(MouseEventArgs e)
         {
             //if right-clicking, then we initiate a quick-copy.
@@ -119,8 +122,140 @@ namespace ShiftOS.WinForms.Controls
             base.OnMouseUp(mevent);
         }
 
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+            if (!TerminalBackend.InStory)
+            {
+                switch (e.KeyCode) {
+                    case Keys.Add:
+                    case Keys.Alt:
+                    case Keys.Apps:
+                    case Keys.Attn:
+                    case Keys.BrowserBack:
+                    case Keys.BrowserFavorites:
+                    case Keys.BrowserForward:
+                    case Keys.BrowserHome:
+                    case Keys.BrowserRefresh:
+                    case Keys.BrowserSearch:
+                    case Keys.BrowserStop:
+                    case Keys.Cancel:
+                    case Keys.Capital:
+                    case Keys.Clear:
+                    case Keys.Control:
+                    case Keys.ControlKey:
+                    case Keys.Crsel:
+                    case Keys.Decimal:
+                    case Keys.Divide:
+                    case Keys.Down:
+                    case Keys.End:
+                    case Keys.Enter:
+                    case Keys.EraseEof:
+                    case Keys.Escape:
+                    case Keys.Execute:
+                    case Keys.Exsel:
+                    case Keys.F1:
+                    case Keys.F10:
+                    case Keys.F11:
+                    case Keys.F12:
+                    case Keys.F13:
+                    case Keys.F14:
+                    case Keys.F15:
+                    case Keys.F16:
+                    case Keys.F17:
+                    case Keys.F18:
+                    case Keys.F19:
+                    case Keys.F2:
+                    case Keys.F20:
+                    case Keys.F21:
+                    case Keys.F22:
+                    case Keys.F23:
+                    case Keys.F24:
+                    case Keys.F3:
+                    case Keys.F4:
+                    case Keys.F5:
+                    case Keys.F6:
+                    case Keys.F7:
+                    case Keys.F8:
+                    case Keys.F9:
+                    case Keys.FinalMode:
+                    case Keys.HanguelMode:
+                    case Keys.HanjaMode:
+                    case Keys.Help:
+                    case Keys.Home:
+                    case Keys.IMEAccept:
+                    case Keys.IMEConvert:
+                    case Keys.IMEModeChange:
+                    case Keys.IMENonconvert:
+                    case Keys.Insert:
+                    case Keys.JunjaMode:
+                    case Keys.KeyCode:
+                    case Keys.LaunchApplication1:
+                    case Keys.LaunchApplication2:
+                    case Keys.LaunchMail:
+                    case Keys.LButton:
+                    case Keys.LControlKey:
+                    case Keys.Left:
+                    case Keys.LineFeed:
+                    case Keys.LMenu:
+                    case Keys.LShiftKey:
+                    case Keys.LWin:
+                    case Keys.MButton:
+                    case Keys.MediaNextTrack:
+                    case Keys.MediaPlayPause:
+                    case Keys.MediaPreviousTrack:
+                    case Keys.MediaStop:
+                    case Keys.Menu:
+                    case Keys.Modifiers:
+                    case Keys.Multiply:
+                    case Keys.Next:
+                    case Keys.NoName:
+                    case Keys.None:
+                    case Keys.NumLock:
+                    case Keys.Pa1:
+                    case Keys.Packet:
+                    case Keys.PageUp:
+                    case Keys.Pause:
+                    case Keys.Play:
+                    case Keys.Print:
+                    case Keys.PrintScreen:
+                    case Keys.ProcessKey:
+                    case Keys.RButton:
+                    case Keys.RControlKey:
+                    case Keys.Right:
+                    case Keys.RMenu:
+                    case Keys.RShiftKey:
+                    case Keys.RWin:
+                    case Keys.Scroll:
+                    case Keys.Select:
+                    case Keys.SelectMedia:
+                    case Keys.Separator:
+                    case Keys.Shift:
+                    case Keys.ShiftKey:
+                    case Keys.Sleep:
+                    case Keys.Subtract:
+                    case Keys.Tab:
+                    case Keys.Up:
+                    case Keys.VolumeDown:
+                    case Keys.VolumeMute:
+                    case Keys.VolumeUp:
+                    case Keys.XButton1:
+                    case Keys.XButton2:
+                    case Keys.Zoom:
+
+                        break;
+                    default:
+                        //Engine.AudioManager.PlayStream(Properties.Resources.typesound); // infernal beeping noise only enable for the trailers
+                        break;
+            }
+        }
+        }
+
+        public string ThreadId = "";
+
         public TerminalBox() : base()
         {
+            ThreadId = Thread.CurrentThread.ManagedThreadId.ToString();
             this.Tag = "keepbg keepfg keepfont";
         }
     }