- if ((GlobalConfig.RequestedScreenWidth > 0) && (GlobalConfig.RequestedScreenHeight > 0) &&
- egSetScreenSize(GlobalConfig.RequestedScreenWidth, GlobalConfig.RequestedScreenHeight)) {
- UGAWidth = GlobalConfig.RequestedScreenWidth;
- UGAHeight = GlobalConfig.RequestedScreenHeight;
+ UINTN NewWidth, NewHeight;
+
+ // Convert mode number to horizontal & vertical resolution values
+ if ((GlobalConfig.RequestedScreenWidth > 0) && (GlobalConfig.RequestedScreenHeight == 0))
+ egGetResFromMode(&(GlobalConfig.RequestedScreenWidth), &(GlobalConfig.RequestedScreenHeight));
+
+ // Set the believed-to-be current resolution to the LOWER of the current
+ // believed-to-be resolution and the requested resolution. This is done to
+ // enable setting a lower-than-default resolution.
+ if ((GlobalConfig.RequestedScreenWidth > 0) && (GlobalConfig.RequestedScreenHeight > 0)) {
+ UGAWidth = (UGAWidth < GlobalConfig.RequestedScreenWidth) ? UGAWidth : GlobalConfig.RequestedScreenWidth;
+ UGAHeight = (UGAHeight < GlobalConfig.RequestedScreenHeight) ? UGAHeight : GlobalConfig.RequestedScreenHeight;
+ }
+
+ // Set text mode. If this requires increasing the size of the graphics mode, do so.
+ if (egSetTextMode(GlobalConfig.RequestedTextMode)) {
+ egGetScreenSize(&NewWidth, &NewHeight);
+ if ((NewWidth > UGAWidth) || (NewHeight > UGAHeight)) {
+ UGAWidth = NewWidth;
+ UGAHeight = NewHeight;
+ }
+ if ((UGAWidth > GlobalConfig.RequestedScreenWidth) || (UGAHeight > GlobalConfig.RequestedScreenHeight)) {
+ // Requested text mode forces us to use a bigger graphics mode
+ GlobalConfig.RequestedScreenWidth = UGAWidth;
+ GlobalConfig.RequestedScreenHeight = UGAHeight;
+ } // if
+ }
+
+ if (GlobalConfig.RequestedScreenWidth > 0) {
+ egSetScreenSize(&(GlobalConfig.RequestedScreenWidth), &(GlobalConfig.RequestedScreenHeight));
+ egGetScreenSize(&UGAWidth, &UGAHeight);