Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Conpty] Pass through request for mouse mode to the Terminal #9970

Merged
9 commits merged into from
May 7, 2021
Merged

[Conpty] Pass through request for mouse mode to the Terminal #9970

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4fffd4f
mouse mode
PankajBhojwani Apr 28, 2021
565aba2
check prev mode
PankajBhojwani Apr 28, 2021
817c420
Merge branch 'main' of https://github.com/microsoft/terminal into dev…
PankajBhojwani Apr 29, 2021
2f5a7c9
combine functions, correct VT
PankajBhojwani Apr 29, 2021
bce6310
check quick edit mode
PankajBhojwani May 3, 2021
b76cc01
less verbose
PankajBhojwani May 4, 2021
5185769
console quick edit mode
PankajBhojwani May 5, 2021
32e5c6a
merge VT requests
PankajBhojwani May 6, 2021
22f1714
comment to GH 9970
PankajBhojwani May 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions src/host/getset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,8 @@ void ApiRoutines::GetNumberOfConsoleMouseButtonsImpl(ULONG& buttons) noexcept
LockConsole();
auto Unlock = wil::scope_exit([&] { UnlockConsole(); });

const auto oldQuickEditMode{ WI_IsFlagSet(gci.Flags, ENABLE_QUICK_EDIT_MODE) };

if (WI_IsAnyFlagSet(mode, PRIVATE_MODES))
{
WI_SetFlag(gci.Flags, CONSOLE_USE_PRIVATE_FLAGS);
Expand All @@ -359,9 +361,27 @@ void ApiRoutines::GetNumberOfConsoleMouseButtonsImpl(ULONG& buttons) noexcept

const auto oldMouseMode{ WI_IsFlagSet(context.InputMode, ENABLE_MOUSE_INPUT) };
const auto newMouseMode{ WI_IsFlagSet(mode, ENABLE_MOUSE_INPUT) };
if (oldMouseMode != newMouseMode)
const auto newQuickEditMode{ WI_IsFlagSet(gci.Flags, ENABLE_QUICK_EDIT_MODE) };
PankajBhojwani marked this conversation as resolved.
Show resolved Hide resolved

// Whether we ask the terminal for mouse input is decided by 2 flags, ENABLE_MOUSE_INPUT
// and ENABLE_QUICK_EDIT_MODE
// If ENABLE_MOUSE_INPUT is set and ENABLE_QUICK_EDIT_MODE is not set, then we need
// to ask the terminal to send us mouse events - in all other cases, terminal should
// stop sending us mouse events
if ((oldMouseMode != newMouseMode) ||
(oldQuickEditMode != newQuickEditMode))
PankajBhojwani marked this conversation as resolved.
Show resolved Hide resolved
{
gci.GetActiveInputBuffer()->PassThroughWin32MouseRequest(newMouseMode);
// At least one of ENABLE_MOUSE_INPUT or ENABLE_QUICK_EDIT_MODE changed, but we
// only want to send the VT if the end result (whether we want mouse input or not)
// changed, so check for that
PankajBhojwani marked this conversation as resolved.
Show resolved Hide resolved
if ((newMouseMode && !newQuickEditMode))
{
gci.GetActiveInputBuffer()->PassThroughWin32MouseRequest(true);
}
else if (oldMouseMode && !oldQuickEditMode)
{
gci.GetActiveInputBuffer()->PassThroughWin32MouseRequest(false);
}
}

context.InputMode = mode;
Expand Down