ShellPkg/[hex]edit: use SimpleTextInEx to read console

[mirror_edk2.git] / ShellPkg / Library / UefiShellDebug1CommandsLib / EditTitleBar.c

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c
index c29ecc00fd4b12ab96ce1bb0153638c18fd0cbb6..727605ccad08eef384fa210ea863866c2c5a249c 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EditTitleBar.c
@@ -1,7 +1,8 @@
 /** @file\r
   Implements titlebar interface functions.\r
 \r
-  Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>\r
+  (C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>\r
+  Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved. <BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -26,7 +27,6 @@ CHAR16  *Title = NULL;
   @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 MainTitleBarInit (\r
   CONST CHAR16 *Prompt\r
   )\r
@@ -51,7 +51,6 @@ MainTitleBarInit (
   Clean up the memory used.\r
 **/\r
 VOID\r
-EFIAPI\r
 MainTitleBarCleanup (\r
   VOID\r
   )\r
@@ -85,7 +84,6 @@ typedef union {
   @retval EFI_SUCCESS           The operation was successful.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 MainTitleBarRefresh (\r
   IN CONST CHAR16                 *FileName OPTIONAL,\r
   IN CONST EDIT_FILE_TYPE         FileType,\r
@@ -107,10 +105,11 @@ MainTitleBarRefresh (
   // backup the old screen attributes\r
   //\r
   Orig.Data             = gST->ConOut->Mode->Attribute;\r
-  New.Colors.Foreground = Orig.Colors.Background;\r
-  New.Colors.Background = Orig.Colors.Foreground;\r
+  New.Data              = 0;\r
+  New.Colors.Foreground = Orig.Colors.Background & 0xF;\r
+  New.Colors.Background = Orig.Colors.Foreground & 0x7;\r
 \r
-  gST->ConOut->SetAttribute (gST->ConOut, New.Data);\r
+  gST->ConOut->SetAttribute (gST->ConOut, New.Data & 0x7F);\r
 \r
   //\r
   // clear the title line\r
@@ -169,6 +168,8 @@ MainTitleBarRefresh (
     case FileTypeAscii:\r
     case FileTypeUnicode:\r
       if (FileType == FileTypeAscii){\r
+        ShellPrintEx (-1,-1, L"     ASCII     ");\r
+      } else {\r
         ShellPrintEx (-1,-1, L"     UNICODE   ");\r
       }\r
       //\r