/** @file\r
Utility functions for User Interface functions.\r
\r
-Copyright (c) 2004 - 2009, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
http://opensource.org/licenses/bsd-license.php\r
\r
**/\r
\r
-#include "Ui.h"\r
#include "Setup.h"\r
\r
LIST_ENTRY gMenuOption;\r
UI_MENU_SELECTION *Selection;\r
FORM_BROWSER_STATEMENT *Question;\r
EFI_HII_CONFIG_ACCESS_PROTOCOL *ConfigAccess;\r
- EFI_HII_VALUE *HiiValue;\r
EFI_BROWSER_ACTION_REQUEST ActionRequest;\r
\r
if (gMenuRefreshHead != NULL) {\r
ConfigAccess = Selection->FormSet->ConfigAccess;\r
if (((Question->QuestionFlags & EFI_IFR_FLAG_CALLBACK) != 0) && (ConfigAccess != NULL)) {\r
ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r
-\r
- HiiValue = &Question->HiiValue;\r
- if (HiiValue->Type == EFI_IFR_TYPE_STRING) {\r
- //\r
- // Create String in HII database for Configuration Driver to retrieve\r
- //\r
- HiiValue->Value.string = NewString ((CHAR16 *) Question->BufferValue, Selection->FormSet->HiiHandle);\r
- }\r
-\r
Status = ConfigAccess->Callback (\r
ConfigAccess,\r
EFI_BROWSER_ACTION_CHANGING,\r
Question->QuestionId,\r
- HiiValue->Type,\r
- &HiiValue->Value,\r
+ Question->HiiValue.Type,\r
+ &Question->HiiValue.Value,\r
&ActionRequest\r
);\r
-\r
- if (HiiValue->Type == EFI_IFR_TYPE_STRING) {\r
- //\r
- // Clean the String in HII Database\r
- //\r
- DeleteString (HiiValue->Value.string, Selection->FormSet->HiiHandle);\r
- }\r
-\r
if (!EFI_ERROR (Status)) {\r
switch (ActionRequest) {\r
case EFI_BROWSER_ACTION_REQUEST_RESET:\r
\r
**/\r
EFI_STATUS\r
+EFIAPI\r
CreateDialog (\r
IN UINTN NumberOfLines,\r
IN BOOLEAN HotKey,\r
\r
**/\r
VOID\r
+EFIAPI\r
CreateMultiStringPopUp (\r
IN UINTN RequestedWidth,\r
IN UINTN NumberOfLines,\r
);\r
mInputError = TRUE;\r
} else {\r
- gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_HIGHLIGHT);\r
+ gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextHighlightColor));\r
for (Index = 0; Index < (GetStringWidth (InputErrorMessage) - 2) / 2; Index++) {\r
PrintAt (gScreenDimensions.LeftColumn + gPromptBlockWidth + Index, gScreenDimensions.BottomRow - 1, L" ");\r
}\r
break;\r
\r
case NV_UPDATE_REQUIRED:\r
- if (gClassOfVfr != FORMSET_CLASS_FRONT_PAGE) {\r
+ if ((gClassOfVfr & FORMSET_CLASS_FRONT_PAGE) != FORMSET_CLASS_FRONT_PAGE) {\r
if (State) {\r
gST->ConOut->SetAttribute (gST->ConOut, INFO_TEXT);\r
PrintStringAt (\r
\r
gNvUpdateRequired = TRUE;\r
} else {\r
- gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_HIGHLIGHT);\r
+ gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextHighlightColor));\r
for (Index = 0; Index < (GetStringWidth (NvUpdateMessage) - 2) / 2; Index++) {\r
PrintAt (\r
(gScreenDimensions.LeftColumn + gPromptBlockWidth + gOptionBlockWidth + Index),\r
Width -= SUBTITLE_INDENT;\r
}\r
\r
- return Width;\r
+ return (UINT16) (Width - LEFT_SKIPPED_COLUMNS);\r
}\r
\r
/**\r
UINT8 DigitUint8;\r
UI_MENU_LIST *CurrentMenu;\r
UI_MENU_LIST *MenuList;\r
+ FORM_BROWSER_FORM *RefForm;\r
\r
CopyMem (&LocalScreen, &gScreenDimensions, sizeof (EFI_SCREEN_DESCRIPTOR));\r
\r
NextMenuOption = NULL;\r
PreviousMenuOption = NULL;\r
SavedMenuOption = NULL;\r
+ RefForm = NULL;\r
\r
ZeroMem (&Key, sizeof (EFI_INPUT_KEY));\r
\r
- if (gClassOfVfr == FORMSET_CLASS_FRONT_PAGE) {\r
+ if ((gClassOfVfr & FORMSET_CLASS_FRONT_PAGE) == FORMSET_CLASS_FRONT_PAGE){\r
TopRow = LocalScreen.TopRow + FRONT_PAGE_HEADER_HEIGHT + SCROLL_ARROW_HEIGHT;\r
Row = LocalScreen.TopRow + FRONT_PAGE_HEADER_HEIGHT + SCROLL_ARROW_HEIGHT;\r
} else {\r
Row = LocalScreen.TopRow + NONE_FRONT_PAGE_HEADER_HEIGHT + SCROLL_ARROW_HEIGHT;\r
}\r
\r
- Col = LocalScreen.LeftColumn;\r
+ Col = LocalScreen.LeftColumn + LEFT_SKIPPED_COLUMNS;\r
BottomRow = LocalScreen.BottomRow - STATUS_BAR_HEIGHT - FOOTER_HEIGHT - SCROLL_ARROW_HEIGHT - 1;\r
\r
Selection->TopRow = TopRow;\r
UpArrow = FALSE;\r
Row = TopRow;\r
\r
- Temp = SkipValue;\r
- Temp2 = SkipValue;\r
+ Temp = (UINTN) SkipValue;\r
+ Temp2 = (UINTN) SkipValue;\r
\r
ClearLines (\r
LocalScreen.LeftColumn,\r
LocalScreen.RightColumn,\r
TopRow - SCROLL_ARROW_HEIGHT,\r
BottomRow + SCROLL_ARROW_HEIGHT,\r
- FIELD_TEXT | FIELD_BACKGROUND\r
+ PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND\r
);\r
\r
UiFreeRefreshList ();\r
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_GRAYED | FIELD_BACKGROUND);\r
} else {\r
if (Statement->Operand == EFI_IFR_SUBTITLE_OP) {\r
- gST->ConOut->SetAttribute (gST->ConOut, SUBTITLE_TEXT | FIELD_BACKGROUND);\r
+ gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserSubtitleTextColor) | FIELD_BACKGROUND);\r
}\r
}\r
\r
Width = GetWidth (Statement, MenuOption->Handle);\r
OriginalRow = Row;\r
\r
+ if (Statement->Operand == EFI_IFR_REF_OP && \r
+ ((gClassOfVfr & FORMSET_CLASS_PLATFORM_SETUP) == FORMSET_CLASS_PLATFORM_SETUP) &&\r
+ MenuOption->Col > 2) {\r
+ //\r
+ // Print Arrow for Goto button.\r
+ //\r
+ PrintAt (\r
+ MenuOption->Col - 2,\r
+ Row,\r
+ L"%c",\r
+ GEOMETRICSHAPE_RIGHT_TRIANGLE\r
+ );\r
+ }\r
+\r
for (Index = 0; GetLineByWidth (MenuOption->Description, Width, &Index, &OutputString) != 0x0000;) {\r
if ((Temp == 0) && (Row <= BottomRow)) {\r
PrintStringAt (MenuOption->Col, Row, OutputString);\r
Temp = 0;\r
Row = OriginalRow;\r
\r
- gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
Status = ProcessOptions (Selection, MenuOption, FALSE, &OptionString);\r
if (EFI_ERROR (Status)) {\r
//\r
MenuRefreshEntry->Selection = Selection;\r
MenuRefreshEntry->CurrentColumn = MenuOption->OptCol;\r
MenuRefreshEntry->CurrentRow = MenuOption->Row;\r
- MenuRefreshEntry->CurrentAttribute = FIELD_TEXT | FIELD_BACKGROUND;\r
+ if (MenuOption->GrayOut) {\r
+ MenuRefreshEntry->CurrentAttribute = FIELD_TEXT_GRAYED | FIELD_BACKGROUND;\r
+ } else { \r
+ MenuRefreshEntry->CurrentAttribute = PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND;\r
+ }\r
gMenuRefreshHead = MenuRefreshEntry;\r
} else {\r
//\r
MenuRefreshEntry->Selection = Selection;\r
MenuRefreshEntry->CurrentColumn = MenuOption->OptCol;\r
MenuRefreshEntry->CurrentRow = MenuOption->Row;\r
- MenuRefreshEntry->CurrentAttribute = FIELD_TEXT | FIELD_BACKGROUND;\r
+ if (MenuOption->GrayOut) {\r
+ MenuRefreshEntry->CurrentAttribute = FIELD_TEXT_GRAYED | FIELD_BACKGROUND;\r
+ } else { \r
+ MenuRefreshEntry->CurrentAttribute = PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND;\r
+ }\r
}\r
}\r
\r
Row = OriginalRow;\r
FreePool (StringPtr);\r
}\r
+ gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND);\r
\r
//\r
// Need to handle the bottom of the display\r
L"%c",\r
ARROW_UP\r
);\r
- gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
+ gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND);\r
}\r
\r
if (DownArrow) {\r
L"%c",\r
ARROW_DOWN\r
);\r
- gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
+ gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND);\r
}\r
\r
MenuOption = NULL;\r
//\r
gST->ConOut->SetCursorPosition (gST->ConOut, MenuOption->Col, MenuOption->Row);\r
ProcessOptions (Selection, MenuOption, FALSE, &OptionString);\r
- gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
+ gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND);\r
if (OptionString != NULL) {\r
if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) ||\r
(MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)\r
if (MenuOption->GrayOut) {\r
gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_GRAYED | FIELD_BACKGROUND);\r
} else if (MenuOption->ThisTag->Operand == EFI_IFR_SUBTITLE_OP) {\r
- gST->ConOut->SetAttribute (gST->ConOut, SUBTITLE_TEXT | FIELD_BACKGROUND);\r
+ gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserSubtitleTextColor) | FIELD_BACKGROUND);\r
}\r
\r
OriginalRow = MenuOption->Row;\r
}\r
\r
MenuOption->Row = OriginalRow;\r
- gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
+ gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND);\r
}\r
}\r
}\r
//\r
// Set reverse attribute\r
//\r
- gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT_HIGHLIGHT | FIELD_BACKGROUND_HIGHLIGHT);\r
+ gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextHighlightColor) | PcdGet8 (PcdBrowserFieldBackgroundHighlightColor));\r
gST->ConOut->SetCursorPosition (gST->ConOut, MenuOption->Col, MenuOption->Row);\r
\r
//\r
//\r
if (gMenuRefreshHead != NULL) {\r
for (MenuRefreshEntry = gMenuRefreshHead; MenuRefreshEntry != NULL; MenuRefreshEntry = MenuRefreshEntry->Next) {\r
- MenuRefreshEntry->CurrentAttribute = FIELD_TEXT | FIELD_BACKGROUND;\r
+ if (MenuOption->GrayOut) {\r
+ MenuRefreshEntry->CurrentAttribute = FIELD_TEXT_GRAYED | FIELD_BACKGROUND;\r
+ } else { \r
+ MenuRefreshEntry->CurrentAttribute = PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND;\r
+ }\r
if (MenuRefreshEntry->MenuOption == MenuOption) {\r
- MenuRefreshEntry->CurrentAttribute = FIELD_TEXT_HIGHLIGHT | FIELD_BACKGROUND_HIGHLIGHT;\r
+ MenuRefreshEntry->CurrentAttribute = PcdGet8 (PcdBrowserFieldTextHighlightColor) | PcdGet8 (PcdBrowserFieldBackgroundHighlightColor);\r
}\r
}\r
}\r
//\r
// Clear reverse attribute\r
//\r
- gST->ConOut->SetAttribute (gST->ConOut, FIELD_TEXT | FIELD_BACKGROUND);\r
+ gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND);\r
}\r
//\r
// Repaint flag will be used when process CfUpdateHelpString, so restore its value\r
//\r
// Don't print anything if it is a NULL help token\r
//\r
+ ASSERT(MenuOption != NULL);\r
if (MenuOption->ThisTag->Help == 0) {\r
StringPtr = L"\0";\r
} else {\r
//\r
case '+':\r
case '-':\r
+ //\r
+ // If the screen has no menu items, and the user didn't select UiReset\r
+ // ignore the selection and go back to reading keys.\r
+ //\r
+ if(IsListEmpty (&gMenuOption)) {\r
+ ControlFlag = CfReadKey;\r
+ break;\r
+ }\r
+\r
+ ASSERT(MenuOption != NULL);\r
Statement = MenuOption->ThisTag;\r
if ((Statement->Operand == EFI_IFR_DATE_OP)\r
|| (Statement->Operand == EFI_IFR_TIME_OP)\r
//\r
Repaint = TRUE;\r
NewLine = TRUE;\r
+ } else {\r
+ Selection->Action = UI_ACTION_REFRESH_FORM;\r
}\r
if (OptionString != NULL) {\r
FreePool (OptionString);\r
break;\r
\r
case ' ':\r
- if (gClassOfVfr != FORMSET_CLASS_FRONT_PAGE) {\r
+ if ((gClassOfVfr & FORMSET_CLASS_FRONT_PAGE) != FORMSET_CLASS_FRONT_PAGE) {\r
+ //\r
+ // If the screen has no menu items, and the user didn't select UiReset\r
+ // ignore the selection and go back to reading keys.\r
+ //\r
+ if(IsListEmpty (&gMenuOption)) {\r
+ ControlFlag = CfReadKey;\r
+ break;\r
+ }\r
+ \r
+ ASSERT(MenuOption != NULL);\r
if (MenuOption->ThisTag->Operand == EFI_IFR_CHECKBOX_OP && !MenuOption->GrayOut) {\r
ScreenOperation = UiSelect;\r
}\r
case CfUiSelect:\r
ControlFlag = CfCheckSelection;\r
\r
+ ASSERT(MenuOption != NULL);\r
Statement = MenuOption->ThisTag;\r
- if ((Statement->Operand == EFI_IFR_TEXT_OP) ||\r
- (Statement->Operand == EFI_IFR_DATE_OP) ||\r
- (Statement->Operand == EFI_IFR_TIME_OP) ||\r
- (Statement->Operand == EFI_IFR_NUMERIC_OP && Statement->Step != 0)) {\r
+ if (Statement->Operand == EFI_IFR_TEXT_OP) {\r
break;\r
}\r
\r
//\r
// Goto another Hii Package list\r
//\r
- ControlFlag = CfCheckSelection;\r
Selection->Action = UI_ACTION_REFRESH_FORMSET;\r
\r
StringPtr = GetToken (Statement->RefDevicePath, Selection->FormSet->HiiHandle);\r
}\r
BufferSize = StrLen (StringPtr) / 2;\r
DevicePath = AllocatePool (BufferSize);\r
+ ASSERT (DevicePath != NULL);\r
\r
//\r
// Convert from Device Path String to DevicePath Buffer in the reverse order.\r
//\r
// Goto another Formset, check for uncommitted data\r
//\r
- ControlFlag = CfCheckSelection;\r
Selection->Action = UI_ACTION_REFRESH_FORMSET;\r
\r
CopyMem (&Selection->FormSetGuid, &Statement->RefFormSetId, sizeof (EFI_GUID));\r
Selection->FormId = Statement->RefFormId;\r
Selection->QuestionId = Statement->RefQuestionId;\r
} else if (Statement->RefFormId != 0) {\r
+ //\r
+ // Check whether target From is suppressed.\r
+ //\r
+ RefForm = IdToForm (Selection->FormSet, Statement->RefFormId);\r
+\r
+ if ((RefForm != NULL) && (RefForm->SuppressExpression != NULL)) {\r
+ Status = EvaluateExpression (Selection->FormSet, RefForm, RefForm->SuppressExpression);\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
+\r
+ if (RefForm->SuppressExpression->Result.Value.b) {\r
+ //\r
+ // Form is suppressed. \r
+ //\r
+ do {\r
+ CreateDialog (4, TRUE, 0, NULL, &Key, gEmptyString, gFormSuppress, gPressEnter, gEmptyString);\r
+ } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
+\r
+ Repaint = TRUE;\r
+ break;\r
+ }\r
+ }\r
+\r
//\r
// Goto another form inside this formset,\r
//\r
Selection->Action = UI_ACTION_REFRESH_FORM;\r
}\r
\r
- if (OptionString != NULL) {\r
- FreePool (OptionString);\r
- }\r
+ if (OptionString != NULL) {\r
+ FreePool (OptionString);\r
+ }\r
break;\r
}\r
break;\r
break;\r
}\r
\r
- if (gClassOfVfr == FORMSET_CLASS_FRONT_PAGE) {\r
+ if ((gClassOfVfr & FORMSET_CLASS_FRONT_PAGE) == FORMSET_CLASS_FRONT_PAGE) {\r
//\r
// We never exit FrontPage, so skip the ESC\r
//\r
\r
case CfUiLeft:\r
ControlFlag = CfCheckSelection;\r
+ ASSERT(MenuOption != NULL);\r
if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) {\r
if (MenuOption->Sequence != 0) {\r
//\r
// In the middle or tail of the Date/Time op-code set, go left.\r
//\r
+ ASSERT(NewPos != NULL);\r
NewPos = NewPos->BackLink;\r
}\r
}\r
\r
case CfUiRight:\r
ControlFlag = CfCheckSelection;\r
+ ASSERT(MenuOption != NULL);\r
if ((MenuOption->ThisTag->Operand == EFI_IFR_DATE_OP) || (MenuOption->ThisTag->Operand == EFI_IFR_TIME_OP)) {\r
if (MenuOption->Sequence != 2) {\r
//\r
// In the middle or tail of the Date/Time op-code set, go left.\r
//\r
+ ASSERT(NewPos != NULL);\r
NewPos = NewPos->ForwardLink;\r
}\r
}\r
\r
SavedListEntry = TopOfScreen;\r
\r
+ ASSERT(NewPos != NULL);\r
if (NewPos->BackLink != &gMenuOption) {\r
NewLine = TRUE;\r
//\r
NewPos = NewPos->BackLink;\r
}\r
\r
+ Difference = MoveToNextStatement (TRUE, &NewPos);\r
PreviousMenuOption = MENU_OPTION_FROM_LINK (NewPos);\r
DistanceValue = PreviousMenuOption->Skip;\r
\r
// checking can be done.\r
//\r
DistanceValue += AdjustDateAndTimePosition (TRUE, &NewPos);\r
-\r
- //\r
- // Check the previous menu entry to see if it was a zero-length advance. If it was,\r
- // don't worry about a redraw.\r
- //\r
- if ((INTN) MenuOption->Row - (INTN) DistanceValue < (INTN) TopRow) {\r
- Repaint = TRUE;\r
- TopOfScreen = NewPos;\r
- }\r
-\r
- Difference = MoveToNextStatement (TRUE, &NewPos);\r
- PreviousMenuOption = MENU_OPTION_FROM_LINK (NewPos);\r
- DistanceValue += PreviousMenuOption->Skip;\r
-\r
- if ((INTN) MenuOption->Row - (INTN) DistanceValue < (INTN) TopRow) {\r
- if (Difference > 0) {\r
- //\r
- // Previous focus MenuOption is above the TopOfScreen, so we need to scroll\r
- //\r
- TopOfScreen = NewPos;\r
- Repaint = TRUE;\r
- SkipValue = 0;\r
- OldSkipValue = 0;\r
- }\r
- }\r
+ \r
+ ASSERT (MenuOption != NULL);\r
if (Difference < 0) {\r
//\r
// We want to goto previous MenuOption, but finally we go down.\r
TopOfScreen = gMenuOption.ForwardLink;\r
Repaint = TRUE;\r
}\r
+ } else if ((INTN) MenuOption->Row - (INTN) DistanceValue - Difference < (INTN) TopRow) {\r
+ //\r
+ // Previous focus MenuOption is above the TopOfScreen, so we need to scroll\r
+ //\r
+ TopOfScreen = NewPos;\r
+ Repaint = TRUE;\r
+ SkipValue = 0;\r
+ OldSkipValue = 0;\r
}\r
\r
//\r
case CfUiPageUp:\r
ControlFlag = CfCheckSelection;\r
\r
+ ASSERT(NewPos != NULL);\r
if (NewPos->BackLink == &gMenuOption) {\r
NewLine = FALSE;\r
Repaint = FALSE;\r
case CfUiPageDown:\r
ControlFlag = CfCheckSelection;\r
\r
+ ASSERT (NewPos != NULL);\r
if (NewPos->ForwardLink == &gMenuOption) {\r
NewLine = FALSE;\r
Repaint = FALSE;\r
MenuOption = MENU_OPTION_FROM_LINK (NewPos);\r
NewLine = TRUE;\r
NewPos = NewPos->ForwardLink;\r
- NextMenuOption = MENU_OPTION_FROM_LINK (NewPos);\r
\r
- DistanceValue += NextMenuOption->Skip;\r
DistanceValue += MoveToNextStatement (FALSE, &NewPos);\r
+ NextMenuOption = MENU_OPTION_FROM_LINK (NewPos);\r
+\r
//\r
// An option might be multi-line, so we need to reflect that data in the overall skip value\r
//\r
- UpdateOptionSkipLines (Selection, NextMenuOption, &OptionString, SkipValue);\r
+ UpdateOptionSkipLines (Selection, NextMenuOption, &OptionString, (UINTN) SkipValue);\r
+ DistanceValue += NextMenuOption->Skip;\r
\r
Temp = MenuOption->Row + MenuOption->Skip + DistanceValue - 1;\r
if ((MenuOption->Row + MenuOption->Skip == BottomRow + 1) &&\r
//\r
// If we have a remainder, skip that many more op-codes until we drain the remainder\r
//\r
- for (;\r
- Difference >= (INTN) SavedMenuOption->Skip;\r
- Difference = Difference - (INTN) SavedMenuOption->Skip\r
- ) {\r
+ while (Difference >= (INTN) SavedMenuOption->Skip) {\r
//\r
// Since the Difference is greater than or equal to this op-code's skip value, skip it\r
//\r
+ Difference = Difference - (INTN) SavedMenuOption->Skip;\r
TopOfScreen = TopOfScreen->ForwardLink;\r
SavedMenuOption = MENU_OPTION_FROM_LINK (TopOfScreen);\r
- if (Difference < (INTN) SavedMenuOption->Skip) {\r
- Difference = SavedMenuOption->Skip - Difference - 1;\r
- break;\r
- } else {\r
- if (Difference == (INTN) SavedMenuOption->Skip) {\r
- TopOfScreen = TopOfScreen->ForwardLink;\r
- SavedMenuOption = MENU_OPTION_FROM_LINK (TopOfScreen);\r
- Difference = SavedMenuOption->Skip - Difference;\r
- break;\r
- }\r
- }\r
}\r
//\r
// Since we will act on this op-code in the next routine, and increment the\r
} else {\r
SkipValue++;\r
}\r
+ } else if (SavedMenuOption->Skip == 1) {\r
+ SkipValue = 0;\r
} else {\r
SkipValue = 0;\r
TopOfScreen = TopOfScreen->ForwardLink;\r
Status = SubmitForm (Selection->FormSet, Selection->Form);\r
\r
if (!EFI_ERROR (Status)) {\r
+ ASSERT(MenuOption != NULL);\r
UpdateStatusBar (INPUT_ERROR, MenuOption->ThisTag->QuestionFlags, FALSE);\r
UpdateStatusBar (NV_UPDATE_REQUIRED, MenuOption->ThisTag->QuestionFlags, FALSE);\r
} else {\r
projects / mirror_edk2.git / blobdiff