Compare commits
8 commits
main
...
dev/kawa/1
Author | SHA1 | Date | |
---|---|---|---|
66f8548c83 | |||
76aeb753c3 | |||
249963514b | |||
e1cf647910 | |||
514222b9f5 | |||
65e62a0fd3 | |||
bdfd5d41a6 | |||
5c7ff43b83 |
File diff suppressed because it is too large
Load diff
|
@ -7,7 +7,6 @@
|
||||||
#include "CascadiaSettings.h"
|
#include "CascadiaSettings.h"
|
||||||
#include "App.g.h"
|
#include "App.g.h"
|
||||||
#include "App.base.h"
|
#include "App.base.h"
|
||||||
#include "ScopedResourceLoader.h"
|
|
||||||
#include "../../cascadia/inc/cppwinrt_utils.h"
|
#include "../../cascadia/inc/cppwinrt_utils.h"
|
||||||
|
|
||||||
#include <winrt/Microsoft.Terminal.TerminalControl.h>
|
#include <winrt/Microsoft.Terminal.TerminalControl.h>
|
||||||
|
@ -34,14 +33,10 @@ namespace winrt::TerminalApp::implementation
|
||||||
Windows::Foundation::Point GetLaunchDimensions(uint32_t dpi);
|
Windows::Foundation::Point GetLaunchDimensions(uint32_t dpi);
|
||||||
bool GetShowTabsInTitlebar();
|
bool GetShowTabsInTitlebar();
|
||||||
|
|
||||||
~App() = default;
|
|
||||||
|
|
||||||
hstring GetTitle();
|
hstring GetTitle();
|
||||||
|
|
||||||
// -------------------------------- WinRT Events ---------------------------------
|
// -------------------------------- WinRT Events ---------------------------------
|
||||||
DECLARE_EVENT(TitleChanged, _titleChangeHandlers, winrt::Microsoft::Terminal::TerminalControl::TitleChangedEventArgs);
|
//DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(SetTitleBarContent, _setTitleBarContentHandlers, TerminalApp::App, winrt::Windows::UI::Xaml::UIElement);
|
||||||
DECLARE_EVENT(LastTabClosed, _lastTabClosedHandlers, winrt::TerminalApp::LastTabClosedEventArgs);
|
|
||||||
DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(SetTitleBarContent, _setTitleBarContentHandlers, TerminalApp::App, winrt::Windows::UI::Xaml::UIElement);
|
|
||||||
DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(RequestedThemeChanged, _requestedThemeChangedHandlers, TerminalApp::App, winrt::Windows::UI::Xaml::ElementTheme);
|
DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(RequestedThemeChanged, _requestedThemeChangedHandlers, TerminalApp::App, winrt::Windows::UI::Xaml::ElementTheme);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -52,99 +47,30 @@ namespace winrt::TerminalApp::implementation
|
||||||
// updated in _ApplyTheme. The two roots currently are _root and _tabRow
|
// updated in _ApplyTheme. The two roots currently are _root and _tabRow
|
||||||
// (which is a root when the tabs are in the titlebar.)
|
// (which is a root when the tabs are in the titlebar.)
|
||||||
Windows::UI::Xaml::Controls::Control _root{ nullptr };
|
Windows::UI::Xaml::Controls::Control _root{ nullptr };
|
||||||
Microsoft::UI::Xaml::Controls::TabView _tabView{ nullptr };
|
|
||||||
TerminalApp::TabRowControl _tabRow{ nullptr };
|
|
||||||
Windows::UI::Xaml::Controls::Grid _tabContent{ nullptr };
|
|
||||||
Windows::UI::Xaml::Controls::SplitButton _newTabButton{ nullptr };
|
|
||||||
|
|
||||||
std::vector<std::shared_ptr<Tab>> _tabs;
|
|
||||||
|
|
||||||
std::unique_ptr<::TerminalApp::CascadiaSettings> _settings;
|
std::unique_ptr<::TerminalApp::CascadiaSettings> _settings;
|
||||||
|
|
||||||
HRESULT _settingsLoadedResult;
|
HRESULT _settingsLoadedResult;
|
||||||
|
|
||||||
bool _loadedInitialSettings;
|
bool _loadedInitialSettings;
|
||||||
std::shared_mutex _dialogLock;
|
|
||||||
|
|
||||||
ScopedResourceLoader _resourceLoader;
|
|
||||||
|
|
||||||
wil::unique_folder_change_reader_nothrow _reader;
|
wil::unique_folder_change_reader_nothrow _reader;
|
||||||
|
|
||||||
std::atomic<bool> _settingsReloadQueued{ false };
|
std::atomic<bool> _settingsReloadQueued{ false };
|
||||||
|
|
||||||
void _CreateNewTabFlyout();
|
|
||||||
|
|
||||||
fire_and_forget _ShowDialog(const winrt::Windows::Foundation::IInspectable& titleElement,
|
|
||||||
const winrt::Windows::Foundation::IInspectable& contentElement,
|
|
||||||
const winrt::hstring& closeButtonText);
|
|
||||||
void _ShowOkDialog(const winrt::hstring& titleKey, const winrt::hstring& contentKey);
|
|
||||||
void _ShowAboutDialog();
|
|
||||||
|
|
||||||
[[nodiscard]] HRESULT _TryLoadSettings(const bool saveOnLoad) noexcept;
|
[[nodiscard]] HRESULT _TryLoadSettings(const bool saveOnLoad) noexcept;
|
||||||
void _LoadSettings();
|
void _LoadSettings();
|
||||||
void _OpenSettings();
|
void _OpenSettings();
|
||||||
|
|
||||||
void _HookupKeyBindings(TerminalApp::AppKeyBindings bindings) noexcept;
|
|
||||||
|
|
||||||
void _RegisterSettingsChange();
|
void _RegisterSettingsChange();
|
||||||
fire_and_forget _DispatchReloadSettings();
|
fire_and_forget _DispatchReloadSettings();
|
||||||
void _ReloadSettings();
|
void _ReloadSettings();
|
||||||
|
|
||||||
void _SettingsButtonOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
|
|
||||||
void _FeedbackButtonOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
|
|
||||||
void _AboutButtonOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
|
|
||||||
|
|
||||||
void _UpdateTabView();
|
|
||||||
void _UpdateTabIcon(std::shared_ptr<Tab> tab);
|
|
||||||
void _UpdateTitle(std::shared_ptr<Tab> tab);
|
|
||||||
|
|
||||||
void _RegisterTerminalEvents(Microsoft::Terminal::TerminalControl::TermControl term, std::shared_ptr<Tab> hostingTab);
|
|
||||||
|
|
||||||
void _CreateNewTabFromSettings(GUID profileGuid, winrt::Microsoft::Terminal::Settings::TerminalSettings settings);
|
|
||||||
winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection _CreateConnectionFromSettings(GUID profileGuid, winrt::Microsoft::Terminal::Settings::TerminalSettings settings);
|
|
||||||
|
|
||||||
void _OpenNewTab(std::optional<int> profileIndex);
|
|
||||||
void _DuplicateTabViewItem();
|
|
||||||
void _CloseFocusedTab();
|
|
||||||
void _CloseFocusedPane();
|
|
||||||
void _SelectNextTab(const bool bMoveRight);
|
|
||||||
void _SelectTab(const int tabIndex);
|
|
||||||
|
|
||||||
void _SetFocusedTabIndex(int tabIndex);
|
|
||||||
int _GetFocusedTabIndex() const;
|
|
||||||
|
|
||||||
void _Scroll(int delta);
|
|
||||||
void _CopyText(const bool trimTrailingWhitespace);
|
|
||||||
void _PasteText();
|
|
||||||
void _SplitVertical(const std::optional<GUID>& profileGuid);
|
|
||||||
void _SplitHorizontal(const std::optional<GUID>& profileGuid);
|
|
||||||
void _SplitPane(const Pane::SplitState splitType, const std::optional<GUID>& profileGuid);
|
|
||||||
|
|
||||||
// Todo: add more event implementations here
|
|
||||||
// MSFT:20641986: Add keybindings for New Window
|
|
||||||
void _ScrollPage(int delta);
|
|
||||||
void _ResizePane(const Direction& direction);
|
|
||||||
void _MoveFocus(const Direction& direction);
|
|
||||||
|
|
||||||
void _OnLoaded(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
|
|
||||||
void _OnTabSelectionChanged(const IInspectable& sender, const Windows::UI::Xaml::Controls::SelectionChangedEventArgs& eventArgs);
|
|
||||||
void _OnTabClosing(const IInspectable& sender, const Microsoft::UI::Xaml::Controls::TabViewTabClosingEventArgs& eventArgs);
|
|
||||||
void _OnTabItemsChanged(const IInspectable& sender, const Windows::Foundation::Collections::IVectorChangedEventArgs& eventArgs);
|
|
||||||
void _OnTabClick(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs);
|
|
||||||
void _OnContentSizeChanged(const IInspectable& sender, Windows::UI::Xaml::SizeChangedEventArgs const& e);
|
|
||||||
|
|
||||||
void _RemoveTabViewItem(const IInspectable& tabViewItem);
|
|
||||||
|
|
||||||
void _ApplyTheme(const Windows::UI::Xaml::ElementTheme& newTheme);
|
void _ApplyTheme(const Windows::UI::Xaml::ElementTheme& newTheme);
|
||||||
|
|
||||||
static Windows::UI::Xaml::Controls::IconElement _GetIconFromProfile(const ::TerminalApp::Profile& profile);
|
void _OnLoaded(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
|
||||||
|
|
||||||
winrt::Microsoft::Terminal::TerminalControl::TermControl _GetFocusedControl();
|
winrt::event_token SetTitleBarContent(Windows::Foundation::TypedEventHandler<TerminalApp::App, winrt::Windows::UI::Xaml::UIElement> const& handler);
|
||||||
|
void SetTitleBarContent(winrt::event_token const& token) noexcept;
|
||||||
void _CopyToClipboardHandler(const winrt::hstring& copiedData);
|
|
||||||
void _PasteFromClipboardHandler(const IInspectable& sender, const Microsoft::Terminal::TerminalControl::PasteFromClipboardEventArgs& eventArgs);
|
|
||||||
|
|
||||||
static void _SetAcceleratorForMenuItem(Windows::UI::Xaml::Controls::MenuFlyoutItem& menuItem, const winrt::Microsoft::Terminal::Settings::KeyChord& keyChord);
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
namespace TerminalApp
|
namespace TerminalApp
|
||||||
{
|
{
|
||||||
delegate void LastTabClosedEventArgs();
|
|
||||||
[default_interface] runtimeclass App : Microsoft.Toolkit.Win32.UI.XamlHost.XamlApplication
|
[default_interface] runtimeclass App : Microsoft.Toolkit.Win32.UI.XamlHost.XamlApplication
|
||||||
{
|
{
|
||||||
App();
|
App();
|
||||||
|
@ -24,9 +23,7 @@ namespace TerminalApp
|
||||||
Windows.Foundation.Point GetLaunchDimensions(UInt32 dpi);
|
Windows.Foundation.Point GetLaunchDimensions(UInt32 dpi);
|
||||||
Boolean GetShowTabsInTitlebar();
|
Boolean GetShowTabsInTitlebar();
|
||||||
|
|
||||||
event Microsoft.Terminal.TerminalControl.TitleChangedEventArgs TitleChanged;
|
//event Windows.Foundation.TypedEventHandler<App, Windows.UI.Xaml.UIElement> SetTitleBarContent;
|
||||||
event LastTabClosedEventArgs LastTabClosed;
|
|
||||||
event Windows.Foundation.TypedEventHandler<App, Windows.UI.Xaml.UIElement> SetTitleBarContent;
|
|
||||||
event Windows.Foundation.TypedEventHandler<App, Windows.UI.Xaml.ElementTheme> RequestedThemeChanged;
|
event Windows.Foundation.TypedEventHandler<App, Windows.UI.Xaml.ElementTheme> RequestedThemeChanged;
|
||||||
|
|
||||||
String GetTitle();
|
String GetTitle();
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -6,12 +6,114 @@
|
||||||
#include "winrt/Microsoft.UI.Xaml.Controls.h"
|
#include "winrt/Microsoft.UI.Xaml.Controls.h"
|
||||||
|
|
||||||
#include "TerminalPage.g.h"
|
#include "TerminalPage.g.h"
|
||||||
|
#include "Tab.h"
|
||||||
|
#include "CascadiaSettings.h"
|
||||||
|
#include "Profile.h"
|
||||||
|
#include "ScopedResourceLoader.h"
|
||||||
|
|
||||||
|
#include <winrt/Microsoft.Terminal.TerminalControl.h>
|
||||||
|
#include <winrt/Microsoft.Terminal.TerminalConnection.h>
|
||||||
|
#include <winrt/Microsoft.UI.Xaml.Controls.Primitives.h>
|
||||||
|
#include <winrt/Windows.ApplicationModel.DataTransfer.h>
|
||||||
|
#include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h>
|
||||||
|
|
||||||
namespace winrt::TerminalApp::implementation
|
namespace winrt::TerminalApp::implementation
|
||||||
{
|
{
|
||||||
struct TerminalPage : TerminalPageT<TerminalPage>
|
struct TerminalPage : TerminalPageT<TerminalPage>
|
||||||
{
|
{
|
||||||
|
public:
|
||||||
TerminalPage();
|
TerminalPage();
|
||||||
|
|
||||||
|
void SetSettings(::TerminalApp::CascadiaSettings* settings);
|
||||||
|
|
||||||
|
void Create();
|
||||||
|
|
||||||
|
hstring GetTitle();
|
||||||
|
|
||||||
|
void RefreshUIAfterSettingsReloaded();
|
||||||
|
|
||||||
|
void ShowOkDialog(const winrt::hstring& titleKey, const winrt::hstring& contentKey);
|
||||||
|
|
||||||
|
TerminalApp::TabRowControl GetTabRow(); // This is a work-around because the winrt events are not working in Page
|
||||||
|
|
||||||
|
// -------------------------------- WinRT Events ---------------------------------
|
||||||
|
DECLARE_EVENT(TitleChanged, _titleChangeHandlers, winrt::Microsoft::Terminal::TerminalControl::TitleChangedEventArgs);
|
||||||
|
DECLARE_EVENT(LastTabClosed, _lastTabClosedHandlers, winrt::TerminalApp::LastTabClosedEventArgs);
|
||||||
|
DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(SetTitleBarContent, _setTitleBarContentHandlers, TerminalApp::TerminalPage, winrt::Windows::UI::Xaml::UIElement);
|
||||||
|
|
||||||
|
private:
|
||||||
|
Microsoft::UI::Xaml::Controls::TabView _tabView{ nullptr };
|
||||||
|
TerminalApp::TabRowControl _tabRow{ nullptr };
|
||||||
|
Windows::UI::Xaml::Controls::Grid _tabContent{ nullptr };
|
||||||
|
Windows::UI::Xaml::Controls::SplitButton _newTabButton{ nullptr };
|
||||||
|
|
||||||
|
::TerminalApp::CascadiaSettings* _settings{ nullptr };
|
||||||
|
|
||||||
|
std::vector<std::shared_ptr<Tab>> _tabs;
|
||||||
|
|
||||||
|
std::shared_mutex _dialogLock;
|
||||||
|
|
||||||
|
ScopedResourceLoader _resourceLoader;
|
||||||
|
|
||||||
|
void _HookupKeyBindings(TerminalApp::AppKeyBindings bindings) noexcept;
|
||||||
|
|
||||||
|
void _CreateNewTabFromSettings(GUID profileGuid, winrt::Microsoft::Terminal::Settings::TerminalSettings settings);
|
||||||
|
void _OpenNewTab(std::optional<int> profileIndex);
|
||||||
|
void _CreateNewTabFlyout();
|
||||||
|
|
||||||
|
void _RegisterTerminalEvents(Microsoft::Terminal::TerminalControl::TermControl term, std::shared_ptr<Tab> hostingTab);
|
||||||
|
|
||||||
|
fire_and_forget _ShowDialog(const IInspectable& titleElement,
|
||||||
|
const IInspectable& contentElement,
|
||||||
|
const winrt::hstring& closeButtonText);
|
||||||
|
void _ShowAboutDialog();
|
||||||
|
|
||||||
|
void _UpdateTitle(std::shared_ptr<Tab> tab);
|
||||||
|
void _UpdateTabIcon(std::shared_ptr<Tab> tab);
|
||||||
|
void _UpdateTabView();
|
||||||
|
|
||||||
|
void _DuplicateTabViewItem();
|
||||||
|
void _SelectNextTab(const bool bMoveRight);
|
||||||
|
void _SelectTab(const int tabIndex);
|
||||||
|
void _MoveFocus(const Direction& direction);
|
||||||
|
void _CloseFocusedTab();
|
||||||
|
void _CloseFocusedPane();
|
||||||
|
|
||||||
|
winrt::Microsoft::Terminal::TerminalControl::TermControl _GetFocusedControl();
|
||||||
|
int _GetFocusedTabIndex() const;
|
||||||
|
void _SetFocusedTabIndex(int tabIndex);
|
||||||
|
|
||||||
|
void _RemoveTabViewItem(const IInspectable& tabViewItem);
|
||||||
|
|
||||||
|
// Todo: add more event implementations here
|
||||||
|
// MSFT:20641986: Add keybindings for New Window
|
||||||
|
void _Scroll(int delta);
|
||||||
|
void _SplitVertical(const std::optional<GUID>& profileGuid);
|
||||||
|
void _SplitHorizontal(const std::optional<GUID>& profileGuid);
|
||||||
|
void _SplitPane(const Pane::SplitState splitType, const std::optional<GUID>& profileGuid);
|
||||||
|
void _ResizePane(const Direction& direction);
|
||||||
|
void _ScrollPage(int delta);
|
||||||
|
void _OpenSettings();
|
||||||
|
fire_and_forget LaunchSettings();
|
||||||
|
static Windows::UI::Xaml::Controls::IconElement _GetIconFromProfile(const ::TerminalApp::Profile& profile);
|
||||||
|
void _SetAcceleratorForMenuItem(Windows::UI::Xaml::Controls::MenuFlyoutItem& menuItem, const winrt::Microsoft::Terminal::Settings::KeyChord& keyChord);
|
||||||
|
|
||||||
|
void _CopyToClipboardHandler(const winrt::hstring& copiedData);
|
||||||
|
void _PasteFromClipboardHandler(const IInspectable& sender,
|
||||||
|
const Microsoft::Terminal::TerminalControl::PasteFromClipboardEventArgs& eventArgs);
|
||||||
|
void _CopyText(const bool trimTrailingWhitespace);
|
||||||
|
void _PasteText();
|
||||||
|
static fire_and_forget PasteFromClipboard(winrt::Microsoft::Terminal::TerminalControl::PasteFromClipboardEventArgs eventArgs);
|
||||||
|
|
||||||
|
void _OnTabClick(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs);
|
||||||
|
void _OnTabSelectionChanged(const IInspectable& sender, const Windows::UI::Xaml::Controls::SelectionChangedEventArgs& eventArgs);
|
||||||
|
void _OnTabItemsChanged(const IInspectable& sender, const Windows::Foundation::Collections::IVectorChangedEventArgs& eventArgs);
|
||||||
|
void _OnContentSizeChanged(const IInspectable& /*sender*/, Windows::UI::Xaml::SizeChangedEventArgs const& e);
|
||||||
|
void _OnTabClosing(const IInspectable& sender, const Microsoft::UI::Xaml::Controls::TabViewTabClosingEventArgs& eventArgs);
|
||||||
|
|
||||||
|
void _SettingsButtonOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
|
||||||
|
void _FeedbackButtonOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
|
||||||
|
void _AboutButtonOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,13 @@
|
||||||
|
|
||||||
namespace TerminalApp
|
namespace TerminalApp
|
||||||
{
|
{
|
||||||
|
delegate void LastTabClosedEventArgs();
|
||||||
[default_interface] runtimeclass TerminalPage : Windows.UI.Xaml.Controls.Page
|
[default_interface] runtimeclass TerminalPage : Windows.UI.Xaml.Controls.Page
|
||||||
{
|
{
|
||||||
TerminalPage();
|
TerminalPage();
|
||||||
|
|
||||||
|
event Microsoft.Terminal.TerminalControl.TitleChangedEventArgs TitleChanged;
|
||||||
|
event LastTabClosedEventArgs LastTabClosed;
|
||||||
|
event Windows.Foundation.TypedEventHandler<TerminalPage, Windows.UI.Xaml.UIElement> SetTitleBarContent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,8 +73,10 @@ void AppHost::Initialize()
|
||||||
|
|
||||||
_app.Create();
|
_app.Create();
|
||||||
|
|
||||||
_app.TitleChanged({ this, &AppHost::AppTitleChanged });
|
// This is a work-around for winrt events not working in TerminalPage
|
||||||
_app.LastTabClosed({ this, &AppHost::LastTabClosed });
|
auto terminalPage = _app.GetRoot().as<winrt::TerminalApp::TerminalPage>();
|
||||||
|
terminalPage.TitleChanged({ this, &AppHost::AppTitleChanged });
|
||||||
|
terminalPage.LastTabClosed({ this, &AppHost::LastTabClosed });
|
||||||
|
|
||||||
AppTitleChanged(_app.GetTitle());
|
AppTitleChanged(_app.GetTitle());
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue