// Screen handling
//
-VOID egInitScreen(VOID)
-{
+static VOID egDetermineScreenSize(VOID) {
EFI_STATUS Status = EFI_SUCCESS;
UINT32 UGAWidth, UGAHeight, UGADepth, UGARefreshRate;
- // get protocols
- Status = LibLocateProtocol(&ConsoleControlProtocolGuid, (VOID **) &ConsoleControl);
- if (EFI_ERROR(Status))
- ConsoleControl = NULL;
-
- Status = LibLocateProtocol(&UgaDrawProtocolGuid, (VOID **) &UgaDraw);
- if (EFI_ERROR(Status))
- UgaDraw = NULL;
-
- Status = LibLocateProtocol(&GraphicsOutputProtocolGuid, (VOID **) &GraphicsOutput);
- if (EFI_ERROR(Status))
- GraphicsOutput = NULL;
-
// get screen size
egHasGraphics = FALSE;
if (GraphicsOutput != NULL) {
}
}
+VOID egInitScreen(VOID)
+{
+ EFI_STATUS Status = EFI_SUCCESS;
+
+ // get protocols
+ Status = LibLocateProtocol(&ConsoleControlProtocolGuid, (VOID **) &ConsoleControl);
+ if (EFI_ERROR(Status))
+ ConsoleControl = NULL;
+
+ Status = LibLocateProtocol(&UgaDrawProtocolGuid, (VOID **) &UgaDraw);
+ if (EFI_ERROR(Status))
+ UgaDraw = NULL;
+
+ Status = LibLocateProtocol(&GraphicsOutputProtocolGuid, (VOID **) &GraphicsOutput);
+ if (EFI_ERROR(Status))
+ GraphicsOutput = NULL;
+
+ egDetermineScreenSize();
+}
+
// Sets the screen resolution to the specified value, if possible. If *ScreenHeight
// is 0 and GOP mode is detected, assume that *ScreenWidth contains a GOP mode
// number rather than a horizontal resolution. If the specified resolution is not
if (GraphicsOutput != NULL) { // GOP mode (UEFI)
if (*ScreenHeight == 0) { // User specified a mode number (stored in *ScreenWidth); use it directly
- if (*ScreenWidth == GraphicsOutput->Mode->Mode) { // user requested current mode; do nothing
- ModeSet = TRUE;
- *ScreenWidth = Info->HorizontalResolution;
- *ScreenHeight = Info->VerticalResolution;
- } else {
+// if ((*ScreenWidth == GraphicsOutput->Mode->Mode)) { // user requested current mode; do nothing
+// ModeSet = TRUE;
+// *ScreenWidth = Info->HorizontalResolution;
+// *ScreenHeight = Info->VerticalResolution;
+// } else {
ModeNum = (UINT32) *ScreenWidth;
Status = refit_call4_wrapper(GraphicsOutput->QueryMode, GraphicsOutput, ModeNum, &Size, &Info);
if (Status == EFI_SUCCESS) {
*ScreenHeight = Info->VerticalResolution;
} // if set mode OK
} // if queried mode OK
- } // if/else
+// } // if/else
// User specified width & height; must find mode -- but only if change is required....
} else {
Status = refit_call4_wrapper(GraphicsOutput->QueryMode, GraphicsOutput, GraphicsOutput->Mode->Mode, &Size, &Info);
- if ((Status == EFI_SUCCESS) && (Info->HorizontalResolution == *ScreenWidth) &&
- (Info->VerticalResolution == *ScreenHeight)) {
- ModeSet = TRUE; // user requested current mode; do nothing
- } else {
+// if ((Status == EFI_SUCCESS) && (Info->HorizontalResolution == *ScreenWidth) &&
+// (Info->VerticalResolution == *ScreenHeight) && !AlwaysSet) {
+// ModeSet = TRUE; // user requested current mode; do nothing
+// } else {
// Do a loop through the modes to see if the specified one is available;
// and if so, switch to it....
do {
ModeSet = (Status == EFI_SUCCESS);
} // if
} while ((++ModeNum < GraphicsOutput->Mode->MaxMode) && !ModeSet);
- } // if/else
+// } // if/else
} // if/else
if (ModeSet) {
VOID egGetScreenSize(OUT UINTN *ScreenWidth, OUT UINTN *ScreenHeight)
{
+ egDetermineScreenSize();
+
if (ScreenWidth != NULL)
*ScreenWidth = egScreenWidth;
if (ScreenHeight != NULL)
*ScreenHeight = egScreenHeight;
}
-// Set a text mode
-// Returns the mode that was actually set.
-UINT32 egSetTextMode(UINT32 RequestedMode) {
+// Set a text mode.
+// Returns TRUE if the mode actually changed, FALSE otherwise.
+// Note that a FALSE return value can mean either an error or no change
+// necessary.
+BOOLEAN egSetTextMode(UINT32 RequestedMode) {
UINTN i = 0, Width, Height;
- UINT32 UsedMode = ST->ConOut->Mode->Mode;
EFI_STATUS Status;
+ BOOLEAN ChangedIt = FALSE;
if (RequestedMode != ST->ConOut->Mode->Mode) {
- SwitchToGraphics();
+// SwitchToGraphics();
Status = refit_call2_wrapper(ST->ConOut->SetMode, ST->ConOut, RequestedMode);
if (Status == EFI_SUCCESS) {
- UsedMode = RequestedMode;
+ ChangedIt = TRUE;
} else {
SwitchToText(FALSE);
Print(L"Error setting text mode %d; available modes are:\n", RequestedMode);
SwitchToGraphics();
} // if/else successful change
} // if need to change mode
- return UsedMode;
-} // UINT32 egSetTextMode()
+ return ChangedIt;
+} // BOOLEAN egSetTextMode()
CHAR16 * egScreenDescription(VOID)
{
EFI_CONSOLE_CONTROL_SCREEN_MODE CurrentMode;
EFI_CONSOLE_CONTROL_SCREEN_MODE NewMode;
+ egSetTextMode(GlobalConfig.RequestedTextMode);
if (ConsoleControl != NULL) {
refit_call4_wrapper(ConsoleControl->GetMode, ConsoleControl, &CurrentMode, NULL, NULL);
if (AboutMenu.EntryCount == 0) {
AboutMenu.TitleImage = BuiltinIcon(BUILTIN_ICON_FUNC_ABOUT);
- AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.6.0.4");
+ AddMenuInfoLine(&AboutMenu, L"rEFInd Version 0.6.0.5");
AddMenuInfoLine(&AboutMenu, L"");
AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2006-2010 Christoph Pfisterer");
AddMenuInfoLine(&AboutMenu, L"Copyright (c) 2012 Roderick W. Smith");
// bootstrap
InitializeLib(ImageHandle, SystemTable);
- InitScreen();
Status = InitRefitLib(ImageHandle);
if (EFI_ERROR(Status))
return Status;
if (GlobalConfig.LegacyType == LEGACY_TYPE_MAC)
CopyMem(GlobalConfig.ScanFor, "ihebocm ", NUM_SCAN_OPTIONS);
ReadConfig(CONFIG_FILE_NAME);
+
+ InitScreen();
WarnIfLegacyProblems();
MainMenu.TimeoutSeconds = GlobalConfig.Timeout;
PrepareBlankLine();
- // show the banner (even when in graphics mode)
- DrawScreenHeader(L"Initializing...");
+ // show the banner if in text mode
+ if (GlobalConfig.TextOnly)
+ DrawScreenHeader(L"Initializing...");
}
VOID SetupScreen(VOID)
{
- GlobalConfig.RequestedTextMode = egSetTextMode(GlobalConfig.RequestedTextMode);
+ UINTN NewWidth, NewHeight;
- if ((GlobalConfig.RequestedScreenWidth > 0) &&
- (egSetScreenSize(&GlobalConfig.RequestedScreenWidth, &GlobalConfig.RequestedScreenHeight))) {
- UGAWidth = GlobalConfig.RequestedScreenWidth;
- UGAHeight = GlobalConfig.RequestedScreenHeight;
+ if ((GlobalConfig.RequestedScreenWidth > 0) && (GlobalConfig.RequestedScreenHeight > 0)) {
+ UGAWidth = (UGAWidth < GlobalConfig.RequestedScreenWidth) ? UGAWidth : GlobalConfig.RequestedScreenWidth;
+ UGAHeight = (UGAHeight < GlobalConfig.RequestedScreenHeight) ? UGAHeight : GlobalConfig.RequestedScreenHeight;
+ }
+ if (egSetTextMode(GlobalConfig.RequestedTextMode)) {
+ egGetScreenSize(&NewWidth, &NewHeight);
+ if ((NewWidth > UGAWidth) || (NewHeight > UGAHeight)) {
+ UGAWidth = NewWidth;
+ UGAHeight = NewHeight;
+ }
+ if (UGAWidth > GlobalConfig.RequestedScreenWidth) {
+ // Requested text mode forces us to use a bigger graphics mode
+ // TODO: Convert single mode # to width & height to check it
+ GlobalConfig.RequestedScreenWidth = UGAWidth;
+ GlobalConfig.RequestedScreenHeight = UGAHeight;
+ } // if
+ }
+
+ if (GlobalConfig.RequestedScreenWidth > 0) {
+ if (!egSetScreenSize(&GlobalConfig.RequestedScreenWidth, &GlobalConfig.RequestedScreenHeight))
+ Print(L"Error setting screen size!\n");
+ egGetScreenSize(&UGAWidth, &UGAHeight);
} // if user requested a particular screen resolution
if (GlobalConfig.TextOnly) {
SwitchToGraphics();
BltClearScreen(TRUE);
}
-}
+} // VOID SetupScreen()
VOID SwitchToText(IN BOOLEAN CursorEnabled)
{
SwitchToGraphics();
BltClearScreen(FALSE);
} else {
- egClearScreen(&DarkBackgroundPixel);
- DrawScreenHeader(Title);
- } // if/else
-
- if (!UseGraphicsMode)
+ egClearScreen(&DarkBackgroundPixel);
+ DrawScreenHeader(Title);
SwitchToText(TRUE);
+ }
// reset error flag
haveError = FALSE;