From: "Ni, Ray" <ray.ni@intel.com>
To: "Gao, Zhichao" <zhichao.gao@intel.com>,
"Bi, Dandan" <dandan.bi@intel.com>
Cc: "Wang, Jian J" <jian.j.wang@intel.com>,
Liming Gao <gaoliming@byosoft.com.cn>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Subject: Re: [PATCH V2] MdeModulePkg/BootManagerMenuApp: Limit string drawing within one line
Date: Thu, 9 Sep 2021 14:54:48 +0000 [thread overview]
Message-ID: <CO1PR11MB49300E9D6FDB30FFC42489AE8CD59@CO1PR11MB4930.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20210909072541.3069-1-zhichao.gao@intel.com>
I remember that HII can tell the width of a string.
Have you evaluated using HII? +@Bi, Dandan
> -----Original Message-----
> From: Gao, Zhichao <zhichao.gao@intel.com>
> Sent: Thursday, September 9, 2021 3:26 PM
> To: devel@edk2.groups.io
> Cc: Wang, Jian J <jian.j.wang@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>; Ni, Ray <ray.ni@intel.com>
> Subject: [PATCH V2] 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.
>
> Change-Id: Ib7bd63cb07b23875a1e4f37ae80a422e1d5ed54f
> 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>
> ---
>
> V2:
>
> Drop the change in UefiBootManagerLib in V1.
>
> Add the limitation in BootManagerMenuApp instead.
>
>
> .../BootManagerMenuApp/BootManagerMenu.c | 72 ++++++++++++++++++-
> 1 file 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;
>
> --
> 2.31.1.windows.1
next prev parent reply other threads:[~2021-09-09 14:54 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-09 7:25 [PATCH V2] MdeModulePkg/BootManagerMenuApp: Limit string drawing within one line Gao, Zhichao
2021-09-09 14:54 ` Ni, Ray [this message]
2021-09-10 6:20 ` Gao, Zhichao
[not found] ` <16A361A200435518.18571@groups.io>
2021-09-22 1:00 ` [edk2-devel] " Gao, Zhichao
2021-09-22 3:27 ` Ni, Ray
2021-09-22 4:49 ` Gao, Zhichao
2021-09-23 2:59 ` 回复: [edk2-devel] " gaoliming
2021-09-23 3:46 ` Gao, Zhichao
2021-09-23 7:42 ` Ni, Ray
2021-09-23 8:21 ` Gao, Zhichao
2021-09-24 1:28 ` Ni, Ray
[not found] ` <16A756C7FFB49908.14001@groups.io>
2021-09-24 6:15 ` Gao, Zhichao
2021-09-26 1:00 ` 回复: " gaoliming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CO1PR11MB49300E9D6FDB30FFC42489AE8CD59@CO1PR11MB4930.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox