X-Git-Url: https://code.delx.au/refind/blobdiff_plain/e99aa7a04054658c8d5d4595717b9b10e848564d..a0bab7e95672ae7438f7fdb806b9b167a5b04e07:/libeg/screen.c diff --git a/libeg/screen.c b/libeg/screen.c index 90988cf..1856cbd 100644 --- a/libeg/screen.c +++ b/libeg/screen.c @@ -33,6 +33,14 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/* + * Modifications copyright (c) 2012 Roderick W. Smith + * + * Modifications distributed under the terms of the GNU General Public + * License (GPL) version 3 (GPLv3), a copy of which must be distributed + * with this source code or binaries made from it. + * + */ #include "libegint.h" #include "../refind/screen.h" @@ -46,16 +54,6 @@ #define LibLocateProtocol EfiLibLocateProtocol #endif -// Scan for at least this many text-mode and graphics-mode display modes, even -// if the first modes are invalid. The number of text modes scanned must be at -// least 3 on some computers to properly list all the available modes when the -// user specifies an invalid value, since mode 1 (numbered from 0) is often -// invalid, but mode 2 (the third one) is usually valid. AFAIK, gaps never -// occur in graphics modes, although I've heard of one case that makes me think -// some exceptions may occur. -#define MIN_SCAN_TEXT_MODES 3 -#define MIN_SCAN_GRAPHICS_MODES 1 - // Console defines and variables static EFI_GUID ConsoleControlProtocolGuid = EFI_CONSOLE_CONTROL_PROTOCOL_GUID; @@ -75,24 +73,14 @@ static UINTN egScreenHeight = 600; // Screen handling // -VOID egInitScreen(VOID) -{ +// 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; - // 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) { @@ -109,8 +97,57 @@ VOID egInitScreen(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) +{ + 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(); } +// 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; + + 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() + // 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 @@ -123,43 +160,34 @@ VOID egInitScreen(VOID) 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; - Status = refit_call4_wrapper(GraphicsOutput->QueryMode, GraphicsOutput, ModeNum, &Size, &Info); - if (Status == EFI_SUCCESS) { - Status = refit_call2_wrapper(GraphicsOutput->SetMode, GraphicsOutput, ModeNum); - if (Status == EFI_SUCCESS) { - ModeSet = TRUE; - *ScreenWidth = Info->HorizontalResolution; - *ScreenHeight = Info->VerticalResolution; - } + if (egGetResFromMode(ScreenWidth, ScreenHeight) && + (refit_call2_wrapper(GraphicsOutput->SetMode, GraphicsOutput, ModeNum) == EFI_SUCCESS)) { + ModeSet = TRUE; } - } else { // User specified width & height; must find mode + + // 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) && (Size >= sizeof(*Info)) && + if ((Status == EFI_SUCCESS) && (Size >= sizeof(*Info) && (Info != NULL)) && (Info->HorizontalResolution == *ScreenWidth) && (Info->VerticalResolution == *ScreenHeight)) { Status = refit_call2_wrapper(GraphicsOutput->SetMode, GraphicsOutput, ModeNum); ModeSet = (Status == EFI_SUCCESS); } // if - } while (((++ModeNum < MIN_SCAN_GRAPHICS_MODES) || (Status == EFI_SUCCESS)) && !ModeSet); -// while ((Status == EFI_SUCCESS) && (!ModeSet)) { -// 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 -// ModeNum++; -// } // while() + } while ((++ModeNum < GraphicsOutput->Mode->MaxMode) && !ModeSet); } // if/else if (ModeSet) { @@ -174,18 +202,10 @@ BOOLEAN egSetScreenSize(IN OUT UINTN *ScreenWidth, IN OUT UINTN *ScreenHeight) { if ((Status == EFI_SUCCESS) && (Info != NULL)) { Print(L"Mode %d: %d x %d\n", ModeNum, Info->HorizontalResolution, Info->VerticalResolution); } // else - } while ((++ModeNum < MIN_SCAN_GRAPHICS_MODES) || (Status == EFI_SUCCESS)); -// Status = EFI_SUCCESS; -// while (Status == EFI_SUCCESS) { -// Status = refit_call4_wrapper(GraphicsOutput->QueryMode, GraphicsOutput, ModeNum, &Size, &Info); -// if ((Status == EFI_SUCCESS) && (Size >= sizeof(*Info))) { -// Print(L"Mode %d: %d x %d\n", ModeNum, Info->HorizontalResolution, Info->VerticalResolution); -// } // else -// ModeNum++; -// } // while() + } 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 @@ -202,44 +222,40 @@ 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) -{ - 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) { + 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) { - UsedMode = RequestedMode; + 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 < MIN_SCAN_TEXT_MODES) || (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(); } // if/else successful change } // if need to change mode - return UsedMode; -} // UINT32 egSetTextMode() + return ChangedIt; +} // BOOLEAN egSetTextMode() CHAR16 * egScreenDescription(VOID) {