/** @file\r
Implements statusbar interface functions.\r
\r
- Copyright (c) 2005 - 2011, Intel Corporation. All rights reserved. <BR>\r
+ Copyright (c) 2005 - 2018, 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
@sa StatusBarSetStatusString\r
**/\r
EFI_STATUS\r
-EFIAPI\r
StatusBarInit (\r
VOID\r
)\r
Cleanup function for the status bar.\r
**/\r
VOID\r
-EFIAPI\r
StatusBarCleanup (\r
VOID\r
)\r
\r
typedef struct {\r
UINT32 Foreground : 4;\r
- UINT32 Background : 4;\r
+ UINT32 Background : 3;\r
} STATUS_BAR_COLOR_ATTRIBUTES;\r
\r
typedef union {\r
/**\r
Cause the status bar to refresh it's printing on the screen.\r
\r
- @param[in] EditorFirst TRUE to indicate the first launch of the editor. \r
+ @param[in] EditorFirst TRUE to indicate the first launch of the editor.\r
FALSE otherwise.\r
@param[in] LastRow LastPrintable row.\r
@param[in] LastCol Last printable column.\r
@retval EFI_SUCCESS The operation was successful.\r
**/\r
EFI_STATUS\r
-EFIAPI\r
StatusBarRefresh (\r
IN BOOLEAN EditorFirst,\r
IN UINTN LastRow,\r
// back up the 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->EnableCursor (gST->ConOut, FALSE);\r
- gST->ConOut->SetAttribute (gST->ConOut, New.Data);\r
+ gST->ConOut->SetAttribute (gST->ConOut, New.Data & 0x7F);\r
\r
//\r
// clear status bar\r
//\r
- EditorClearLine (LastRow - 3, LastCol, LastRow);\r
+ EditorClearLine (LastRow, LastCol, LastRow);\r
\r
//\r
// print row, column fields\r
if (FileRow != (UINTN)(-1) && FileCol != (UINTN)(-1)) {\r
ShellPrintEx (\r
0,\r
- (INT32)(LastRow) - 4,\r
- L" Row: %d Col: %d %s",\r
+ (INT32)(LastRow) - 1,\r
+ L" %d,%d %s",\r
FileRow,\r
FileCol,\r
StatusString\r
} else {\r
ShellPrintEx (\r
0,\r
- (INT32)(LastRow) - 4,\r
+ (INT32)(LastRow) - 1,\r
L" %s",\r
StatusString\r
);\r
// print insert mode field\r
//\r
if (InsertMode) {\r
- ShellPrintEx ((INT32)(LastCol) - 10, (INT32)(LastRow) - 4, L"|%s|", L"INS");\r
+ ShellPrintEx ((INT32)(LastCol) - 21, (INT32)(LastRow) - 1, L"|%s| Help: Ctrl-E", L"INS");\r
} else {\r
- ShellPrintEx ((INT32)(LastCol) - 10, (INT32)(LastRow) - 4, L"|%s|", L"OVR");\r
+ ShellPrintEx ((INT32)(LastCol) - 21, (INT32)(LastRow) - 1, L"|%s| Help: Ctrl-E", L"OVR");\r
}\r
//\r
// restore the old screen attributes\r
@retval EFI_OUT_OF_RESOURCES A memory allocation failed.\r
**/\r
EFI_STATUS\r
-EFIAPI\r
StatusBarSetStatusString (\r
IN CHAR16 *Str\r
)\r
@return The string that is used.\r
**/\r
CONST CHAR16*\r
-EFIAPI\r
StatusBarGetString (\r
VOID\r
)\r
Function to set the need refresh boolean to TRUE.\r
**/\r
VOID\r
-EFIAPI\r
StatusBarSetRefresh(\r
VOID\r
)\r
@retval TRUE The status bar needs to be refreshed.\r
**/\r
BOOLEAN\r
-EFIAPI\r
StatusBarGetRefresh(\r
VOID\r
)\r