From fccd3c0fa85bdffc7f484bd9add62c069241e12d Mon Sep 17 00:00:00 2001
From: Ilya Biryukov <ilya.biryukov@microsoft.com>
Date: Wed, 30 May 2018 09:20:37 -0700
Subject: [PATCH] Add TerminalRenderer API

---
 .../ITerminalRenderer.cs                      | 56 +++++++++++
 .../ITerminalRendererService.cs               | 25 +++++
 .../BrowserBridge/RendererScriptingObject.cs  | 49 ++++++++++
 .../BrowserBridge/TerminalScriptingObject.cs  | 64 ++----------
 .../TerminalScriptingObjectBase.cs            | 43 ++++++++
 .../BrowserBridge/TerminalTheme.cs            |  7 ++
 .../BrowserBridge/TerminalThemer.cs           |  1 +
 .../Microsoft.VisualStudio.Terminal.csproj    | 21 +++-
 .../RendererToolWindow.cs                     | 27 ++++++
 .../RendererToolWindowControl.xaml            | 15 +++
 .../RendererToolWindowControl.xaml.cs         | 72 ++++++++++++++
 .../TermWindowPackage.cs                      | 46 ++++++---
 .../VsService/EmbeddedTerminal.cs             | 97 +------------------
 .../VsService/EmbeddedTerminalService.cs      | 40 ++++++--
 .../VsService/TerminalRenderer.cs             | 72 ++++++++++++++
 .../VsService/TerminalWindow.cs               | 93 ++++++++++++++++++
 .../WebView/ts/TermView.ts                    | 70 ++++++++++++-
 .../WebView/ts/TerminalFit.d.ts               | 11 +++
 .../WebView/ts/VsEventManager.ts              |  3 +-
 .../packages.config                           |  2 +-
 package-lock.json                             |  3 +
 21 files changed, 635 insertions(+), 182 deletions(-)
 create mode 100644 Microsoft.VisualStudio.Terminal.Embeddable/ITerminalRenderer.cs
 create mode 100644 Microsoft.VisualStudio.Terminal.Embeddable/ITerminalRendererService.cs
 create mode 100644 Microsoft.VisualStudio.Terminal/BrowserBridge/RendererScriptingObject.cs
 create mode 100644 Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalScriptingObjectBase.cs
 create mode 100644 Microsoft.VisualStudio.Terminal/RendererToolWindow.cs
 create mode 100644 Microsoft.VisualStudio.Terminal/RendererToolWindowControl.xaml
 create mode 100644 Microsoft.VisualStudio.Terminal/RendererToolWindowControl.xaml.cs
 create mode 100644 Microsoft.VisualStudio.Terminal/VsService/TerminalRenderer.cs
 create mode 100644 Microsoft.VisualStudio.Terminal/VsService/TerminalWindow.cs
 create mode 100644 Microsoft.VisualStudio.Terminal/WebView/ts/TerminalFit.d.ts
 create mode 100644 package-lock.json

diff --git a/Microsoft.VisualStudio.Terminal.Embeddable/ITerminalRenderer.cs b/Microsoft.VisualStudio.Terminal.Embeddable/ITerminalRenderer.cs
new file mode 100644
index 0000000..c22ecf0
--- /dev/null
+++ b/Microsoft.VisualStudio.Terminal.Embeddable/ITerminalRenderer.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Microsoft.VisualStudio.Terminal
+{
+    public delegate void TerminalDataRecievedEventHandler(object sender, string data);
+
+    /// <summary>
+    /// Terminal renderer.
+    /// The terminal starts in auto-fit mode where terminal size always matches the window size when window resizes.
+    /// After a first call to <c>ResizeAsyc()</c>, the terminal switches to fixed size mode where the terminal size stays
+    /// fixed and doesn't change when the window size changes. In this mode the terminal size can only be changed
+    /// with <c>ResizeAsync()</c>. To show the terminal inside the window, a dotted border will be displayed 
+    /// on the bottom and right sides of it.
+    /// If the terminal window gets smaller than the terminal, some parts of the terminal may get clipped from view.
+    /// </summary>
+    [ComImport, Guid("150B7535-03F9-41C0-9515-17ECB8199FFE")]
+    public interface ITerminalRenderer : ITerminal
+    {
+        /// <summary>
+        /// Gets current cols of the terminal window.
+        /// </summary>
+        int Cols { get; }
+
+        /// <summary>
+        /// Gets current rows of the terminal window.
+        /// </summary>
+        int Rows { get; }
+
+        /// <summary>
+        /// Changes the size of the terminal.
+        /// After that the terminal size may not match the terminal window size.
+        /// <c>Rows</c> and <c>Cols</c> always match the terminal window, and may differ from the terminal size
+        /// after <c>ResizeAsync</c> is called.
+        /// Calling<c>ResizeAsync</c> doesn't cause <c>TerminalResized</c> event.
+        /// </summary>
+        Task ResizeAsync(int cols, int rows, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// An event that is fired when the terminal window is resized and either Rows or Cols have changed. 
+        /// </summary>
+        event EventHandler TerminalResized;
+
+        /// <summary>
+        /// An event that is fired when user input is recieved.
+        /// </summary>
+        event TerminalDataRecievedEventHandler TerminalDataRecieved;
+
+        /// <summary>
+        /// Sends data to the terminal making it render the data.
+        /// </summary>
+        Task PtyDataAsync(string data, CancellationToken cancellationToken);
+    }
+}
diff --git a/Microsoft.VisualStudio.Terminal.Embeddable/ITerminalRendererService.cs b/Microsoft.VisualStudio.Terminal.Embeddable/ITerminalRendererService.cs
new file mode 100644
index 0000000..95fb8a3
--- /dev/null
+++ b/Microsoft.VisualStudio.Terminal.Embeddable/ITerminalRendererService.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+
+namespace Microsoft.VisualStudio.Terminal
+{
+    [ComImport, Guid("250301DA-0BEA-4C4E-B199-C363C7C164B2")]
+    public interface ITerminalRendererService
+    {
+        /// <summary>
+        /// Create a new terminal renderer instance with the given name that fits the window.
+        /// </summary>
+        /// <param name="name">The name that will be displayed as the tool window title.</param>
+        /// <returns>An instance of ITerminalRenderer</returns>
+        Task<object> CreateTerminalRendererAsync(string name);
+
+        /// <summary>
+        /// Create a new terminal renderer instance with the given name and dimensions.
+        /// The terminal size won't change when user resizes the window.
+        /// </summary>
+        /// <param name="name">The name that will be displayed as the tool window title.</param>
+        /// <returns>An instance of ITerminalRenderer</returns>
+        Task<object> CreateTerminalRendererAsync(string name, int cols, int rows);
+    }
+}
diff --git a/Microsoft.VisualStudio.Terminal/BrowserBridge/RendererScriptingObject.cs b/Microsoft.VisualStudio.Terminal/BrowserBridge/RendererScriptingObject.cs
new file mode 100644
index 0000000..dac1593
--- /dev/null
+++ b/Microsoft.VisualStudio.Terminal/BrowserBridge/RendererScriptingObject.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Security.Permissions;
+
+namespace Microsoft.VisualStudio.Terminal
+{
+    [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
+    [ComVisible(true)]
+    public class RendererScriptingObject : TerminalScriptingObjectBase
+    {
+        internal RendererScriptingObject(TermWindowPackage package) : base(package)
+        {
+        }
+
+        internal EventHandler<string> TermDataRecieved { get; set; }
+
+        internal EventHandler TermInit { get; set; }
+
+        internal EventHandler<ResizeEventArgs> TermResized { get; set; }
+
+
+        public override void ClosePty()
+        {
+            // There is already Closed event that is fired by the TerminalWindow
+        }
+
+        public override void InitPty(int cols, int rows, string directory) => TermInit?.Invoke(this, EventArgs.Empty);
+
+        public override void ResizePty(int cols, int rows) => TermResized?.Invoke(this, new ResizeEventArgs(cols, rows));
+
+        public override void TermData(string data) => TermDataRecieved?.Invoke(this, data);
+
+        public override string GetSolutionDir() => null;
+    }
+
+    [DebuggerStepThrough]
+    public class ResizeEventArgs : EventArgs
+    {
+        public ResizeEventArgs(int cols, int rows)
+        {
+            Cols = cols;
+            Rows = rows;
+        }
+
+        public int Cols { get; }
+        public int Rows { get; }
+    }
+}
diff --git a/Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalScriptingObject.cs b/Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalScriptingObject.cs
index b106dc2..5b4ee82 100644
--- a/Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalScriptingObject.cs
+++ b/Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalScriptingObject.cs
@@ -4,15 +4,13 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Security.Permissions;
-using System.Windows;
 
 namespace Microsoft.VisualStudio.Terminal
 {
     [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
     [ComVisible(true)]
-    public class TerminalScriptingObject : ITerminalScriptingObject
+    public class TerminalScriptingObject : TerminalScriptingObjectBase
     {
-        private readonly TermWindowPackage package;
         private readonly JsonRpc ptyService;
         private readonly SolutionUtils solutionUtils;
         private readonly string workingDirectory;
@@ -29,9 +27,8 @@ internal TerminalScriptingObject(
             bool useSolutionDir,
             string shellPath,
             IEnumerable<string> args,
-            IDictionary<string, string> env)
+            IDictionary<string, string> env) : base(package)
         {
-            this.package = package;
             this.ptyService = ptyService;
             this.solutionUtils = solutionUtils;
             this.workingDirectory = workingDirectory;
@@ -41,22 +38,7 @@ internal TerminalScriptingObject(
             this.env = env;
         }
 
-        public string GetTheme()
-        {
-            return TerminalThemer.GetTheme();
-        }
-
-        public string GetFontFamily()
-        {
-            return this.package.OptionFontFamily;
-        }
-
-        public int GetFontSize()
-        {
-            return this.package.OptionFontSize;
-        }
-
-        public string GetSolutionDir()
+        public override string GetSolutionDir()
         {
             if (!this.useSolutionDir)
             {
@@ -71,32 +53,9 @@ public string GetSolutionDir()
             return solutionDir;
         }
 
-        public void ClosePty()
-        {
-            this.ptyService.InvokeAsync("closeTerm");
-        }
-
-        public void CopyStringToClipboard(string stringToCopy)
-        {
-            Clipboard.SetText(stringToCopy ?? "");
-        }
-
-        public string GetClipboard()
-        {
-            return Clipboard.GetText();
-        }
-
-        public string GetLinkRegex()
-        {
-            return TerminalRegex.LocalLinkRegex.ToString();
-        }
-
-        public void HandleLocalLink(string uri)
-        {
-            TerminalRegex.HandleLocalLink(uri);
-        }
+        public override void ClosePty() => this.ptyService.InvokeAsync("closeTerm");
 
-        public void InitPty(int cols, int rows, string directory)
+        public override void InitPty(int cols, int rows, string directory)
         {
             string configuredShellPath;
             if (this.package.OptionTerminal == DefaultTerminal.Other)
@@ -111,19 +70,10 @@ public void InitPty(int cols, int rows, string directory)
             this.ptyService.InvokeAsync("initTerm", this.shellPath ?? configuredShellPath, cols, rows, directory, ((object)this.args) ?? this.package.OptionStartupArgument, env).FileAndForget("WhackWhackTerminal/InitPty");
         }
 
-        public void ResizePty(int cols, int rows)
-        {
+        public override void ResizePty(int cols, int rows) =>
             this.ptyService.InvokeAsync("resizeTerm", cols, rows).FileAndForget("WhackWhackTerminal/ResizePty");
-        }
 
-        public void TermData(string data)
-        {
+        public override void TermData(string data) =>
             this.ptyService.InvokeAsync("termData", data).FileAndForget("WhackWhackTerminal/TermData");
-        }
-
-        public bool ValidateLocalLink(string link)
-        {
-            return TerminalRegex.ValidateLocalLink(link);
-        }
     }
 }
diff --git a/Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalScriptingObjectBase.cs b/Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalScriptingObjectBase.cs
new file mode 100644
index 0000000..d616b84
--- /dev/null
+++ b/Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalScriptingObjectBase.cs
@@ -0,0 +1,43 @@
+using System.Runtime.InteropServices;
+using System.Security.Permissions;
+using System.Windows;
+
+namespace Microsoft.VisualStudio.Terminal
+{
+    [PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
+    [ComVisible(true)]
+    public abstract class TerminalScriptingObjectBase : ITerminalScriptingObject
+    {
+        protected readonly TermWindowPackage package;
+
+        internal TerminalScriptingObjectBase(TermWindowPackage package)
+        {
+            this.package = package;
+        }
+
+        public string GetTheme() => TerminalThemer.GetTheme();
+
+        public string GetFontFamily() => this.package.OptionFontFamily;
+
+        public int GetFontSize() => this.package.OptionFontSize;
+
+        public abstract string GetSolutionDir();
+        public abstract void ClosePty();
+
+        public void CopyStringToClipboard(string stringToCopy) => Clipboard.SetText(stringToCopy ?? "");
+
+        public string GetClipboard() => Clipboard.GetText();
+
+        public string GetLinkRegex() => TerminalRegex.LocalLinkRegex.ToString();
+
+        public void HandleLocalLink(string uri) => TerminalRegex.HandleLocalLink(uri);
+
+        public abstract void InitPty(int cols, int rows, string directory);
+
+        public abstract void ResizePty(int cols, int rows);
+
+        public abstract void TermData(string data);
+
+        public bool ValidateLocalLink(string link) => TerminalRegex.ValidateLocalLink(link);
+    }
+}
diff --git a/Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalTheme.cs b/Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalTheme.cs
index e61a7eb..e39e22f 100644
--- a/Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalTheme.cs
+++ b/Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalTheme.cs
@@ -137,5 +137,12 @@ public string BrightWhite
             get;
             set;
         }
+
+        [DataMember(Name = "border")]
+        public string Border
+        {
+            get;
+            set;
+        }
     }
 }
diff --git a/Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalThemer.cs b/Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalThemer.cs
index 53fc813..a9f56a9 100644
--- a/Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalThemer.cs
+++ b/Microsoft.VisualStudio.Terminal/BrowserBridge/TerminalThemer.cs
@@ -63,6 +63,7 @@ public static string GetTheme()
             theme.Background = ColorTranslator.ToHtml(VSColorTheme.GetThemedColor(EnvironmentColors.ToolboxBackgroundColorKey));
             theme.Foreground = ColorTranslator.ToHtml(VSColorTheme.GetThemedColor(EnvironmentColors.ToolboxContentTextColorKey));
             theme.Cursor = ColorTranslator.ToHtml(VSColorTheme.GetThemedColor(EnvironmentColors.ToolboxContentTextColorKey));
+            theme.Border = ColorTranslator.ToHtml(VSColorTheme.GetThemedColor(EnvironmentColors.ToolboxDisabledContentTextColorKey));
             return JsonConvert.SerializeObject(theme);
         }
     }
diff --git a/Microsoft.VisualStudio.Terminal/Microsoft.VisualStudio.Terminal.csproj b/Microsoft.VisualStudio.Terminal/Microsoft.VisualStudio.Terminal.csproj
index 8ef1c21..2f438ff 100644
--- a/Microsoft.VisualStudio.Terminal/Microsoft.VisualStudio.Terminal.csproj
+++ b/Microsoft.VisualStudio.Terminal/Microsoft.VisualStudio.Terminal.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.TypeScript.MSBuild.2.8.3\build\Microsoft.TypeScript.MSBuild.props" Condition="Exists('..\packages\Microsoft.TypeScript.MSBuild.2.8.3\build\Microsoft.TypeScript.MSBuild.props')" />
   <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props')" />
-  <Import Project="..\packages\Microsoft.TypeScript.MSBuild.2.7.1\build\Microsoft.TypeScript.MSBuild.props" Condition="Exists('..\packages\Microsoft.TypeScript.MSBuild.2.7.1\build\Microsoft.TypeScript.MSBuild.props')" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -86,13 +86,20 @@
     <Compile Include="BrowserBridge\BetterBrowser.cs" />
     <Compile Include="BrowserBridge\ITerminalScriptingObject.cs" />
     <Compile Include="BrowserBridge\TerminalRegex.cs" />
+    <Compile Include="BrowserBridge\RendererScriptingObject.cs" />
+    <Compile Include="BrowserBridge\TerminalScriptingObjectBase.cs" />
     <Compile Include="BrowserBridge\TerminalScriptingObject.cs" />
     <Compile Include="BrowserBridge\TerminalEvent.cs" />
     <Compile Include="BrowserBridge\TerminalThemer.cs" />
+    <Compile Include="RendererToolWindow.cs" />
     <Compile Include="ServiceToolWindow.cs" />
+    <Compile Include="RendererToolWindowControl.xaml.cs">
+      <DependentUpon>RendererToolWindowControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ServiceToolWindowControl.xaml.cs">
       <DependentUpon>ServiceToolWindowControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="VsService\TerminalWindow.cs" />
     <Compile Include="VsService\EmbeddedTerminal.cs" />
     <Compile Include="VsService\EmbeddedTerminalService.cs" />
     <Compile Include="BrowserBridge\TerminalTheme.cs" />
@@ -111,6 +118,7 @@
     </Compile>
     <Compile Include="TermWindowPackage.cs" />
     <Compile Include="ToolWindowContext.cs" />
+    <Compile Include="VsService\TerminalRenderer.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="BrandWhackWhackTerminal_256x.png">
@@ -153,6 +161,10 @@
     </VSCTCompile>
   </ItemGroup>
   <ItemGroup>
+    <Page Include="RendererToolWindowControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="ServiceToolWindowControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -349,6 +361,7 @@
   <ItemGroup>
     <TypeScriptCompile Include="WebView\ts\external.d.ts" />
     <TypeScriptCompile Include="WebView\ts\main.ts" />
+    <TypeScriptCompile Include="WebView\ts\TerminalFit.d.ts" />
     <TypeScriptCompile Include="WebView\ts\TerminalLinkMatcher.ts" />
     <TypeScriptCompile Include="WebView\ts\TermView.ts" />
     <TypeScriptCompile Include="WebView\ts\VsEventManager.ts" />
@@ -370,12 +383,11 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.props'))" />
     <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.TypeScript.MSBuild.2.7.1\build\Microsoft.TypeScript.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.TypeScript.MSBuild.2.7.1\build\Microsoft.TypeScript.MSBuild.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.TypeScript.MSBuild.2.7.1\build\Microsoft.TypeScript.MSBuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.TypeScript.MSBuild.2.7.1\build\Microsoft.TypeScript.MSBuild.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.16\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.16\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets'))" />
     <Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.2.1.23\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.2.1.23\build\Nerdbank.GitVersioning.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.TypeScript.MSBuild.2.8.3\build\Microsoft.TypeScript.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.TypeScript.MSBuild.2.8.3\build\Microsoft.TypeScript.MSBuild.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.TypeScript.MSBuild.2.8.3\build\Microsoft.TypeScript.MSBuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.TypeScript.MSBuild.2.8.3\build\Microsoft.TypeScript.MSBuild.targets'))" />
   </Target>
-  <Import Project="..\packages\Microsoft.TypeScript.MSBuild.2.7.1\build\Microsoft.TypeScript.MSBuild.targets" Condition="Exists('..\packages\Microsoft.TypeScript.MSBuild.2.7.1\build\Microsoft.TypeScript.MSBuild.targets')" />
   <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.5.100\build\Microsoft.VSSDK.BuildTools.targets')" />
   <Target Name="AddTsToContent" AfterTargets="CompileTypeScript" Condition="'$(BuildingProject)' != 'false'">
     <ItemGroup>
@@ -405,6 +417,7 @@
   </Target>
   <Import Project="..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.16\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SDK.EmbedInteropTypes.15.0.16\build\Microsoft.VisualStudio.SDK.EmbedInteropTypes.targets')" />
   <Import Project="..\packages\Nerdbank.GitVersioning.2.1.23\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.2.1.23\build\Nerdbank.GitVersioning.targets')" />
