diff options
| author | Zhichao Gao <zhichao.gao@intel.com> | 2021-09-09 14:17:04 +0800 |
|---|---|---|
| committer | Liming Gao <gaoliming@byosoft.com.cn> | 2021-09-29 09:38:58 +0800 |
| commit | f57040b038ccf9ea2a79e3ce58b14e7634666d19 (patch) | |
| tree | 11644d88afa87a0b62612ed02eb0d620379eb9b9 /MdeModulePkg | |
| parent | 46b4606ba23498d3d0e66b53e498eb3d5d592586 (diff) | |
| download | edk2-f57040b038ccf9ea2a79e3ce58b14e7634666d19.tar.gz edk2-f57040b038ccf9ea2a79e3ce58b14e7634666d19.tar.bz2 edk2-f57040b038ccf9ea2a79e3ce58b14e7634666d19.zip | |
MdeModulePkg/BootManagerMenuApp: Limit string drawing within one line
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3590
Limit the draw box always within the screen's column and row.
Limit the string drawing within one line.
For the incompleted string the last 3 characters in one line would
be replaced with "...".
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Diffstat (limited to 'MdeModulePkg')
| -rw-r--r-- | MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c | 72 |
1 files changed, 69 insertions, 3 deletions
diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c index 9e729074ec..d4bdeba073 100644 --- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c +++ b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c @@ -1,7 +1,7 @@ /** @file
The application to show the Boot Manager Menu.
-Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2021, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
@@ -45,9 +45,56 @@ PrintStringAt ( IN CHAR16 *String
)
{
+ UINTN ScreenWidth;
+ UINTN ScreenRows;
+ CHAR16 *TurncateString;
+ EFI_STATUS Status;
+ UINTN ShowingLength;
gST->ConOut->SetCursorPosition (gST->ConOut, Column, Row);
- return Print (L"%s", String);
+
+ gST->ConOut->QueryMode (
+ gST->ConOut,
+ gST->ConOut->Mode->Mode,
+ &ScreenWidth,
+ &ScreenRows
+ );
+
+ if (Column > (ScreenWidth - 1) || Row > (ScreenRows - 1)) {
+ return 0;
+ }
+
+ if ((StrLen (String) + Column) > (ScreenWidth - 1)) {
+ //
+ // | - ScreenWidth - |
+ // ...Column.....................
+ // TurncateString length should leave one character for draw box and
+ // require one character for string end.
+ //
+ ShowingLength = ScreenWidth - Column - 1;
+ TurncateString = AllocatePool ((ShowingLength + 1) * sizeof (CHAR16));
+
+ if (TurncateString == NULL) {
+ return 0;
+ }
+
+ Status = StrnCpyS (TurncateString, ShowingLength + 1, String, ShowingLength - 3);
+
+ if (EFI_ERROR (Status)) {
+ FreePool (TurncateString);
+ return 0;
+ }
+
+ *(TurncateString + ShowingLength - 3) = L'.';
+ *(TurncateString + ShowingLength - 2) = L'.';
+ *(TurncateString + ShowingLength - 1) = L'.';
+ *(TurncateString + ShowingLength) = L'\0';
+ ShowingLength = Print (L"%s", TurncateString);
+ FreePool (TurncateString);
+ return ShowingLength;
+ } else {
+ return Print (L"%s", String);
+ }
}
/**
@@ -68,7 +115,22 @@ PrintCharAt ( CHAR16 Character
)
{
+ UINTN ScreenWidth;
+ UINTN ScreenRows;
+
gST->ConOut->SetCursorPosition (gST->ConOut, Column, Row);
+
+ gST->ConOut->QueryMode (
+ gST->ConOut,
+ gST->ConOut->Mode->Mode,
+ &ScreenWidth,
+ &ScreenRows
+ );
+
+ if (Column > (ScreenWidth - 1) || Row > (ScreenRows - 1)) {
+ return 0;
+ }
+
return Print (L"%c", Character);
}
@@ -193,7 +255,11 @@ InitializeBootMenuScreen ( MaxPrintRows = Row - 6;
UnSelectableItmes = TITLE_TOKEN_COUNT + 2 + HELP_TOKEN_COUNT + 2;
- BootMenuData->MenuScreen.Width = MaxStrWidth + 8;
+ if (MaxStrWidth + 8 > Column) {
+ BootMenuData->MenuScreen.Width = Column;
+ } else {
+ BootMenuData->MenuScreen.Width = MaxStrWidth + 8;
+ }
if (BootMenuData->ItemCount + UnSelectableItmes > MaxPrintRows) {
BootMenuData->MenuScreen.Height = MaxPrintRows;
BootMenuData->ScrollBarControl.HasScrollBar = TRUE;
|