starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-02-06 21:29:10 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

Use more cppwinrt_utils (#11856)

Browse Source 
* Adds the `cppwinrt_utils.h` to the include path for all winrt projects.
* Adds the file to the pch.h's for every project, so you don't need to include it in every header.
* Replaces some usages of `DECLARE_EVENT`/`DEFINE_EVENT` with `WINRT_CALLBACK`, which will do it in a oneliner
* Adds more `BASIC_FACTORY` usage.
* [x] Closes #2456

It's 92 files with one-line changes, don't be scared.
This commit is contained in:
Mike Griese
2021-12-06 14:11:23 -06:00
committed by GitHub
parent 81d9297537
commit 3606c3daab
93 changed files with 66 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cascadia/LocalTests_SettingsModel/pch.h
View File

@@ -66,3 +66,5 @@ Author(s):
#include "../../inc/conattrs.hpp"
#include "../../types/inc/utils.hpp"
#include "../../inc/DefaultSettings.h"
#include <cppwinrt_utils.h>

2
src/cascadia/LocalTests_TerminalApp/pch.h
View File

@@ -73,3 +73,5 @@ Author(s):
#include "../../inc/conattrs.hpp"
#include "../../types/inc/utils.hpp"
#include "../../inc/DefaultSettings.h"
#include <cppwinrt_utils.h>

1
src/cascadia/Remoting/CommandlineArgs.h
View File

@@ -1,7 +1,6 @@
#pragma once
#include "CommandlineArgs.g.h"
#include "../cascadia/inc/cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::Remoting::implementation
{

1
src/cascadia/Remoting/FindTargetWindowArgs.h
View File

@@ -19,7 +19,6 @@ Abstract:
#pragma once
#include "FindTargetWindowArgs.g.h"
#include "../cascadia/inc/cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::Remoting::implementation
{

1
src/cascadia/Remoting/GetWindowLayoutArgs.h
View File

@@ -15,7 +15,6 @@ Abstract:
#pragma once
#include "GetWindowLayoutArgs.g.h"
#include "../cascadia/inc/cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::Remoting::implementation
{

1
src/cascadia/Remoting/Monarch.h
View File

@@ -5,7 +5,6 @@
#include "Monarch.g.h"
#include "Peasant.h"
#include "../cascadia/inc/cppwinrt_utils.h"
#include "WindowActivatedArgs.h"
#include <atomic>

1
src/cascadia/Remoting/Peasant.h
View File

@@ -4,7 +4,6 @@
#pragma once
#include "Peasant.g.h"
#include "../cascadia/inc/cppwinrt_utils.h"
#include "RenameRequestArgs.h"
namespace RemotingUnitTests

1
src/cascadia/Remoting/ProposeCommandlineResult.h
View File

@@ -19,7 +19,6 @@ Abstract:
#pragma once
#include "ProposeCommandlineResult.g.h"
#include "../cascadia/inc/cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::Remoting::implementation
{

1
src/cascadia/Remoting/QuitAllRequestedArgs.h
View File

@@ -14,7 +14,6 @@ Abstract:
#pragma once
#include "QuitAllRequestedArgs.g.h"
#include "../cascadia/inc/cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::Remoting::implementation
{

1
src/cascadia/Remoting/RenameRequestArgs.h
View File

@@ -9,7 +9,6 @@ Class Name:
#pragma once
#include "RenameRequestArgs.g.h"
#include "../cascadia/inc/cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::Remoting::implementation
{

1
src/cascadia/Remoting/SummonWindowBehavior.h
View File

@@ -13,7 +13,6 @@ Abstract:
#pragma once
#include "SummonWindowBehavior.g.h"
#include "../cascadia/inc/cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::Remoting::implementation
{

1
src/cascadia/Remoting/SummonWindowSelectionArgs.h
View File

@@ -18,7 +18,6 @@ Abstract:
#pragma once
#include "SummonWindowSelectionArgs.g.h"
#include "../cascadia/inc/cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::Remoting::implementation
{

1
src/cascadia/Remoting/WindowActivatedArgs.h
View File

@@ -14,7 +14,6 @@ Abstract:
#pragma once
#include "WindowActivatedArgs.g.h"
#include "../cascadia/inc/cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::Remoting::implementation
{

1
src/cascadia/Remoting/WindowManager.h
View File

@@ -24,7 +24,6 @@ Abstract:
#include "WindowManager.g.h"
#include "Peasant.h"
#include "Monarch.h"
#include "../cascadia/inc/cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::Remoting::implementation
{

2
src/cascadia/Remoting/pch.h
View File

@@ -50,3 +50,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hRemotingProvider);
// Manually include til after we include Windows.Foundation to give it winrt superpowers
#include "til.h"
#include <cppwinrt_utils.h>

1
src/cascadia/ShellExtension/OpenTerminalHere.h
View File

@@ -23,7 +23,6 @@ Author(s):
#pragma once
#include <conattrs.hpp>
#include "../../cascadia/inc/cppwinrt_utils.h"
using namespace Microsoft::WRL;

1
src/cascadia/TerminalApp/ActionPaletteItem.h
View File

@@ -5,7 +5,6 @@
#include "PaletteItem.h"
#include "ActionPaletteItem.g.h"
#include "inc/cppwinrt_utils.h"
namespace winrt::TerminalApp::implementation
{

1
src/cascadia/TerminalApp/AppKeyBindings.h
View File

@@ -5,7 +5,6 @@
#include "AppKeyBindings.g.h"
#include "ShortcutActionDispatch.h"
#include "../inc/cppwinrt_utils.h"
// fwdecl unittest classes
namespace TerminalAppLocalTests

4
src/cascadia/TerminalApp/AppLogic.h
View File

@@ -212,7 +212,5 @@ namespace winrt::TerminalApp::implementation
namespace winrt::TerminalApp::factory_implementation
{
struct AppLogic : AppLogicT<AppLogic, implementation::AppLogic>
{
};
BASIC_FACTORY(AppLogic);
}

5
src/cascadia/TerminalApp/ColorPickupFlyout.h
View File

@@ -1,6 +1,5 @@
#pragma once
#include "ColorPickupFlyout.g.h"
#include "../cascadia/inc/cppwinrt_utils.h"
namespace winrt::TerminalApp::implementation
{
@@ -21,7 +20,5 @@ namespace winrt::TerminalApp::implementation
namespace winrt::TerminalApp::factory_implementation
{
struct ColorPickupFlyout : ColorPickupFlyoutT<ColorPickupFlyout, implementation::ColorPickupFlyout>
{
};
BASIC_FACTORY(ColorPickupFlyout);
}

1
src/cascadia/TerminalApp/CommandLinePaletteItem.h
View File

@@ -5,7 +5,6 @@
#include "PaletteItem.h"
#include "CommandLinePaletteItem.g.h"
#include "inc/cppwinrt_utils.h"
namespace winrt::TerminalApp::implementation
{

1
src/cascadia/TerminalApp/CommandPalette.h
View File

@@ -6,7 +6,6 @@
#include "FilteredCommand.h"
#include "CommandPalette.g.h"
#include "AppCommandlineArgs.h"
#include "../../cascadia/inc/cppwinrt_utils.h"
// fwdecl unittest classes
namespace TerminalAppLocalTests

1
src/cascadia/TerminalApp/DebugTapConnection.h
View File

@@ -4,7 +4,6 @@
#pragma once
#include <winrt/Microsoft.Terminal.TerminalConnection.h>
#include "../../inc/cppwinrt_utils.h"
#include <til/latch.h>
namespace winrt::Microsoft::TerminalApp::implementation

1
src/cascadia/TerminalApp/EmptyStringVisibilityConverter.h
View File

@@ -1,7 +1,6 @@
#pragma once
#include "EmptyStringVisibilityConverter.g.h"
#include "../inc/cppwinrt_utils.h"
namespace winrt::TerminalApp::implementation
{

1
src/cascadia/TerminalApp/FilteredCommand.h
View File

@@ -5,7 +5,6 @@
#include "HighlightedTextControl.h"
#include "FilteredCommand.g.h"
#include "../../cascadia/inc/cppwinrt_utils.h"
// fwdecl unittest classes
namespace TerminalAppLocalTests

1
src/cascadia/TerminalApp/HighlightedText.h
View File

@@ -7,7 +7,6 @@
#include "HighlightedTextSegment.g.h"
#include "HighlightedText.g.h"
#include "../../cascadia/inc/cppwinrt_utils.h"
namespace winrt::TerminalApp::implementation
{

1
src/cascadia/TerminalApp/HighlightedTextControl.h
View File

@@ -6,7 +6,6 @@
#include "winrt/Microsoft.UI.Xaml.Controls.h"
#include "HighlightedTextControl.g.h"
#include "../../cascadia/inc/cppwinrt_utils.h"
namespace winrt::TerminalApp::implementation
{

5
src/cascadia/TerminalApp/MinMaxCloseControl.h
View File

@@ -7,7 +7,6 @@
#pragma once
#include "MinMaxCloseControl.g.h"
#include "../../cascadia/inc/cppwinrt_utils.h"
#include <ThrottledFunc.h>
namespace winrt::TerminalApp::implementation
@@ -40,7 +39,5 @@ namespace winrt::TerminalApp::implementation
namespace winrt::TerminalApp::factory_implementation
{
struct MinMaxCloseControl : MinMaxCloseControlT<MinMaxCloseControl, implementation::MinMaxCloseControl>
{
};
BASIC_FACTORY(MinMaxCloseControl);
}

1
src/cascadia/TerminalApp/PaletteItem.h
View File

@@ -2,7 +2,6 @@
// Licensed under the MIT license.
#pragma once
#include "inc/cppwinrt_utils.h"
#include "PaletteItem.g.h"
namespace winrt::TerminalApp::implementation

1
src/cascadia/TerminalApp/PaletteItemTemplateSelector.h
View File

@@ -4,7 +4,6 @@
#pragma once
#include "PaletteItemTemplateSelector.g.h"
#include "inc/cppwinrt_utils.h"
namespace winrt::TerminalApp::implementation
{

7
src/cascadia/TerminalApp/Pane.cpp
View File

@@ -1526,7 +1526,7 @@ std::shared_ptr<Pane> Pane::DetachPane(std::shared_ptr<Pane> pane)
// Trigger the detached event on each child
detached->WalkTree([](auto pane) {
pane->_PaneDetachedHandlers(pane);
pane->_DetachedHandlers(pane);
return false;
});
@@ -3253,8 +3253,3 @@ void Pane::CollectTaskbarStates(std::vector<winrt::TerminalApp::TaskbarState>& s
_secondChild->CollectTaskbarStates(states);
}
}
DEFINE_EVENT(Pane, GotFocus, _GotFocusHandlers, Pane::gotFocusArgs);
DEFINE_EVENT(Pane, LostFocus, _LostFocusHandlers, winrt::delegate<std::shared_ptr<Pane>>);
DEFINE_EVENT(Pane, PaneRaiseBell, _PaneRaiseBellHandlers, winrt::Windows::Foundation::EventHandler<bool>);
DEFINE_EVENT(Pane, Detached, _PaneDetachedHandlers, winrt::delegate<std::shared_ptr<Pane>>);

9
src/cascadia/TerminalApp/Pane.h
View File

@@ -20,7 +20,6 @@
#pragma once
#include "../../cascadia/inc/cppwinrt_utils.h"
#include "TaskbarState.h"
// fwdecl unittest classes
@@ -185,10 +184,10 @@ public:
using gotFocusArgs = winrt::delegate<std::shared_ptr<Pane>, winrt::Windows::UI::Xaml::FocusState>;
DECLARE_EVENT(GotFocus, _GotFocusHandlers, gotFocusArgs);
DECLARE_EVENT(LostFocus, _LostFocusHandlers, winrt::delegate<std::shared_ptr<Pane>>);
DECLARE_EVENT(PaneRaiseBell, _PaneRaiseBellHandlers, winrt::Windows::Foundation::EventHandler<bool>);
DECLARE_EVENT(Detached, _PaneDetachedHandlers, winrt::delegate<std::shared_ptr<Pane>>);
WINRT_CALLBACK(GotFocus, gotFocusArgs);
WINRT_CALLBACK(LostFocus, winrt::delegate<std::shared_ptr<Pane>>);
WINRT_CALLBACK(PaneRaiseBell, winrt::Windows::Foundation::EventHandler<bool>);
WINRT_CALLBACK(Detached, winrt::delegate<std::shared_ptr<Pane>>);
private:
struct PanePoint;

1
src/cascadia/TerminalApp/SettingsTab.h
View File

@@ -18,7 +18,6 @@ Author(s):
#pragma once
#include "TabBase.h"
#include "SettingsTab.g.h"
#include "../../cascadia/inc/cppwinrt_utils.h"
namespace winrt::TerminalApp::implementation
{

1
src/cascadia/TerminalApp/ShortcutActionDispatch.h
View File

@@ -4,7 +4,6 @@
#pragma once
#include "ShortcutActionDispatch.g.h"
#include "../inc/cppwinrt_utils.h"
#include "../TerminalSettingsModel/AllShortcutActions.h"
// fwdecl unittest classes

1
src/cascadia/TerminalApp/TabBase.h
View File

@@ -2,7 +2,6 @@
// Licensed under the MIT license.
#pragma once
#include "inc/cppwinrt_utils.h"
#include "TabBase.g.h"
// fwdecl unittest classes

1
src/cascadia/TerminalApp/TabHeaderControl.h
View File

@@ -4,7 +4,6 @@
#pragma once
#include "winrt/Microsoft.UI.Xaml.Controls.h"
#include "inc/cppwinrt_utils.h"
#include "TabHeaderControl.g.h"

1
src/cascadia/TerminalApp/TabPaletteItem.h
View File

@@ -5,7 +5,6 @@
#include "PaletteItem.h"
#include "TabPaletteItem.g.h"
#include "inc/cppwinrt_utils.h"
namespace winrt::TerminalApp::implementation
{

5
src/cascadia/TerminalApp/TabRowControl.h
View File

@@ -4,7 +4,6 @@
#pragma once
#include "winrt/Microsoft.UI.Xaml.Controls.h"
#include "../../cascadia/inc/cppwinrt_utils.h"
#include "TabRowControl.g.h"
@@ -25,7 +24,5 @@ namespace winrt::TerminalApp::implementation
namespace winrt::TerminalApp::factory_implementation
{
struct TabRowControl : TabRowControlT<TabRowControl, implementation::TabRowControl>
{
};
BASIC_FACTORY(TabRowControl);
}

1
src/cascadia/TerminalApp/TaskbarState.h
View File

@@ -2,7 +2,6 @@
// Licensed under the MIT license.
#pragma once
#include "inc/cppwinrt_utils.h"
#include "TaskbarState.g.h"
// fwdecl unittest classes

14
src/cascadia/TerminalApp/TerminalTab.cpp
View File

@@ -583,7 +583,7 @@ namespace winrt::TerminalApp::implementation
_rootPane->Closed(_rootClosedToken);
auto p = _rootPane;
p->WalkTree([](auto pane) {
pane->_PaneDetachedHandlers(pane);
pane->_DetachedHandlers(pane);
return false;
});
@@ -1481,7 +1481,7 @@ namespace winrt::TerminalApp::implementation
_RefreshVisualState();
_colorSelected(color);
_ColorSelectedHandlers(color);
}
// Method Description:
@@ -1535,7 +1535,7 @@ namespace winrt::TerminalApp::implementation
TabViewItem().Background(WUX::Media::SolidColorBrush{ Windows::UI::Colors::Transparent() });
_RefreshVisualState();
_colorCleared();
_ColorClearedHandlers();
}
// Method Description:
@@ -1743,12 +1743,4 @@ namespace winrt::TerminalApp::implementation
return Title();
}
DEFINE_EVENT(TerminalTab, ActivePaneChanged, _ActivePaneChangedHandlers, winrt::delegate<>);
DEFINE_EVENT(TerminalTab, ColorSelected, _colorSelected, winrt::delegate<winrt::Windows::UI::Color>);
DEFINE_EVENT(TerminalTab, ColorCleared, _colorCleared, winrt::delegate<>);
DEFINE_EVENT(TerminalTab, TabRaiseVisualBell, _TabRaiseVisualBellHandlers, winrt::delegate<>);
DEFINE_EVENT(TerminalTab, DuplicateRequested, _DuplicateRequestedHandlers, winrt::delegate<>);
DEFINE_EVENT(TerminalTab, SplitTabRequested, _SplitTabRequestedHandlers, winrt::delegate<>);
DEFINE_EVENT(TerminalTab, ExportTabRequested, _ExportTabRequestedHandlers, winrt::delegate<>);
}

14
src/cascadia/TerminalApp/TerminalTab.h
View File

@@ -98,13 +98,13 @@ namespace winrt::TerminalApp::implementation
return _tabStatus;
}
DECLARE_EVENT(ActivePaneChanged, _ActivePaneChangedHandlers, winrt::delegate<>);
DECLARE_EVENT(ColorSelected, _colorSelected, winrt::delegate<winrt::Windows::UI::Color>);
DECLARE_EVENT(ColorCleared, _colorCleared, winrt::delegate<>);
DECLARE_EVENT(TabRaiseVisualBell, _TabRaiseVisualBellHandlers, winrt::delegate<>);
DECLARE_EVENT(DuplicateRequested, _DuplicateRequestedHandlers, winrt::delegate<>);
DECLARE_EVENT(SplitTabRequested, _SplitTabRequestedHandlers, winrt::delegate<>);
DECLARE_EVENT(ExportTabRequested, _ExportTabRequestedHandlers, winrt::delegate<>);
WINRT_CALLBACK(ActivePaneChanged, winrt::delegate<>);
WINRT_CALLBACK(ColorSelected, winrt::delegate<winrt::Windows::UI::Color>);
WINRT_CALLBACK(ColorCleared, winrt::delegate<>);
WINRT_CALLBACK(TabRaiseVisualBell, winrt::delegate<>);
WINRT_CALLBACK(DuplicateRequested, winrt::delegate<>);
WINRT_CALLBACK(SplitTabRequested, winrt::delegate<>);
WINRT_CALLBACK(ExportTabRequested, winrt::delegate<>);
TYPED_EVENT(TaskbarProgressChanged, IInspectable, IInspectable);
private:

1
src/cascadia/TerminalApp/TerminalTabStatus.h
View File

@@ -3,7 +3,6 @@
#pragma once
#include "inc/cppwinrt_utils.h"
#include "TerminalTabStatus.g.h"
namespace winrt::TerminalApp::implementation

4
src/cascadia/TerminalApp/TitlebarControl.h
View File

@@ -36,7 +36,5 @@ namespace winrt::TerminalApp::implementation
namespace winrt::TerminalApp::factory_implementation
{
struct TitlebarControl : TitlebarControlT<TitlebarControl, implementation::TitlebarControl>
{
};
BASIC_FACTORY(TitlebarControl);
}

2
src/cascadia/TerminalApp/pch.h
View File

@@ -77,3 +77,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider);
// Manually include til after we include Windows.Foundation to give it winrt superpowers
#include "til.h"
#include <cppwinrt_utils.h>

2
src/cascadia/TerminalAzBridge/pch.h
View File

@@ -38,3 +38,5 @@ Abstract:
#include <wil/resource.h>
#include <wil/win32_helpers.h>
#include <cppwinrt_utils.h>

5
src/cascadia/TerminalConnection/AzureConnection.h
View File

@@ -11,7 +11,6 @@
#include <mutex>
#include <condition_variable>
#include "../cascadia/inc/cppwinrt_utils.h"
#include "ConnectionStateHolder.h"
#include "AzureClient.h"
@@ -104,7 +103,5 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
namespace winrt::Microsoft::Terminal::TerminalConnection::factory_implementation
{
struct AzureConnection : AzureConnectionT<AzureConnection, implementation::AzureConnection>
{
};
BASIC_FACTORY(AzureConnection);
}

1
src/cascadia/TerminalConnection/ConnectionInformation.h
View File

@@ -16,7 +16,6 @@ Abstract:
--*/
#pragma once
#include "../inc/cppwinrt_utils.h"
#include "ConnectionInformation.g.h"
namespace winrt::Microsoft::Terminal::TerminalConnection::implementation

2
src/cascadia/TerminalConnection/ConnectionStateHolder.h
View File

@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT license.
#include "../inc/cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
{
template<typename T>

5
src/cascadia/TerminalConnection/ConptyConnection.h
View File

@@ -5,7 +5,6 @@
#include "ConptyConnection.g.h"
#include "ConnectionStateHolder.h"
#include "../inc/cppwinrt_utils.h"
#include <conpty-static.h>
@@ -93,7 +92,5 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
namespace winrt::Microsoft::Terminal::TerminalConnection::factory_implementation
{
struct ConptyConnection : ConptyConnectionT<ConptyConnection, implementation::ConptyConnection>
{
};
BASIC_FACTORY(ConptyConnection);
}

6
src/cascadia/TerminalConnection/EchoConnection.h
View File

@@ -5,8 +5,6 @@
#include "EchoConnection.g.h"
#include "../cascadia/inc/cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
{
struct EchoConnection : EchoConnectionT<EchoConnection>
@@ -29,7 +27,5 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
namespace winrt::Microsoft::Terminal::TerminalConnection::factory_implementation
{
struct EchoConnection : EchoConnectionT<EchoConnection, implementation::EchoConnection>
{
};
BASIC_FACTORY(EchoConnection);
}

2
src/cascadia/TerminalConnection/pch.h
View File

@@ -31,3 +31,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalConnectionProvider);
#include <telemetry/ProjectTelemetry.h>
#include "til.h"
#include <cppwinrt_utils.h>

1
src/cascadia/TerminalControl/ControlCore.h
View File

@@ -20,7 +20,6 @@
#include "../../renderer/base/Renderer.hpp"
#include "../../cascadia/TerminalCore/Terminal.hpp"
#include "../buffer/out/search.h"
#include "cppwinrt_utils.h"
#include <til/ticket_lock.h>

1
src/cascadia/TerminalControl/ControlInteractivity.h
View File

@@ -19,7 +19,6 @@
#include "ControlInteractivity.g.h"
#include "EventArgs.h"
#include "../buffer/out/search.h"
#include "cppwinrt_utils.h"
#include "ControlCore.h"
#include "../../renderer/uia/UiaRenderer.hpp"

1
src/cascadia/TerminalControl/EventArgs.h
View File

@@ -11,7 +11,6 @@
#include "ScrollPositionChangedArgs.g.h"
#include "RendererWarningArgs.g.h"
#include "TransparencyChangedEventArgs.g.h"
#include "cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::Control::implementation
{

4
src/cascadia/TerminalControl/KeyChord.h
View File

@@ -32,7 +32,5 @@ namespace winrt::Microsoft::Terminal::Control::implementation
namespace winrt::Microsoft::Terminal::Control::factory_implementation
{
struct KeyChord : KeyChordT<KeyChord, implementation::KeyChord>
{
};
BASIC_FACTORY(KeyChord);
}

5
src/cascadia/TerminalControl/SearchBoxControl.h
View File

@@ -16,7 +16,6 @@ Author(s):
#pragma once
#include "winrt/Windows.UI.Xaml.h"
#include "winrt/Windows.UI.Xaml.Controls.h"
#include "../../cascadia/inc/cppwinrt_utils.h"
#include "SearchBoxControl.g.h"
@@ -51,7 +50,5 @@ namespace winrt::Microsoft::Terminal::Control::implementation
namespace winrt::Microsoft::Terminal::Control::factory_implementation
{
struct SearchBoxControl : SearchBoxControlT<SearchBoxControl, implementation::SearchBoxControl>
{
};
BASIC_FACTORY(SearchBoxControl);
}

4
src/cascadia/TerminalControl/TSFInputControl.cpp
View File

@@ -441,7 +441,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
{
const auto text = _inputBuffer.substr(_activeTextStart);
_compositionCompletedHandlers(text);
_CompositionCompletedHandlers(text);
_activeTextStart = _inputBuffer.length();
@@ -470,6 +470,4 @@ namespace winrt::Microsoft::Terminal::Control::implementation
void TSFInputControl::_formatUpdatingHandler(CoreTextEditContext sender, CoreTextFormatUpdatingEventArgs const& /*args*/)
{
}
DEFINE_EVENT(TSFInputControl, CompositionCompleted, _compositionCompletedHandlers, Control::CompositionCompletedEventArgs);
}

7
src/cascadia/TerminalControl/TSFInputControl.h
View File

@@ -5,7 +5,6 @@
#include "TSFInputControl.g.h"
#include "CursorPositionEventArgs.g.h"
#include "FontInfoEventArgs.g.h"
#include "cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::Control::implementation
{
@@ -46,7 +45,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
// -------------------------------- WinRT Events ---------------------------------
TYPED_EVENT(CurrentCursorPosition, Control::TSFInputControl, Control::CursorPositionEventArgs);
TYPED_EVENT(CurrentFontInfo, Control::TSFInputControl, Control::FontInfoEventArgs);
DECLARE_EVENT(CompositionCompleted, _compositionCompletedHandlers, Control::CompositionCompletedEventArgs);
WINRT_CALLBACK(CompositionCompleted, Control::CompositionCompletedEventArgs);
private:
void _layoutRequestedHandler(winrt::Windows::UI::Text::Core::CoreTextEditContext sender, winrt::Windows::UI::Text::Core::CoreTextLayoutRequestedEventArgs const& args);
@@ -89,7 +88,5 @@ namespace winrt::Microsoft::Terminal::Control::implementation
}
namespace winrt::Microsoft::Terminal::Control::factory_implementation
{
struct TSFInputControl : TSFInputControlT<TSFInputControl, implementation::TSFInputControl>
{
};
BASIC_FACTORY(TSFInputControl);
}

1
src/cascadia/TerminalControl/TermControl.h
View File

@@ -11,7 +11,6 @@
#include "../../renderer/uia/UiaRenderer.hpp"
#include "../../cascadia/TerminalCore/Terminal.hpp"
#include "../buffer/out/search.h"
#include "cppwinrt_utils.h"
#include "SearchBoxControl.h"
#include "ControlInteractivity.h"

1
src/cascadia/TerminalControl/XamlLights.h
View File

@@ -3,7 +3,6 @@
#pragma once
#include "cppwinrt_utils.h"
#include "VisualBellLight.g.h"
namespace winrt::Microsoft::Terminal::Control::implementation

2
src/cascadia/TerminalControl/pch.h
View File

@@ -62,3 +62,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalControlProvider);
#include "til.h"
#include "ThrottledFunc.h"
#include <cppwinrt_utils.h>

4
src/cascadia/TerminalSettingsEditor/Converters.h
View File

@@ -27,7 +27,5 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
{
struct Converters : ConvertersT<Converters, implementation::Converters>
{
};
BASIC_FACTORY(Converters);
}

1
src/cascadia/TerminalSettingsEditor/PreviewConnection.h
View File

@@ -13,7 +13,6 @@
#pragma once
#include <winrt/Microsoft.Terminal.TerminalConnection.h>
#include "../../inc/cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
{

2
src/cascadia/TerminalSettingsEditor/Utils.h
View File

@@ -3,8 +3,6 @@
#pragma once
#include "../inc/cppwinrt_utils.h"
// This macro must be used alongside GETSET_BINDABLE_ENUM_SETTING.
// Use this in your class's constructor after Initialize_Component().
// It sorts and initializes the observable list of enum entries with the enum name

2
src/cascadia/TerminalSettingsEditor/ViewModelHelpers.h
View File

@@ -3,8 +3,6 @@
#pragma once
#include "../inc/cppwinrt_utils.h"
template<typename T>
struct ViewModelHelper
{

2
src/cascadia/TerminalSettingsEditor/pch.h
View File

@@ -55,3 +55,5 @@
// Manually include til after we include Windows.Foundation to give it winrt superpowers
#include "til.h"
#include <cppwinrt_utils.h>

1
src/cascadia/TerminalSettingsModel/ActionAndArgs.h
View File

@@ -6,7 +6,6 @@
#include "ActionAndArgs.g.h"
#include "ActionArgs.h"
#include "TerminalWarnings.h"
#include "../inc/cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::Settings::Model::implementation
{

1
src/cascadia/TerminalSettingsModel/ActionArgs.h
View File

@@ -39,7 +39,6 @@
#include "ClearBufferArgs.g.h"
#include "MultipleActionsArgs.g.h"
#include "../../cascadia/inc/cppwinrt_utils.h"
#include "JsonUtils.h"
#include "HashUtils.h"
#include "TerminalWarnings.h"

1
src/cascadia/TerminalSettingsModel/ActionMap.h
View File

@@ -18,7 +18,6 @@ Author(s):
#include "ActionMap.g.h"
#include "IInheritable.h"
#include "Command.h"
#include "../inc/cppwinrt_utils.h"
// fwdecl unittest classes
namespace SettingsModelLocalTests

1
src/cascadia/TerminalSettingsModel/ColorScheme.h
View File

@@ -17,7 +17,6 @@ Author(s):
#pragma once
#include "../../inc/conattrs.hpp"
#include "inc/cppwinrt_utils.h"
#include "DefaultSettings.h"
#include "ColorScheme.g.h"

1
src/cascadia/TerminalSettingsModel/Command.h
View File

@@ -22,7 +22,6 @@ Author(s):
#include "TerminalWarnings.h"
#include "Profile.h"
#include "ActionAndArgs.h"
#include "../inc/cppwinrt_utils.h"
#include "SettingsTypes.h"
// fwdecl unittest classes

1
src/cascadia/TerminalSettingsModel/FontConfig.h
View File

@@ -20,7 +20,6 @@ Author(s):
#include "FontConfig.g.h"
#include "JsonUtils.h"
#include "MTSMSettings.h"
#include "../inc/cppwinrt_utils.h"
#include "IInheritable.h"
#include <DefaultSettings.h>

1
src/cascadia/TerminalSettingsModel/IconPathConverter.h
View File

@@ -1,7 +1,6 @@
#pragma once
#include "IconPathConverter.g.h"
#include "../inc/cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::Settings::Model::implementation
{

1
src/cascadia/TerminalSettingsModel/KeyChordSerialization.h
View File

@@ -5,7 +5,6 @@
#include "KeyChordSerialization.g.h"
#include "JsonUtils.h"
#include "../inc/cppwinrt_utils.h"
namespace winrt::Microsoft::Terminal::Settings::Model::implementation
{

1
src/cascadia/TerminalSettingsModel/Profile.h
View File

@@ -48,7 +48,6 @@ Author(s):
#include "IInheritable.h"
#include "MTSMSettings.h"
#include "../inc/cppwinrt_utils.h"
#include "JsonUtils.h"
#include <DefaultSettings.h>
#include "AppearanceConfig.h"

1
src/cascadia/TerminalSettingsModel/TerminalSettings.h
View File

@@ -17,7 +17,6 @@ Author(s):
#include "TerminalSettings.g.h"
#include "TerminalSettingsCreateResult.g.h"
#include "IInheritable.h"
#include "../inc/cppwinrt_utils.h"
#include <DefaultSettings.h>
#include <conattrs.hpp>

2
src/cascadia/TerminalSettingsModel/pch.h
View File

@@ -56,3 +56,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hSettingsModelProvider);
#include <til/mutex.h>
#include <til/throttled_func.h>
#include <cppwinrt_utils.h>

2
src/cascadia/UnitTests_Control/MockConnection.h
View File

@@ -7,8 +7,6 @@
#pragma once
#include "../cascadia/inc/cppwinrt_utils.h"
namespace ControlUnitTests
{
class MockConnection : public winrt::implements<MockConnection, winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection>

1
src/cascadia/UnitTests_Control/MockControlSettings.h
View File

@@ -4,7 +4,6 @@ Licensed under the MIT license.
--*/
#pragma once
#include "../inc/cppwinrt_utils.h"
#include <DefaultSettings.h>
#include <conattrs.hpp>

2
src/cascadia/UnitTests_Control/pch.h
View File

@@ -54,3 +54,5 @@ Licensed under the MIT license.
#include "../../inc/conattrs.hpp"
#include "../../types/inc/utils.hpp"
#include "../../inc/DefaultSettings.h"
#include <cppwinrt_utils.h>

2
src/cascadia/UnitTests_Remoting/pch.h
View File

@@ -48,3 +48,5 @@ Licensed under the MIT license.
#include "../../inc/conattrs.hpp"
#include "../../types/inc/utils.hpp"
#include "../../inc/DefaultSettings.h"
#include <cppwinrt_utils.h>

1
src/cascadia/UnitTests_TerminalCore/MockTermSettings.h
View File

@@ -6,7 +6,6 @@
#include "DefaultSettings.h"
#include <winrt/Microsoft.Terminal.Core.h>
#include "../inc/cppwinrt_utils.h"
using namespace winrt::Microsoft::Terminal::Core;

2
src/cascadia/UnitTests_TerminalCore/pch.h
View File

@@ -57,3 +57,5 @@ typedef NTSTATUS* PNTSTATUS;
/*lint -restore */ // Resume checking for different typedefs.
#define NT_SUCCESS(Status) (((NTSTATUS)(Status)) >= 0)
// </Conhost Includes>
#include <cppwinrt_utils.h>

2
src/cascadia/WinRTUtils/pch.h
View File

@@ -34,3 +34,5 @@
#include <shlobj.h>
#include <shobjidl_core.h>
#include <cppwinrt_utils.h>

5
src/cascadia/WindowsTerminal/IslandWindow.cpp
View File

@@ -492,7 +492,7 @@ long IslandWindow::_calculateTotalSize(const bool isWidth, const long clientSize
// If the user wants to close the app by clicking 'X' button,
// we hand off the close experience to the app layer. If all the tabs
// are closed, the window will be closed as well.
_windowCloseButtonClickedHandler();
_WindowCloseButtonClickedHandlers();
return 0;
}
case WM_MOUSEWHEEL:
@@ -1778,6 +1778,3 @@ void IslandWindow::RemoveFromSystemMenu(const winrt::hstring& itemLabel)
}
_systemMenuItems.erase(it->first);
}
DEFINE_EVENT(IslandWindow, DragRegionClicked, _DragRegionClickedHandlers, winrt::delegate<>);
DEFINE_EVENT(IslandWindow, WindowCloseButtonClicked, _windowCloseButtonClickedHandler, winrt::delegate<>);

5
src/cascadia/WindowsTerminal/IslandWindow.h
View File

@@ -4,7 +4,6 @@
#include "pch.h"
#include "BaseWindow.h"
#include <winrt/TerminalApp.h>
#include "../../cascadia/inc/cppwinrt_utils.h"
void SetWindowLongWHelper(const HWND hWnd, const int nIndex, const LONG dwNewLong) noexcept;
@@ -63,8 +62,8 @@ public:
void AddToSystemMenu(const winrt::hstring& itemLabel, winrt::delegate<void()> callback);
void RemoveFromSystemMenu(const winrt::hstring& itemLabel);
DECLARE_EVENT(DragRegionClicked, _DragRegionClickedHandlers, winrt::delegate<>);
DECLARE_EVENT(WindowCloseButtonClicked, _windowCloseButtonClickedHandler, winrt::delegate<>);
WINRT_CALLBACK(DragRegionClicked, winrt::delegate<>);
WINRT_CALLBACK(WindowCloseButtonClicked, 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)>);

1
src/cascadia/WindowsTerminal/NotificationIcon.h
View File

@@ -2,7 +2,6 @@
// Licensed under the MIT license.
#include "pch.h"
#include "../cascadia/inc/cppwinrt_utils.h"
// This enumerates all the possible actions
// that our notification icon context menu could do.

2
src/cascadia/WindowsTerminal/pch.h
View File

@@ -89,3 +89,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hWindowsTerminalProvider);
#include <processenv.h>
#include <WinUser.h>
#include "til.h"
#include <cppwinrt_utils.h>

2
src/cascadia/ut_app/TerminalApp.UnitTests.vcxproj
View File

@@ -58,7 +58,7 @@
<!-- ====================== Compiler & Linker Flags ===================== -->
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>..;$(OpenConsoleDir)\dep\jsoncpp\json;$(OpenConsoleDir)src\inc;$(OpenConsoleDir)src\inc\test;$(WinRT_IncludePath)\..\cppwinrt\winrt;"$(OpenConsoleDir)\src\cascadia\TerminalApp\Generated Files";"$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\Generated Files";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..;$(OpenConsoleDir)src\cascadia\inc;$(OpenConsoleDir)\dep\jsoncpp\json;$(OpenConsoleDir)src\inc;$(OpenConsoleDir)src\inc\test;$(WinRT_IncludePath)\..\cppwinrt\winrt;"$(OpenConsoleDir)\src\cascadia\TerminalApp\Generated Files";"$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\Generated Files";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
<!-- Manually disable unreachable code warning, because jconcpp has a ton of that. -->

2
src/cppwinrt.build.pre.props
View File

@@ -87,7 +87,7 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(OpenConsoleDir)\src\cascadia\WinRTUtils\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(OpenConsoleDir)\src\cascadia\WinRTUtils\inc;$(OpenConsoleDir)src\cascadia\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>

5
src/tools/MonarchPeasantSample/SampleMonarch.h
View File

@@ -2,7 +2,6 @@
#include "Monarch.g.h"
#include "SamplePeasant.h"
#include "../cascadia/inc/cppwinrt_utils.h"
// {50dba6cd-2222-4b12-8363-5e06f5d0082c}
constexpr GUID Monarch_clsid{
@@ -51,7 +50,5 @@ namespace winrt::MonarchPeasantSample::implementation
namespace winrt::MonarchPeasantSample::factory_implementation
{
struct Monarch : MonarchT<Monarch, implementation::Monarch>
{
};
BASIC_FACTORY(Monarch);
}

5
src/tools/MonarchPeasantSample/SamplePeasant.h
View File

@@ -1,7 +1,6 @@
#pragma once
#include "Peasant.g.h"
#include "../cascadia/inc/cppwinrt_utils.h"
namespace winrt::MonarchPeasantSample::implementation
{
@@ -26,7 +25,5 @@ namespace winrt::MonarchPeasantSample::implementation
namespace winrt::MonarchPeasantSample::factory_implementation
{
struct Peasant : PeasantT<Peasant, implementation::Peasant>
{
};
BASIC_FACTORY(Peasant);
}

2
src/tools/MonarchPeasantSample/pch.h
View File

@@ -24,3 +24,5 @@
#include "til.h"
#include <conio.h>
#include <cppwinrt_utils.h>