microsoft/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2025-12-10 00:48:23 -06:00
Code Issues Packages Projects Releases 138 Wiki Activity

Fix dispatching of system keys (#18444)

Browse Source 
This fixes the bit check for key down and adds a few comments.

Closes #18331

## Validation Steps Performed
Printing the resulting INPUT_RECORDs shows both key down and up events
when pressing F7. Alt-Space now also works again.
This commit is contained in:
Leonard Hecker 2025-01-21 21:48:51 +01:00 committed by GitHub
parent c56fb1b2d2
commit b33bde1992
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cascadia/WindowsTerminal/WindowEmperor.cpp
View File

@ -387,6 +387,9 @@ void WindowEmperor::HandleCommandlineArgs(int nCmdShow)
MSG msg{};
while (GetMessageW(&msg, nullptr, 0, 0))
{
// This is `if (WM_KEYDOWN || WM_KEYUP || WM_SYSKEYDOWN || WM_SYSKEYUP)`.
// It really doesn't need to be written that obtuse, but it at
// least nicely mirrors our `keyDown = msg.message & 1` logic.
// FYI: For the key-down/up messages the lowest bit indicates if it's up.
if ((msg.message & ~1) == WM_KEYDOWN || (msg.message & ~1) == WM_SYSKEYDOWN)
{
@ -401,7 +404,7 @@ void WindowEmperor::HandleCommandlineArgs(int nCmdShow)
loggedInteraction = true;
}
const bool keyDown = msg.message & 1;
const bool keyDown = (msg.message & 1) == 0;
if (
// GH#638: The Xaml input stack doesn't allow an application to suppress the "caret browsing"
// dialog experience triggered when you press F7. Official recommendation from the Xaml
@ -448,15 +451,13 @@ void WindowEmperor::HandleCommandlineArgs(int nCmdShow)
__assume(false);
}
void WindowEmperor::_dispatchSpecialKey(MSG& msg) const
void WindowEmperor::_dispatchSpecialKey(const MSG& msg) const
{
const auto hwnd = msg.hwnd;
// Each CoreInput window is a child of our IslandWindow.
// We can figure out the IslandWindow HWND via GetAncestor().
const auto hwnd = GetAncestor(msg.hwnd, GA_ROOT);
AppHost* window = nullptr;
// Just in case someone has targed a specific HWND,
// we'll try to dispatch it to the corresponding class.
// Usually this will not find anything because under WinUI the hidden CoreInput
// window is responsible for all input handling (for whatever reason).
for (const auto& h : _windows)
{
const auto w = h->GetWindow();
@ -467,6 +468,7 @@ void WindowEmperor::_dispatchSpecialKey(MSG& msg) const
}
}
// Fallback.
if (!window)
{
window = _mostRecentWindow();
@ -478,7 +480,7 @@ void WindowEmperor::_dispatchSpecialKey(MSG& msg) const
const auto vkey = gsl::narrow_cast<uint32_t>(msg.wParam);
const auto scanCode = gsl::narrow_cast<uint8_t>(msg.lParam >> 16);
const bool keyDown = msg.message & 1;
const bool keyDown = (msg.message & 1) == 0;
window->OnDirectKeyEvent(vkey, scanCode, keyDown);
}

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

@ -50,7 +50,7 @@ private:
AppHost* _mostRecentWindow() const noexcept;
bool _summonWindow(const SummonWindowSelectionArgs& args) const;
void _summonAllWindows() const;
void _dispatchSpecialKey(MSG& msg) const;
void _dispatchSpecialKey(const MSG& msg) const;
void _dispatchCommandline(winrt::TerminalApp::CommandlineArgs args);
safe_void_coroutine _dispatchCommandlineCurrentDesktop(winrt::TerminalApp::CommandlineArgs args);
LRESULT _messageHandler(HWND window, UINT message, WPARAM wParam, LPARAM lParam) noexcept;