+  <Import Project="..\packages\Microsoft.TypeScript.MSBuild.2.8.3\build\Microsoft.TypeScript.MSBuild.targets" Condition="Exists('..\packages\Microsoft.TypeScript.MSBuild.2.8.3\build\Microsoft.TypeScript.MSBuild.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Microsoft.VisualStudio.Terminal/RendererToolWindow.cs b/Microsoft.VisualStudio.Terminal/RendererToolWindow.cs
new file mode 100644
index 0000000..0113472
--- /dev/null
+++ b/Microsoft.VisualStudio.Terminal/RendererToolWindow.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Runtime.InteropServices;
+using Microsoft.VisualStudio.Shell;
+
+namespace Microsoft.VisualStudio.Terminal
+{
+    /// <summary>
+    /// This class implements the tool window exposed by this package and hosts a user control.
+    /// </summary>
+    [Guid(ToolWindowGuid)]
+    public class RendererToolWindow : ToolWindowPane
+    {
+        public const string ToolWindowGuid = "7f989465-4c63-4820-aa1c-c320682d2c73";
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RendererToolWindow"/> class.
+        /// </summary>
+        public RendererToolWindow(TermWindowPackage package) : base(null)
+        {
+            this.Content = new RendererToolWindowControl(package);
+        }
+
+        private RendererToolWindowControl Control => ((RendererToolWindowControl)Content);
+
+        internal void FinishInitialize(ITerminalScriptingObject scriptingObject) => Control.FinishInitialize(scriptingObject);
+    }
+}
diff --git a/Microsoft.VisualStudio.Terminal/RendererToolWindowControl.xaml b/Microsoft.VisualStudio.Terminal/RendererToolWindowControl.xaml
new file mode 100644
index 0000000..7242669
--- /dev/null
+++ b/Microsoft.VisualStudio.Terminal/RendererToolWindowControl.xaml
@@ -0,0 +1,15 @@
+<UserControl 
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:Microsoft.VisualStudio.Terminal"
+			 xmlns:platformui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
+	         x:Class="Microsoft.VisualStudio.Terminal.RendererToolWindowControl"
+             Background="{DynamicResource VsBrush.Window}"
+             Foreground="{DynamicResource VsBrush.WindowText}"
+             x:Name="MyToolWindow">
+    <Grid x:Name="mainGrid">
+        <local:BetterBrowser x:Name="terminalView" />
+    </Grid>
+</UserControl>
diff --git a/Microsoft.VisualStudio.Terminal/RendererToolWindowControl.xaml.cs b/Microsoft.VisualStudio.Terminal/RendererToolWindowControl.xaml.cs
new file mode 100644
index 0000000..11d6e8a
--- /dev/null
+++ b/Microsoft.VisualStudio.Terminal/RendererToolWindowControl.xaml.cs
@@ -0,0 +1,72 @@
+using Microsoft.VisualStudio.PlatformUI;
+using System;
+using System.IO;
+using System.Reflection;
+using System.Windows;
+using System.Windows.Controls;
+using static System.FormattableString;
+
+namespace Microsoft.VisualStudio.Terminal
+{
+    /// <summary>
+    /// Interaction logic for ServiceToolWindowControl.
+    /// </summary>
+    public partial class RendererToolWindowControl : UserControl, IDisposable
+    {
+        private readonly TermWindowPackage package;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ServiceToolWindowControl"/> class.
+        /// </summary>
+        public RendererToolWindowControl(TermWindowPackage package)
+        {
+            this.package = package;
+
+            this.InitializeComponent();
+
+            this.Focusable = true;
+            this.GotFocus += TermWindowControl_GotFocus;
+        }
+
+        internal void PtyData(string data) => this.terminalView.Invoke("triggerEvent", "ptyData", data);
+
+        internal void FinishInitialize(ITerminalScriptingObject scriptingObject)
+        {
+            VSColorTheme.ThemeChanged += VSColorTheme_ThemeChanged;
+
+            this.terminalView.ScriptingObject = scriptingObject;
+
+            string extensionDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            string rootPath = Path.Combine(extensionDirectory, "WebView\\default.html").Replace("\\\\", "\\");
+            this.terminalView.Navigate(new Uri(rootPath));
+        }
+
+        internal void Resize(int cols, int rows) => this.terminalView.Invoke(
+            "triggerEvent",
+            "resize",
+            Invariant($"{{\"cols\": {cols}, \"rows\": {rows}}}"));
+
+        public void Dispose()
+        {
+            var helper = (ITerminalScriptingObject)this.terminalView.ScriptingObject;
+            helper.ClosePty();
+        }
+
+        private void TermWindowControl_GotFocus(object sender, RoutedEventArgs e)
+        {
+            // We call focus here because if we don't, the next call will prevent the toolbar from turning blue.
+            // No functionality is lost when this happens but it is not consistent with VS design conventions.
+            this.Focus();
+            this.terminalView.Invoke("triggerEvent", "focus");
+        }
+
+        private void VSColorTheme_ThemeChanged(ThemeChangedEventArgs e)
+        {
+            this.package.JoinableTaskFactory.RunAsync(async () =>
+            {
+                await this.package.JoinableTaskFactory.SwitchToMainThreadAsync();
+                this.terminalView.Invoke("triggerEvent", "themeChanged", TerminalThemer.GetTheme());
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/Microsoft.VisualStudio.Terminal/TermWindowPackage.cs b/Microsoft.VisualStudio.Terminal/TermWindowPackage.cs
index 398be4c..6e9c5e5 100644
--- a/Microsoft.VisualStudio.Terminal/TermWindowPackage.cs
+++ b/Microsoft.VisualStudio.Terminal/TermWindowPackage.cs
@@ -37,6 +37,7 @@ namespace Microsoft.VisualStudio.Terminal
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [ProvideToolWindow(typeof(TermWindow), Style = VsDockStyle.Tabbed, Window = "34E76E81-EE4A-11D0-AE2E-00A0C90FFFC3")]
     [ProvideToolWindow(typeof(ServiceToolWindow), Transient = true, MultiInstances = true, Style = VsDockStyle.Tabbed, Window = TermWindow.TermWindowGuidString)]
+    [ProvideToolWindow(typeof(RendererToolWindow), Transient = true, MultiInstances = true, Style = VsDockStyle.Tabbed, Window = TermWindow.TermWindowGuidString)]
     [ProvideOptionPage(typeof(TerminalOptionPage), "Whack Whack Terminal", "General", 0, 0, true)]
     [ProvideService(typeof(STerminalService), IsAsyncQueryable = true)]
     public sealed class TermWindowPackage : AsyncPackage
@@ -71,7 +72,9 @@ private Task<object> CreateServiceAsync(IAsyncServiceContainer container, Cancel
 
         public override IVsAsyncToolWindowFactory GetAsyncToolWindowFactory(Guid toolWindowType)
         {
-            if (toolWindowType.Equals(new Guid(TermWindow.TermWindowGuidString)) || toolWindowType.Equals(new Guid(ServiceToolWindow.ServiceToolWindowGuid)))
+            if (toolWindowType.Equals(new Guid(TermWindow.TermWindowGuidString)) 
+                || toolWindowType.Equals(new Guid(ServiceToolWindow.ServiceToolWindowGuid))
+                || toolWindowType.Equals(new Guid(RendererToolWindow.ToolWindowGuid)))
             {
                 return this;
             }
@@ -81,7 +84,9 @@ public override IVsAsyncToolWindowFactory GetAsyncToolWindowFactory(Guid toolWin
 
         protected override string GetToolWindowTitle(Type toolWindowType, int id)
         {
-            if (toolWindowType == typeof(TermWindow) || toolWindowType == typeof(ServiceToolWindow))
+            if (toolWindowType == typeof(TermWindow) 
+                || toolWindowType == typeof(ServiceToolWindow)
+                || toolWindowType == typeof(RendererToolWindow))
             {
                 return "Terminal Window";
             }
@@ -91,20 +96,31 @@ protected override string GetToolWindowTitle(Type toolWindowType, int id)
 
         protected override async Task<object> InitializeToolWindowAsync(Type toolWindowType, int id, CancellationToken cancellationToken)
         {
-            await this.JoinableTaskFactory.SwitchToMainThreadAsync();
-            var solutionService = (IVsSolution)await this.GetServiceAsync(typeof(SVsSolution));
-            var componentModel = (IComponentModel)await this.GetServiceAsync(typeof(SComponentModel));
-            var workspaceService = componentModel.GetService<IVsFolderWorkspaceService>();
-            var solutionUtils = new SolutionUtils(solutionService, workspaceService);
-
-            var client = new HubClient();
-            var clientStream = await client.RequestServiceAsync("wwt.pty");
-            return new ToolWindowContext()
+            if (toolWindowType == typeof(TermWindow)
+                || toolWindowType == typeof(ServiceToolWindow))
+            {
+                await this.JoinableTaskFactory.SwitchToMainThreadAsync();
+                var solutionService = (IVsSolution)await this.GetServiceAsync(typeof(SVsSolution));
+                var componentModel = (IComponentModel)await this.GetServiceAsync(typeof(SComponentModel));
+                var workspaceService = componentModel.GetService<IVsFolderWorkspaceService>();
+                var solutionUtils = new SolutionUtils(solutionService, workspaceService);
+
+                var client = new HubClient();
+                var clientStream = await client.RequestServiceAsync("wwt.pty");
+                return new ToolWindowContext()
+                {
+                    Package = this,
+                    ServiceHubStream = clientStream,
+                    SolutionUtils = solutionUtils,
+                };
+            }
+
+            if (toolWindowType == typeof(RendererToolWindow))
             {
-                Package = this,
-                ServiceHubStream = clientStream,
-                SolutionUtils = solutionUtils,
-            };
+                return this;
+            }
+
+            return ToolWindowCreationContext.Unspecified;
         }
 
         public DefaultTerminal OptionTerminal
diff --git a/Microsoft.VisualStudio.Terminal/VsService/EmbeddedTerminal.cs b/Microsoft.VisualStudio.Terminal/VsService/EmbeddedTerminal.cs
index a2e3b4f..4d16e51 100644
--- a/Microsoft.VisualStudio.Terminal/VsService/EmbeddedTerminal.cs
+++ b/Microsoft.VisualStudio.Terminal/VsService/EmbeddedTerminal.cs
@@ -1,102 +1,13 @@
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
-using System;
-using Task = System.Threading.Tasks.Task;
+using Task = System.Threading.Tasks.Task;
 
 namespace Microsoft.VisualStudio.Terminal.VsService
 {
-    public class EmbeddedTerminal : ITerminal
+    public class EmbeddedTerminal : TerminalWindow<ServiceToolWindow, ServiceToolWindowControl>
     {
-        private readonly TermWindowPackage package;
-        private readonly ServiceToolWindow windowPane;
-
-        public event EventHandler Closed;
-
-        public EmbeddedTerminal(TermWindowPackage package, ServiceToolWindow windowPane)
+        public EmbeddedTerminal(TermWindowPackage package, ServiceToolWindow windowPane) : base(package, windowPane)
         {
-            ThreadHelper.ThrowIfNotOnUIThread();
-            this.package = package;
-            this.windowPane = windowPane;
-
-            if (this.windowPane.Frame is IVsWindowFrame2 windowFrame)
-            {
-                var events = new WindowFrameEvents(windowFrame, this);
-                windowFrame.Advise(events, out var cookie);
-                events.Cookie = cookie;
-            }
         }
 
-        public async Task CloseAsync()
-        {
-            await this.package.JoinableTaskFactory.SwitchToMainThreadAsync();
-            (this.windowPane.Frame as IVsWindowFrame)?.CloseFrame((uint)__FRAMECLOSE.FRAMECLOSE_NoSave);
-        }
-
-        public async Task HideAsync()
-        {
-            await this.package.JoinableTaskFactory.SwitchToMainThreadAsync();
-            (this.windowPane.Frame as IVsWindowFrame)?.Hide();
-        }
-
-        public async Task ShowAsync()
-        {
-            await this.package.JoinableTaskFactory.SwitchToMainThreadAsync();
-            (this.windowPane.Frame as IVsWindowFrame)?.Show();
-        }
-
-        public Task ChangeWorkingDirectoryAsync(string newDirectory)
-        {
-            return ((ServiceToolWindowControl)this.windowPane.Content).ChangeWorkingDirectoryAsync(newDirectory);
-        }
-
-        private class WindowFrameEvents: IVsWindowFrameNotify, IVsWindowFrameNotify2
-        {
-            private readonly IVsWindowFrame2 frame;
-            private EmbeddedTerminal terminal;
-
-            public WindowFrameEvents(IVsWindowFrame2 frame, EmbeddedTerminal terminal)
-            {
-                this.frame = frame;
-                this.terminal = terminal;
-            }
-
-            public uint? Cookie
-            {
-                get;
-                set;
-            }
-
-            public int OnClose(ref uint pgrfSaveOptions)
-            {
-                ThreadHelper.ThrowIfNotOnUIThread();
-                terminal.Closed?.Invoke(terminal, EventArgs.Empty);
-
-                if (this.Cookie.HasValue)
-                {
-                    this.frame?.Unadvise(this.Cookie.Value);
-                }
-                return VSConstants.S_OK;
-            }
-
-            public int OnShow(int fShow)
-            {
-                return VSConstants.S_OK;
-            }
-
-            public int OnMove()
-            {
-                return VSConstants.S_OK;
-            }
-
-            public int OnSize()
-            {
-                return VSConstants.S_OK;
-            }
-
-            public int OnDockableChange(int fDockable)
-            {
-                return VSConstants.S_OK;
-            }
-        }
+        public override Task ChangeWorkingDirectoryAsync(string newDirectory) => Control.ChangeWorkingDirectoryAsync(newDirectory);
     }
 }
diff --git a/Microsoft.VisualStudio.Terminal/VsService/EmbeddedTerminalService.cs b/Microsoft.VisualStudio.Terminal/VsService/EmbeddedTerminalService.cs
index 04846b6..4e7d709 100644
--- a/Microsoft.VisualStudio.Terminal/VsService/EmbeddedTerminalService.cs
+++ b/Microsoft.VisualStudio.Terminal/VsService/EmbeddedTerminalService.cs
@@ -1,10 +1,11 @@
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.Shell;
 
 namespace Microsoft.VisualStudio.Terminal.VsService
 {
-    public class EmbeddedTerminalService : STerminalService, ITerminalService
+    public class EmbeddedTerminalService : STerminalService, ITerminalService, ITerminalRendererService
     {
         private int nextToolWindowId = 1;
         private readonly TermWindowPackage package;
@@ -17,15 +18,42 @@ public EmbeddedTerminalService(TermWindowPackage package)
         public async Task<object> CreateTerminalAsync(string name, string shellPath, string workingDirectory, IEnumerable<string> args, IDictionary<string, string> environment)
         {
             await this.package.JoinableTaskFactory.SwitchToMainThreadAsync(package.DisposalToken);
-            var pane = (ServiceToolWindow)await package.FindToolWindowAsync(
-                    typeof(ServiceToolWindow),
+            var pane = await CreateToolWindowAsync<ServiceToolWindow>(name);
+
+            ((ServiceToolWindowControl)pane.Content).FinishInitialize(workingDirectory, shellPath, args, environment);
+
+            return new EmbeddedTerminal(this.package, pane);
+        }
+
+        async Task<object> ITerminalRendererService.CreateTerminalRendererAsync(string name) =>
+            await CreateTerminalRendererAsync(name);
+
+        public async Task<object> CreateTerminalRendererAsync(string name, int cols, int rows)
+        {
+            var result = await CreateTerminalRendererAsync(name);
+            await result.ResizeAsync(cols, rows, CancellationToken.None);
+            return result;
+        }
+
+        private async Task<TerminalRenderer> CreateTerminalRendererAsync(string name)
+        {
+            await this.package.JoinableTaskFactory.SwitchToMainThreadAsync(package.DisposalToken);
+            var pane = await CreateToolWindowAsync<RendererToolWindow>(name);
+            var result = new TerminalRenderer(this.package, pane);
+            await result.WaitForStartAsync(CancellationToken.None);
+            return result;
+        }
+
+        private async Task<T> CreateToolWindowAsync<T>(string name) where T: ToolWindowPane
+        {
+            await this.package.JoinableTaskFactory.SwitchToMainThreadAsync(package.DisposalToken);
+            var pane = (T)await package.FindToolWindowAsync(
+                    typeof(T),
                     nextToolWindowId++,
                     create: true,
                     cancellationToken: package.DisposalToken);
             pane.Caption = name;
-            ((ServiceToolWindowControl)pane.Content).FinishInitialize(workingDirectory, shellPath, args, environment);
-
-            return new EmbeddedTerminal(this.package, pane);
+            return pane;
         }
     }
 }
diff --git a/Microsoft.VisualStudio.Terminal/VsService/TerminalRenderer.cs b/Microsoft.VisualStudio.Terminal/VsService/TerminalRenderer.cs
new file mode 100644
index 0000000..79d7d2f
--- /dev/null
+++ b/Microsoft.VisualStudio.Terminal/VsService/TerminalRenderer.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.Threading;
+
+namespace Microsoft.VisualStudio.Terminal.VsService
+{
+    internal sealed class TerminalRenderer : TerminalWindow<RendererToolWindow, RendererToolWindowControl>, ITerminalRenderer
+    {
+        private readonly RendererScriptingObject scriptingObject;
+        private readonly TaskCompletionSource<object> started = new TaskCompletionSource<object>();
+
+        public TerminalRenderer(TermWindowPackage package, RendererToolWindow pane) : base(package, pane)
+        {
+            this.scriptingObject = new RendererScriptingObject(package)
+            {
+                TermInit = ScriptingObject_TermInit,
+                TermDataRecieved = ScriptingObject_TermDataRecieved,
+                TermResized = ScriptingObject_TermResized,
+            };
+
+            pane.FinishInitialize(this.scriptingObject);
+        }
+
+        public int Cols { get; private set; }
+        public int Rows { get; private set; }
+
+        public event EventHandler TerminalResized;
+        public event TerminalDataRecievedEventHandler TerminalDataRecieved;
+
+        public async Task ResizeAsync(int cols, int rows, CancellationToken cancellationToken)
+        {
+            await this.package.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
+            Control.Resize(cols, rows);
+        }
+
+        public async Task PtyDataAsync(string data, CancellationToken cancellationToken)
+        {
+            await this.package.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
+            Control.PtyData(data);
+        }
+
+        internal async Task WaitForStartAsync(CancellationToken cancellationToken)
+        {
+            await this.started.Task.WithCancellation(cancellationToken);
+        }
+
+        protected override void WindowFrameEvents_Closed(object sender, EventArgs e)
+        {
+            this.started.TrySetCanceled();
+            base.WindowFrameEvents_Closed(sender, e);
+        }
+
+        private void ScriptingObject_TermDataRecieved(object sender, string data) =>
+            TerminalDataRecieved?.Invoke(this, data);
+
+        private void ScriptingObject_TermResized(object sender, ResizeEventArgs e)
+        {
+            bool changed = Cols != e.Cols || Rows != e.Rows;
+            Cols = e.Cols;
+            Rows = e.Rows;
+
+            if (changed)
+            {
+                TerminalResized?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        private void ScriptingObject_TermInit(object sender, EventArgs e) =>
+            this.started.TrySetResult(null);
+    }
+}
diff --git a/Microsoft.VisualStudio.Terminal/VsService/TerminalWindow.cs b/Microsoft.VisualStudio.Terminal/VsService/TerminalWindow.cs
new file mode 100644
index 0000000..541217d
--- /dev/null
+++ b/Microsoft.VisualStudio.Terminal/VsService/TerminalWindow.cs
@@ -0,0 +1,93 @@
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
+using System;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using Task = System.Threading.Tasks.Task;
+
+namespace Microsoft.VisualStudio.Terminal.VsService
+{
+    public class TerminalWindow<TWindowPane, TControl> : ITerminal
+        where TWindowPane: ToolWindowPane 
+        where TControl : UserControl
+    {
+        protected readonly TermWindowPackage package;
+        protected readonly TWindowPane pane;
+
+        public event EventHandler Closed;
+
+        public TerminalWindow(TermWindowPackage package, TWindowPane pane)
+        {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
+            this.package = package;
+            this.pane = pane;
+
+            if (this.pane.Frame is IVsWindowFrame2 windowFrame)
+            {
+                new WindowFrameEvents(windowFrame)
+                {
+                    Closed = WindowFrameEvents_Closed,
+                };
+            }
+        }
+
+        public virtual Task ChangeWorkingDirectoryAsync(string newDirectory) => Task.CompletedTask;
+
+        protected TControl Control => ((TControl)this.pane.Content);
+
+        protected virtual void WindowFrameEvents_Closed(object sender, EventArgs e) =>
+            Closed?.Invoke(this, EventArgs.Empty);
+
+        public async Task CloseAsync()
+        {
+            await this.package.JoinableTaskFactory.SwitchToMainThreadAsync();
+            (this.pane.Frame as IVsWindowFrame)?.CloseFrame((uint)__FRAMECLOSE.FRAMECLOSE_NoSave);
+        }
+
+        public async Task HideAsync()
+        {
+            await this.package.JoinableTaskFactory.SwitchToMainThreadAsync();
+            (this.pane.Frame as IVsWindowFrame)?.Hide();
+        }
+
+        public async Task ShowAsync()
+        {
+            await this.package.JoinableTaskFactory.SwitchToMainThreadAsync();
+            (this.pane.Frame as IVsWindowFrame)?.Show();
+        }
+
+        private sealed class WindowFrameEvents: IVsWindowFrameNotify, IVsWindowFrameNotify2
+        {
+            private readonly IVsWindowFrame2 frame;
+            private readonly uint cookie;
+
+            public WindowFrameEvents(IVsWindowFrame2 frame)
+            {
+                ThreadHelper.ThrowIfNotOnUIThread();
+
+                this.frame = frame;
+                ErrorHandler.ThrowOnFailure(frame.Advise(this, out this.cookie));
+            }
+
+            public EventHandler Closed
+            {
+                get;
+                set;
+            }
+
+            public int OnClose(ref uint pgrfSaveOptions)
+            {
+                ThreadHelper.ThrowIfNotOnUIThread();
+                Closed?.Invoke(this, EventArgs.Empty);
+                this.frame.Unadvise(this.cookie);
+                return VSConstants.S_OK;
+            }
+
+            public int OnShow(int fShow) => VSConstants.S_OK;
+            public int OnMove() => VSConstants.S_OK;
+            public int OnSize() => VSConstants.S_OK;
+            public int OnDockableChange(int fDockable) => VSConstants.S_OK;
+        }
+    }
+}
diff --git a/Microsoft.VisualStudio.Terminal/WebView/ts/TermView.ts b/Microsoft.VisualStudio.Terminal/WebView/ts/TermView.ts
index 190642e..ddcbfd3 100644
--- a/Microsoft.VisualStudio.Terminal/WebView/ts/TermView.ts
+++ b/Microsoft.VisualStudio.Terminal/WebView/ts/TermView.ts
@@ -1,5 +1,5 @@
 import { ITheme, Terminal } from 'xterm';
-import { fit } from 'xterm/lib/addons/fit';
+import { apply as applyFit } from 'xterm/lib/addons/fit';
 import { VisualStudio } from './VsEventManager';
 import { registerLocalLinkHandler } from './TerminalLinkMatcher';
 
@@ -10,11 +10,21 @@ import * as xterm from 'xterm';
 const TerminalConstructor = xterm as any as (typeof Terminal);
 
 export class TermView {
+    private autoFit: boolean;
     private term: Terminal;
+    private termFit: TerminalFit;
     private resizeTimeout: number | null;
     private solutionDirectory: string;
+
+    private borderStyle: HTMLElement;
+    private backgroundColor: string;
+    private borderColor: string;
+
     constructor(theme: ITheme, fontFamily: string, fontSize: number, solutionDirectory: string) {
         this.solutionDirectory = solutionDirectory;
+        this.autoFit = true;
+        applyFit(TerminalConstructor);
+
         this.term = new TerminalConstructor({
             theme: theme,
             fontFamily: fontFamily + ', courier-new, courier, monospace',
@@ -23,9 +33,19 @@ export class TermView {
             cols: 80,
             rows: 24
         });
+        this.termFit = <any>this.term;
+
+        this.backgroundColor = theme.background;
+        this.borderColor = (<any>theme).border || theme.foreground;
 
-        this.term.open(document.getElementById('content'));
-        fit(this.term);
+        const content = document.getElementById('content');
+
+        this.borderStyle = document.createElement('style');
+        this.updateBorder();
+        content.appendChild(this.borderStyle);
+
+        this.term.open(content);
+        this.termFit.fit();
         this.term.on('data', (data) => this.termData(data));
         VisualStudio.Events.on('ptyData', (data) => this.ptyData(data));
         VisualStudio.Events.on('themeChanged', (data) => {
@@ -48,12 +68,31 @@ export class TermView {
         VisualStudio.Events.on('focus', () => {
             this.term.focus();
         });
+        VisualStudio.Events.on('resize', data => {
+            const size: Geometry = JSON.parse(data);
+            if (size) {
+                const borderChanging = this.autoFit;
+                this.autoFit = false;
+                if (borderChanging) {
+                    this.updateBorder();
+                }
+
+                this.resizeTerm(size);
+            }
+        });
         window.addEventListener("resize", () => this.resizeHandler())
         this.registerKeyboardHandlers();
         this.initPty(solutionDirectory);
         registerLocalLinkHandler(this.term);
     }
 
+    private resizeTerm(size: Geometry) {
+        if (this.term.cols !== size.cols || this.term.rows !== size.rows) {
+            (<any>this.term).renderer.clear();
+            this.term.resize(size.cols, size.rows);
+        }
+    }
+
     private initPty(cwd: string) {
         window.external.InitPty(this.term.cols, this.term.rows, cwd);
     }
@@ -72,12 +111,21 @@ export class TermView {
 
     private setTheme(theme: ITheme) {
         this.term.setOption('theme', theme);
+        this.backgroundColor = theme.background;
+        this.borderColor = (<any>theme).border || theme.foreground;
+        this.updateBorder();
     }
 
     private resizeHandler() {
         let actualHandler = () => {
-            fit(this.term);
-            window.external.ResizePty(this.term.cols, this.term.rows);
+            const size: Geometry = this.termFit.proposeGeometry();
+            if (size) {
+                if (this.autoFit) {
+                    this.resizeTerm(size);
+                }
+
+                window.external.ResizePty(size.cols, size.rows);
+            }
         };
 
         let timeoutCallback = () => {
@@ -113,4 +161,16 @@ export class TermView {
             }
         });
     }
+
+    private updateBorder() {
+        this.borderStyle.innerHTML = this.autoFit ? '' :
+            '.xterm-screen { ' +
+                'border-style: dotted; ' +
+                'border-width: 1px; ' +
+                `border-top-color: ${this.backgroundColor}; ` +
+                `border-bottom-color: ${this.borderColor}; ` +
+                `border-left-color: ${this.backgroundColor}; ` +
+                `border-right-color: ${this.borderColor}` +
+            '}';
+    }
 }
\ No newline at end of file
diff --git a/Microsoft.VisualStudio.Terminal/WebView/ts/TerminalFit.d.ts b/Microsoft.VisualStudio.Terminal/WebView/ts/TerminalFit.d.ts
new file mode 100644
index 0000000..ebcaf0c
--- /dev/null
+++ b/Microsoft.VisualStudio.Terminal/WebView/ts/TerminalFit.d.ts
@@ -0,0 +1,11 @@
+// This interface is applied to Terminal by fit's apply()
+
+interface TerminalFit {
+    fit(): void;
+    proposeGeometry(): Geometry;
+}
+
+interface Geometry {
+    cols: number;
+    rows: number;
+}
diff --git a/Microsoft.VisualStudio.Terminal/WebView/ts/VsEventManager.ts b/Microsoft.VisualStudio.Terminal/WebView/ts/VsEventManager.ts
index 51dea27..9de46a9 100644
--- a/Microsoft.VisualStudio.Terminal/WebView/ts/VsEventManager.ts
+++ b/Microsoft.VisualStudio.Terminal/WebView/ts/VsEventManager.ts
@@ -4,7 +4,8 @@
         ptyData: '',
         ptyExited: '',
         directoryChanged: '',
-        focus: ''
+        focus: '',
+        resize: '',
     };
 
     export type EventType = keyof typeof eventStrings;
diff --git a/Microsoft.VisualStudio.Terminal/packages.config b/Microsoft.VisualStudio.Terminal/packages.config
index 5c22ce7..4e0434d 100644
--- a/Microsoft.VisualStudio.Terminal/packages.config
+++ b/Microsoft.VisualStudio.Terminal/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.ServiceHub.Client" version="1.0.226-rc" targetFramework="net46" />
-  <package id="Microsoft.TypeScript.MSBuild" version="2.7.1" targetFramework="net46" developmentDependency="true" />
+  <package id="Microsoft.TypeScript.MSBuild" version="2.8.3" targetFramework="net46" developmentDependency="true" />
   <package id="Microsoft.VisualStudio.CoreUtility" version="15.6.27413" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.ImageCatalog" version="15.6.27413" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Imaging" version="15.6.27413" targetFramework="net46" />
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..48e341a
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,3 @@
+{
+  "lockfileVersion": 1
+}