From 11bd5beb7ecaef69dc454bb7aaaaf9f5b2e54275 Mon Sep 17 00:00:00 2001
From: Pankaj Bhojwani <pankaj.d.bhoj@gmail.com>
Date: Thu, 19 Sep 2024 19:40:39 -0700
Subject: [PATCH] add keychord

---
 .../ActionsViewModel.cpp                      | 26 +++++++++++++++++--
 .../TerminalSettingsEditor/ActionsViewModel.h |  4 +++
 .../ActionsViewModel.idl                      |  4 +++
 .../TerminalSettingsEditor/EditAction.xaml    | 10 +++++--
 .../Resources/en-US/Resources.resw            |  6 ++++-
 .../TerminalSettingsModel/ActionMap.cpp       |  6 +++++
 .../TerminalSettingsModel/ActionMap.h         |  1 +
 .../TerminalSettingsModel/ActionMap.idl       |  1 +
 8 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp
index b594b3d7d3..29a0485cf8 100644
--- a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp
+++ b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp
@@ -160,15 +160,27 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         DeleteRequested.raise(*this, *this);
     }
 
+    void CommandViewModel::AddKeybinding_Click()
+    {
+        auto kbdVM{ make_self<KeyChordViewModel>(nullptr) };
+        kbdVM->IsInEditMode(true);
+        _RegisterEvents(*kbdVM);
+        KeyChordViewModelList().Append(*kbdVM);
+    }
+
     void CommandViewModel::_RegisterEvents(Editor::KeyChordViewModel kcVM)
     {
         if (const auto actionsPageVM{ _actionsPageVM.get() })
         {
+            const auto id = ID();
+            kcVM.AddKeyChordRequested([actionsPageVM, id](const Editor::KeyChordViewModel& /*sender*/, const Control::KeyChord& args) {
+                actionsPageVM.AttemptAddKeyChord(args, id);
+            });
             kcVM.ModifyKeyChordRequested([actionsPageVM](const Editor::KeyChordViewModel& sender, const Editor::ModifyKeyChordEventArgs& args) {
                 actionsPageVM.AttemptModifyKeyChord(sender, args);
             });
             kcVM.DeleteKeyChordRequested([actionsPageVM](const Editor::KeyChordViewModel& /*sender*/, const Control::KeyChord& args) {
-                // todo: remove the sender from our list
+                // todo: remove the sender from our list, remove flyout
                 actionsPageVM.AttemptDeleteKeyChord(args);
             });
         }
@@ -204,7 +216,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void KeyChordViewModel::AttemptAcceptChanges()
     {
-        if (_currentKeys.Modifiers() != _ProposedKeys.Modifiers() || _currentKeys.Vkey() != _ProposedKeys.Vkey())
+        if (!_currentKeys)
+        {
+            AddKeyChordRequested.raise(*this, _ProposedKeys);
+        }
+        else if (_currentKeys.Modifiers() != _ProposedKeys.Modifiers() || _currentKeys.Vkey() != _ProposedKeys.Vkey())
         {
             const auto args{ make_self<ModifyKeyChordEventArgs>(_currentKeys,     // OldKeys
                                                                 _ProposedKeys) }; // NewKeys
@@ -436,6 +452,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _Settings.ActionMap().DeleteKeyBinding(keys);
     }
 
+    void ActionsViewModel::AttemptAddKeyChord(const Control::KeyChord& keys, const winrt::hstring& cmdID)
+    {
+        // Update the settings model
+        _Settings.ActionMap().AddKeyBinding(keys, cmdID);
+    }
+
     void ActionsViewModel::_KeyBindingViewModelPropertyChangedHandler(const IInspectable& sender, const Windows::UI::Xaml::Data::PropertyChangedEventArgs& args)
     {
         const auto senderVM{ sender.as<Editor::KeyBindingViewModel>() };
diff --git a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h
index 5056e782b2..2c42ecdffe 100644
--- a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h
+++ b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h
@@ -143,6 +143,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void Delete_Click();
         til::typed_event<Editor::CommandViewModel, IInspectable> DeleteRequested;
 
+        void AddKeybinding_Click();
+
         VIEW_MODEL_OBSERVABLE_PROPERTY(IInspectable, ProposedAction);
         VIEW_MODEL_OBSERVABLE_PROPERTY(hstring, CurrentAction);
         WINRT_PROPERTY(Windows::Foundation::Collections::IObservableVector<hstring>, AvailableActions, nullptr);
@@ -173,6 +175,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         VIEW_MODEL_OBSERVABLE_PROPERTY(Windows::UI::Xaml::Controls::Flyout, AcceptChangesFlyout, nullptr);
 
     public:
+        til::typed_event<Editor::KeyChordViewModel, Terminal::Control::KeyChord> AddKeyChordRequested;
         til::typed_event<Editor::KeyChordViewModel, Editor::ModifyKeyChordEventArgs> ModifyKeyChordRequested;
         til::typed_event<Editor::KeyChordViewModel, Terminal::Control::KeyChord> DeleteKeyChordRequested;
 
@@ -194,6 +197,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         void AttemptModifyKeyChord(const Editor::KeyChordViewModel& senderVM, const Editor::ModifyKeyChordEventArgs& args);
         void AttemptDeleteKeyChord(const Control::KeyChord& keys);
+        void AttemptAddKeyChord(const Control::KeyChord& keys, const winrt::hstring& cmdID);
 
         til::typed_event<IInspectable, IInspectable> FocusContainer;
         til::typed_event<IInspectable, IInspectable> UpdateBackground;
diff --git a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl
index cca5d171ac..7f0c46c476 100644
--- a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl
+++ b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl
@@ -48,6 +48,7 @@ namespace Microsoft.Terminal.Settings.Editor
         void CancelChanges();
         void DeleteKeyBinding();
 
+
         event Windows.Foundation.TypedEventHandler<KeyBindingViewModel, ModifyKeyBindingEventArgs> ModifyKeyBindingRequested;
         event Windows.Foundation.TypedEventHandler<KeyBindingViewModel, Microsoft.Terminal.Control.KeyChord> DeleteKeyBindingRequested;
     }
@@ -66,6 +67,7 @@ namespace Microsoft.Terminal.Settings.Editor
         Object ProposedAction;
         void Edit_Click();
         void Delete_Click();
+        void AddKeybinding_Click();
         IObservableVector<String> AvailableActions { get; };
     }
 
@@ -82,6 +84,7 @@ namespace Microsoft.Terminal.Settings.Editor
         void CancelChanges();
         void DeleteKeyChord();
 
+        event Windows.Foundation.TypedEventHandler<KeyChordViewModel, Microsoft.Terminal.Control.KeyChord> AddKeyChordRequested;
         event Windows.Foundation.TypedEventHandler<KeyChordViewModel, ModifyKeyChordEventArgs> ModifyKeyChordRequested;
         event Windows.Foundation.TypedEventHandler<KeyChordViewModel, Microsoft.Terminal.Control.KeyChord> DeleteKeyChordRequested;
     }
@@ -107,6 +110,7 @@ namespace Microsoft.Terminal.Settings.Editor
         ActionsSubPage CurrentPage;
         CommandViewModel CurrentCommand;
 
+        void AttemptAddKeyChord(Microsoft.Terminal.Control.KeyChord keys, String cmdID);
         void AttemptModifyKeyChord(KeyChordViewModel senderVM, ModifyKeyChordEventArgs args);
         void AttemptDeleteKeyChord(Microsoft.Terminal.Control.KeyChord keys);
 
diff --git a/src/cascadia/TerminalSettingsEditor/EditAction.xaml b/src/cascadia/TerminalSettingsEditor/EditAction.xaml
index f12bdbbc25..5681eb7ba9 100644
--- a/src/cascadia/TerminalSettingsEditor/EditAction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/EditAction.xaml
@@ -238,14 +238,20 @@
                       IsEnabled="{x:Bind ViewModel.IsUserAction}"/>
             <ListView ItemTemplate="{StaticResource KeyChordTemplate}"
                       ItemsSource="{x:Bind ViewModel.KeyChordViewModelList, Mode=OneWay}"
-                      SelectionMode="None" />
+                      SelectionMode="None">
+                <ListView.Header>
+                    <Button Click="{x:Bind ViewModel.AddKeybinding_Click}">
+                        <TextBlock x:Uid="Actions_AddKeyChord" />
+                    </Button>
+                </ListView.Header>
+            </ListView>
             <Button Style="{StaticResource DeleteButtonStyle}"
                     IsEnabled="{x:Bind ViewModel.IsUserAction}">
                 <Button.Content>
                     <StackPanel Orientation="Horizontal">
                         <FontIcon FontSize="{StaticResource StandardIconSize}"
                                   Glyph="&#xE74D;" />
