#include "../include/refit_call_wrapper.h"
#include "../include/egemb_back_selected_small.h"
+#include "../include/egemb_back_selected_big.h"
#include "../include/egemb_arrow_left.h"
#include "../include/egemb_arrow_right.h"
static CHAR16 ArrowUp[2] = { ARROW_UP, 0 };
static CHAR16 ArrowDown[2] = { ARROW_DOWN, 0 };
+static UINTN TileSizes[2] = { 144, 64 };
// Text and icon spacing constants....
#define TEXT_YMARGIN (2)
-//#define TEXT_XMARGIN (8)
-//#define TEXT_LINE_HEIGHT (FONT_CELL_HEIGHT + TEXT_YMARGIN * 2)
#define TITLEICON_SPACING (16)
-#define ROW0_TILESIZE (144)
-#define ROW1_TILESIZE (64)
#define TILE_XSPACING (8)
#define TILE_YSPACING (16)
static VOID InitSelection(VOID)
{
- UINTN x, y, src_x, src_y;
- EG_PIXEL *DestPtr, *SrcPtr;
+ EG_IMAGE *TempSmallImage = NULL, *TempBigImage = NULL;
+ BOOLEAN LoadedSmallImage = FALSE;
if (!AllowGraphicsMode)
return;
// load small selection image
if (GlobalConfig.SelectionSmallFileName != NULL) {
- SelectionImages[1] = egLoadImage(SelfDir, GlobalConfig.SelectionSmallFileName, TRUE);
+ TempSmallImage = egLoadImage(SelfDir, GlobalConfig.SelectionSmallFileName, TRUE);
}
- if (SelectionImages[1] == NULL)
- SelectionImages[1] = egPrepareEmbeddedImage(&egemb_back_selected_small, TRUE);
- SelectionImages[1] = egEnsureImageSize(SelectionImages[1], ROW1_TILESIZE, ROW1_TILESIZE, &MenuBackgroundPixel);
- if (SelectionImages[1] == NULL)
- return;
+ if (TempSmallImage == NULL)
+ TempSmallImage = egPrepareEmbeddedImage(&egemb_back_selected_small, TRUE);
+ else
+ LoadedSmallImage = TRUE;
+ SelectionImages[1] = egScaleImage(TempSmallImage, TileSizes[1], TileSizes[1]);
// load big selection image
if (GlobalConfig.SelectionBigFileName != NULL) {
- SelectionImages[0] = egLoadImage(SelfDir, GlobalConfig.SelectionBigFileName, TRUE);
- SelectionImages[0] = egEnsureImageSize(SelectionImages[0], ROW0_TILESIZE, ROW0_TILESIZE, &MenuBackgroundPixel);
+ TempBigImage = egLoadImage(SelfDir, GlobalConfig.SelectionBigFileName, TRUE);
}
- if (SelectionImages[0] == NULL) {
- // calculate big selection image from small one
-
- SelectionImages[0] = egCreateImage(ROW0_TILESIZE, ROW0_TILESIZE, TRUE);
- if (SelectionImages[0] == NULL) {
- egFreeImage(SelectionImages[1]);
- SelectionImages[1] = NULL;
- return;
- }
-
- DestPtr = SelectionImages[0]->PixelData;
- SrcPtr = SelectionImages[1]->PixelData;
- for (y = 0; y < ROW0_TILESIZE; y++) {
- if (y < (ROW1_TILESIZE >> 1))
- src_y = y;
- else if (y < (ROW0_TILESIZE - (ROW1_TILESIZE >> 1)))
- src_y = (ROW1_TILESIZE >> 1);
- else
- src_y = y - (ROW0_TILESIZE - ROW1_TILESIZE);
-
- for (x = 0; x < ROW0_TILESIZE; x++) {
- if (x < (ROW1_TILESIZE >> 1))
- src_x = x;
- else if (x < (ROW0_TILESIZE - (ROW1_TILESIZE >> 1)))
- src_x = (ROW1_TILESIZE >> 1);
- else
- src_x = x - (ROW0_TILESIZE - ROW1_TILESIZE);
-
- *DestPtr++ = SrcPtr[src_y * ROW1_TILESIZE + src_x];
- }
+ if (TempBigImage == NULL) {
+ if (LoadedSmallImage) {
+ // calculate big selection image from small one
+ TempBigImage = egCopyImage(TempSmallImage);
+ } else {
+ TempBigImage = egPrepareEmbeddedImage(&egemb_back_selected_big, TRUE);
}
}
+ SelectionImages[0] = egScaleImage(TempBigImage, TileSizes[0], TileSizes[0]);
+
+ if (TempSmallImage)
+ egFreeImage(TempSmallImage);
+ if (TempBigImage)
+ egFreeImage(TempBigImage);
} // VOID InitSelection()
//
State->MaxIndex = (INTN)ItemCount - 1;
State->FirstVisible = 0;
if (AllowGraphicsMode) {
- State->MaxVisible = UGAWidth / (ROW0_TILESIZE + TILE_XSPACING) - 1;
+ State->MaxVisible = UGAWidth / (TileSizes[0] + TILE_XSPACING) - 1;
} else
State->MaxVisible = ConHeight - 4;
if ((VisibleSpace > 0) && (VisibleSpace < State->MaxVisible))
}
-static INTN FindMenuShortcutEntry(IN REFIT_MENU_SCREEN *Screen, IN CHAR16 *Shortcut)
+static INTN FindMenuShortcutEntry(IN REFIT_MENU_SCREEN *Screen, IN CHAR16 *Defaults)
{
- UINTN i;
-
- if (Shortcut == NULL)
- return (-1);
-
- if (StrLen(Shortcut) == 1) {
- if (Shortcut[0] >= 'a' && Shortcut[0] <= 'z')
- Shortcut[0] -= ('a' - 'A');
- if (Shortcut[0]) {
- for (i = 0; i < Screen->EntryCount; i++) {
- if (Screen->Entries[i]->ShortcutDigit == Shortcut[0] || Screen->Entries[i]->ShortcutLetter == Shortcut[0]) {
- return i;
- } // if
- } // for
- } // if
- } else if (StrLen(Shortcut) > 1) {
- for (i = 0; i < Screen->EntryCount; i++) {
- if (StriSubCmp(Shortcut, Screen->Entries[i]->Title))
- return i;
- } // for
- }
+ UINTN i, j = 0;
+ CHAR16 *Shortcut;
+
+ while ((Shortcut = FindCommaDelimited(Defaults, j)) != NULL) {
+ if (StrLen(Shortcut) == 1) {
+ if (Shortcut[0] >= 'a' && Shortcut[0] <= 'z')
+ Shortcut[0] -= ('a' - 'A');
+ if (Shortcut[0]) {
+ for (i = 0; i < Screen->EntryCount; i++) {
+ if (Screen->Entries[i]->ShortcutDigit == Shortcut[0] || Screen->Entries[i]->ShortcutLetter == Shortcut[0]) {
+ MyFreePool(Shortcut);
+ return i;
+ } // if
+ } // for
+ } // if
+ } else if (StrLen(Shortcut) > 1) {
+ for (i = 0; i < Screen->EntryCount; i++) {
+ if (StriSubCmp(Shortcut, Screen->Entries[i]->Title)) {
+ MyFreePool(Shortcut);
+ return i;
+ } // if
+ } // for
+ }
+ MyFreePool(Shortcut);
+ j++;
+ } // while()
return -1;
}
State->FinalRow0 = 0;
State->InitialRow1 = State->MaxIndex;
- for (i = 0; i < State->MaxIndex; i++) {
+ for (i = 0; i <= State->MaxIndex; i++) {
if (Screen->Entries[i]->Row == 0) {
State->FinalRow0 = i;
} else if ((Screen->Entries[i]->Row == 1) && (State->InitialRow1 > i)) {
State->MaxVisible = State->FinalRow0 + 1;
} // static VOID IdentifyRows()
+// Blank the screen, wait for a keypress, and restore banner/background.
+// Screen may still require redrawing of text and icons on return.
+// TODO: Support more sophisticated screen savers, such as power-saving
+// mode and dynamic images.
+static VOID SaveScreen(VOID) {
+ UINTN index;
+ EG_PIXEL Black = { 0x0, 0x0, 0x0, 0 };
+
+ egClearScreen(&Black);
+ refit_call3_wrapper(BS->WaitForEvent, 1, &ST->ConIn->WaitForKey, &index);
+ if (AllowGraphicsMode)
+ SwitchToGraphicsAndClear();
+ ReadAllKeyStrokes();
+} // VOID SaveScreen()
+
//
// generic menu function
//
UINTN index;
INTN ShortcutEntry;
BOOLEAN HaveTimeout = FALSE;
+ BOOLEAN WaitForRelease = FALSE;
UINTN TimeoutCountdown = 0;
- INTN PreviousTime = -1, CurrentTime;
+ INTN PreviousTime = -1, CurrentTime, TimeSinceKeystroke = 0;
CHAR16 TimeoutMessage[256];
CHAR16 KeyAsString[2];
UINTN MenuExit;
// override the starting selection with the default index, if any
if (*DefaultEntryIndex >= 0 && *DefaultEntryIndex <= State.MaxIndex) {
State.CurrentSelection = *DefaultEntryIndex;
- UpdateScroll(&State, SCROLL_NONE);
+ if (GlobalConfig.ScreensaverTime != -1)
+ UpdateScroll(&State, SCROLL_NONE);
+ }
+
+ if (Screen->TimeoutSeconds == -1) {
+ Status = refit_call2_wrapper(ST->ConIn->ReadKeyStroke, ST->ConIn, &key);
+ if (Status == EFI_NOT_READY) {
+ MenuExit = MENU_EXIT_TIMEOUT;
+ } else {
+ KeyAsString[0] = key.UnicodeChar;
+ KeyAsString[1] = 0;
+ ShortcutEntry = FindMenuShortcutEntry(Screen, KeyAsString);
+ if (ShortcutEntry >= 0) {
+ State.CurrentSelection = ShortcutEntry;
+ MenuExit = MENU_EXIT_ENTER;
+ } else {
+ WaitForRelease = TRUE;
+ HaveTimeout = FALSE;
+ }
+ }
}
- State.PaintAll = TRUE;
+
+ if (GlobalConfig.ScreensaverTime != -1)
+ State.PaintAll = TRUE;
while (!MenuExit) {
// update the screen
- if (State.PaintAll) {
+ if (State.PaintAll && (GlobalConfig.ScreensaverTime != -1)) {
StyleFunc(Screen, &State, MENU_FUNCTION_PAINT_ALL, NULL);
State.PaintAll = FALSE;
} else if (State.PaintSelection) {
State.PaintSelection = FALSE;
}
+ if (WaitForRelease) {
+ Status = refit_call2_wrapper(ST->ConIn->ReadKeyStroke, ST->ConIn, &key);
+ if (Status == EFI_SUCCESS) {
+ // reset, because otherwise the buffer gets queued with keystrokes
+ refit_call2_wrapper(ST->ConIn->Reset, ST->ConIn, FALSE);
+ refit_call1_wrapper(BS->Stall, 100000);
+ } else {
+ WaitForRelease = FALSE;
+ refit_call2_wrapper(ST->ConIn->Reset, ST->ConIn, TRUE);
+ }
+ continue;
+ }
+
if (HaveTimeout) {
CurrentTime = (TimeoutCountdown + 5) / 10;
if (CurrentTime != PreviousTime) {
SPrint(TimeoutMessage, 255, L"%s in %d seconds", Screen->TimeoutText, CurrentTime);
- StyleFunc(Screen, &State, MENU_FUNCTION_PAINT_TIMEOUT, TimeoutMessage);
+ if (GlobalConfig.ScreensaverTime != -1)
+ StyleFunc(Screen, &State, MENU_FUNCTION_PAINT_TIMEOUT, TimeoutMessage);
PreviousTime = CurrentTime;
}
}
// read key press (and wait for it if applicable)
Status = refit_call2_wrapper(ST->ConIn->ReadKeyStroke, ST->ConIn, &key);
- if (Status == EFI_NOT_READY) {
+ if (Status != EFI_SUCCESS) {
if (HaveTimeout && TimeoutCountdown == 0) {
// timeout expired
MenuExit = MENU_EXIT_TIMEOUT;
break;
- } else if (HaveTimeout) {
- refit_call1_wrapper(BS->Stall, 100000); // Pause for 100 ms
- TimeoutCountdown--;
- } else
+ } else if (HaveTimeout || GlobalConfig.ScreensaverTime > 0) {
+ EFI_EVENT TimerEvent;
+ UINTN ElapsCount = 1;
+
+ Status = refit_call5_wrapper(BS->CreateEvent, EVT_TIMER, 0, NULL, NULL, &TimerEvent);
+ if (EFI_ERROR(Status)) {
+ refit_call1_wrapper(BS->Stall, 100000); // Pause for 100 ms
+ } else {
+ EFI_EVENT WaitList[2];
+ UINTN Index;
+
+ refit_call3_wrapper(BS->SetTimer, TimerEvent, TimerRelative, 10000000); // 1s Timeout
+ WaitList[0] = ST->ConIn->WaitForKey;
+ WaitList[1] = TimerEvent;
+ Status = refit_call3_wrapper(BS->WaitForEvent, 2, WaitList, &Index);
+ refit_call1_wrapper(BS->CloseEvent, TimerEvent);
+ if (EFI_ERROR(Status))
+ refit_call1_wrapper(BS->Stall, 100000); // Pause for 100 ms
+ else if(Index == 0)
+ continue;
+ else
+ ElapsCount = 10; // always counted as 1s to end of the timeout
+ }
+ TimeSinceKeystroke += ElapsCount;
+ if(HaveTimeout) {
+ TimeoutCountdown = TimeoutCountdown <= ElapsCount ? 0 : TimeoutCountdown - ElapsCount;
+ } else if (GlobalConfig.ScreensaverTime > 0 &&
+ TimeSinceKeystroke > (GlobalConfig.ScreensaverTime * 10))
+ {
+ SaveScreen();
+ State.PaintAll = TRUE;
+ TimeSinceKeystroke = 0;
+ } // if
+ } else {
refit_call3_wrapper(BS->WaitForEvent, 1, &ST->ConIn->WaitForKey, &index);
+ }
continue;
- }
+ } else {
+ TimeSinceKeystroke = 0;
+ } // if/else !read keystroke
+
if (HaveTimeout) {
// the user pressed a key, cancel the timeout
StyleFunc(Screen, &State, MENU_FUNCTION_PAINT_TIMEOUT, L"");
HaveTimeout = FALSE;
+ if (GlobalConfig.ScreensaverTime == -1) { // cancel start-with-blank-screen coding
+ GlobalConfig.ScreensaverTime = 0;
+ if (!GlobalConfig.TextOnly)
+ BltClearScreen(TRUE);
+ }
}
// react to key press
// text-mode generic style
//
+// Show information lines in text mode.
+static VOID ShowTextInfoLines(IN REFIT_MENU_SCREEN *Screen) {
+ INTN i;
+
+ BeginTextScreen(Screen->Title);
+ if (Screen->InfoLineCount > 0) {
+ refit_call2_wrapper(ST->ConOut->SetAttribute, ST->ConOut, ATTR_BASIC);
+ for (i = 0; i < (INTN)Screen->InfoLineCount; i++) {
+ refit_call3_wrapper(ST->ConOut->SetCursorPosition, ST->ConOut, 3, 4 + i);
+ refit_call2_wrapper(ST->ConOut->OutputString, ST->ConOut, Screen->InfoLines[i]);
+ }
+ }
+} // VOID ShowTextInfoLines()
+
+// Do most of the work for text-based menus....
static VOID TextMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, IN UINTN Function, IN CHAR16 *ParamText)
{
INTN i;
// TODO: account for double-width characters
} // for
- // initial painting
- BeginTextScreen(Screen->Title);
- if (Screen->InfoLineCount > 0) {
- refit_call2_wrapper(ST->ConOut->SetAttribute, ST->ConOut, ATTR_BASIC);
- for (i = 0; i < (INTN)Screen->InfoLineCount; i++) {
- refit_call3_wrapper(ST->ConOut->SetCursorPosition, ST->ConOut, 3, 4 + i);
- refit_call2_wrapper(ST->ConOut->OutputString, ST->ConOut, Screen->InfoLines[i]);
- }
- }
-
break;
case MENU_FUNCTION_CLEANUP:
case MENU_FUNCTION_PAINT_ALL:
// paint the whole screen (initially and after scrolling)
+
+ ShowTextInfoLines(Screen);
for (i = 0; i <= State->MaxIndex; i++) {
if (i >= State->FirstVisible && i <= State->LastVisible) {
refit_call3_wrapper(ST->ConOut->SetCursorPosition, ST->ConOut, 2, MenuPosY + (i - State->FirstVisible));
UINTN i;
UINTN Sum = 0;
- if (Image != NULL) {
+ if ((Image != NULL) && ((Image->Width * Image->Height) != 0)) {
for (i = 0; i < (Image->Width * Image->Height); i++) {
Sum += (Image->PixelData[i].r + Image->PixelData[i].g + Image->PixelData[i].b);
}
+ Sum /= (Image->Width * Image->Height * 3);
} // if
- return (UINT8) (Sum / (Image->Width * Image->Height * 3));
+ return (UINT8) Sum;
} // UINT8 AverageBrightness()
// Display text against the screen's background image. Special case: If Text is NULL
}
TextBuffer = egCropImage(GlobalConfig.ScreenBackground, XPos, YPos, TextWidth, TextLineHeight());
- if (TextBuffer == NULL) {
- Print(L"Error: NULL TextBuffer in DrawTextWithTransparency()\n");
+ if (TextBuffer == NULL)
return;
- }
// render the text
egRenderText(Text, TextBuffer, 0, 0, AverageBrightness(TextBuffer));
Screen->Title[i] = 0;
} // if
} // if/else
-
- DrawText(Screen->Title, FALSE, (StrLen(Screen->Title) + 2) * CharWidth, TitlePosX, EntriesPosY += TextLineHeight());
- if (Screen->TitleImage) {
- BltImageAlpha(Screen->TitleImage, EntriesPosX + TITLEICON_SPACING, EntriesPosY + TextLineHeight() * 2,
- BackgroundPixel);
- EntriesPosX += (Screen->TitleImage->Width + TITLEICON_SPACING * 2);
- }
- EntriesPosY += (TextLineHeight() * 2);
- if (Screen->InfoLineCount > 0) {
- for (i = 0; i < (INTN)Screen->InfoLineCount; i++) {
- DrawText(Screen->InfoLines[i], FALSE, LineWidth, EntriesPosX, EntriesPosY);
- EntriesPosY += TextLineHeight();
- }
- EntriesPosY += TextLineHeight(); // also add a blank line
- }
-
break;
case MENU_FUNCTION_CLEANUP:
break;
case MENU_FUNCTION_PAINT_ALL:
- for (i = 0; i <= State->MaxIndex; i++) {
- DrawText(Screen->Entries[i]->Title, (i == State->CurrentSelection), LineWidth, EntriesPosX,
- EntriesPosY + i * TextLineHeight());
- }
- if (!(GlobalConfig.HideUIFlags & HIDEUI_FLAG_HINTS)) {
- if ((Screen->Hint1 != NULL) && (StrLen(Screen->Hint1) > 0))
- DrawTextWithTransparency(Screen->Hint1, (UGAWidth - egComputeTextWidth(Screen->Hint1)) / 2,
- UGAHeight - (egGetFontHeight() * 3));
- if ((Screen->Hint2 != NULL) && (StrLen(Screen->Hint2) > 0))
- DrawTextWithTransparency(Screen->Hint2, (UGAWidth - egComputeTextWidth(Screen->Hint2)) / 2,
+ ComputeSubScreenWindowSize(Screen, State, &EntriesPosX, &EntriesPosY, &MenuWidth, &MenuHeight, &LineWidth);
+ DrawText(Screen->Title, FALSE, (StrLen(Screen->Title) + 2) * CharWidth, TitlePosX, EntriesPosY += TextLineHeight());
+ if (Screen->TitleImage) {
+ BltImageAlpha(Screen->TitleImage, EntriesPosX + TITLEICON_SPACING, EntriesPosY + TextLineHeight() * 2,
+ BackgroundPixel);
+ EntriesPosX += (Screen->TitleImage->Width + TITLEICON_SPACING * 2);
+ }
+ EntriesPosY += (TextLineHeight() * 2);
+ if (Screen->InfoLineCount > 0) {
+ for (i = 0; i < (INTN)Screen->InfoLineCount; i++) {
+ DrawText(Screen->InfoLines[i], FALSE, LineWidth, EntriesPosX, EntriesPosY);
+ EntriesPosY += TextLineHeight();
+ }
+ EntriesPosY += TextLineHeight(); // also add a blank line
+ }
+
+ for (i = 0; i <= State->MaxIndex; i++) {
+ DrawText(Screen->Entries[i]->Title, (i == State->CurrentSelection), LineWidth, EntriesPosX,
+ EntriesPosY + i * TextLineHeight());
+ }
+ if (!(GlobalConfig.HideUIFlags & HIDEUI_FLAG_HINTS)) {
+ if ((Screen->Hint1 != NULL) && (StrLen(Screen->Hint1) > 0))
+ DrawTextWithTransparency(Screen->Hint1, (UGAWidth - egComputeTextWidth(Screen->Hint1)) / 2,
+ UGAHeight - (egGetFontHeight() * 3));
+ if ((Screen->Hint2 != NULL) && (StrLen(Screen->Hint2) > 0))
+ DrawTextWithTransparency(Screen->Hint2, (UGAWidth - egComputeTextWidth(Screen->Hint2)) / 2,
UGAHeight - (egGetFontHeight() * 2));
- } // if
- break;
+ } // if
+ break;
case MENU_FUNCTION_PAINT_SELECTION:
// redraw selection cursor
} // static VOID MoveSelection(VOID)
// Display a 48x48 icon at the specified location. Uses the image specified by
-// ExternalFilename if it's available, or BuiltInImage if it's not. The
+// ExternalFilename if it's available, or BuiltInImage if it's not. The
// Y position is specified as the center value, and so is adjusted by half
// the icon's height. The X position is set along the icon's left
// edge if Alignment == ALIGN_LEFT, and along the right edge if
static VOID PaintIcon(IN EG_EMBEDDED_IMAGE *BuiltInIcon, IN CHAR16 *ExternalFilename, UINTN PosX, UINTN PosY, UINTN Alignment) {
EG_IMAGE *Icon = NULL;
- Icon = egFindIcon(ExternalFilename, 48);
+ Icon = egFindIcon(ExternalFilename, GlobalConfig.IconSizes[ICON_SIZE_SMALL]);
if (Icon == NULL)
Icon = egPrepareEmbeddedImage(BuiltInIcon, TRUE);
if (Icon != NULL) {
}
} // static VOID ()
-inline UINTN ComputeRow0PosY(VOID) {
- return ((UGAHeight / 2) - ROW0_TILESIZE / 2);
+UINTN ComputeRow0PosY(VOID) {
+ return ((UGAHeight / 2) - TileSizes[0] / 2);
} // UINTN ComputeRow0PosY()
// Display (or erase) the arrow icons to the left and right of an icon's row,
// NOTE: Assume that left and right arrows are of the same size....
Width = egemb_arrow_left.Width;
Height = egemb_arrow_left.Height;
- RightX = (UGAWidth + (ROW0_TILESIZE + TILE_XSPACING) * State->MaxVisible) / 2 + TILE_XSPACING;
+ RightX = (UGAWidth + (TileSizes[0] + TILE_XSPACING) * State->MaxVisible) / 2 + TILE_XSPACING;
AdjPosY = PosY - (Height / 2);
// For PaintIcon() calls, the starting Y position is moved to the midpoint
row0Count++;
}
}
- row0PosX = (UGAWidth + TILE_XSPACING - (ROW0_TILESIZE + TILE_XSPACING) * row0Count) >> 1;
+ row0PosX = (UGAWidth + TILE_XSPACING - (TileSizes[0] + TILE_XSPACING) * row0Count) >> 1;
row0PosY = ComputeRow0PosY();
- row1PosX = (UGAWidth + TILE_XSPACING - (ROW1_TILESIZE + TILE_XSPACING) * row1Count) >> 1;
- row1PosY = row0PosY + ROW0_TILESIZE + TILE_YSPACING;
+ row1PosX = (UGAWidth + TILE_XSPACING - (TileSizes[1] + TILE_XSPACING) * row1Count) >> 1;
+ row1PosY = row0PosY + TileSizes[0] + TILE_YSPACING;
if (row1Count > 0)
- textPosY = row1PosY + ROW1_TILESIZE + TILE_YSPACING;
+ textPosY = row1PosY + TileSizes[1] + TILE_YSPACING;
else
textPosY = row1PosY;
for (i = 0; i <= State->MaxIndex; i++) {
if (Screen->Entries[i]->Row == 0) {
itemPosX[i] = row0PosXRunning;
- row0PosXRunning += ROW0_TILESIZE + TILE_XSPACING;
+ row0PosXRunning += TileSizes[0] + TILE_XSPACING;
} else {
itemPosX[i] = row1PosXRunning;
- row1PosXRunning += ROW1_TILESIZE + TILE_XSPACING;
+ row1PosXRunning += TileSizes[1] + TILE_XSPACING;
}
}
// initial painting
// For PaintArrows(), the starting Y position is moved to the midpoint
// of the surrounding row; PaintIcon() adjusts this back up by half the
// icon's height to properly center it.
- PaintArrows(State, row0PosX - TILE_XSPACING, row0PosY + (ROW0_TILESIZE / 2), row0Loaders);
+ PaintArrows(State, row0PosX - TILE_XSPACING, row0PosY + (TileSizes[0] / 2), row0Loaders);
break;
case MENU_FUNCTION_PAINT_SELECTION:
return RunGenericMenu(Screen, Style, &DefaultEntry, ChosenEntry);
}
-UINTN RunMainMenu(IN REFIT_MENU_SCREEN *Screen, IN CHAR16* DefaultSelection, OUT REFIT_MENU_ENTRY **ChosenEntry)
+UINTN RunMainMenu(REFIT_MENU_SCREEN *Screen, CHAR16** DefaultSelection, REFIT_MENU_ENTRY **ChosenEntry)
{
MENU_STYLE_FUNC Style = TextMenuStyle;
MENU_STYLE_FUNC MainStyle = TextMenuStyle;
REFIT_MENU_ENTRY *TempChosenEntry;
+ CHAR16 *MenuTitle;
UINTN MenuExit = 0;
INTN DefaultEntryIndex = -1;
INTN DefaultSubmenuIndex = -1;
- if (DefaultSelection != NULL) {
+ TileSizes[0] = (GlobalConfig.IconSizes[ICON_SIZE_BIG] * 9) / 8;
+ TileSizes[1] = (GlobalConfig.IconSizes[ICON_SIZE_SMALL] * 4) / 3;
+
+ if ((DefaultSelection != NULL) && (*DefaultSelection != NULL)) {
// Find a menu entry that includes *DefaultSelection as a substring
- DefaultEntryIndex = FindMenuShortcutEntry(Screen, DefaultSelection);
+ DefaultEntryIndex = FindMenuShortcutEntry(Screen, *DefaultSelection);
}
if (AllowGraphicsMode) {
MenuExit = RunGenericMenu(Screen, MainStyle, &DefaultEntryIndex, &TempChosenEntry);
Screen->TimeoutSeconds = 0;
+ MenuTitle = StrDuplicate(TempChosenEntry->Title);
if (MenuExit == MENU_EXIT_DETAILS) {
if (TempChosenEntry->SubScreen != NULL) {
MenuExit = RunGenericMenu(TempChosenEntry->SubScreen, Style, &DefaultSubmenuIndex, &TempChosenEntry);
if (ChosenEntry)
*ChosenEntry = TempChosenEntry;
+ if (DefaultSelection) {
+ MyFreePool(*DefaultSelection);
+ *DefaultSelection = MenuTitle;
+ } // if
return MenuExit;
} /* UINTN RunMainMenu() */