EmulatorPkg: Fix Terminal Issues

After running EmulatorPkg, one will notice that their terminal acts
strangely. This is caused by the EmulatorPkg Host changing the terminal
mode and not restoring the original mode, which is now fixed.

Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
This commit is contained in:
Nate DeSimone 2023-09-26 11:07:43 -07:00 committed by mergify[bot]
parent be971fc302
commit ad1c0394b1
2 changed files with 57 additions and 2 deletions

View File

@ -9,7 +9,7 @@
it may cause the table to be initialized with the members at the end being it may cause the table to be initialized with the members at the end being
set to zero. This is bad as jumping to zero will crash. set to zero. This is bad as jumping to zero will crash.
Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2023, Intel Corporation. All rights reserved.<BR>
Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR> Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
@ -34,6 +34,9 @@ UINTN settimer_callback = 0;
BOOLEAN gEmulatorInterruptEnabled = FALSE; BOOLEAN gEmulatorInterruptEnabled = FALSE;
STATIC BOOLEAN mEmulatorStdInConfigured = FALSE;
STATIC struct termios mOldTty;
UINTN UINTN
SecWriteStdErr ( SecWriteStdErr (
IN UINT8 *Buffer, IN UINT8 *Buffer,
@ -58,8 +61,16 @@ SecConfigStdIn (
// Need to turn off line buffering, ECHO, and make it unbuffered. // Need to turn off line buffering, ECHO, and make it unbuffered.
// //
tcgetattr (STDIN_FILENO, &tty); tcgetattr (STDIN_FILENO, &tty);
if (!mEmulatorStdInConfigured) {
//
// Save the original state of the TTY so it can be restored on exit
//
CopyMem (&mOldTty, &tty, sizeof (struct termios));
}
tty.c_lflag &= ~(ICANON | ECHO); tty.c_lflag &= ~(ICANON | ECHO);
tcsetattr (STDIN_FILENO, TCSANOW, &tty); tcsetattr (STDIN_FILENO, TCSANOW, &tty);
mEmulatorStdInConfigured = TRUE;
// setvbuf (STDIN_FILENO, NULL, _IONBF, 0); // setvbuf (STDIN_FILENO, NULL, _IONBF, 0);
@ -338,6 +349,11 @@ SecExit (
UINTN Status UINTN Status
) )
{ {
// Reset the TTY back to its original state
if (mEmulatorStdInConfigured) {
tcsetattr (STDIN_FILENO, TCSANOW, &mOldTty);
}
exit (Status); exit (Status);
} }

View File

@ -1,6 +1,6 @@
/**@file /**@file
Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
Module Name: Module Name:
@ -30,6 +30,12 @@ Abstract:
#include "WinHost.h" #include "WinHost.h"
STATIC BOOLEAN mEmulatorStdInConfigured = FALSE;
STATIC DWORD mOldStdInMode;
#if defined (NTDDI_VERSION) && defined (NTDDI_WIN10_TH2) && (NTDDI_VERSION > NTDDI_WIN10_TH2)
STATIC DWORD mOldStdOutMode;
#endif
UINTN UINTN
SecWriteStdErr ( SecWriteStdErr (
IN UINT8 *Buffer, IN UINT8 *Buffer,
@ -61,6 +67,13 @@ SecConfigStdIn (
Success = GetConsoleMode (GetStdHandle (STD_INPUT_HANDLE), &Mode); Success = GetConsoleMode (GetStdHandle (STD_INPUT_HANDLE), &Mode);
if (Success) { if (Success) {
if (!mEmulatorStdInConfigured) {
//
// Save the original state of the console so it can be restored on exit
//
mOldStdInMode = Mode;
}
// //
// Disable buffer (line input), echo, mouse, window // Disable buffer (line input), echo, mouse, window
// //
@ -82,6 +95,13 @@ SecConfigStdIn (
// //
if (Success) { if (Success) {
Success = GetConsoleMode (GetStdHandle (STD_OUTPUT_HANDLE), &Mode); Success = GetConsoleMode (GetStdHandle (STD_OUTPUT_HANDLE), &Mode);
if (!mEmulatorStdInConfigured) {
//
// Save the original state of the console so it can be restored on exit
//
mOldStdOutMode = Mode;
}
if (Success) { if (Success) {
Success = SetConsoleMode ( Success = SetConsoleMode (
GetStdHandle (STD_OUTPUT_HANDLE), GetStdHandle (STD_OUTPUT_HANDLE),
@ -91,6 +111,10 @@ SecConfigStdIn (
} }
#endif #endif
if (Success) {
mEmulatorStdInConfigured = TRUE;
}
return Success ? EFI_SUCCESS : EFI_DEVICE_ERROR; return Success ? EFI_SUCCESS : EFI_DEVICE_ERROR;
} }
@ -467,6 +491,21 @@ SecExit (
UINTN Status UINTN Status
) )
{ {
if (mEmulatorStdInConfigured) {
//
// Reset the console back to its original state
//
#if defined (NTDDI_VERSION) && defined (NTDDI_WIN10_TH2) && (NTDDI_VERSION > NTDDI_WIN10_TH2)
BOOL Success = SetConsoleMode (GetStdHandle (STD_INPUT_HANDLE), mOldStdInMode);
if (Success) {
SetConsoleMode (GetStdHandle (STD_OUTPUT_HANDLE), mOldStdOutMode);
}
#else
SetConsoleMode (GetStdHandle (STD_INPUT_HANDLE), mOldStdInMode);
#endif
}
exit ((int)Status); exit ((int)Status);
} }