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

Workaround for the confusion of 'escape key input + DSR reply' and 'LAlt-Shift-F3' #175

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Workaround for the confusion of 'escape key input + DSR reply' and 'LAlt-Shift-F3' #175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions src/agent/ConsoleInput.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ void ConsoleInput::flushIncompleteEscapeCode()
(GetTickCount() - m_lastWriteTick) > kIncompleteEscapeTimeoutMs) {
doWrite(true);
m_byteQueue.clear();
m_dsrSent = false;
}
}

Expand Down Expand Up @@ -431,6 +432,15 @@ int ConsoleInput::scanInput(std::vector<INPUT_RECORD> &records,
// timeout to signify flushed input).
trace("Incomplete escape sequence");
return -1;
} else if (matchLen > 0 &&
input[0] == '\x1B' && inputSize >= 2 && input[1] == '\x1B' &&
m_dsrSent && matchDsr(&input[1], inputSize - 1) > 0) {
// If escape key is input and soon DSR reply is received,
// it might match to LAlt-Shift-F3, LAlt-F3, LAlt-LCtrl-F3, and so on.
// (These matches occur only when the cursor position (lines, cols) is
// in the range of (1, 2) to (1, 8).)
// (e.g. `^[ ^[ [ 1 ; 2 R` = 'escape key input + DSR reply' = 'LAlt-Shift-F3')
// We ignore these matches.
} else if (matchLen > 0) {
uint32_t winCodePointDn = match.unicodeChar;
if ((match.keyState & LEFT_CTRL_PRESSED) && (match.keyState & LEFT_ALT_PRESSED)) {
Expand Down