Migrate spelling-0.0.19 changes from main

.github/actions/spelling/allow/allow.txt

@@ -1,10 +1,15 @@
-Apc
 apc
+calt
+ccmp
+changelog
+cybersecurity
+Apc
 clickable
+clig
 copyable
 dalet
-Dcs
 dcs
+Dcs
 dialytika
 dje
 downside
@@ -12,8 +17,10 @@ downsides
 dze
 dzhe
 Enum'd
+Fitt
 formattings
 ftp
+fvar
 geeksforgeeks
 ghe
 gje
@@ -25,9 +32,17 @@ hyperlinks
 img
 It'd
 kje
+liga
 lje
+locl
+lorem
+Llast
+Lmid
+Lorigin
 maxed
+mkmk
 mru
+noreply
 nje
 ogonek
 ok'd
@@ -36,19 +51,25 @@ postmodern
 ptys
 qof
 qps
+rclt
 reimplementation
 reserialization
 reserialize
 reserializes
+rlig
 runtimes
 shcha
+slnt
 Sos
 timestamped
+TLDR
 tokenizes
 tonos
 tshe
+uiatextrange
 UIs
 und
+unregister
 versioned
 We'd
 wildcards

.github/actions/spelling/allow/apis.txt

@@ -2,17 +2,20 @@ ACCEPTFILES
 ACCESSDENIED
 alignas
 alignof
+APPLYTOSUBMENUS
 bitfield
 bitfields
 BUILDBRANCH
 BUILDMSG
 BUILDNUMBER
+BYPOSITION
 charconv
 CLASSNOTAVAILABLE
 cmdletbinding
 COLORPROPERTY
 colspan
 COMDLG
+comparand
 cstdint
 CXICON
 CYICON
@@ -22,9 +25,11 @@ DERR
 dlldata
 DONTADDTORECENT
 DWORDLONG
+enumset
 environstrings
 EXPCMDFLAGS
 EXPCMDSTATE
+filetime
 FILTERSPEC
 FORCEFILESYSTEM
 FORCEMINIMIZE
@@ -61,6 +66,8 @@ IObject
 iosfwd
 IPackage
 IPeasant
+isspace
+ISetup
 IStorage
 istream
 IStringable
@@ -68,23 +75,35 @@ ITab
 ITaskbar
 IUri
 IVirtual
+KEYSELECT
 LCID
 llabs
 llu
 localtime
 lround
 LSHIFT
+MENUCOMMAND
+MENUDATA
+MENUINFO
+memicmp
+mptt
+mov
 msappx
 MULTIPLEUSE
 NCHITTEST
 NCLBUTTONDBLCLK
 NCRBUTTONDBLCLK
+NIF
+NIN
 NOAGGREGATION
 NOASYNC
 NOCHANGEDIR
 NOPROGRESS
 NOREDIRECTIONBITMAP
 NOREPEAT
+NOTIFYBYPOS
+NOTIFYICON
+NOTIFYICONDATA
 ntprivapi
 oaidl
 ocidl
@@ -98,6 +117,7 @@ overridable
 PAGESCROLL
 PICKFOLDERS
 pmr
+rcx
 REGCLS
 RETURNCMD
 rfind
@@ -106,27 +126,36 @@ RSHIFT
 schandle
 semver
 serializer
+SETVERSION
 SHELLEXECUTEINFOW
 shobjidl
 SHOWMINIMIZED
+SHOWTIP
 SINGLEUSE
 SIZENS
 smoothstep
 snprintf
 spsc
 sregex
+SRWLOC
+SRWLOCK
 STDCPP
 STDMETHOD
 strchr
+strcpy
 streambuf
+strtoul
 Stubless
 Subheader
 Subpage
 syscall
+TASKBARCREATED
 TBPF
 THEMECHANGED
+tlg
 tmp
 tolower
+toupper
 TTask
 TVal
 UChar
@@ -135,13 +164,16 @@ userenv
 wcsstr
 wcstoui
 winmain
+wmemcmp
 wpc
 wsregex
 wwinmain
+xchg
 XDocument
 XElement
 xfacet
 xhash
+XIcon
 xiosbase
 xlocale
 xlocbuf
@@ -150,6 +182,7 @@ xlocmes
 xlocmon
 xlocnum
 xloctime
+XMax
 xmemory
 XParse
 xpath
@@ -157,3 +190,5 @@ xstddef
 xstring
 xtree
 xutility
+YIcon
+YMax

.github/actions/spelling/allow/fonts.txt

@@ -7,3 +7,4 @@ Iosevka
 MDL
 Monofur
 Segoe
+wght

.github/actions/spelling/allow/math.txt

@@ -1,3 +1,11 @@
+atan
+CPrime
+HBar
+HPrime
 isnan
+LPrime
+LStep
 powf
+RSub
 sqrtf
+ULP

.github/actions/spelling/allow/microsoft.txt

@@ -1,5 +1,6 @@
 ACLs
 ADMINS
+advapi
 altform
 altforms
 appendwttlogging
@@ -15,6 +16,7 @@ CPLs
 cpptools
 cppvsdbg
 CPRs
+cryptbase
 DACL
 DACLs
 diffs
@@ -24,14 +26,20 @@ DTDs
 DWINRT
 enablewttlogging
 Intelli
+IVisual
 LKG
+LOCKFILE
+Lxss
 mfcribbon
 microsoft
 microsoftonline
+MSAA
 msixbundle
+MSVC
 muxc
 netcore
 osgvsowi
+PFILETIME
 pgc
 pgo
 pgosweep
@@ -39,10 +47,14 @@ powerrename
 powershell
 propkey
 pscustomobject
+QWORD
+regedit
 robocopy
 SACLs
+sdkddkver
 Shobjidl
 Skype
+SRW
 sxs
 Sysinternals
 sysnative
@@ -57,6 +69,7 @@ Virtualization
 visualstudio
 vscode
 VSTHRD
+winsdkver
 wlk
 wslpath
 wtl

.github/actions/spelling/allow/names.txt

@@ -31,6 +31,7 @@ Kourosh
 kowalczyk
 leonmsft
 Lepilleur
+lhecker
 lukesampson
 Manandhar
 mbadolato
@@ -52,6 +53,7 @@ oldnewthing
 opengl
 osgwiki
 pabhojwa
+panos
 paulcam
 pauldotknopf
 PGP
@@ -66,6 +68,7 @@ sonpham
 stakx
 thereses
 Walisch
+Wellons
 Wirt
 Wojciech
 zadjii

.github/actions/spelling/expect/expect.txt

@@ -14,7 +14,6 @@ ACTIVEBORDER
 ACTIVECAPTION
 adaa
 ADDALIAS
-ADDB
 ADDREF
 addressof
 ADDSTRING
@@ -50,6 +49,7 @@ APARTMENTTHREADED
 APCs
 api
 APIENTRY
+apimswincoresynchl
 apiset
 APPBARDATA
 appconsult
@@ -105,6 +105,7 @@ autoscrolling
 Autowrap
 AVerify
 AVI
+AVX
 awch
 azuredevopspodcast
 azzle
@@ -114,6 +115,7 @@ Backgrounder
 backgrounding
 backport
 backstory
+barbaz
 Batang
 baz
 Bazz
@@ -167,6 +169,7 @@ brandings
 BRK
 Browsable
 bsearch
+Bspace
 bstr
 BTNFACE
 buf
@@ -186,9 +189,11 @@ cacafire
 callee
 capslock
 CARETBLINKINGENABLED
+carlos
 CARRIAGERETURN
 cascadia
 cassert
+castsi
 catid
 cazamor
 CBash
@@ -267,9 +272,12 @@ cmder
 CMDEXT
 Cmdlet
 cmdline
+cmh
 CMOUSEBUTTONS
 cmp
+cmpeq
 cmt
+cmw
 cmyk
 CNL
 cnt
@@ -379,6 +387,7 @@ cplusplus
 cpp
 CPPCORECHECK
 cppcorecheckrules
+cppm
 cpprest
 cpprestsdk
 cppwinrt
@@ -401,11 +410,13 @@ csbiex
 csharp
 CSHORT
 CSIDL
+Cspace
 csproj
 Csr
 csrmsg
 CSRSS
 csrutil
+css
 cstdarg
 cstddef
 cstdio
@@ -496,7 +507,6 @@ DEADCHAR
 dealloc
 Debian
 debolden
-debounce
 debugtype
 DECALN
 DECANM
@@ -505,6 +515,8 @@ DECAWM
 DECCKM
 DECCOLM
 DECDHL
+decdld
+DECDLD
 DECDWL
 DECEKBD
 DECID
@@ -525,6 +537,7 @@ DECRC
 DECREQTPARM
 DECRLM
 DECRQM
+DECRQSS
 DECRST
 DECSASD
 DECSC
@@ -545,6 +558,7 @@ DECSTR
 DECSWL
 DECTCEM
 Dedupe
+deduplicate
 deduplicated
 DEFAPP
 DEFAULTBACKGROUND
@@ -654,6 +668,7 @@ dwriteglyphrundescriptionclustermap
 dxgi
 dxgidwm
 dxinterop
+dxsm
 dxttbmp
 eachother
 eae
@@ -757,7 +772,6 @@ filepath
 FILESUBTYPE
 FILESYSPATH
 filesystem
-FILETIME
 FILETYPE
 fileurl
 FILEW
@@ -773,11 +787,13 @@ FINDSTRINGEXACT
 FINDUP
 FIter
 FIXEDCONVERTED
+FIXEDFILEINFO
 Flg
 flyout
 fmodern
 fmtarg
 fmtid
+FNV
 FOLDERID
 FONTCHANGE
 fontdlg
@@ -786,6 +802,7 @@ FONTENUMPROC
 FONTFACE
 FONTFAMILY
 FONTHEIGHT
+FONTINFO
 fontlist
 FONTOK
 FONTSIZE
@@ -795,6 +812,7 @@ FONTTYPE
 FONTWEIGHT
 FONTWIDTH
 FONTWINDOW
+fooo
 forceinline
 FORCEOFFFEEDBACK
 FORCEONFEEDBACK
@@ -898,6 +916,7 @@ github
 gitlab
 gle
 globals
+GLYPHENTRY
 gmail
 GMEM
 GNUC
@@ -946,6 +965,7 @@ hdrstop
 HEIGHTSCROLL
 hfile
 hfont
+hfontresource
 hglobal
 hhh
 HHmm
@@ -981,7 +1001,7 @@ hostlib
 Hostx
 HPA
 HPAINTBUFFER
-hpcon
+HPCON
 hpj
 hpp
 HPR
@@ -1020,6 +1040,7 @@ IAction
 IApi
 IApplication
 IBase
+ICache
 icacls
 iccex
 icch
@@ -1113,6 +1134,7 @@ interop
 interoperability
 inthread
 intptr
+intrin
 intsafe
 INVALIDARG
 INVALIDATERECT
@@ -1165,6 +1187,7 @@ IWin
 IWindow
 IXaml
 IXMP
+ixx
 jconcpp
 JOBOBJECT
 JOBOBJECTINFOCLASS
@@ -1209,6 +1232,7 @@ KLF
 KLMNO
 KLMNOPQRST
 KLMNOPQRSTQQQQQ
+KPRIORITY
 KVM
 langid
 LANGUAGELIST
@@ -1257,6 +1281,7 @@ lnkd
 lnkfile
 LNM
 LOADONCALL
+loadu
 LOBYTE
 localappdata
 localhost
@@ -1264,6 +1289,7 @@ locsrc
 locstudio
 Loewen
 LOGFONT
+LOGFONTA
 LOGFONTW
 logissue
 lowercased
@@ -1417,6 +1443,7 @@ MOUSEFIRST
 MOUSEHWHEEL
 MOUSEMOVE
 mousewheel
+movemask
 MOVESTART
 msb
 msbuild
@@ -1443,11 +1470,13 @@ MSVCRTD
 MSVS
 msys
 msysgit
+MTSM
 mui
 Mul
 multiline
 munged
 munges
+murmurhash
 mutex
 mutexes
 muxes
@@ -1498,6 +1527,7 @@ nfe
 nlength
 Nls
 NLSMODE
+nnn
 NOACTIVATE
 NOAPPLYNOW
 NOCLIP
@@ -1578,6 +1608,7 @@ NTVDM
 ntverp
 NTWIN
 nuget
+nullability
 nullness
 nullonfailure
 nullopt
@@ -1612,6 +1643,7 @@ onecoreuapuuid
 onecoreuuid
 ONECOREWINDOWS
 onehalf
+oneseq
 ONLCR
 openbash
 opencode
@@ -1642,6 +1674,7 @@ oss
 ostream
 ostringstream
 ouicompat
+OUnter
 outdir
 outfile
 Outof
@@ -1652,6 +1685,7 @@ Outptr
 OVERLAPPEDWINDOW
 OWNDC
 OWNERDRAWFIXED
+packagename
 packageuwp
 PACKCOORD
 PACKVERSION
@@ -1676,6 +1710,7 @@ pcch
 PCCHAR
 PCCONSOLE
 PCD
+pcg
 pch
 PCHAR
 PCIDLIST
@@ -1771,6 +1806,7 @@ POSX
 POSXSCROLL
 POSYSCROLL
 ppci
+PPEB
 ppf
 ppguid
 ppidl
@@ -1921,6 +1957,7 @@ realloc
 reamapping
 rects
 redef
+redefinable
 Redir
 redirector
 redist
@@ -1942,7 +1979,7 @@ REGSTR
 reingest
 Relayout
 RELBINPATH
-Remoting
+remoting
 renamer
 renderengine
 rendersize
@@ -1963,9 +2000,11 @@ resx
 retval
 rfa
 rfc
+rfid
 rftp
 rgb
 rgba
+RGBCOLOR
 rgbi
 rgci
 rgfae
@@ -1983,9 +2022,11 @@ rhs
 RIGHTALIGN
 RIGHTBUTTON
 riid
+Rike
 RIPMSG
 RIS
 RMENU
+rng
 roadmap
 robomac
 roundtrip
@@ -2031,7 +2072,6 @@ scanline
 schemename
 SCL
 scm
-scprintf
 SCRBUF
 SCRBUFSIZE
 screenbuffer
@@ -2063,7 +2103,7 @@ selectany
 SELECTEDFONT
 SELECTSTRING
 Selfhosters
-serializers
+SERIALIZERS
 SERVERDLL
 SETACTIVE
 SETBUDDYINT
@@ -2135,6 +2175,7 @@ SIGDN
 SINGLEFLAG
 SINGLETHREADED
 siup
+sixel
 SIZEBOX
 sizeof
 SIZESCROLL
@@ -2206,6 +2247,7 @@ stoi
 stol
 stoul
 stoutapot
+Stri
 strikethrough
 stringstream
 STRINGTABLE
@@ -2238,6 +2280,7 @@ SWMR
 SWP
 swprintf
 SYMED
+symlink
 SYNCPAINT
 sys
 syscalls
@@ -2304,7 +2347,6 @@ testmddefinition
 testmode
 testname
 testnameprefix
-testnetv
 TESTNULL
 testpass
 testpasses
@@ -2340,7 +2382,6 @@ TITLEISLINKNAME
 TJson
 TLambda
 TLEN
-Tlg
 Tlgdata
 TMAE
 TMPF
@@ -2415,7 +2456,6 @@ uapadmin
 UAX
 ubuntu
 ucd
-ucd
 ucdxml
 uch
 UCHAR
@@ -2524,6 +2564,7 @@ vcvarsall
 vcxitems
 vcxproj
 vec
+vectorized
 VERCTRL
 versioning
 VERTBAR
@@ -2541,13 +2582,13 @@ VMs
 VPA
 VPATH
 VPR
-VPrintf
 VProc
 VRaw
 VREDRAW
 vsc
 vscprintf
 VSCROLL
+vsdevshell
 vsinfo
 vsnprintf
 vso
@@ -2656,6 +2697,7 @@ WINDOWPOSCHANGING
 windowproc
 windowrect
 windowsapp
+windowsdeveloper
 windowsinternalstring
 WINDOWSIZE
 windowsx
@@ -2687,6 +2729,7 @@ wixproj
 wline
 wlinestream
 wmain
+wmemory
 WMSZ
 wnd
 WNDALLOC
@@ -2742,6 +2785,7 @@ WTo
 wtof
 wtoi
 WTs
+WTSOFTFONT
 wtw
 wtypes
 Wubi
@@ -2768,10 +2812,10 @@ XCount
 xdy
 XEncoding
 xes
-Xes
 xff
 XFile
 XFORM
+xIcon
 XManifest
 XMath
 XMFLOAT
@@ -2779,8 +2823,6 @@ xml
 xmlns
 xor
 xorg
-xorg
-Xpath
 XPosition
 XResource
 xsd
@@ -2806,6 +2848,7 @@ YCast
 YCENTER
 YCount
 YDPI
+yIcon
 yml
 YOffset
 YPosition
@@ -2813,6 +2856,7 @@ YSize
 YSubstantial
 YVIRTUALSCREEN
 YWalk
+zamora
 ZCmd
 ZCtrl
 zsh

.github/actions/spelling/expect/web.txt

@@ -1,5 +1,7 @@
 http
 www
+easyrgb
+php
 ecma
 rapidtables
 WCAG
@@ -11,6 +13,7 @@ leonerd
 fixterms
 winui
 appshellintegration
+mdtauk
 cppreference
 gfycat
 Guake

.github/actions/spelling/patterns/patterns.txt

@@ -24,3 +24,4 @@ VERIFY_ARE_EQUAL\(L"[^"]+"
 std::memory_order_[\w]+
 D2DERR_SHADER_COMPILE_FAILED
 TIL_FEATURE_[0-9A-Z_]+
+vcvars\w*

.github/workflows/spelling2.yml

@@ -1,19 +1,20 @@
+# spelling.yml is blocked per https://github.com/check-spelling/check-spelling/security/advisories/GHSA-g86g-chm8-7r2p
 name: Spell checking
 on:
   pull_request_target:
   push:
 
 jobs:
-  build:
+  spelling:
     name: Spell checking
     runs-on: ubuntu-latest
     steps:
     - name: checkout-merge
       if: "contains(github.event_name, 'pull_request')"
-      uses: actions/checkout@v2.0.0
+      uses: actions/checkout@v2
       with:
         ref: refs/pull/${{github.event.pull_request.number}}/merge
     - name: checkout
       if: "!contains(github.event_name, 'pull_request')"
-      uses: actions/checkout@v2.0.0
-    - uses: check-spelling/check-spelling@v0.0.18
+      uses: actions/checkout@v2
+    - uses: check-spelling/check-spelling@v0.0.19

src/cascadia/Remoting/Monarch.cpp

@@ -762,4 +762,32 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                               TraceLoggingKeyword(TIL_KEYWORD_TRACE));
         }
     }
+
+    Windows::Foundation::Collections::IMap<uint64_t, winrt::hstring> Monarch::GetPeasantNames()
+    {
+        auto names = winrt::single_threaded_map<uint64_t, winrt::hstring>();
+
+        std::vector<uint64_t> peasantsToErase{};
+        for (const auto& [id, p] : _peasants)
+        {
+            try
+            {
+                names.Insert(id, p.WindowName());
+            }
+            catch (...)
+            {
+                LOG_CAUGHT_EXCEPTION();
+                peasantsToErase.push_back(id);
+            }
+        }
+
+        // Remove the dead peasants we came across while iterating.
+        for (const auto& id : peasantsToErase)
+        {
+            _peasants.erase(id);
+            _clearOldMruEntries(id);
+        }
+
+        return names;
+    }
 }

src/cascadia/Remoting/Monarch.h

@@ -51,6 +51,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         void HandleActivatePeasant(const winrt::Microsoft::Terminal::Remoting::WindowActivatedArgs& args);
         void SummonWindow(const Remoting::SummonWindowSelectionArgs& args);
 
+        Windows::Foundation::Collections::IMap<uint64_t, winrt::hstring> GetPeasantNames();
+
         TYPED_EVENT(FindTargetWindowRequested, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Remoting::FindTargetWindowArgs);
 
     private:

src/cascadia/Remoting/Monarch.idl

@@ -40,6 +40,8 @@ namespace Microsoft.Terminal.Remoting
         void HandleActivatePeasant(WindowActivatedArgs args);
         void SummonWindow(SummonWindowSelectionArgs args);
 
+        Windows.Foundation.Collections.IMap<UInt64, String> GetPeasantNames();
+
         event Windows.Foundation.TypedEventHandler<Object, FindTargetWindowArgs> FindTargetWindowRequested;
     };
 }

src/cascadia/Remoting/Peasant.cpp

@@ -8,6 +8,8 @@
 #include "Peasant.g.cpp"
 #include "../../types/inc/utils.hpp"
 
+#include <LibraryResources.h>
+
 using namespace winrt;
 using namespace winrt::Microsoft::Terminal;
 using namespace winrt::Windows::Foundation;
@@ -30,6 +32,12 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
     void Peasant::AssignID(uint64_t id)
     {
         _id = id;
+
+        // Provide a default name if we're currently unnamed.
+        if (_WindowName.empty())
+        {
+            _WindowName = fmt::format(L"{} {}", RS_(L"Window"), _id);
+        }
     }
     uint64_t Peasant::GetID()
     {

src/cascadia/Remoting/Resources/en-US/Resources.resw

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Window" xml:space="preserve">
+    <value>Window</value>
+  </data>
 </root>

src/cascadia/Remoting/WindowManager.cpp

@@ -509,4 +509,11 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         _monarch.SummonWindow(args);
     }
 
+    Windows::Foundation::Collections::IMap<uint64_t, winrt::hstring> WindowManager::GetPeasantNames()
+    {
+        // We should only get called when we're the monarch since the monarch
+        // is the only one that knows about all peasants.
+        return _monarch.GetPeasantNames();
+    }
+
 }

src/cascadia/Remoting/WindowManager.h

@@ -40,6 +40,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         bool IsMonarch();
         void SummonWindow(const Remoting::SummonWindowSelectionArgs& args);
 
+        Windows::Foundation::Collections::IMap<uint64_t, winrt::hstring> GetPeasantNames();
+
         TYPED_EVENT(FindTargetWindowRequested, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Remoting::FindTargetWindowArgs);
         TYPED_EVENT(BecameMonarch, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
 

src/cascadia/Remoting/WindowManager.idl

@@ -12,6 +12,7 @@ namespace Microsoft.Terminal.Remoting
         IPeasant CurrentWindow();
         Boolean IsMonarch { get; };
         void SummonWindow(SummonWindowSelectionArgs args);
+        Windows.Foundation.Collections.IMap<UInt64, String> GetPeasantNames();
         event Windows.Foundation.TypedEventHandler<Object, FindTargetWindowArgs> FindTargetWindowRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> BecameMonarch;
     };

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -815,4 +815,11 @@ namespace winrt::TerminalApp::implementation
             }
         }
     }
+
+    void TerminalPage::_HandleMinimizeToTray(const IInspectable& /*sender*/,
+                                             const ActionEventArgs& args)
+    {
+        _MinimizeToTrayRequestedHandlers(*this, nullptr);
+        args.Handled(true);
+    }
 }

src/cascadia/TerminalApp/AppLogic.cpp

@@ -1466,4 +1466,26 @@ namespace winrt::TerminalApp::implementation
         return _root->IsQuakeWindow();
     }
 
+    bool AppLogic::GetMinimizeToTray()
+    {
+        if (!_loadedInitialSettings)
+        {
+            // Load settings if we haven't already
+            LoadSettings();
+        }
+
+        return _settings.GlobalSettings().MinimizeToTray();
+    }
+
+    bool AppLogic::GetAlwaysShowTrayIcon()
+    {
+        if (!_loadedInitialSettings)
+        {
+            // Load settings if we haven't already
+            LoadSettings();
+        }
+
+        return _settings.GlobalSettings().AlwaysShowTrayIcon();
+    }
+
 }

src/cascadia/TerminalApp/AppLogic.h

@@ -90,6 +90,9 @@ namespace winrt::TerminalApp::implementation
         size_t GetLastActiveControlTaskbarState();
         size_t GetLastActiveControlTaskbarProgress();
 
+        bool GetMinimizeToTray();
+        bool GetAlwaysShowTrayIcon();
+
         winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> ShowDialog(winrt::Windows::UI::Xaml::Controls::ContentDialog dialog);
 
         Windows::Foundation::Collections::IMapView<Microsoft::Terminal::Control::KeyChord, Microsoft::Terminal::Settings::Model::Command> GlobalHotkeys();
@@ -163,6 +166,7 @@ namespace winrt::TerminalApp::implementation
         FORWARDED_TYPED_EVENT(RenameWindowRequested, Windows::Foundation::IInspectable, winrt::TerminalApp::RenameWindowRequestedArgs, _root, RenameWindowRequested);
         FORWARDED_TYPED_EVENT(IsQuakeWindowChanged, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, IsQuakeWindowChanged);
         FORWARDED_TYPED_EVENT(SummonWindowRequested, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, SummonWindowRequested);
+        FORWARDED_TYPED_EVENT(MinimizeToTrayRequested, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, MinimizeToTrayRequested);
 
 #ifdef UNIT_TESTING
         friend class TerminalAppLocalTests::CommandlineTest;

src/cascadia/TerminalApp/AppLogic.idl

@@ -71,6 +71,9 @@ namespace TerminalApp
         UInt64 GetLastActiveControlTaskbarState();
         UInt64 GetLastActiveControlTaskbarProgress();
 
+        Boolean GetMinimizeToTray();
+        Boolean GetAlwaysShowTrayIcon();
+
         FindTargetWindowResult FindTargetWindow(String[] args);
 
         Windows.Foundation.Collections.IMapView<Microsoft.Terminal.Control.KeyChord, Microsoft.Terminal.Settings.Model.Command> GlobalHotkeys();
@@ -93,5 +96,6 @@ namespace TerminalApp
         event Windows.Foundation.TypedEventHandler<Object, Object> SettingsChanged;
         event Windows.Foundation.TypedEventHandler<Object, Object> IsQuakeWindowChanged;
         event Windows.Foundation.TypedEventHandler<Object, Object> SummonWindowRequested;
+        event Windows.Foundation.TypedEventHandler<Object, Object> MinimizeToTrayRequested;
     }
 }

src/cascadia/TerminalApp/TerminalPage.h

@@ -123,6 +123,7 @@ namespace winrt::TerminalApp::implementation
         TYPED_EVENT(RenameWindowRequested, Windows::Foundation::IInspectable, winrt::TerminalApp::RenameWindowRequestedArgs);
         TYPED_EVENT(IsQuakeWindowChanged, IInspectable, IInspectable);
         TYPED_EVENT(SummonWindowRequested, IInspectable, IInspectable);
+        TYPED_EVENT(MinimizeToTrayRequested, IInspectable, IInspectable);
 
     private:
         friend struct TerminalPageT<TerminalPage>; // for Xaml to bind events

src/cascadia/TerminalApp/TerminalPage.idl

@@ -57,5 +57,6 @@ namespace TerminalApp
         event Windows.Foundation.TypedEventHandler<Object, RenameWindowRequestedArgs> RenameWindowRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> IsQuakeWindowChanged;
         event Windows.Foundation.TypedEventHandler<Object, Object> SummonWindowRequested;
+        event Windows.Foundation.TypedEventHandler<Object, Object> MinimizeToTrayRequested;
     }
 }

src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp

@@ -61,6 +61,7 @@ static constexpr std::string_view OpenWindowRenamerKey{ "openWindowRenamer" };
 static constexpr std::string_view GlobalSummonKey{ "globalSummon" };
 static constexpr std::string_view QuakeModeKey{ "quakeMode" };
 static constexpr std::string_view FocusPaneKey{ "focusPane" };
+static constexpr std::string_view MinimizeToTrayKey{ "minimizeToTray" };
 
 static constexpr std::string_view ActionKey{ "action" };
 
@@ -330,6 +331,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
                 { ShortcutAction::GlobalSummon, L"" }, // Intentionally omitted, must be generated by GenerateName
                 { ShortcutAction::QuakeMode, RS_(L"QuakeModeCommandKey") },
                 { ShortcutAction::FocusPane, L"" }, // Intentionally omitted, must be generated by GenerateName
+                { ShortcutAction::MinimizeToTray, RS_(L"MinimizeToTrayCommandKey") },
             };
         }();
 

src/cascadia/TerminalSettingsModel/AllShortcutActions.h

@@ -75,7 +75,8 @@
     ON_ALL_ACTIONS(OpenWindowRenamer)    \
     ON_ALL_ACTIONS(GlobalSummon)         \
     ON_ALL_ACTIONS(QuakeMode)            \
-    ON_ALL_ACTIONS(FocusPane)
+    ON_ALL_ACTIONS(FocusPane)            \
+    ON_ALL_ACTIONS(MinimizeToTray)
 
 #define ALL_SHORTCUT_ACTIONS_WITH_ARGS             \
     ON_ALL_ACTIONS_WITH_ARGS(AdjustFontSize)       \

src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp

@@ -48,6 +48,8 @@ static constexpr std::string_view StartupActionsKey{ "startupActions" };
 static constexpr std::string_view FocusFollowMouseKey{ "focusFollowMouse" };
 static constexpr std::string_view WindowingBehaviorKey{ "windowingBehavior" };
 static constexpr std::string_view TrimBlockSelectionKey{ "trimBlockSelection" };
+static constexpr std::string_view AlwaysShowTrayIconKey{ "alwaysShowTrayIcon" };
+static constexpr std::string_view MinimizeToTrayKey{ "minimizeToTray" };
 
 static constexpr std::string_view DebugFeaturesKey{ "debugFeatures" };
 
@@ -129,6 +131,8 @@ winrt::com_ptr<GlobalAppSettings> GlobalAppSettings::Copy() const
     globals->_WindowingBehavior = _WindowingBehavior;
     globals->_TrimBlockSelection = _TrimBlockSelection;
     globals->_DetectURLs = _DetectURLs;
+    globals->_MinimizeToTray = _MinimizeToTray;
+    globals->_AlwaysShowTrayIcon = _AlwaysShowTrayIcon;
 
     globals->_UnparsedDefaultProfile = _UnparsedDefaultProfile;
     globals->_validDefaultProfile = _validDefaultProfile;
@@ -319,6 +323,10 @@ void GlobalAppSettings::LayerJson(const Json::Value& json)
 
     JsonUtils::GetValueForKey(json, DetectURLsKey, _DetectURLs);
 
+    JsonUtils::GetValueForKey(json, MinimizeToTrayKey, _MinimizeToTray);
+
+    JsonUtils::GetValueForKey(json, AlwaysShowTrayIconKey, _AlwaysShowTrayIcon);
+
     // This is a helper lambda to get the keybindings and commands out of both
     // and array of objects. We'll use this twice, once on the legacy
     // `keybindings` key, and again on the newer `bindings` key.
@@ -414,6 +422,8 @@ Json::Value GlobalAppSettings::ToJson() const
     JsonUtils::SetValueForKey(json, WindowingBehaviorKey,           _WindowingBehavior);
     JsonUtils::SetValueForKey(json, TrimBlockSelectionKey,          _TrimBlockSelection);
     JsonUtils::SetValueForKey(json, DetectURLsKey,                  _DetectURLs);
+    JsonUtils::SetValueForKey(json, MinimizeToTrayKey,              _MinimizeToTray);
+    JsonUtils::SetValueForKey(json, AlwaysShowTrayIconKey,          _AlwaysShowTrayIcon);
     // clang-format on
 
     json[JsonKey(ActionsKey)] = _actionMap->ToJson();

src/cascadia/TerminalSettingsModel/GlobalAppSettings.h

@@ -92,6 +92,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         INHERITABLE_SETTING(Model::GlobalAppSettings, Model::WindowingMode, WindowingBehavior, Model::WindowingMode::UseNew);
         INHERITABLE_SETTING(Model::GlobalAppSettings, bool, TrimBlockSelection, false);
         INHERITABLE_SETTING(Model::GlobalAppSettings, bool, DetectURLs, true);
+        INHERITABLE_SETTING(Model::GlobalAppSettings, bool, MinimizeToTray, false);
+        INHERITABLE_SETTING(Model::GlobalAppSettings, bool, AlwaysShowTrayIcon, false);
 
     private:
         guid _defaultProfile;

src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl

@@ -70,6 +70,8 @@ namespace Microsoft.Terminal.Settings.Model
         INHERITABLE_SETTING(WindowingMode, WindowingBehavior);
         INHERITABLE_SETTING(Boolean, TrimBlockSelection);
         INHERITABLE_SETTING(Boolean, DetectURLs);
+        INHERITABLE_SETTING(Boolean, MinimizeToTray);
+        INHERITABLE_SETTING(Boolean, AlwaysShowTrayIcon);
 
         Windows.Foundation.Collections.IMapView<String, ColorScheme> ColorSchemes();
         void AddColorScheme(ColorScheme scheme);

