- 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);