Add globalSummon action

src/cascadia/Remoting/Monarch.idl

@@ -20,8 +20,9 @@ namespace Microsoft.Terminal.Remoting
 
     [default_interface] runtimeclass SummonWindowSelectionArgs {
         SummonWindowSelectionArgs();
+        SummonWindowSelectionArgs(String windowName);
         String WindowName;
-        // Other options:
+        // TODO GH#8888 Other options:
         // * CurrentDesktop
         // * CurrentMonitor
 

src/cascadia/Remoting/SummonWindowSelectionArgs.h

@@ -26,9 +26,11 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
     {
     public:
         SummonWindowSelectionArgs() = default;
+        SummonWindowSelectionArgs(winrt::hstring name) :
+            _WindowName{ name } {};
 
         WINRT_PROPERTY(winrt::hstring, WindowName);
-        WINRT_PROPERTY(bool, FoundMatch, true);
+        WINRT_PROPERTY(bool, FoundMatch, false);
     };
 }
 

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -756,11 +756,19 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleGlobalSummon(const IInspectable& /*sender*/,
                                            const ActionEventArgs& args)
     {
+        // Manually return false. These shouldn't ever get here, except for when
+        // we fail to register for the global hotkey. In that case, returning
+        // false here will let the underlying terminal still process the key, as
+        // if it wasn't bound at all.
         args.Handled(false);
     }
     void TerminalPage::_HandleQuakeMode(const IInspectable& /*sender*/,
                                         const ActionEventArgs& args)
     {
+        // Manually return false. These shouldn't ever get here, except for when
+        // we fail to register for the global hotkey. In that case, returning
+        // false here will let the underlying terminal still process the key, as
+        // if it wasn't bound at all.
         args.Handled(false);
     }
 }

src/cascadia/TerminalApp/AppLogic.idl

@@ -70,7 +70,6 @@ namespace TerminalApp
 
         FindTargetWindowResult FindTargetWindow(String[] args);
 
-        // Microsoft.Terminal.Control.KeyChord GlobalHotkey();
         Windows.Foundation.Collections.IMap<Microsoft.Terminal.Control.KeyChord, Microsoft.Terminal.Settings.Model.ActionAndArgs> GlobalHotkeys();
 
         // See IDialogPresenter and TerminalPage's DialogPresenter for more

src/cascadia/TerminalSettingsModel/ActionAndArgs.cpp

@@ -343,7 +343,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
                 { ShortcutAction::RenameWindow, RS_(L"ResetWindowNameCommandKey") },
                 { ShortcutAction::OpenWindowRenamer, RS_(L"OpenWindowRenamerCommandKey") },
                 { ShortcutAction::GlobalSummon, L"" }, // Intentionally omitted, must be generated by GenerateName
-                { ShortcutAction::QuakeMode, L"" }, // Intentionally omitted, must be generated by GenerateName
+                { ShortcutAction::QuakeMode, RS_(L"QuakeModeCommandKey") },
             };
         }();
 

src/cascadia/TerminalSettingsModel/ActionArgs.cpp

@@ -586,6 +586,16 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 
     winrt::hstring GlobalSummonArgs::GenerateName() const
     {
-        return L"";
+        std::wstringstream ss;
+        ss << std::wstring_view(RS_(L"GlobalSummonCommandKey"));
+
+        // "Summon the Terminal window"
+        // "Summon the Terminal window, name:\"{_Name}\""
+        if (!_Name.empty())
+        {
+            ss << L", name: ";
+            ss << std::wstring_view(_Name);
+        }
+        return winrt::hstring{ ss.str() };
     }
 }

src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp

@@ -16,7 +16,6 @@ using namespace winrt::Microsoft::Terminal::Settings::Model::implementation;
 using namespace winrt::Windows::UI::Xaml;
 using namespace ::Microsoft::Console;
 using namespace winrt::Microsoft::UI::Xaml::Controls;
-using namespace winrt::Microsoft::Terminal::Control;
 
 static constexpr std::string_view LegacyKeybindingsKey{ "keybindings" };
 static constexpr std::string_view ActionsKey{ "actions" };

src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl

@@ -76,6 +76,5 @@ namespace Microsoft.Terminal.Settings.Model
         KeyMapping KeyMap();
 
         Windows.Foundation.Collections.IMapView<String, Command> Commands();
-
     }
 }

src/cascadia/TerminalSettingsModel/KeyMapping.cpp

@@ -146,6 +146,10 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     // - Build a map of all the globalSummon actions.
     // - quakeMode actions are included in this, but expanded to the equivalent
     //   set of GlobalSummonArgs
+    // - This is only ever called in two scenarios:
+    //    - on becoming the monarch (which only happens once per window)
+    //    - when the settings reload (and the cache would inevitably be dirty)
+    //   So it's perfectly reasonable to not cache these results.
     // Arguments:
     // - <none>
     // Return Value:

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

@@ -391,4 +391,10 @@
   <data name="OpenWindowRenamerCommandKey" xml:space="preserve">
     <value>Rename window...</value>
   </data>
+  <data name="GlobalSummonCommandKey" xml:space="preserve">
+    <value>Summon the Terminal window</value>
+  </data>
+  <data name="QuakeModeCommandKey" xml:space="preserve">
+    <value>Summon Quake window</value>
+  </data>
 </root>

src/cascadia/WindowsTerminal/AppHost.cpp

@@ -565,7 +565,8 @@ bool AppHost::HasWindow()
 void AppHost::_DispatchCommandline(winrt::Windows::Foundation::IInspectable /*sender*/,
                                    Remoting::CommandlineArgs args)
 {
-    // TODO! Should we summon the window whenever we dispatch a commandline to it? methinks yes, but not in this PR.
+    // Summon the window whenever we dispatch a commandline to it. This will
+    // make it obvious when a new tab/pane is created in a window.
     _window->SummonWindow();
     _logic.ExecuteCommandline(args.Commandline(), args.CurrentDirectory());
 }
@@ -660,8 +661,8 @@ void AppHost::_GlobalHotkeyPressed(const long hotkeyIndex)
     {
         if (const auto& summonArgs{ actionAndArgs.Args().try_as<Settings::Model::GlobalSummonArgs>() })
         {
-            Remoting::SummonWindowSelectionArgs args;
-            args.WindowName(summonArgs.Name());
+            Remoting::SummonWindowSelectionArgs args{ summonArgs.Name() };
+
             _windowManager.SummonWindow(args);
             if (args.FoundMatch())
             {

src/cascadia/WindowsTerminal/IslandWindow.cpp

@@ -373,7 +373,7 @@ long IslandWindow::_calculateTotalSize(const bool isWidth, const long clientSize
         {
             // send focus to the child window
             SetFocus(_interopWindowHandle);
-            // return 0; // eat the message
+            return 0;
         }
         break;
     }
@@ -918,7 +918,7 @@ void IslandWindow::UnsetHotkeys(const std::vector<winrt::Microsoft::Terminal::Co
 
     for (size_t i = 0; i < hotkeyList.size(); i++)
     {
-        LOG_IF_WIN32_BOOL_FALSE(UnregisterHotKey(_window.get(), i));
+        LOG_IF_WIN32_BOOL_FALSE(UnregisterHotKey(_window.get(), static_cast<int>(i)));
     }
 }
 
@@ -993,6 +993,10 @@ winrt::fire_and_forget IslandWindow::SummonWindow()
     });
     LOG_IF_WIN32_BOOL_FALSE(BringWindowToTop(_window.get()));
     LOG_IF_WIN32_BOOL_FALSE(ShowWindow(_window.get(), SW_SHOW));
+
+    // Activate the window too. This will force us to the virtual desktop this
+    // window is on, if it's on another virtual desktop.
+    LOG_LAST_ERROR_IF_NULL(SetActiveWindow(_window.get()));
 }
 
 DEFINE_EVENT(IslandWindow, DragRegionClicked, _DragRegionClickedHandlers, winrt::delegate<>);