public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Gao, Zhichao" <zhichao.gao@intel.com>
To: devel@edk2.groups.io
Cc: Jian J Wang <jian.j.wang@intel.com>,
	Liming Gao <gaoliming@byosoft.com.cn>, Ray Ni <ray.ni@intel.com>
Subject: [PATCH V3] MdeModulePkg/BootManagerMenuApp: Limit string drawing within one line
Date: Mon, 27 Sep 2021 15:10:08 +0800	[thread overview]
Message-ID: <20210927071008.3297-1-zhichao.gao@intel.com> (raw)

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>
---
V2:
Drop the change in UefiBootManagerLib in V1.
Add the limitation in BootManagerMenuApp instead.

V3:
Update the commit message only.

 .../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


                 reply	other threads:[~2021-09-27  7:10 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20210927071008.3297-1-zhichao.gao@intel.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