X-Git-Url: https://code.delx.au/refind/blobdiff_plain/1bce5f96f4f03d381586b3716e73380fe64a331e..953397f78420efbd81d4ab60a2c01da0d2c19711:/refind/menu.c diff --git a/refind/menu.c b/refind/menu.c index d2d5c38..d35cd11 100644 --- a/refind/menu.c +++ b/refind/menu.c @@ -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 // @@ -163,12 +160,12 @@ static VOID InitSelection(VOID) static VOID InitScroll(OUT SCROLL_STATE *State, IN UINTN ItemCount, IN UINTN VisibleSpace) { - State->LastSelection = State->CurrentSelection = 0; + State->PreviousSelection = State->CurrentSelection = 0; State->MaxIndex = (INTN)ItemCount - 1; State->FirstVisible = 0; - if (AllowGraphicsMode) + if (AllowGraphicsMode) { State->MaxVisible = UGAWidth / (ROW0_TILESIZE + TILE_XSPACING) - 1; - else + } else State->MaxVisible = ConHeight - 4; if ((VisibleSpace > 0) && (VisibleSpace < State->MaxVisible)) State->MaxVisible = (INTN)VisibleSpace; @@ -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; @@ -197,23 +194,66 @@ static VOID AdjustScrollState(/* IN REFIT_MENU_SCREEN *Screen, */ IN SCROLL_STAT static VOID UpdateScroll(IN OUT SCROLL_STATE *State, IN UINTN Movement) { - State->LastSelection = State->CurrentSelection; + State->PreviousSelection = State->CurrentSelection; switch (Movement) { - case SCROLL_LINE_UP: + case SCROLL_LINE_LEFT: if (State->CurrentSelection > 0) { State->CurrentSelection --; } break; - case SCROLL_LINE_DOWN: + case SCROLL_LINE_RIGHT: if (State->CurrentSelection < State->MaxIndex) { State->CurrentSelection ++; } break; - // TODO: Better handling of SCROLL_PAGE_UP & SCROLL_PAGE_DOWN + case SCROLL_LINE_UP: + if (State->ScrollMode == SCROLL_MODE_ICONS) { + if (State->CurrentSelection >= State->InitialRow1) { + if (State->MaxIndex > State->InitialRow1) { // avoid division by 0! + State->CurrentSelection = State->FirstVisible + (State->LastVisible - State->FirstVisible) * + (State->CurrentSelection - State->InitialRow1) / + (State->MaxIndex - State->InitialRow1); + } else { + State->CurrentSelection = State->FirstVisible; + } // if/else + } // if in second row + } else { + if (State->CurrentSelection > 0) + State->CurrentSelection--; + } // if/else + break; + + case SCROLL_LINE_DOWN: + if (State->ScrollMode == SCROLL_MODE_ICONS) { + if (State->CurrentSelection <= State->FinalRow0) { + if (State->LastVisible > State->FirstVisible) { // avoid division by 0! + State->CurrentSelection = State->InitialRow1 + (State->MaxIndex - State->InitialRow1) * + (State->CurrentSelection - State->FirstVisible) / + (State->LastVisible - State->FirstVisible); + } else { + State->CurrentSelection = State->InitialRow1; + } // if/else + } // if in first row + } else { + if (State->CurrentSelection < State->MaxIndex) + State->CurrentSelection++; + } // if/else + break; + case SCROLL_PAGE_UP: + if (State->CurrentSelection <= State->FinalRow0) + State->CurrentSelection -= State->MaxVisible; + else if (State->CurrentSelection == State->InitialRow1) + State->CurrentSelection = State->FinalRow0; + else + State->CurrentSelection = State->InitialRow1; + if (State->CurrentSelection < 0) + State->CurrentSelection = 0; + break; + case SCROLL_FIRST: if (State->CurrentSelection > 0) { State->PaintAll = TRUE; @@ -222,6 +262,19 @@ static VOID UpdateScroll(IN OUT SCROLL_STATE *State, IN UINTN Movement) break; case SCROLL_PAGE_DOWN: + if (State->CurrentSelection < State->FinalRow0) { + State->CurrentSelection += State->MaxVisible; + if (State->CurrentSelection > State->FinalRow0) + State->CurrentSelection = State->FinalRow0; + } else if (State->CurrentSelection == State->FinalRow0) { + State->CurrentSelection++; + } else { + State->CurrentSelection = State->MaxIndex; + } + if (State->CurrentSelection > State->MaxIndex) + State->CurrentSelection = State->MaxIndex; + break; + case SCROLL_LAST: if (State->CurrentSelection < State->MaxIndex) { State->PaintAll = TRUE; @@ -233,13 +286,13 @@ static VOID UpdateScroll(IN OUT SCROLL_STATE *State, IN UINTN Movement) break; } - if (!AllowGraphicsMode) + if (State->ScrollMode == SCROLL_MODE_TEXT) AdjustScrollState(State); - if (!State->PaintAll && State->CurrentSelection != State->LastSelection) + if (!State->PaintAll && State->CurrentSelection != State->PreviousSelection) State->PaintSelection = TRUE; State->LastVisible = State->FirstVisible + State->MaxVisible - 1; -} +} // static VOID UpdateScroll() // // menu helper functions @@ -287,10 +340,28 @@ static INTN FindMenuShortcutEntry(IN REFIT_MENU_SCREEN *Screen, IN CHAR16 *Short return -1; } +// Identify the end of row 0 and the beginning of row 1; store the results in the +// appropriate fields in State. Also reduce MaxVisible if that value is greater +// than the total number of row-0 tags and if we're in an icon-based screen +static VOID IdentifyRows(IN SCROLL_STATE *State, IN REFIT_MENU_SCREEN *Screen) { + UINTN i; + + State->FinalRow0 = 0; + State->InitialRow1 = State->MaxIndex; + 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->InitialRow1 = i; + } // if/else + } // for + if ((State->ScrollMode == SCROLL_MODE_ICONS) && (State->MaxVisible > (State->FinalRow0 + 1))) + State->MaxVisible = State->FinalRow0 + 1; +} // static VOID IdentifyRows() + // // generic menu function // - static UINTN RunGenericMenu(IN REFIT_MENU_SCREEN *Screen, IN MENU_STYLE_FUNC StyleFunc, IN INTN DefaultEntryIndex, OUT REFIT_MENU_ENTRY **ChosenEntry) { SCROLL_STATE State; @@ -311,6 +382,7 @@ static UINTN RunGenericMenu(IN REFIT_MENU_SCREEN *Screen, IN MENU_STYLE_FUNC Sty MenuExit = 0; StyleFunc(Screen, &State, MENU_FUNCTION_INIT, NULL); + IdentifyRows(&State, Screen); // override the starting selection with the default index, if any if (DefaultEntryIndex >= 0 && DefaultEntryIndex <= State.MaxIndex) { State.CurrentSelection = DefaultEntryIndex; @@ -356,13 +428,17 @@ static UINTN RunGenericMenu(IN REFIT_MENU_SCREEN *Screen, IN MENU_STYLE_FUNC Sty // react to key press switch (key.ScanCode) { case SCAN_UP: - case SCAN_LEFT: UpdateScroll(&State, SCROLL_LINE_UP); break; + case SCAN_LEFT: + UpdateScroll(&State, SCROLL_LINE_LEFT); + break; case SCAN_DOWN: - case SCAN_RIGHT: UpdateScroll(&State, SCROLL_LINE_DOWN); break; + case SCAN_RIGHT: + UpdateScroll(&State, SCROLL_LINE_RIGHT); + break; case SCAN_HOME: UpdateScroll(&State, SCROLL_FIRST); break; @@ -385,6 +461,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: @@ -426,6 +506,7 @@ static VOID TextMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, static CHAR16 **DisplayStrings; CHAR16 *TimeoutMessage; + State->ScrollMode = SCROLL_MODE_TEXT; switch (Function) { case MENU_FUNCTION_INIT: @@ -503,9 +584,9 @@ static VOID TextMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, case MENU_FUNCTION_PAINT_SELECTION: // redraw selection cursor - refit_call3_wrapper(ST->ConOut->SetCursorPosition, ST->ConOut, 2, MenuPosY + (State->LastSelection - State->FirstVisible)); + refit_call3_wrapper(ST->ConOut->SetCursorPosition, ST->ConOut, 2, MenuPosY + (State->PreviousSelection - State->FirstVisible)); refit_call2_wrapper(ST->ConOut->SetAttribute, ST->ConOut, ATTR_CHOICE_BASIC); - refit_call2_wrapper(ST->ConOut->OutputString, ST->ConOut, DisplayStrings[State->LastSelection]); + refit_call2_wrapper(ST->ConOut->OutputString, ST->ConOut, DisplayStrings[State->PreviousSelection]); refit_call3_wrapper(ST->ConOut->SetCursorPosition, ST->ConOut, 2, MenuPosY + (State->CurrentSelection - State->FirstVisible)); refit_call2_wrapper(ST->ConOut->SetAttribute, ST->ConOut, ATTR_CHOICE_CURRENT); refit_call2_wrapper(ST->ConOut->OutputString, ST->ConOut, DisplayStrings[State->CurrentSelection]); @@ -537,8 +618,6 @@ static VOID TextMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, static VOID DrawMenuText(IN CHAR16 *Text, IN UINTN SelectedWidth, IN UINTN XPos, IN UINTN YPos) { -// Print(L"Entering DrawMenuText(); Text is '%s', SelectedWidth is %d, XPos is %d, YPos is %d\n", -// Text, SelectedWidth, XPos, YPos); if (TextBuffer == NULL) TextBuffer = egCreateImage(LAYOUT_TEXT_WIDTH, TEXT_LINE_HEIGHT, FALSE); @@ -561,6 +640,7 @@ static VOID GraphicsMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *Sta UINTN ItemWidth; static UINTN MenuWidth, EntriesPosX, EntriesPosY, TimeoutPosY; + State->ScrollMode = SCROLL_MODE_TEXT; switch (Function) { case MENU_FUNCTION_INIT: @@ -620,8 +700,8 @@ static VOID GraphicsMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *Sta case MENU_FUNCTION_PAINT_SELECTION: // redraw selection cursor - DrawMenuText(Screen->Entries[State->LastSelection]->Title, 0, - EntriesPosX, EntriesPosY + State->LastSelection * TEXT_LINE_HEIGHT); + DrawMenuText(Screen->Entries[State->PreviousSelection]->Title, 0, + EntriesPosX, EntriesPosY + State->PreviousSelection * TEXT_LINE_HEIGHT); DrawMenuText(Screen->Entries[State->CurrentSelection]->Title, MenuWidth, EntriesPosX, EntriesPosY + State->CurrentSelection * TEXT_LINE_HEIGHT); break; @@ -680,8 +760,7 @@ static VOID PaintAll(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, UINTN itemPosX[i - State->FirstVisible], row0PosY); } // if } else { - 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)) @@ -692,17 +771,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->LastSelection], FALSE, - itemPosX[State->LastSelection - State->FirstVisible], - (Screen->Entries[State->LastSelection]->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) @@ -725,17 +817,19 @@ 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) { case MENU_FUNCTION_INIT: @@ -790,13 +884,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: