388b975663
## Summary of the Pull Request Enables the `toggleFullscreen` action to be able to enter fullscreen mode, bound by default to <kbd>alt+enter</kbd>. The action is bubbled up to the WindowsTerminal (Win32) layer, where the window resizes itself to take the entire size of the monitor. This largely reuses code from conhost. Conhost already had a fullscreen mode, so I figured I might as well re-use that. ## References Unfortunately there are still very thin borders around the window when the NonClientIslandWindow is fullscreened. I think I know where the problem is. However, that area of code is about to get a massive overhaul with #3064, so I didn't want to necessarily make it worse right now. A follow up should be filed to add support for "Always show / reveal / never show tabs in fullscreen mode". Currently, the only mode is "never show tabs". Additionally, some of this code (particularily re:drawing the nonclient area) could be re-used for #2238. ## PR Checklist * [x] Closes #531, #3411 * [x] I work here * [n/a] Tests added/passed 😭 * [x] Requires documentation to be updated ## Validation Steps Performed * Manually tested both the NonClientIslandWindow and the IslandWindow. * Cherry-pick commit 8e56bfe * Don't draw the tab strip when maximized (cherry picked from commit bac4be7c0f3ed1cdcd4f9ae8980fc98103538613) * Fix the vista window flash for the NCIW (cherry picked from commit 7d3a18a893c02bd2ed75026f2aac52e20321a1cf) * Some code cleanup for review (cherry picked from commit 9e22b7730bba426adcbfd9e7025f192dbf8efb32) * A tad bit more notes and cleanup * Update schema, docs * Most of the PR comments * I'm not sure this actually works, so I'm committing it to revert it and check * Update some comments that were lost. * Fix a build break? * oh no
444 lines
17 KiB
C++
444 lines
17 KiB
C++
// Copyright (c) Microsoft Corporation.
|
|
// Licensed under the MIT license.
|
|
|
|
#include "pch.h"
|
|
#include "AppKeyBindings.h"
|
|
#include "KeyChordSerialization.h"
|
|
|
|
#include "AppKeyBindings.g.cpp"
|
|
|
|
using namespace winrt::Microsoft::Terminal;
|
|
using namespace winrt::TerminalApp;
|
|
|
|
namespace winrt::TerminalApp::implementation
|
|
{
|
|
void AppKeyBindings::SetKeyBinding(const TerminalApp::ShortcutAction& action,
|
|
const Settings::KeyChord& chord)
|
|
{
|
|
_keyShortcuts[chord] = action;
|
|
}
|
|
|
|
// Method Description:
|
|
// - Remove the action that's bound to a particular KeyChord.
|
|
// Arguments:
|
|
// - chord: the keystroke to remove the action for.
|
|
// Return Value:
|
|
// - <none>
|
|
void AppKeyBindings::ClearKeyBinding(const Settings::KeyChord& chord)
|
|
{
|
|
_keyShortcuts.erase(chord);
|
|
}
|
|
|
|
Microsoft::Terminal::Settings::KeyChord AppKeyBindings::GetKeyBinding(TerminalApp::ShortcutAction const& action)
|
|
{
|
|
for (auto& kv : _keyShortcuts)
|
|
{
|
|
if (kv.second == action)
|
|
{
|
|
return kv.first;
|
|
}
|
|
}
|
|
return { nullptr };
|
|
}
|
|
|
|
bool AppKeyBindings::TryKeyChord(const Settings::KeyChord& kc)
|
|
{
|
|
const auto keyIter = _keyShortcuts.find(kc);
|
|
if (keyIter != _keyShortcuts.end())
|
|
{
|
|
const auto action = keyIter->second;
|
|
return _DoAction(action);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool AppKeyBindings::_DoAction(ShortcutAction action)
|
|
{
|
|
switch (action)
|
|
{
|
|
case ShortcutAction::CopyText:
|
|
{
|
|
auto args = winrt::make_self<CopyTextArgs>();
|
|
args->TrimWhitespace(true);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_CopyTextHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::CopyTextWithoutNewlines:
|
|
{
|
|
auto args = winrt::make_self<CopyTextArgs>();
|
|
args->TrimWhitespace(false);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_CopyTextHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::PasteText:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_PasteTextHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::NewTab:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_NewTabHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::OpenNewTabDropdown:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_OpenNewTabDropdownHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::DuplicateTab:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_DuplicateTabHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::OpenSettings:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_OpenSettingsHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
|
|
case ShortcutAction::NewTabProfile0:
|
|
{
|
|
auto args = winrt::make_self<NewTabWithProfileArgs>();
|
|
args->ProfileIndex(0);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_NewTabWithProfileHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::NewTabProfile1:
|
|
{
|
|
auto args = winrt::make_self<NewTabWithProfileArgs>();
|
|
args->ProfileIndex(1);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_NewTabWithProfileHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::NewTabProfile2:
|
|
{
|
|
auto args = winrt::make_self<NewTabWithProfileArgs>();
|
|
args->ProfileIndex(2);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_NewTabWithProfileHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::NewTabProfile3:
|
|
{
|
|
auto args = winrt::make_self<NewTabWithProfileArgs>();
|
|
args->ProfileIndex(3);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_NewTabWithProfileHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::NewTabProfile4:
|
|
{
|
|
auto args = winrt::make_self<NewTabWithProfileArgs>();
|
|
args->ProfileIndex(4);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_NewTabWithProfileHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::NewTabProfile5:
|
|
{
|
|
auto args = winrt::make_self<NewTabWithProfileArgs>();
|
|
args->ProfileIndex(5);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_NewTabWithProfileHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::NewTabProfile6:
|
|
{
|
|
auto args = winrt::make_self<NewTabWithProfileArgs>();
|
|
args->ProfileIndex(6);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_NewTabWithProfileHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::NewTabProfile7:
|
|
{
|
|
auto args = winrt::make_self<NewTabWithProfileArgs>();
|
|
args->ProfileIndex(7);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_NewTabWithProfileHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::NewTabProfile8:
|
|
{
|
|
auto args = winrt::make_self<NewTabWithProfileArgs>();
|
|
args->ProfileIndex(8);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_NewTabWithProfileHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
|
|
case ShortcutAction::NewWindow:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_NewWindowHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::CloseWindow:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_CloseWindowHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::CloseTab:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_CloseTabHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::ClosePane:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_ClosePaneHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
|
|
case ShortcutAction::ScrollUp:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_ScrollUpHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::ScrollDown:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_ScrollDownHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::ScrollUpPage:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_ScrollUpPageHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::ScrollDownPage:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_ScrollDownPageHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
|
|
case ShortcutAction::NextTab:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_NextTabHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::PrevTab:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_PrevTabHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
|
|
case ShortcutAction::SplitVertical:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_SplitVerticalHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::SplitHorizontal:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_SplitHorizontalHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
|
|
case ShortcutAction::SwitchToTab0:
|
|
{
|
|
auto args = winrt::make_self<SwitchToTabArgs>();
|
|
args->TabIndex(0);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_SwitchToTabHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::SwitchToTab1:
|
|
{
|
|
auto args = winrt::make_self<SwitchToTabArgs>();
|
|
args->TabIndex(1);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_SwitchToTabHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::SwitchToTab2:
|
|
{
|
|
auto args = winrt::make_self<SwitchToTabArgs>();
|
|
args->TabIndex(2);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_SwitchToTabHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::SwitchToTab3:
|
|
{
|
|
auto args = winrt::make_self<SwitchToTabArgs>();
|
|
args->TabIndex(3);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_SwitchToTabHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::SwitchToTab4:
|
|
{
|
|
auto args = winrt::make_self<SwitchToTabArgs>();
|
|
args->TabIndex(4);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_SwitchToTabHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::SwitchToTab5:
|
|
{
|
|
auto args = winrt::make_self<SwitchToTabArgs>();
|
|
args->TabIndex(5);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_SwitchToTabHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::SwitchToTab6:
|
|
{
|
|
auto args = winrt::make_self<SwitchToTabArgs>();
|
|
args->TabIndex(6);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_SwitchToTabHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::SwitchToTab7:
|
|
{
|
|
auto args = winrt::make_self<SwitchToTabArgs>();
|
|
args->TabIndex(7);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_SwitchToTabHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::SwitchToTab8:
|
|
{
|
|
auto args = winrt::make_self<SwitchToTabArgs>();
|
|
args->TabIndex(8);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_SwitchToTabHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::ResizePaneLeft:
|
|
{
|
|
auto args = winrt::make_self<ResizePaneArgs>();
|
|
args->Direction(Direction::Left);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_ResizePaneHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::ResizePaneRight:
|
|
{
|
|
auto args = winrt::make_self<ResizePaneArgs>();
|
|
args->Direction(Direction::Right);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_ResizePaneHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::ResizePaneUp:
|
|
{
|
|
auto args = winrt::make_self<ResizePaneArgs>();
|
|
args->Direction(Direction::Up);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_ResizePaneHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::ResizePaneDown:
|
|
{
|
|
auto args = winrt::make_self<ResizePaneArgs>();
|
|
args->Direction(Direction::Down);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_ResizePaneHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::MoveFocusLeft:
|
|
{
|
|
auto args = winrt::make_self<MoveFocusArgs>();
|
|
args->Direction(Direction::Left);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_MoveFocusHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::MoveFocusRight:
|
|
{
|
|
auto args = winrt::make_self<MoveFocusArgs>();
|
|
args->Direction(Direction::Right);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_MoveFocusHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::MoveFocusUp:
|
|
{
|
|
auto args = winrt::make_self<MoveFocusArgs>();
|
|
args->Direction(Direction::Up);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_MoveFocusHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::MoveFocusDown:
|
|
{
|
|
auto args = winrt::make_self<MoveFocusArgs>();
|
|
args->Direction(Direction::Down);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_MoveFocusHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::IncreaseFontSize:
|
|
{
|
|
auto args = winrt::make_self<AdjustFontSizeArgs>();
|
|
args->Delta(1);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_AdjustFontSizeHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::DecreaseFontSize:
|
|
{
|
|
auto args = winrt::make_self<AdjustFontSizeArgs>();
|
|
args->Delta(-1);
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>(*args);
|
|
_AdjustFontSizeHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
case ShortcutAction::ToggleFullscreen:
|
|
{
|
|
auto eventArgs = winrt::make_self<ActionEventArgs>();
|
|
_ToggleFullscreenHandlers(*this, *eventArgs);
|
|
return eventArgs->Handled();
|
|
}
|
|
default:
|
|
return false;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
// Method Description:
|
|
// - Takes the KeyModifier flags from Terminal and maps them to the WinRT types which are used by XAML
|
|
// Return Value:
|
|
// - a Windows::System::VirtualKeyModifiers object with the flags of which modifiers used.
|
|
Windows::System::VirtualKeyModifiers AppKeyBindings::ConvertVKModifiers(Settings::KeyModifiers modifiers)
|
|
{
|
|
Windows::System::VirtualKeyModifiers keyModifiers = Windows::System::VirtualKeyModifiers::None;
|
|
|
|
if (WI_IsFlagSet(modifiers, Settings::KeyModifiers::Ctrl))
|
|
{
|
|
keyModifiers |= Windows::System::VirtualKeyModifiers::Control;
|
|
}
|
|
if (WI_IsFlagSet(modifiers, Settings::KeyModifiers::Shift))
|
|
{
|
|
keyModifiers |= Windows::System::VirtualKeyModifiers::Shift;
|
|
}
|
|
if (WI_IsFlagSet(modifiers, Settings::KeyModifiers::Alt))
|
|
{
|
|
// note: Menu is the Alt VK_MENU
|
|
keyModifiers |= Windows::System::VirtualKeyModifiers::Menu;
|
|
}
|
|
|
|
return keyModifiers;
|
|
}
|
|
}
|