tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Zhichao Gao 2021-09-09 14:17:04 +08:00 committed by Liming Gao
parent 46b4606ba2
commit f57040b038
1 changed files with 69 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c
View File

@ -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;