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

Make sure cursor visibility is restored after using an IME #6207

Merged
1 commit merged into from
May 27, 2020
Merged

Make sure cursor visibility is restored after using an IME #6207

Show file tree
Hide file tree
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
9 changes: 2 additions & 7 deletions src/host/conimeinfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ void ConsoleImeInfo::WriteCompMessage(const std::wstring_view text,
const std::basic_string_view<BYTE> attributes,
const std::basic_string_view<WORD> colorArray)
{
// Backup the cursor visibility state and turn it off for drawing.
_SaveCursorVisibility();

ClearAllAreas();

// Save copies of the composition message in case we need to redraw it as things scroll/resize
Expand All @@ -80,8 +77,6 @@ void ConsoleImeInfo::WriteCompMessage(const std::wstring_view text,
// - text - The actual text of what the user would like to insert (UTF-16)
void ConsoleImeInfo::WriteResultMessage(const std::wstring_view text)
{
_RestoreCursorVisibility();

ClearAllAreas();

_InsertConvertedString(text);
Expand Down Expand Up @@ -471,7 +466,7 @@ void ConsoleImeInfo::_InsertConvertedString(const std::wstring_view text)
// Routine Description:
// - Backs up the global cursor visibility state if it is shown and disables
// it while we work on the conversion areas.
void ConsoleImeInfo::_SaveCursorVisibility()
void ConsoleImeInfo::SaveCursorVisibility()
{
CONSOLE_INFORMATION& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
Cursor& cursor = gci.GetActiveOutputBuffer().GetTextBuffer().GetCursor();
Expand All @@ -487,7 +482,7 @@ void ConsoleImeInfo::_SaveCursorVisibility()

// Routine Description:
// - Restores the global cursor visibility state if it was on when it was backed up.
void ConsoleImeInfo::_RestoreCursorVisibility()
void ConsoleImeInfo::RestoreCursorVisibility()
{
if (_isSavedCursorVisible)
{
Expand Down
5 changes: 3 additions & 2 deletions src/host/conimeinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ class ConsoleImeInfo final

void RedrawCompMessage();

void SaveCursorVisibility();
void RestoreCursorVisibility();

private:
[[nodiscard]] HRESULT _AddConversionArea();

Expand All @@ -80,8 +83,6 @@ class ConsoleImeInfo final
const Microsoft::Console::Types::Viewport view,
SCREEN_INFORMATION& screenInfo);

void _SaveCursorVisibility();
void _RestoreCursorVisibility();
bool _isSavedCursorVisible;

std::wstring _text;
Expand Down
6 changes: 6 additions & 0 deletions src/host/convarea.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ void WriteConvRegionToScreen(const SCREEN_INFORMATION& ScreenInfo,
gci.LockConsole();
auto unlock = wil::scope_exit([&] { gci.UnlockConsole(); });

ConsoleImeInfo* const pIme = &gci.ConsoleIme;
pIme->SaveCursorVisibility();

gci.pInputBuffer->fInComposition = true;
return S_OK;
}
Expand All @@ -114,6 +117,9 @@ void WriteConvRegionToScreen(const SCREEN_INFORMATION& ScreenInfo,
gci.LockConsole();
auto unlock = wil::scope_exit([&] { gci.UnlockConsole(); });

ConsoleImeInfo* const pIme = &gci.ConsoleIme;
pIme->RestoreCursorVisibility();

gci.pInputBuffer->fInComposition = false;
return S_OK;
}
Expand Down