X-Git-Url: https://code.delx.au/refind/blobdiff_plain/9f59e764bc973af9845d222cad85713395c51cf0..ff9fddedc9bd47d7df1fc0cb2c29f67e227c6125:/refind/menu.c diff --git a/refind/menu.c b/refind/menu.c index eb49b92..35a8f26 100644 --- a/refind/menu.c +++ b/refind/menu.c @@ -34,13 +34,26 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* - * Modifications copyright (c) 2012 Roderick W. Smith + * Modifications copyright (c) 2012-2015 Roderick W. Smith * * Modifications distributed under the terms of the GNU General Public - * License (GPL) version 3 (GPLv3), a copy of which must be distributed - * with this source code or binaries made from it. + * License (GPL) version 3 (GPLv3), or (at your option) any later version. * */ +/* + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #include "global.h" #include "screen.h" @@ -49,9 +62,12 @@ #include "config.h" #include "libeg.h" #include "libegint.h" +#include "line_edit.h" +#include "mystrings.h" #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" @@ -68,15 +84,12 @@ typedef VOID (*MENU_STYLE_FUNC)(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *S 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) @@ -93,8 +106,8 @@ static EG_PIXEL SelectionBackgroundPixel = { 0xff, 0xff, 0xff, 0 }; 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; @@ -103,51 +116,32 @@ static VOID InitSelection(VOID) // 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() // @@ -160,7 +154,7 @@ static VOID InitScroll(OUT SCROLL_STATE *State, IN UINTN ItemCount, IN UINTN Vis 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)) @@ -382,12 +376,12 @@ static UINTN RunGenericMenu(IN REFIT_MENU_SCREEN *Screen, IN MENU_STYLE_FUNC Sty UINTN index; INTN ShortcutEntry; BOOLEAN HaveTimeout = FALSE; + BOOLEAN WaitForRelease = FALSE; UINTN TimeoutCountdown = 0; INTN PreviousTime = -1, CurrentTime, TimeSinceKeystroke = 0; CHAR16 TimeoutMessage[256]; CHAR16 KeyAsString[2]; UINTN MenuExit; -// EG_PIXEL Black = { 0x0, 0x0, 0x0, 0 }; if (Screen->TimeoutSeconds > 0) { HaveTimeout = TRUE; @@ -403,6 +397,25 @@ static UINTN RunGenericMenu(IN REFIT_MENU_SCREEN *Screen, IN MENU_STYLE_FUNC Sty 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; + } + } + } + if (GlobalConfig.ScreensaverTime != -1) State.PaintAll = TRUE; @@ -416,6 +429,19 @@ static UINTN RunGenericMenu(IN REFIT_MENU_SCREEN *Screen, IN MENU_STYLE_FUNC Sty 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) { @@ -433,17 +459,38 @@ static UINTN RunGenericMenu(IN REFIT_MENU_SCREEN *Screen, IN MENU_STYLE_FUNC Sty // timeout expired MenuExit = MENU_EXIT_TIMEOUT; break; - } else if (HaveTimeout) { - refit_call1_wrapper(BS->Stall, 100000); // Pause for 100 ms - TimeoutCountdown--; - TimeSinceKeystroke++; - } else if (GlobalConfig.ScreensaverTime > 0) { - refit_call1_wrapper(BS->Stall, 100000); // Pause for 100 ms - TimeSinceKeystroke++; - if (TimeSinceKeystroke > (GlobalConfig.ScreensaverTime * 10)) { - SaveScreen(); - State.PaintAll = TRUE; - TimeSinceKeystroke = 0; + } 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); @@ -729,12 +776,13 @@ static UINT8 AverageBrightness(EG_IMAGE *Image) { 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 @@ -755,10 +803,8 @@ static VOID DrawTextWithTransparency(IN CHAR16 *Text, IN UINTN XPos, IN UINTN YP } 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)); @@ -1003,7 +1049,7 @@ static VOID PaintSelection(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, } // 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 @@ -1011,7 +1057,7 @@ static VOID PaintSelection(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, 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) { @@ -1021,8 +1067,8 @@ static VOID PaintIcon(IN EG_EMBEDDED_IMAGE *BuiltInIcon, IN CHAR16 *ExternalFile } } // 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, @@ -1034,7 +1080,7 @@ static VOID PaintArrows(SCROLL_STATE *State, UINTN PosX, UINTN PosY, UINTN row0L // 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 @@ -1085,12 +1131,12 @@ VOID MainMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, IN UINT 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; @@ -1100,10 +1146,10 @@ VOID MainMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, IN UINT 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 @@ -1120,7 +1166,7 @@ VOID MainMenuStyle(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, IN UINT // 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: @@ -1179,18 +1225,22 @@ UINTN RunMenu(IN REFIT_MENU_SCREEN *Screen, OUT REFIT_MENU_ENTRY **ChosenEntry) 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) { @@ -1202,6 +1252,7 @@ UINTN RunMainMenu(IN REFIT_MENU_SCREEN *Screen, IN CHAR16* DefaultSelection, OUT 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); @@ -1219,5 +1270,9 @@ UINTN RunMainMenu(IN REFIT_MENU_SCREEN *Screen, IN CHAR16* DefaultSelection, OUT if (ChosenEntry) *ChosenEntry = TempChosenEntry; + if (DefaultSelection) { + MyFreePool(*DefaultSelection); + *DefaultSelection = MenuTitle; + } // if return MenuExit; } /* UINTN RunMainMenu() */