cursor shape

microsoft · Nov 30, 2020 · f4dd69a · f4dd69a
1 parent 8f8e6e7
commit f4dd69a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/src/cascadia/TerminalApp/AppAppearanceConfig.h b/src/cascadia/TerminalApp/AppAppearanceConfig.h
@@ -18,6 +18,7 @@ namespace winrt::TerminalApp::implementation
         GETSET_PROPERTY(uint32_t, DefaultBackground, DEFAULT_BACKGROUND_WITH_ALPHA);
         GETSET_PROPERTY(uint32_t, SelectionBackground, DEFAULT_FOREGROUND);
         GETSET_PROPERTY(uint32_t, CursorColor, DEFAULT_CURSOR_COLOR);
+        GETSET_PROPERTY(Microsoft::Terminal::TerminalControl::CursorStyle, CursorShape, Microsoft::Terminal::TerminalControl::CursorStyle::Vintage);
         GETSET_PROPERTY(hstring, BackgroundImage);
 
     private:

diff --git a/src/cascadia/TerminalApp/TerminalSettings.cpp b/src/cascadia/TerminalApp/TerminalSettings.cpp
@@ -162,6 +162,7 @@ namespace winrt::TerminalApp::implementation
             auto unfocusedConfig = winrt::make_self<implementation::AppAppearanceConfig>();
 
             unfocusedConfig->ColorSchemeName(profile.UnfocusedConfig().ColorSchemeName());
+            unfocusedConfig->CursorShape(profile.UnfocusedConfig().CursorShape());
             if (profile.UnfocusedConfig().Background())
             {
                 unfocusedConfig->DefaultBackground(til::color{ profile.UnfocusedConfig().Background().Value() });

diff --git a/src/cascadia/TerminalControl/IControlSettings.idl b/src/cascadia/TerminalControl/IControlSettings.idl
@@ -44,14 +44,11 @@ namespace Microsoft.Terminal.TerminalControl
         String StartingDirectory;
         String EnvironmentVariables;
 
-        //String BackgroundImage;
         Double BackgroundImageOpacity;
         Windows.UI.Xaml.Media.Stretch BackgroundImageStretchMode;
         Windows.UI.Xaml.HorizontalAlignment BackgroundImageHorizontalAlignment;
         Windows.UI.Xaml.VerticalAlignment BackgroundImageVerticalAlignment;
 
-        //UInt32 SelectionBackground;
-
         TextAntialiasingMode AntialiasingMode;
 
         Boolean RetroTerminalEffect;

diff --git a/src/cascadia/TerminalCore/IAppearance.idl b/src/cascadia/TerminalCore/IAppearance.idl
@@ -3,14 +3,23 @@
 
 namespace Microsoft.Terminal.TerminalControl
 {
+    enum CursorStyle
+    {
+        Vintage,
+        Bar,
+        Underscore,
+        FilledBox,
+        EmptyBox
+    };
+
     // [default_interface]
     interface IAppearance
     {
         UInt32 DefaultForeground { get; set; };
         UInt32 DefaultBackground { get; set; };
         UInt32 CursorColor { get; set; };
         UInt32 SelectionBackground { get; set; };
-        //CursorStyle CursorShape;
+        CursorStyle CursorShape;
         String BackgroundImage { get; set; };
     };
 }
diff --git a/src/cascadia/TerminalCore/ICoreSettings.idl b/src/cascadia/TerminalCore/ICoreSettings.idl
@@ -5,19 +5,8 @@ import "..\IAppearance.idl";
 
 namespace Microsoft.Terminal.TerminalControl
 {
-    enum CursorStyle
-    {
-        Vintage,
-        Bar,
-        Underscore,
-        FilledBox,
-        EmptyBox
-    };
-
     interface ICoreSettings requires IAppearance
     {
-        //UInt32 DefaultForeground;
-        //UInt32 DefaultBackground;
         UInt32 GetColorTableEntry(Int32 index);
         // TODO:MSFT:20642297 - define a sentinel for Infinite Scrollback
         Int32 HistorySize;
@@ -27,8 +16,6 @@ namespace Microsoft.Terminal.TerminalControl
         Boolean SnapOnInput;
         Boolean AltGrAliasing;
 
-        //UInt32 CursorColor;
-        CursorStyle CursorShape;
         UInt32 CursorHeight;
         String StartingTitle;
         Boolean SuppressApplicationTitle;