sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean the garbage space for the statements nest in subtitle menu.

Browse Source 
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14774 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Eric Dong
2013-10-15 02:51:13 +00:00
committed by ydong10
parent 566771b0a7
commit 6f05c02325
1 changed files with 98 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
View File

@@ -259,7 +259,7 @@ GetPrompt (
/** /**
Get the supported width for a particular op-code Get the supported width for a particular op-code
@param Statement The curent statement. @param MenuOption The menu option.
@param AdjustWidth The width which is saved for the space. @param AdjustWidth The width which is saved for the space.
@return Returns the number of CHAR16 characters that is support. @return Returns the number of CHAR16 characters that is support.
@@ -267,13 +267,17 @@ GetPrompt (
**/ **/
UINT16 UINT16
GetWidth ( GetWidth (
IN FORM_DISPLAY_ENGINE_STATEMENT *Statement, IN UI_MENU_OPTION *MenuOption,
OUT UINT16 *AdjustWidth OUT UINT16 *AdjustWidth
) )
{ {
CHAR16 *String; CHAR16 *String;
UINTN Size; UINTN Size;
EFI_IFR_TEXT *TestOp; EFI_IFR_TEXT *TestOp;
UINT16 ReturnWidth;
FORM_DISPLAY_ENGINE_STATEMENT *Statement;
Statement = MenuOption->ThisTag;
// //
// For modal form, clean the entire row. // For modal form, clean the entire row.
@@ -319,13 +323,23 @@ GetWidth (
// //
// Keep consistent with current behavior. // Keep consistent with current behavior.
// //
return (UINT16) (gPromptBlockWidth + gOptionBlockWidth - 2); ReturnWidth = (UINT16) (gPromptBlockWidth + gOptionBlockWidth - 2);
} else {
if (AdjustWidth != NULL) {
*AdjustWidth = 1;
}
ReturnWidth = (UINT16) (gPromptBlockWidth - 1);
} }
if (AdjustWidth != NULL) { //
*AdjustWidth = 1; // For nest in statement, should the subtitle indent.
//
if (MenuOption->NestInStatement) {
ReturnWidth -= SUBTITLE_INDENT;
} }
return (UINT16) (gPromptBlockWidth - 1);
return ReturnWidth;
} }
/** /**
@@ -539,24 +553,7 @@ UiAddMenuOption (
String = GetToken (PromptId, gFormData->HiiHandle); String = GetToken (PromptId, gFormData->HiiHandle);
ASSERT (String != NULL); ASSERT (String != NULL);
Width = GetWidth (Statement, NULL);
for (; GetLineByWidth (String, Width, &GlyphWidth,&ArrayEntry, &OutputString) != 0x0000;) {
//
// If there is more string to process print on the next row and increment the Skip value
//
if (StrLen (&String[ArrayEntry]) != 0) {
NumberOfLines++;
}
FreePool (OutputString);
}
if (Statement->OpCode->OpCode == EFI_IFR_DATE_OP || Statement->OpCode->OpCode == EFI_IFR_TIME_OP) { if (Statement->OpCode->OpCode == EFI_IFR_DATE_OP || Statement->OpCode->OpCode == EFI_IFR_TIME_OP) {
//
// Add three MenuOptions for Date/Time
// Data format : [01/02/2004] [11:22:33]
// Line number : 0 0 1 0 0 1
//
NumberOfLines = 0;
Count = 3; Count = 3;
} }
@@ -571,14 +568,6 @@ UiAddMenuOption (
MenuOption->NestInStatement = NestIn; MenuOption->NestInStatement = NestIn;
MenuOption->EntryNumber = *MenuItemCount; MenuOption->EntryNumber = *MenuItemCount;
if (Index == 2) {
//
// Override LineNumber for the MenuOption in Date/Time sequence
//
MenuOption->Skip = 1;
} else {
MenuOption->Skip = NumberOfLines;
}
MenuOption->Sequence = Index; MenuOption->Sequence = Index;
if ((Statement->Attribute & HII_DISPLAY_GRAYOUT) != 0) { if ((Statement->Attribute & HII_DISPLAY_GRAYOUT) != 0) {
@@ -633,6 +622,37 @@ UiAddMenuOption (
} }
} }
if (Index == 0 &&
(Statement->OpCode->OpCode != EFI_IFR_DATE_OP) &&
(Statement->OpCode->OpCode != EFI_IFR_TIME_OP)) {
Width = GetWidth (MenuOption, NULL);
for (; GetLineByWidth (String, Width, &GlyphWidth,&ArrayEntry, &OutputString) != 0x0000;) {
//
// If there is more string to process print on the next row and increment the Skip value
//
if (StrLen (&String[ArrayEntry]) != 0) {
NumberOfLines++;
}
FreePool (OutputString);
}
} else {
//
// Add three MenuOptions for Date/Time
// Data format : [01/02/2004] [11:22:33]
// Line number : 0 0 1 0 0 1
//
NumberOfLines = 0;
}
if (Index == 2) {
//
// Override LineNumber for the MenuOption in Date/Time sequence
//
MenuOption->Skip = 1;
} else {
MenuOption->Skip = NumberOfLines;
}
InsertTailList (&gMenuOption, &MenuOption->Link); InsertTailList (&gMenuOption, &MenuOption->Link);
} }
@@ -1765,7 +1785,7 @@ DisplayOneMenu (
// //
// 2. Paint the description. // 2. Paint the description.
// //
PromptWidth = GetWidth (Statement, &AdjustValue); PromptWidth = GetWidth (MenuOption, &AdjustValue);
Row = MenuOption->Row; Row = MenuOption->Row;
GlyphWidth = 1; GlyphWidth = 1;
PromptLineNum = 0; PromptLineNum = 0;
@@ -2077,7 +2097,7 @@ UiDisplayMenu (
if ((FormData->Attribute & HII_DISPLAY_MODAL) != 0) { if ((FormData->Attribute & HII_DISPLAY_MODAL) != 0) {
Status = DisplayOneMenu (MenuOption, Status = DisplayOneMenu (MenuOption,
LEFT_SKIPPED_COLUMNS, MenuOption->Col - gStatementDimensions.LeftColumn,
gStatementDimensions.LeftColumn + gModalSkipColumn, gStatementDimensions.LeftColumn + gModalSkipColumn,
Link == TopOfScreen ? SkipValue : 0, Link == TopOfScreen ? SkipValue : 0,
BottomRow, BottomRow,
@@ -2085,7 +2105,7 @@ UiDisplayMenu (
); );
} else { } else {
Status = DisplayOneMenu (MenuOption, Status = DisplayOneMenu (MenuOption,
LEFT_SKIPPED_COLUMNS, MenuOption->Col - gStatementDimensions.LeftColumn,
gStatementDimensions.LeftColumn, gStatementDimensions.LeftColumn,
Link == TopOfScreen ? SkipValue : 0, Link == TopOfScreen ? SkipValue : 0,
BottomRow, BottomRow,
@@ -2194,7 +2214,7 @@ UiDisplayMenu (
ProcessStringForDateTime(MenuOption, OptionString, FALSE); ProcessStringForDateTime(MenuOption, OptionString, FALSE);
} }
Width = (UINT16) gOptionBlockWidth; Width = (UINT16) gOptionBlockWidth - 1;
OriginalRow = MenuOption->Row; OriginalRow = MenuOption->Row;
GlyphWidth = 1; GlyphWidth = 1;
@@ -2229,7 +2249,7 @@ UiDisplayMenu (
} }
OriginalRow = MenuOption->Row; OriginalRow = MenuOption->Row;
Width = GetWidth (MenuOption->ThisTag, NULL); Width = GetWidth (MenuOption, NULL);
GlyphWidth = 1; GlyphWidth = 1;
for (Index = 0; GetLineByWidth (MenuOption->Description, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) { for (Index = 0; GetLineByWidth (MenuOption->Description, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) {
@@ -2280,7 +2300,7 @@ UiDisplayMenu (
if (Statement->OpCode->OpCode == EFI_IFR_DATE_OP || Statement->OpCode->OpCode == EFI_IFR_TIME_OP) { if (Statement->OpCode->OpCode == EFI_IFR_DATE_OP || Statement->OpCode->OpCode == EFI_IFR_TIME_OP) {
ProcessStringForDateTime(MenuOption, OptionString, FALSE); ProcessStringForDateTime(MenuOption, OptionString, FALSE);
} }
Width = (UINT16) gOptionBlockWidth; Width = (UINT16) gOptionBlockWidth - 1;
OriginalRow = MenuOption->Row; OriginalRow = MenuOption->Row;
GlyphWidth = 1; GlyphWidth = 1;
@@ -2311,7 +2331,7 @@ UiDisplayMenu (
if (NewLine) { if (NewLine) {
OriginalRow = MenuOption->Row; OriginalRow = MenuOption->Row;
Width = GetWidth (Statement, NULL); Width = GetWidth (MenuOption, NULL);
GlyphWidth = 1; GlyphWidth = 1;
for (Index = 0; GetLineByWidth (MenuOption->Description, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) { for (Index = 0; GetLineByWidth (MenuOption->Description, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) {
@@ -2874,6 +2894,11 @@ UiDisplayMenu (
MenuOption = MENU_OPTION_FROM_LINK (SavedListEntry); MenuOption = MENU_OPTION_FROM_LINK (SavedListEntry);
UpdateStatusBar (INPUT_ERROR, FALSE); UpdateStatusBar (INPUT_ERROR, FALSE);
} else { } else {
if (NewPos->ForwardLink == &gMenuOption) {
NewLine = FALSE;
Repaint = FALSE;
break;
}
// //
// Scroll up to the last page. // Scroll up to the last page.
// //
@@ -2882,6 +2907,7 @@ UiDisplayMenu (
MenuOption = MENU_OPTION_FROM_LINK (SavedListEntry); MenuOption = MENU_OPTION_FROM_LINK (SavedListEntry);
ScreenOperation = UiPageUp; ScreenOperation = UiPageUp;
ControlFlag = CfScreenOperation; ControlFlag = CfScreenOperation;
SkipValue = 0;
} }
break; break;
@@ -2938,23 +2964,32 @@ UiDisplayMenu (
} }
if ((Link->BackLink == &gMenuOption) && (Index >= TopRow)) { if ((Link->BackLink == &gMenuOption) && (Index >= TopRow)) {
SkipValue = 0;
if (TopOfScreen == &gMenuOption) { if (TopOfScreen == &gMenuOption) {
TopOfScreen = gMenuOption.ForwardLink; TopOfScreen = gMenuOption.ForwardLink;
NewPos = gMenuOption.BackLink; NewPos = gMenuOption.BackLink;
MoveToNextStatement (TRUE, &NewPos, BottomRow - TopRow); MoveToNextStatement (TRUE, &NewPos, BottomRow - TopRow);
Repaint = FALSE; if (Index < PreviousMenuOption->Skip) {
Repaint = TRUE;
SkipValue = PreviousMenuOption->Skip - (Index - TopRow);
} else {
Repaint = FALSE;
SkipValue = 0;
}
} else if (TopOfScreen != Link) { } else if (TopOfScreen != Link) {
TopOfScreen = Link; TopOfScreen = Link;
NewPos = Link; NewPos = Link;
MoveToNextStatement (FALSE, &NewPos, BottomRow - TopRow); MoveToNextStatement (FALSE, &NewPos, BottomRow - TopRow);
SkipValue = 0;
} else { } else {
// //
// Finally we know that NewPos is the last MenuOption can be focused. // Finally we know that NewPos is the last MenuOption can be focused.
// //
Repaint = FALSE; if (SkipValue == 0) {
Repaint = FALSE;
}
NewPos = Link; NewPos = Link;
MoveToNextStatement (FALSE, &NewPos, BottomRow - TopRow); MoveToNextStatement (FALSE, &NewPos, BottomRow - TopRow);
SkipValue = 0;
} }
} else { } else {
if (Index > TopRow) { if (Index > TopRow) {
@@ -3002,6 +3037,13 @@ UiDisplayMenu (
ASSERT (NewPos != NULL); ASSERT (NewPos != NULL);
if (NewPos->ForwardLink == &gMenuOption) { if (NewPos->ForwardLink == &gMenuOption) {
MenuOption = MENU_OPTION_FROM_LINK (NewPos);
if (SkipValue + BottomRow - TopRow + 1 < MenuOption->Skip) {
SkipValue += BottomRow - TopRow + 1;
NewLine = TRUE;
Repaint = TRUE;
break;
}
NewLine = FALSE; NewLine = FALSE;
Repaint = FALSE; Repaint = FALSE;
break; break;
@@ -3080,6 +3122,12 @@ UiDisplayMenu (
AdjustDateAndTimePosition (FALSE, &NewPos); AdjustDateAndTimePosition (FALSE, &NewPos);
if (NewPos->ForwardLink != &gMenuOption) { if (NewPos->ForwardLink != &gMenuOption) {
if (NewPos == TopOfScreen) {
Temp2 = SkipValue;
} else {
Temp2 = 0;
}
MenuOption = MENU_OPTION_FROM_LINK (NewPos); MenuOption = MENU_OPTION_FROM_LINK (NewPos);
NewLine = TRUE; NewLine = TRUE;
NewPos = NewPos->ForwardLink; NewPos = NewPos->ForwardLink;
@@ -3088,11 +3136,11 @@ UiDisplayMenu (
// //
// Current menu not at the bottom of the form. // Current menu not at the bottom of the form.
// //
if (BottomRow >= MenuOption->Row + MenuOption->Skip) { if (BottomRow >= MenuOption->Row + MenuOption->Skip - Temp2) {
// //
// Find the next selectable menu. // Find the next selectable menu.
// //
Difference = MoveToNextStatement (FALSE, &NewPos, BottomRow - MenuOption->Row - MenuOption->Skip); Difference = MoveToNextStatement (FALSE, &NewPos, BottomRow - MenuOption->Row - MenuOption->Skip + Temp2);
// //
// We hit the end of MenuOption that can be focused // We hit the end of MenuOption that can be focused
// so we simply scroll to the first page. // so we simply scroll to the first page.
@@ -3124,10 +3172,10 @@ UiDisplayMenu (
if (NextMenuOption->Row == 0) { if (NextMenuOption->Row == 0) {
UpdateOptionSkipLines (NextMenuOption); UpdateOptionSkipLines (NextMenuOption);
} }
DistanceValue = Difference + NextMenuOption->Skip; DistanceValue = Difference + NextMenuOption->Skip - Temp2;
Temp = MenuOption->Row + MenuOption->Skip + DistanceValue - 1; Temp = MenuOption->Row + MenuOption->Skip + DistanceValue - 1;
if ((MenuOption->Row + MenuOption->Skip == BottomRow + 1) && if ((MenuOption->Row + MenuOption->Skip - Temp2 == BottomRow + 1) &&
(NextMenuOption->ThisTag->OpCode->OpCode == EFI_IFR_DATE_OP || (NextMenuOption->ThisTag->OpCode->OpCode == EFI_IFR_DATE_OP ||
NextMenuOption->ThisTag->OpCode->OpCode == EFI_IFR_TIME_OP) NextMenuOption->ThisTag->OpCode->OpCode == EFI_IFR_TIME_OP)
) { ) {
@@ -3225,7 +3273,7 @@ UiDisplayMenu (
// //
// Scroll to the first page. // Scroll to the first page.
// //
if (TopOfScreen != gMenuOption.ForwardLink) { if (TopOfScreen != gMenuOption.ForwardLink || SkipValue != 0) {
TopOfScreen = gMenuOption.ForwardLink; TopOfScreen = gMenuOption.ForwardLink;
Repaint = TRUE; Repaint = TRUE;
MenuOption = NULL; MenuOption = NULL;