src/cascadia/TerminalSettingsModel/Resources/en-US/Resources.resw

@@ -413,4 +413,7 @@
     <value>Windows Console Host</value>
     <comment>Name describing the usage of the classic windows console as the terminal UI. (`conhost.exe`)</comment>
   </data>
+  <data name="MinimizeToTrayCommandKey" xml:space="preserve">
+    <value>Minimize window to tray</value>
+  </data>
 </root>

src/cascadia/TerminalSettingsModel/defaults.json

@@ -29,6 +29,8 @@
     "disableAnimations": false,
     "startupActions": "",
     "focusFollowMouse": false,
+    "minimizeToTray": false,
+    "alwaysShowTrayIcon": false,
 
     "profiles":
     [

src/cascadia/WindowsTerminal/AppHost.cpp

@@ -9,6 +9,10 @@
 #include "../WinRTUtils/inc/WtExeUtils.h"
 #include "resource.h"
 #include "VirtualDesktopUtils.h"
+#include "icon.h"
+#include "TrayIconData.h"
+
+#include <LibraryResources.h>
 
 using namespace winrt::Windows::UI;
 using namespace winrt::Windows::UI::Composition;
@@ -62,6 +66,8 @@ AppHost::AppHost() noexcept :
     // Update our own internal state tracking if we're in quake mode or not.
     _IsQuakeWindowChanged(nullptr, nullptr);
 
+    _window->SetMinimizeToTrayBehavior(_logic.GetMinimizeToTray());
+
     // Tell the window to callback to us when it's about to handle a WM_CREATE
     auto pfn = std::bind(&AppHost::_HandleCreateWindow,
                          this,
@@ -77,6 +83,10 @@ AppHost::AppHost() noexcept :
     _window->MouseScrolled({ this, &AppHost::_WindowMouseWheeled });
     _window->WindowActivated({ this, &AppHost::_WindowActivated });
     _window->HotkeyPressed({ this, &AppHost::_GlobalHotkeyPressed });
+    _window->NotifyTrayIconPressed({ this, &AppHost::_HandleTrayIconPressed });
+    _window->NotifyShowTrayContextMenu({ this, &AppHost::_ShowTrayContextMenu });
+    _window->NotifyTrayMenuItemSelected({ this, &AppHost::_TrayMenuItemSelected });
+    _window->NotifyCreateTrayIcon({ this, &AppHost::_UpdateTrayIcon });
     _window->SetAlwaysOnTop(_logic.GetInitialAlwaysOnTop());
     _window->MakeWindow();
 
@@ -90,7 +100,7 @@ AppHost::AppHost() noexcept :
 AppHost::~AppHost()
 {
     // destruction order is important for proper teardown here
-
+    _DestroyTrayIcon();
     _window = nullptr;
     _app.Close();
     _app = nullptr;
@@ -267,6 +277,7 @@ void AppHost::Initialize()
     _logic.SettingsChanged({ this, &AppHost::_HandleSettingsChanged });
     _logic.IsQuakeWindowChanged({ this, &AppHost::_IsQuakeWindowChanged });
     _logic.SummonWindowRequested({ this, &AppHost::_SummonWindowRequested });
+    _logic.MinimizeToTrayRequested({ this, &AppHost::_MinimizeToTrayRequested });
 
     _window->UpdateTitle(_logic.Title());
 
@@ -641,6 +652,7 @@ winrt::fire_and_forget AppHost::_WindowActivated()
 void AppHost::_BecomeMonarch(const winrt::Windows::Foundation::IInspectable& /*sender*/,
                              const winrt::Windows::Foundation::IInspectable& /*args*/)
 {
+    _UpdateTrayIcon();
     _setupGlobalHotkeys();
 
     // The monarch is just going to be THE listener for inbound connections.
@@ -920,6 +932,13 @@ void AppHost::_HandleSettingsChanged(const winrt::Windows::Foundation::IInspecta
                                      const winrt::Windows::Foundation::IInspectable& /*args*/)
 {
     _setupGlobalHotkeys();
+
+    if (_windowManager.IsMonarch())
+    {
+        _UpdateTrayIcon();
+    }
+
+    _window->SetMinimizeToTrayBehavior(_logic.GetMinimizeToTray());
 }
 
 void AppHost::_IsQuakeWindowChanged(const winrt::Windows::Foundation::IInspectable&,
@@ -930,7 +949,6 @@ void AppHost::_IsQuakeWindowChanged(const winrt::Windows::Foundation::IInspectab
 
 void AppHost::_SummonWindowRequested(const winrt::Windows::Foundation::IInspectable& sender,
                                      const winrt::Windows::Foundation::IInspectable&)
-
 {
     const Remoting::SummonWindowBehavior summonArgs{};
     summonArgs.MoveToCurrentDesktop(false);
@@ -939,3 +957,168 @@ void AppHost::_SummonWindowRequested(const winrt::Windows::Foundation::IInspecta
     summonArgs.ToggleVisibility(false); // Do not toggle, just make visible.
     _HandleSummon(sender, summonArgs);
 }
+
+void AppHost::_MinimizeToTrayRequested(const winrt::Windows::Foundation::IInspectable&,
+                                       const winrt::Windows::Foundation::IInspectable&)
+{
+    _window->HideWindow();
+}
+
+void AppHost::_HandleTrayIconPressed()
+{
+    // No name in the args means summon the mru window.
+    Remoting::SummonWindowSelectionArgs args{};
+    args.SummonBehavior().ToggleVisibility(false);
+    _windowManager.SummonWindow(args);
+}
+
+// Method Description:
+// - Creates and adds an icon to the notification tray.
+// If an icon already exists, update the HWND associated
+// to the icon with this window's HWND.
+// Arguments:
+// - <unused>
+// Return Value:
+// - <none>
+void AppHost::_UpdateTrayIcon()
+{
+    if (_logic.GetAlwaysShowTrayIcon() || _logic.GetMinimizeToTray())
+    {
+        if (!_trayIconData)
+        {
+            NOTIFYICONDATA nid{};
+            nid.cbSize = sizeof(NOTIFYICONDATA);
+
+            // This HWND will receive the callbacks sent by the tray icon.
+            nid.hWnd = _window->GetHandle();
+
+            // App-defined identifier of the icon. The HWND and ID are used
+            // to identify which icon to operate on when calling Shell_NotifyIcon.
+            // Multiple icons can be associated with one HWND, but here we're only
+            // going to be showing one so the ID doesn't really matter.
+            nid.uID = 1;
+
+            nid.uCallbackMessage = CM_NOTIFY_FROM_TRAY;
+
+            nid.hIcon = static_cast<HICON>(GetActiveAppIconHandle(true));
+            StringCchCopy(nid.szTip, ARRAYSIZE(nid.szTip), L"Windows Terminal");
+            nid.uFlags = NIF_MESSAGE | NIF_SHOWTIP | NIF_TIP | NIF_ICON;
+            Shell_NotifyIcon(NIM_ADD, &nid);
+
+            // For whatever reason, the NIM_ADD call doesn't seem to set the version
+            // properly, resulting in us being unable to receive the expected notification
+            // events. We actually have to make a separate NIM_SETVERSION call for it to
+            // work properly.
+            nid.uVersion = NOTIFYICON_VERSION_4;
+            Shell_NotifyIcon(NIM_SETVERSION, &nid);
+
+            _trayIconData = nid;
+        }
+    }
+    else if (_trayIconData)
+    {
+        // We have a tray icon existing, but the now the new settings
+        // are telling us we don't want you so poof.
+        _DestroyTrayIcon();
+    }
+}
+
+void AppHost::_ShowTrayContextMenu(const til::point coord)
+{
+    if (auto hmenu = _CreateTrayContextMenu())
+    {
+        // We'll need to set our window to the foreground before calling
+        // TrackPopupMenuEx or else the menu won't dismiss when clicking away.
+        SetForegroundWindow(_window->GetHandle());
+
+        UINT uFlags = TPM_RIGHTBUTTON;
+        if (GetSystemMetrics(SM_MENUDROPALIGNMENT) != 0)
+        {
+            uFlags |= TPM_RIGHTALIGN;
+        }
+        else
+        {
+            uFlags |= TPM_LEFTALIGN;
+        }
+
+        TrackPopupMenuEx(hmenu, uFlags, (int)coord.x(), (int)coord.y(), _window->GetHandle(), NULL);
+    }
+}
+
+HMENU AppHost::_CreateTrayContextMenu()
+{
+    auto hmenu = CreatePopupMenu();
+    if (hmenu)
+    {
+        MENUINFO mi{};
+        mi.cbSize = sizeof(MENUINFO);
+        mi.fMask = MIM_STYLE | MIM_APPLYTOSUBMENUS;
+        mi.dwStyle = MNS_NOTIFYBYPOS;
+        SetMenuInfo(hmenu, &mi);
+
+        // Focus Current Terminal Window
+        AppendMenu(hmenu, MF_STRING, (UINT_PTR)TrayMenuItemAction::FocusTerminal, L"Focus Terminal");
+        AppendMenu(hmenu, MF_SEPARATOR, 0, L"");
+
+        // Submenu for Windows
+        if (auto windowSubmenu = _CreateWindowSubmenu())
+        {
+            AppendMenu(hmenu, MF_POPUP, (UINT_PTR)windowSubmenu, L"Windows");
+            AppendMenu(hmenu, MF_SEPARATOR, 0, L"");
+        }
+
+        AppendMenu(hmenu, MF_STRING, (UINT_PTR)TrayMenuItemAction::QuitAll, L"Close All Windows");
+    }
+    return hmenu;
+}
+
+HMENU AppHost::_CreateWindowSubmenu()
+{
+    if (auto hmenu = CreatePopupMenu())
+    {
+        for (const auto [id, name] : _windowManager.GetPeasantNames())
+        {
+            AppendMenu(hmenu, MF_STRING, (UINT_PTR)TrayMenuItemAction::SummonWindow, name.c_str());
+        }
+        return hmenu;
+    }
+    return nullptr;
+}
+
+void AppHost::_TrayMenuItemSelected(const HMENU menu, const UINT menuItemIndex)
+{
+    auto action = (TrayMenuItemAction)GetMenuItemID(menu, menuItemIndex);
+    switch (action)
+    {
+    case TrayMenuItemAction::FocusTerminal:
+    {
+        Remoting::SummonWindowSelectionArgs args{};
+        args.SummonBehavior().ToggleVisibility(false);
+        break;
+    }
+    case TrayMenuItemAction::SummonWindow:
+    {
+        WCHAR name[255];
+        GetMenuString(menu, menuItemIndex, name, 255, MF_BYPOSITION);
+
+        Remoting::SummonWindowSelectionArgs args{ name };
+        args.SummonBehavior().ToggleVisibility(false);
+        _windowManager.SummonWindow(args);
+        break;
+    }
+    case TrayMenuItemAction::QuitAll:
+    {
+        break;
+    }
+
+    }
+}
+
+void AppHost::_DestroyTrayIcon()
+{
+    if (_trayIconData)
+    {
+        Shell_NotifyIcon(NIM_DELETE, &_trayIconData.value());
+        _trayIconData.reset();
+    }
+}

src/cascadia/WindowsTerminal/AppHost.h

@@ -85,4 +85,17 @@ private:
 
     void _SummonWindowRequested(const winrt::Windows::Foundation::IInspectable& sender,
                                 const winrt::Windows::Foundation::IInspectable& args);
+
+    void _MinimizeToTrayRequested(const winrt::Windows::Foundation::IInspectable& sender,
+                                  const winrt::Windows::Foundation::IInspectable&);
+
+    void _UpdateTrayIcon();
+    void _HandleTrayIconPressed();
+    void _ShowTrayContextMenu(const til::point coord);
+    HMENU _CreateTrayContextMenu();
+    HMENU _CreateWindowSubmenu();
+    void _TrayMenuItemSelected(const HMENU menu, const UINT menuItemIndex);
+    void _DestroyTrayIcon();
+
+    std::optional<NOTIFYICONDATA> _trayIconData;
 };

src/cascadia/WindowsTerminal/IslandWindow.cpp

@@ -21,6 +21,8 @@ using namespace ::Microsoft::Console::Types;
 
 #define XAML_HOSTING_WINDOW_CLASS_NAME L"CASCADIA_HOSTING_WINDOW_CLASS"
 
+const UINT WM_TASKBARCREATED = RegisterWindowMessage(L"TaskbarCreated");
+
 IslandWindow::IslandWindow() noexcept :
     _interopWindowHandle{ nullptr },
     _rootGrid{ nullptr },
@@ -506,6 +508,38 @@ long IslandWindow::_calculateTotalSize(const bool isWidth, const long clientSize
     case WM_THEMECHANGED:
         UpdateWindowIconForActiveMetrics(_window.get());
         return 0;
+    case CM_NOTIFY_FROM_TRAY:
+    {
+        switch (LOWORD(lparam))
+        {
+        case NIN_SELECT:
+        case NIN_KEYSELECT:
+        {
+            _NotifyTrayIconPressedHandlers();
+            return 0;
+        }
+        case WM_CONTEXTMENU:
+        {
+            const til::point eventPoint{ GET_X_LPARAM(wparam), GET_Y_LPARAM(wparam) };
+            _NotifyShowTrayContextMenuHandlers(eventPoint);
+            return 0;
+        }
+        }
+        break;
+    }
+    case WM_MENUCOMMAND:
+    {
+        _NotifyTrayMenuItemSelectedHandlers((HMENU)lparam, (UINT)wparam);
+        return 0;
+    }
+    }
+
+    // We'll want to receive this message when explorer.exe restarts
+    // so that we can re-add our icon to the tray.
+    if (message == WM_TASKBARCREATED)
+    {
+        _NotifyCreateTrayIconHandlers();
+        return 0;
     }
 
     // TODO: handle messages here...
@@ -530,6 +564,10 @@ void IslandWindow::OnResize(const UINT width, const UINT height)
 void IslandWindow::OnMinimize()
 {
     // TODO GH#1989 Stop rendering island content when the app is minimized.
+    if (_minimizeToTray)
+    {
+        HideWindow();
+    }
 }
 
 // Method Description:
@@ -1459,5 +1497,15 @@ void IslandWindow::_enterQuakeMode()
                  SWP_SHOWWINDOW | SWP_FRAMECHANGED | SWP_NOACTIVATE);
 }
 
+void IslandWindow::HideWindow()
+{
+    ShowWindow(GetHandle(), SW_HIDE);
+}
+
+void IslandWindow::SetMinimizeToTrayBehavior(bool minimizeToTray) noexcept
+{
+    _minimizeToTray = minimizeToTray;
+}
+
 DEFINE_EVENT(IslandWindow, DragRegionClicked, _DragRegionClickedHandlers, winrt::delegate<>);
 DEFINE_EVENT(IslandWindow, WindowCloseButtonClicked, _windowCloseButtonClickedHandler, winrt::delegate<>);

src/cascadia/WindowsTerminal/IslandWindow.h

@@ -6,6 +6,8 @@
 #include <winrt/TerminalApp.h>
 #include "../../cascadia/inc/cppwinrt_utils.h"
 
+#define CM_NOTIFY_FROM_TRAY (WM_APP + 1)
+
 class IslandWindow :
     public BaseWindow<IslandWindow>
 {
@@ -46,11 +48,18 @@ public:
     bool IsQuakeWindow() const noexcept;
     void IsQuakeWindow(bool isQuakeWindow) noexcept;
 
+    void HideWindow();
+    void SetMinimizeToTrayBehavior(bool minimizeToTray) noexcept;
+
     DECLARE_EVENT(DragRegionClicked, _DragRegionClickedHandlers, winrt::delegate<>);
     DECLARE_EVENT(WindowCloseButtonClicked, _windowCloseButtonClickedHandler, winrt::delegate<>);
     WINRT_CALLBACK(MouseScrolled, winrt::delegate<void(til::point, int32_t)>);
     WINRT_CALLBACK(WindowActivated, winrt::delegate<void()>);
     WINRT_CALLBACK(HotkeyPressed, winrt::delegate<void(long)>);
+    WINRT_CALLBACK(NotifyTrayIconPressed, winrt::delegate<void()>);
+    WINRT_CALLBACK(NotifyShowTrayContextMenu, winrt::delegate<void(til::point)>);
+    WINRT_CALLBACK(NotifyTrayMenuItemSelected, winrt::delegate<void(HMENU, UINT)>);
+    WINRT_CALLBACK(NotifyCreateTrayIcon, winrt::delegate<void()>);
 
 protected:
     void ForceResize()
@@ -113,6 +122,8 @@ protected:
 
     void _summonWindowRoutineBody(winrt::Microsoft::Terminal::Remoting::SummonWindowBehavior args);
 
+    bool _minimizeToTray{ false };
+
 private:
     // This minimum width allows for width the tabs fit
     static constexpr long minimumWidth = 460L;

src/cascadia/WindowsTerminal/TrayIconData.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include "pch.h"
+
+enum class TrayMenuItemAction
+{
+    FocusTerminal,
+    SummonWindow,
+    QuitAll
+};

src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj

@@ -46,6 +46,7 @@
     <ClInclude Include="BaseWindow.h" />
     <ClInclude Include="IslandWindow.h" />
     <ClInclude Include="NonClientIslandWindow.h" />
+    <ClInclude Include="TrayIconData.h" />
     <ClInclude Include="VirtualDesktopUtils.h" />
   </ItemGroup>
   <ItemGroup>

src/cascadia/WindowsTerminal/icon.cpp

@@ -27,22 +27,29 @@ static int _GetActiveAppIconResource()
     return iconResource;
 }
 
-void UpdateWindowIconForActiveMetrics(HWND window)
+// There's only two possible sizes - ICON_SMALL and ICON_BIG.
+// So, use true for smallIcon if you want small and false for big.
+HANDLE GetActiveAppIconHandle(bool smallIcon)
 {
     auto iconResource{ MAKEINTRESOURCEW(_GetActiveAppIconResource()) };
 
+    const auto smXIcon = smallIcon ? SM_CXSMICON : SM_CXICON;
+    const auto smYIcon = smallIcon ? SM_CYSMICON : SM_CYICON;
+
     // These handles are loaded with LR_SHARED, so they are safe to "leak".
-    HANDLE smallIcon{ LoadImageW(wil::GetModuleInstanceHandle(), iconResource, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED) };
-    LOG_LAST_ERROR_IF_NULL(smallIcon);
+    HANDLE hIcon{ LoadImageW(wil::GetModuleInstanceHandle(), iconResource, IMAGE_ICON, GetSystemMetrics(smXIcon), GetSystemMetrics(smYIcon), LR_SHARED) };
+    LOG_LAST_ERROR_IF_NULL(hIcon);
 
-    HANDLE largeIcon{ LoadImageW(wil::GetModuleInstanceHandle(), iconResource, IMAGE_ICON, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), LR_SHARED) };
-    LOG_LAST_ERROR_IF_NULL(largeIcon);
+    return hIcon;
+}
 
-    if (smallIcon)
+void UpdateWindowIconForActiveMetrics(HWND window)
+{
+    if (auto smallIcon = GetActiveAppIconHandle(true))
     {
         SendMessageW(window, WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(smallIcon));
     }
-    if (largeIcon)
+    if (auto largeIcon = GetActiveAppIconHandle(false))
     {
         SendMessageW(window, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(largeIcon));
     }

src/cascadia/WindowsTerminal/icon.h

@@ -3,4 +3,5 @@
 
 #pragma once
 
+HANDLE GetActiveAppIconHandle(bool smallIcon);
 void UpdateWindowIconForActiveMetrics(HWND window);