Docs: Fixed launching Shell with text over it

zhk0365 · May 10, 2020 · 8b5099b · 8b5099b
1 parent da8302f
commit 8b5099b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -17,6 +17,7 @@ OpenCore Changelog
 - Added `ApplePanic` to store panic logs on ESP root
 - Fixed `ReconnectOnResChange` reconnecting even without res change
 - Fixed OpenCanopy showing internal icons for external drives
+- Fixed OpenCanopy launching Shell with text over it
 
 #### v0.5.8
 - Fixed invalid CPU object reference in SSDT-PLUG

diff --git a/Include/Library/OcConsoleLib.h b/Include/Library/OcConsoleLib.h
@@ -30,7 +30,8 @@ typedef enum {
 /**
   Special commands sent to Builtin text renderer through TestString.
 **/
-#define OC_CONSOLE_CLEAR_AND_CLIP  L"ClearAndClip"
+#define OC_CONSOLE_CLEAR_AND_CLIP        L"ClearAndClip"
+#define OC_CONSOLE_CLEAR_WHOLE_AND_CLIP  L"ClearWholeAndClip"
 
 /**
   Configure console control protocol with given options.

diff --git a/Library/OcBootManagementLib/OcBootManagementLib.c b/Library/OcBootManagementLib/OcBootManagementLib.c
@@ -650,6 +650,7 @@ OcRunBootPicker (
         //
         // Clear screen from picker contents before loading the entry.
         //
+        gST->ConOut->TestString (gST->ConOut, OC_CONSOLE_CLEAR_WHOLE_AND_CLIP);
         gST->ConOut->ClearScreen (gST->ConOut);
         //
         // Voice chosen information.

diff --git a/Library/OcConsoleLib/TextOutputBuiltin.c b/Library/OcConsoleLib/TextOutputBuiltin.c
@@ -570,6 +570,12 @@ AsciiTextTestString (
     This->ClearScreen (This);
     mConsoleMaxPosX = 0;
     mConsoleMaxPosY = 0;
+  } else if (StrCmp (String, OC_CONSOLE_CLEAR_WHOLE_AND_CLIP) == 0) {
+    mConsoleMaxPosX = mGraphicsOutput->Mode->Info->HorizontalResolution / TGT_CHAR_WIDTH;
+    mConsoleMaxPosY = mGraphicsOutput->Mode->Info->VerticalResolution   / TGT_CHAR_HEIGHT;
+    This->ClearScreen (This);
+    mConsoleMaxPosX = 0;
+    mConsoleMaxPosY = 0;
   }
 
   return EFI_SUCCESS;