// Screen handling
//
+// Make the necessary system calls to identify the current graphics mode.
+// Stores the results in the file-global variables egScreenWidth,
+// egScreenHeight, and egHasGraphics. The first two of these will be
+// unchanged if neither GraphicsOutput nor UgaDraw is a valid pointer.
static VOID egDetermineScreenSize(VOID) {
EFI_STATUS Status = EFI_SUCCESS;
UINT32 UGAWidth, UGAHeight, UGADepth, UGARefreshRate;
egHasGraphics = TRUE;
}
}
+} // static VOID egDetermineScreenSize()
+
+VOID egGetScreenSize(OUT UINTN *ScreenWidth, OUT UINTN *ScreenHeight)
+{
+ egDetermineScreenSize();
+
+ if (ScreenWidth != NULL)
+ *ScreenWidth = egScreenWidth;
+ if (ScreenHeight != NULL)
+ *ScreenHeight = egScreenHeight;
}
VOID egInitScreen(VOID)
egDetermineScreenSize();
}
+// Convert a graphics mode (in *ModeWidth) to a width and height (returned in
+// *ModeWidth and *Height, respectively).
+// Returns TRUE if successful, FALSE if not (invalid mode, typically)
+BOOLEAN egGetResFromMode(UINTN *ModeWidth, UINTN *Height) {
+ UINTN Size;
+ EFI_STATUS Status;
+ EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info = NULL;
+
+ Status = refit_call4_wrapper(GraphicsOutput->QueryMode, GraphicsOutput, *ModeWidth, &Size, &Info);
+ if ((Status == EFI_SUCCESS) && (Info != NULL)) {
+ *ModeWidth = Info->HorizontalResolution;
+ *Height = Info->VerticalResolution;
+ return TRUE;
+ }
+ return FALSE;
+} // BOOLEAN egGetResFromMode()
+
// 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 {
- ModeNum = (UINT32) *ScreenWidth;
+ ModeNum = (UINT32) *ScreenWidth;
+ if (egGetResFromMode(ScreenWidth, ScreenHeight) &&
+ (refit_call2_wrapper(GraphicsOutput->SetMode, GraphicsOutput, ModeNum) == EFI_SUCCESS)) {
+ ModeSet = TRUE;
+ }
+
+ // User specified width & height; must find mode...
+ } else {
+ // Do a loop through the modes to see if the specified one is available;
+ // and if so, switch to it....
+ do {
Status = refit_call4_wrapper(GraphicsOutput->QueryMode, GraphicsOutput, ModeNum, &Size, &Info);
- if (Status == EFI_SUCCESS) {
+ if ((Status == EFI_SUCCESS) && (Size >= sizeof(*Info)) &&
+ (Info->HorizontalResolution == *ScreenWidth) && (Info->VerticalResolution == *ScreenHeight)) {
Status = refit_call2_wrapper(GraphicsOutput->SetMode, GraphicsOutput, ModeNum);
- if (Status == EFI_SUCCESS) {
- ModeSet = TRUE;
- *ScreenWidth = Info->HorizontalResolution;
- *ScreenHeight = Info->VerticalResolution;
- } // if set mode OK
- } // if queried mode OK
-// } // 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) && !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 {
- Status = refit_call4_wrapper(GraphicsOutput->QueryMode, GraphicsOutput, ModeNum, &Size, &Info);
- if ((Status == EFI_SUCCESS) && (Size >= sizeof(*Info)) &&
- (Info->HorizontalResolution == *ScreenWidth) && (Info->VerticalResolution == *ScreenHeight)) {
- Status = refit_call2_wrapper(GraphicsOutput->SetMode, GraphicsOutput, ModeNum);
- ModeSet = (Status == EFI_SUCCESS);
- } // if
- } while ((++ModeNum < GraphicsOutput->Mode->MaxMode) && !ModeSet);
-// } // if/else
+ ModeSet = (Status == EFI_SUCCESS);
+ } // if
+ } while ((++ModeNum < GraphicsOutput->Mode->MaxMode) && !ModeSet);
} // if/else
if (ModeSet) {
} while (++ModeNum < GraphicsOutput->Mode->MaxMode);
PauseForKey();
SwitchToGraphics();
- } // if()
+ } // if GOP mode (UEFI)
} else if (UgaDraw != NULL) { // UGA mode (EFI 1.x)
// Try to use current color depth & refresh rate for new mode. Maybe not the best choice
// This is just a placeholder until something better can be done....
Print(L"Error setting graphics mode %d x %d; unsupported mode!\n");
} // if/else
- } // if/else if
+ } // if/else if UGA mode (EFI 1.x)
return (ModeSet);
} // BOOLEAN egSetScreenSize()
-VOID egGetScreenSize(OUT UINTN *ScreenWidth, OUT UINTN *ScreenHeight)
-{
- egDetermineScreenSize();
-
- if (ScreenWidth != NULL)
- *ScreenWidth = egScreenWidth;
- if (ScreenHeight != NULL)
- *ScreenHeight = egScreenHeight;
-}
-
// 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
EFI_STATUS Status;
BOOLEAN ChangedIt = FALSE;
- if (RequestedMode != ST->ConOut->Mode->Mode) {
+ if ((RequestedMode != ST->ConOut->Mode->Mode) && (RequestedMode != DONT_CHANGE_TEXT_MODE)) {
// SwitchToGraphics();
Status = refit_call2_wrapper(ST->ConOut->SetMode, ST->ConOut, RequestedMode);
if (Status == EFI_SUCCESS) {
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);