-                        <TextBlock x:Uid="Actions_DeleteButton"
+                        <TextBlock x:Uid="Actions_DeleteButton2"
                                    Style="{StaticResource IconButtonTextBlockStyle}" />
                     </StackPanel>
                 </Button.Content>
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
index 44606b5bd3..1a2598b010 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -1703,10 +1703,14 @@
     <value>Delete the unfocused appearance for this profile.</value>
     <comment>A description for what the delete unfocused appearance button does.</comment>
   </data>
-  <data name="Actions_DeleteButton.Text" xml:space="preserve">
+  <data name="Actions_DeleteButton2.Text" xml:space="preserve">
     <value>Delete action</value>
     <comment>Button label that deletes the selected action.</comment>
   </data>
+  <data name="Actions_AddKeyChord.Text" xml:space="preserve">
+    <value>Add keybinding</value>
+    <comment>Button label that adds a keybinding to the current action.</comment>
+  </data>
   <data name="Actions_DeleteConfirmationButton.Content" xml:space="preserve">
     <value>Yes, delete key binding</value>
     <comment>Button label that confirms deletion of a key binding entry.</comment>
diff --git a/src/cascadia/TerminalSettingsModel/ActionMap.cpp b/src/cascadia/TerminalSettingsModel/ActionMap.cpp
index 989c36df35..36da2ace88 100644
--- a/src/cascadia/TerminalSettingsModel/ActionMap.cpp
+++ b/src/cascadia/TerminalSettingsModel/ActionMap.cpp
@@ -741,6 +741,12 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         }
     }
 
+    void ActionMap::AddKeyBinding(Control::KeyChord keys, const winrt::hstring& cmdID)
+    {
+        _KeyMap.insert_or_assign(keys, cmdID);
+        _RefreshKeyBindingCaches();
+    }
+
     // Method Description:
     // - Add a new key binding
     // - If the key chord is already in use, the conflicting command is overwritten.
diff --git a/src/cascadia/TerminalSettingsModel/ActionMap.h b/src/cascadia/TerminalSettingsModel/ActionMap.h
index c5f83af6ba..37191c2361 100644
--- a/src/cascadia/TerminalSettingsModel/ActionMap.h
+++ b/src/cascadia/TerminalSettingsModel/ActionMap.h
@@ -78,6 +78,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         // modification
         bool RebindKeys(const Control::KeyChord& oldKeys, const Control::KeyChord& newKeys);
         void DeleteKeyBinding(const Control::KeyChord& keys);
+        void AddKeyBinding(Control::KeyChord keys, const winrt::hstring& cmdID);
         void RegisterKeyBinding(Control::KeyChord keys, Model::ActionAndArgs action);
         void DeleteUserCommand(const winrt::hstring& cmdID);
         void AddSendInputAction(winrt::hstring name, winrt::hstring input, const Control::KeyChord keys);
diff --git a/src/cascadia/TerminalSettingsModel/ActionMap.idl b/src/cascadia/TerminalSettingsModel/ActionMap.idl
index b90e595105..80cbf2f7ea 100644
--- a/src/cascadia/TerminalSettingsModel/ActionMap.idl
+++ b/src/cascadia/TerminalSettingsModel/ActionMap.idl
@@ -30,6 +30,7 @@ namespace Microsoft.Terminal.Settings.Model
         void RebindKeys(Microsoft.Terminal.Control.KeyChord oldKeys, Microsoft.Terminal.Control.KeyChord newKeys);
         void DeleteKeyBinding(Microsoft.Terminal.Control.KeyChord keys);
         void DeleteUserCommand(String cmdID);
+        void AddKeyBinding(Microsoft.Terminal.Control.KeyChord keys, String cmdID);
         void RegisterKeyBinding(Microsoft.Terminal.Control.KeyChord keys, ActionAndArgs action);
         void AddSendInputAction(String name, String input, Microsoft.Terminal.Control.KeyChord keys);
     }