X-Git-Url: https://code.delx.au/refind/blobdiff_plain/99a75c0d391580161f651db61bb43afb46f4e5cd..a0bab7e95672ae7438f7fdb806b9b167a5b04e07:/libeg/screen.c diff --git a/libeg/screen.c b/libeg/screen.c index 02b9f67..1856cbd 100644 --- a/libeg/screen.c +++ b/libeg/screen.c @@ -73,6 +73,10 @@ static UINTN egScreenHeight = 600; // 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; @@ -93,6 +97,16 @@ static VOID egDetermineScreenSize(VOID) { 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) @@ -117,17 +131,19 @@ VOID egInitScreen(VOID) // 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) +// 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; + if ((ModeWidth != NULL) && (Height != 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() @@ -144,53 +160,34 @@ BOOLEAN egGetResFromMode(UINTN *ModeWidth, UINTN *Height) { BOOLEAN egSetScreenSize(IN OUT UINTN *ScreenWidth, IN OUT UINTN *ScreenHeight) { EFI_STATUS Status = EFI_SUCCESS; EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Info; - UINT32 ModeNum = 0; UINTN Size; - BOOLEAN ModeSet = FALSE; + UINT32 ModeNum = 0; UINT32 UGAWidth, UGAHeight, UGADepth, UGARefreshRate; + BOOLEAN ModeSet = FALSE; + + if ((ScreenWidth == NULL) || (ScreenHeight == NULL)) + return FALSE; if (GraphicsOutput != NULL) { // GOP mode (UEFI) if (*ScreenHeight == 0) { // User specified a mode number (stored in *ScreenWidth); use it directly ModeNum = (UINT32) *ScreenWidth; - if (egGetResFromMode(ScreenWidth, ScreenHeight) && ( - refit_call2_wrapper(GraphicsOutput->SetMode, GraphicsOutput, ModeNum) == EFI_SUCCESS)) { + if (egGetResFromMode(ScreenWidth, ScreenHeight) && + (refit_call2_wrapper(GraphicsOutput->SetMode, GraphicsOutput, ModeNum) == EFI_SUCCESS)) { ModeSet = TRUE; } -// if ((*ScreenWidth == GraphicsOutput->Mode->Mode)) { // user requested current mode; do nothing -// ModeSet = TRUE; -// *ScreenWidth = Info->HorizontalResolution; -// *ScreenHeight = Info->VerticalResolution; -// } else { -/* ModeNum = (UINT32) *ScreenWidth; + + // 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 != NULL)) && + (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) { @@ -208,7 +205,7 @@ BOOLEAN egSetScreenSize(IN OUT UINTN *ScreenWidth, IN OUT UINTN *ScreenHeight) { } 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 @@ -225,20 +222,10 @@ BOOLEAN egSetScreenSize(IN OUT UINTN *ScreenWidth, IN OUT UINTN *ScreenHeight) { // 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 @@ -248,19 +235,20 @@ BOOLEAN egSetTextMode(UINT32 RequestedMode) { EFI_STATUS Status; BOOLEAN ChangedIt = FALSE; - if (RequestedMode != ST->ConOut->Mode->Mode) { + if ((RequestedMode != DONT_CHANGE_TEXT_MODE) && (RequestedMode != ST->ConOut->Mode->Mode)) { // SwitchToGraphics(); Status = refit_call2_wrapper(ST->ConOut->SetMode, ST->ConOut, RequestedMode); if (Status == EFI_SUCCESS) { ChangedIt = TRUE; } else { SwitchToText(FALSE); - Print(L"Error setting text mode %d; available modes are:\n", RequestedMode); + Print(L"\nError setting text mode %d; available modes are:\n", RequestedMode); do { Status = refit_call4_wrapper(ST->ConOut->QueryMode, ST->ConOut, i, &Width, &Height); if (Status == EFI_SUCCESS) Print(L"Mode %d: %d x %d\n", i, Width, Height); } while (++i < ST->ConOut->Mode->MaxMode); + Print(L"Mode %d: Use default mode\n", DONT_CHANGE_TEXT_MODE); PauseForKey(); SwitchToGraphics();