X-Git-Url: https://code.delx.au/refind/blobdiff_plain/0cc0f285174db0f780227e66a31b9aadc79875c1..4c9f41e161bd197922912efbcf4cc676077d5c00:/refind/menu.c diff --git a/refind/menu.c b/refind/menu.c index 3ff16b1..1beb3e7 100644 --- a/refind/menu.c +++ b/refind/menu.c @@ -48,11 +48,11 @@ #include "menu.h" #include "config.h" #include "libeg.h" -#include "refit_call_wrapper.h" +#include "../include/refit_call_wrapper.h" -#include "egemb_back_selected_small.h" -#include "egemb_arrow_left.h" -#include "egemb_arrow_right.h" +#include "../include/egemb_back_selected_small.h" +#include "../include/egemb_arrow_left.h" +#include "../include/egemb_arrow_right.h" // other menu definitions @@ -85,9 +85,6 @@ static EG_IMAGE *SelectionImages[4] = { NULL, NULL, NULL, NULL }; static EG_PIXEL SelectionBackgroundPixel = { 0xff, 0xff, 0xff, 0 }; static EG_IMAGE *TextBuffer = NULL; -// Used in MainMenuStyle(), but must be persistent.... -UINTN row0PosX = 0, row0PosXRunning = 0, row1PosY = 0, row0Loaders = 0; - // // Graphics helper functions // @@ -180,7 +177,7 @@ static VOID InitScroll(OUT SCROLL_STATE *State, IN UINTN ItemCount, IN UINTN Vis // Adjust variables relating to the scrolling of tags, for when a selected icon isn't // visible given the current scrolling condition.... -static VOID AdjustScrollState(/* IN REFIT_MENU_SCREEN *Screen, */ IN SCROLL_STATE *State) { +static VOID AdjustScrollState(IN SCROLL_STATE *State) { if (State->CurrentSelection > State->LastVisible) { State->LastVisible = State->CurrentSelection; State->FirstVisible = 1 + State->CurrentSelection - State->MaxVisible; @@ -295,7 +292,7 @@ static VOID UpdateScroll(IN OUT SCROLL_STATE *State, IN UINTN Movement) if (!State->PaintAll && State->CurrentSelection != State->PreviousSelection) State->PaintSelection = TRUE; State->LastVisible = State->FirstVisible + State->MaxVisible - 1; -} +} // static VOID UpdateScroll() // // menu helper functions @@ -374,7 +371,7 @@ static UINTN RunGenericMenu(IN REFIT_MENU_SCREEN *Screen, IN MENU_STYLE_FUNC Sty INTN ShortcutEntry; BOOLEAN HaveTimeout = FALSE; UINTN TimeoutCountdown = 0; - CHAR16 *TimeoutMessage; + CHAR16 TimeoutMessage[256]; CHAR16 KeyAsString[2]; UINTN MenuExit; @@ -403,9 +400,8 @@ static UINTN RunGenericMenu(IN REFIT_MENU_SCREEN *Screen, IN MENU_STYLE_FUNC Sty } if (HaveTimeout) { - TimeoutMessage = PoolPrint(L"%s in %d seconds", Screen->TimeoutText, (TimeoutCountdown + 5) / 10); + SPrint(TimeoutMessage, 255, L"%s in %d seconds", Screen->TimeoutText, (TimeoutCountdown + 5) / 10); StyleFunc(Screen, &State, MENU_FUNCTION_PAINT_TIMEOUT, TimeoutMessage); - FreePool(TimeoutMessage); } // read key press (and wait for it if applicable) @@ -464,6 +460,10 @@ static UINTN RunGenericMenu(IN REFIT_MENU_SCREEN *Screen, IN MENU_STYLE_FUNC Sty case SCAN_F10: egScreenShot(); break; + case 0x0016: // F12 + if (EjectMedia()) + MenuExit = MENU_EXIT_ESCAPE; + break; } switch (key.UnicodeChar) { case CHAR_LINEFEED: @@ -503,7 +503,7 @@ static VOID TextMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, UINTN MenuWidth, ItemWidth, MenuHeight; static UINTN MenuPosY; static CHAR16 **DisplayStrings; - CHAR16 *TimeoutMessage; + CHAR16 TimeoutMessage[256]; State->ScrollMode = SCROLL_MODE_TEXT; switch (Function) { @@ -531,8 +531,8 @@ static VOID TextMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, // prepare strings for display DisplayStrings = AllocatePool(sizeof(CHAR16 *) * Screen->EntryCount); for (i = 0; i <= State->MaxIndex; i++) - DisplayStrings[i] = PoolPrint(L" %-.*s ", MenuWidth, Screen->Entries[i]->Title); - // TODO: shorten strings that are too long (PoolPrint doesn't do that...) + SPrint(DisplayStrings[i], Screen->EntryCount, L" %-.*s ", MenuWidth, Screen->Entries[i]->Title); +// DisplayStrings[i] = PoolPrint(L" %-.*s ", MenuWidth, Screen->Entries[i]->Title); // TODO: use more elaborate techniques for shortening too long strings (ellipses in the middle) // TODO: account for double-width characters @@ -601,9 +601,8 @@ static VOID TextMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, // paint or update message refit_call2_wrapper(ST->ConOut->SetAttribute, ST->ConOut, ATTR_ERROR); refit_call3_wrapper(ST->ConOut->SetCursorPosition, ST->ConOut, 3, ConHeight - 1); - TimeoutMessage = PoolPrint(L"%s ", ParamText); + SPrint(TimeoutMessage, 255, L"%s ", ParamText); refit_call2_wrapper(ST->ConOut->OutputString, ST->ConOut, TimeoutMessage); - FreePool(TimeoutMessage); } break; @@ -754,16 +753,12 @@ static VOID PaintAll(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, UINTN AdjustScrollState(State); for (i = State->FirstVisible; i <= State->MaxIndex; i++) { if (Screen->Entries[i]->Row == 0) { - State->FinalRow0 = i; if (i <= State->LastVisible) { DrawMainMenuEntry(Screen->Entries[i], (i == State->CurrentSelection) ? TRUE : FALSE, itemPosX[i - State->FirstVisible], row0PosY); } // if } else { - if (State->InitialRow1 > i) - State->InitialRow1 = i; - DrawMainMenuEntry(Screen->Entries[i], (i == State->CurrentSelection) ? TRUE : FALSE, - itemPosX[i], row1PosY); + DrawMainMenuEntry(Screen->Entries[i], (i == State->CurrentSelection) ? TRUE : FALSE, itemPosX[i], row1PosY); } } if (!(GlobalConfig.HideUIFlags & HIDEUI_FLAG_LABEL)) @@ -774,17 +769,30 @@ static VOID PaintAll(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, UINTN // Move the selection to State->CurrentSelection, adjusting icon row if necessary... static VOID PaintSelection(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, UINTN *itemPosX, UINTN row0PosY, UINTN row1PosY, UINTN textPosY) { - if ((State->CurrentSelection < State->LastVisible) && (State->CurrentSelection >= State->FirstVisible)) { - DrawMainMenuEntry(Screen->Entries[State->PreviousSelection], FALSE, - itemPosX[State->PreviousSelection - State->FirstVisible], - (Screen->Entries[State->PreviousSelection]->Row == 0) ? row0PosY : row1PosY); - DrawMainMenuEntry(Screen->Entries[State->CurrentSelection], TRUE, - itemPosX[State->CurrentSelection - State->FirstVisible], - (Screen->Entries[State->CurrentSelection]->Row == 0) ? row0PosY : row1PosY); + UINTN XSelectPrev, XSelectCur, YPosPrev, YPosCur; + + if (((State->CurrentSelection <= State->LastVisible) && (State->CurrentSelection >= State->FirstVisible)) || + (State->CurrentSelection >= State->InitialRow1) ) { + if (Screen->Entries[State->PreviousSelection]->Row == 0) { + XSelectPrev = State->PreviousSelection - State->FirstVisible; + YPosPrev = row0PosY; + } else { + XSelectPrev = State->PreviousSelection; + YPosPrev = row1PosY; + } // if/else + if (Screen->Entries[State->CurrentSelection]->Row == 0) { + XSelectCur = State->CurrentSelection - State->FirstVisible; + YPosCur = row0PosY; + } else { + XSelectCur = State->CurrentSelection; + YPosCur = row1PosY; + } // if/else + DrawMainMenuEntry(Screen->Entries[State->PreviousSelection], FALSE, itemPosX[XSelectPrev], YPosPrev); + DrawMainMenuEntry(Screen->Entries[State->CurrentSelection], TRUE, itemPosX[XSelectCur], YPosCur); if (!(GlobalConfig.HideUIFlags & HIDEUI_FLAG_LABEL)) DrawMainMenuText(Screen->Entries[State->CurrentSelection]->Title, (UGAWidth - LAYOUT_TEXT_WIDTH) >> 1, textPosY); - } else { + } else { // Current selection not visible; must redraw the menu.... MainMenuStyle(Screen, State, MENU_FUNCTION_PAINT_ALL, NULL); } } // static VOID MoveSelection(VOID) @@ -807,16 +815,17 @@ static VOID PaintIcon(IN EG_EMBEDDED_IMAGE *BuiltInIcon, IN CHAR16 *ExternalFile PosX -= Icon->Width; BltImageAlpha(Icon, PosX, PosY - (Icon->Height / 2), &MenuBackgroundPixel); } -} // static VOID PaintArrow() +} // static VOID PaintIcon() // Display main menu in graphics mode VOID MainMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, IN UINTN Function, IN CHAR16 *ParamText) { INTN i; - extern UINTN row0PosX, row0PosXRunning, row1PosY, row0Loaders; + static UINTN row0PosX, row0PosXRunning, row1PosY, row0Loaders; UINTN row0Count, row1Count, row1PosX, row1PosXRunning; static UINTN *itemPosX; static UINTN row0PosY, textPosY; + CHAR16 FileName[256]; State->ScrollMode = SCROLL_MODE_ICONS; switch (Function) { @@ -873,13 +882,17 @@ VOID MainMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, IN UINT // For PaintIcon() calls, 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. - if ((State->FirstVisible > 0) && (!(GlobalConfig.HideUIFlags & HIDEUI_FLAG_ARROWS))) - PaintIcon(&egemb_arrow_left, L"icons\\arrow_left.icns", row0PosX - TILE_XSPACING, + if ((State->FirstVisible > 0) && (!(GlobalConfig.HideUIFlags & HIDEUI_FLAG_ARROWS))) { + SPrint(FileName, 255, L"%s\\arrow_left.icns", GlobalConfig.IconsDir ? GlobalConfig.IconsDir : DEFAULT_ICONS_DIR); + PaintIcon(&egemb_arrow_left, FileName, row0PosX - TILE_XSPACING, row0PosY + (ROW0_TILESIZE / 2), ALIGN_RIGHT); - if ((State->LastVisible < (row0Loaders - 1)) && (!(GlobalConfig.HideUIFlags & HIDEUI_FLAG_ARROWS))) - PaintIcon(&egemb_arrow_right, L"icons\\arrow_right.icns", + } // if + if ((State->LastVisible < (row0Loaders - 1)) && (!(GlobalConfig.HideUIFlags & HIDEUI_FLAG_ARROWS))) { + SPrint(FileName, 255, L"%s\\arrow_right.icns", GlobalConfig.IconsDir ? GlobalConfig.IconsDir : DEFAULT_ICONS_DIR); + PaintIcon(&egemb_arrow_right, FileName, (UGAWidth + (ROW0_TILESIZE + TILE_XSPACING) * State->MaxVisible) / 2 + TILE_XSPACING, row0PosY + (ROW0_TILESIZE / 2), ALIGN_LEFT); + } // if break; case MENU_FUNCTION_PAINT_SELECTION: