* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*
- * Modifications copyright (c) 2012 Roderick W. Smith
+ * Modifications copyright (c) 2012-2017 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 <http://www.gnu.org/licenses/>.
+ */
#include "global.h"
#include "screen.h"
#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"
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 EG_IMAGE *SelectionImages[2] = { NULL, NULL };
static EG_PIXEL SelectionBackgroundPixel = { 0xff, 0xff, 0xff, 0 };
+//Touch variables
+EFI_ABSOLUTE_POINTER_PROTOCOL *TouchProtocol = NULL;
+EFI_GUID TouchGuid = EFI_ABSOLUTE_POINTER_PROTOCOL_GUID;
+BOOLEAN TouchEnabled = FALSE;
+BOOLEAN TouchActive = FALSE;
+
//
// Graphics helper functions
//
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))
State->MaxVisible = State->FinalRow0 + 1;
} // static VOID IdentifyRows()
-// Blank the screen, wait for a keypress, and restore banner/background.
+// Blank the screen, wait for a keypress or touch event, 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 };
-
+ EFI_EVENT WaitList[2] = { ST->ConIn->WaitForKey, NULL };
+
egClearScreen(&Black);
- refit_call3_wrapper(BS->WaitForEvent, 1, &ST->ConIn->WaitForKey, &index);
+ if(TouchEnabled) {
+ WaitList[1] = TouchProtocol->WaitForInput;
+ refit_call3_wrapper(BS->WaitForEvent, 2, WaitList, &index);
+ } else {
+ refit_call3_wrapper(BS->WaitForEvent, 1, WaitList, &index);
+ }
if (AllowGraphicsMode)
SwitchToGraphicsAndClear();
ReadAllKeyStrokes();
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 };
+
+ EFI_STATUS TouchStatus = EFI_NOT_READY;
+ EFI_ABSOLUTE_POINTER_STATE TouchState;
if (Screen->TimeoutSeconds > 0) {
HaveTimeout = TRUE;
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;
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) {
}
}
- // read key press (and wait for it if applicable)
+ // read key press or touch event (and wait for them if applicable)
+ if(TouchEnabled) {
+ TouchStatus = refit_call2_wrapper(TouchProtocol->GetState, TouchProtocol, &TouchState);
+ }
Status = refit_call2_wrapper(ST->ConIn->ReadKeyStroke, ST->ConIn, &key);
- if (Status != EFI_SUCCESS) {
+
+ if(Status == EFI_SUCCESS) {
+ TouchActive = FALSE;
+ TimeSinceKeystroke = 0;
+ } else if (TouchStatus == EFI_SUCCESS) {
+ if (StyleFunc != MainMenuStyle) {
+ // prevent user from getting stuck on submenus
+ // (the only one currently reachable without a keyboard is the about screen)
+ MenuExit = MENU_EXIT_ENTER;
+ break;
+ }
+
+ TouchActive = TRUE;
+ TimeSinceKeystroke = 0;
+ } else {
+ EFI_EVENT WaitList[3] = { ST->ConIn->WaitForKey, NULL, NULL };
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--;
- 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 {
+ UINTN Index;
+
+ refit_call3_wrapper(BS->SetTimer, TimerEvent, TimerRelative, 10000000); // 1s Timeout
+
+ if (TouchEnabled) {
+ WaitList[1] = TouchProtocol->WaitForInput;
+ WaitList[2] = TimerEvent;
+ Status = refit_call3_wrapper(BS->WaitForEvent, 3, WaitList, &Index);
+ } else {
+ 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 || (TouchEnabled && Index == 1))
+ 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);
+ if (TouchEnabled) {
+ WaitList[1] = TouchProtocol->WaitForInput;
+ refit_call3_wrapper(BS->WaitForEvent, 2, WaitList, &index);
+ } else {
+ refit_call3_wrapper(BS->WaitForEvent, 1, WaitList, &index);
+ }
}
continue;
- } else {
- TimeSinceKeystroke = 0;
} // if/else !read keystroke
if (HaveTimeout) {
}
}
- // react to key press
- switch (key.ScanCode) {
- case SCAN_UP:
- UpdateScroll(&State, SCROLL_LINE_UP);
- break;
- case SCAN_LEFT:
- UpdateScroll(&State, SCROLL_LINE_LEFT);
- break;
- case SCAN_DOWN:
- UpdateScroll(&State, SCROLL_LINE_DOWN);
- break;
- case SCAN_RIGHT:
- UpdateScroll(&State, SCROLL_LINE_RIGHT);
- break;
- case SCAN_HOME:
- UpdateScroll(&State, SCROLL_FIRST);
- break;
- case SCAN_END:
- UpdateScroll(&State, SCROLL_LAST);
- break;
- case SCAN_PAGE_UP:
- UpdateScroll(&State, SCROLL_PAGE_UP);
- break;
- case SCAN_PAGE_DOWN:
- UpdateScroll(&State, SCROLL_PAGE_DOWN);
- break;
- case SCAN_ESC:
- MenuExit = MENU_EXIT_ESCAPE;
- break;
- case SCAN_INSERT:
- case SCAN_F2:
- MenuExit = MENU_EXIT_DETAILS;
- break;
- case SCAN_F10:
- egScreenShot();
- break;
- case 0x0016: // F12
- if (EjectMedia())
- MenuExit = MENU_EXIT_ESCAPE;
- break;
- }
- switch (key.UnicodeChar) {
- case CHAR_LINEFEED:
- case CHAR_CARRIAGE_RETURN:
- case ' ':
- MenuExit = MENU_EXIT_ENTER;
- break;
- case '+':
- MenuExit = MENU_EXIT_DETAILS;
- break;
- default:
- KeyAsString[0] = key.UnicodeChar;
- KeyAsString[1] = 0;
- ShortcutEntry = FindMenuShortcutEntry(Screen, KeyAsString);
- if (ShortcutEntry >= 0) {
- State.CurrentSelection = ShortcutEntry;
+ if(!TouchActive) { // react to key press
+ switch (key.ScanCode) {
+ case SCAN_UP:
+ UpdateScroll(&State, SCROLL_LINE_UP);
+ break;
+ case SCAN_LEFT:
+ UpdateScroll(&State, SCROLL_LINE_LEFT);
+ break;
+ case SCAN_DOWN:
+ UpdateScroll(&State, SCROLL_LINE_DOWN);
+ break;
+ case SCAN_RIGHT:
+ UpdateScroll(&State, SCROLL_LINE_RIGHT);
+ break;
+ case SCAN_HOME:
+ UpdateScroll(&State, SCROLL_FIRST);
+ break;
+ case SCAN_END:
+ UpdateScroll(&State, SCROLL_LAST);
+ break;
+ case SCAN_PAGE_UP:
+ UpdateScroll(&State, SCROLL_PAGE_UP);
+ break;
+ case SCAN_PAGE_DOWN:
+ UpdateScroll(&State, SCROLL_PAGE_DOWN);
+ break;
+ case SCAN_ESC:
+ MenuExit = MENU_EXIT_ESCAPE;
+ break;
+ case SCAN_INSERT:
+ case SCAN_F2:
+ MenuExit = MENU_EXIT_DETAILS;
+ break;
+ case SCAN_F10:
+ egScreenShot();
+ break;
+ case 0x0016: // F12
+ if (EjectMedia())
+ MenuExit = MENU_EXIT_ESCAPE;
+ break;
+ }
+ switch (key.UnicodeChar) {
+ case CHAR_LINEFEED:
+ case CHAR_CARRIAGE_RETURN:
+ case ' ':
MenuExit = MENU_EXIT_ENTER;
- }
- break;
+ break;
+ case CHAR_BACKSPACE:
+ MenuExit = MENU_EXIT_ESCAPE;
+ break;
+ case '+':
+ case CHAR_TAB:
+ MenuExit = MENU_EXIT_DETAILS;
+ break;
+ default:
+ KeyAsString[0] = key.UnicodeChar;
+ KeyAsString[1] = 0;
+ ShortcutEntry = FindMenuShortcutEntry(Screen, KeyAsString);
+ if (ShortcutEntry >= 0) {
+ State.CurrentSelection = ShortcutEntry;
+ MenuExit = MENU_EXIT_ENTER;
+ }
+ break;
+ }
+ } else { //react to touch event
+ //the TouchProtocol min/max may not match the screen size
+ UINT32 TouchScreenPosX = (TouchState.CurrentX * UGAWidth) / TouchProtocol->Mode->AbsoluteMaxX;
+ UINT32 TouchScreenPosY = (TouchState.CurrentY * UGAHeight) / TouchProtocol->Mode->AbsoluteMaxY;
+
+
+ UINTN Item = FindMainMenuItem(Screen, &State, TouchScreenPosX, TouchScreenPosY);
+ switch (Item) {
+ case TOUCH_NO_ITEM:
+ //do nothing
+ break;
+ case TOUCH_LEFT_ARROW:
+ UpdateScroll(&State, SCROLL_PAGE_UP);
+ break;
+ case TOUCH_RIGHT_ARROW:
+ UpdateScroll(&State, SCROLL_PAGE_DOWN);
+ break;
+ default:
+ State.CurrentSelection = Item;
+ MenuExit = MENU_EXIT_ENTER;
+ break;
+ }
}
}
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));
{
EG_IMAGE *Background;
- if (SelectionImages != NULL) {
- if (selected) {
- Background = egCropImage(GlobalConfig.ScreenBackground, XPos, YPos,
+ // don't draw selection image if using touch
+ if (selected && !TouchActive) {
+ Background = egCropImage(GlobalConfig.ScreenBackground, XPos, YPos,
+ SelectionImages[Entry->Row]->Width, SelectionImages[Entry->Row]->Height);
+ egComposeImage(Background, SelectionImages[Entry->Row], 0, 0);
+ BltImageCompositeBadge(Background, Entry->Image, Entry->BadgeImage, XPos, YPos);
+ } else { // Image not selected; copy background
+ egDrawImageWithTransparency(Entry->Image, Entry->BadgeImage, XPos, YPos,
SelectionImages[Entry->Row]->Width, SelectionImages[Entry->Row]->Height);
- egComposeImage(Background, SelectionImages[Entry->Row], 0, 0);
- BltImageCompositeBadge(Background, Entry->Image, Entry->BadgeImage, XPos, YPos);
- } else { // Image not selected; copy background
- egDrawImageWithTransparency(Entry->Image, Entry->BadgeImage, XPos, YPos,
- SelectionImages[Entry->Row]->Width, SelectionImages[Entry->Row]->Height);
- } // if/else
- } // if
+ } // if/else
} // VOID DrawMainMenuEntry()
static VOID PaintAll(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, UINTN *itemPosX,
} // 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:
}
} // VOID MainMenuStyle()
+// Determines the index of the main menu item at the given coordinates.
+UINTN FindMainMenuItem(IN REFIT_MENU_SCREEN *Screen, IN SCROLL_STATE *State, IN UINT64 PosX, IN UINT64 PosY)
+{
+ UINTN i;
+ static UINTN row0PosX, row0PosXRunning, row1PosY, row0Loaders;
+ UINTN row0Count, row1Count, row1PosX, row1PosXRunning;
+ static UINTN *itemPosX;
+ static UINTN row0PosY;
+ UINTN itemRow;
+
+ row0Count = 0;
+ row1Count = 0;
+ row0Loaders = 0;
+ for (i = 0; i <= State->MaxIndex; i++) {
+ if (Screen->Entries[i]->Row == 1) {
+ row1Count++;
+ } else {
+ row0Loaders++;
+ if (row0Count < State->MaxVisible)
+ row0Count++;
+ }
+ }
+ row0PosX = (UGAWidth + TILE_XSPACING - (TileSizes[0] + TILE_XSPACING) * row0Count) >> 1;
+ row0PosY = ComputeRow0PosY();
+ row1PosX = (UGAWidth + TILE_XSPACING - (TileSizes[1] + TILE_XSPACING) * row1Count) >> 1;
+ row1PosY = row0PosY + TileSizes[0] + TILE_YSPACING;
+
+ if(PosY >= row0PosY && PosY <= row0PosY + TileSizes[0]) {
+ itemRow = 0;
+ if(PosX <= row0PosX) {
+ return TOUCH_LEFT_ARROW;
+ }
+ else if(PosX >= (UGAWidth - row0PosX)) {
+ return TOUCH_RIGHT_ARROW;
+ }
+ } else if(PosY >= row1PosY && PosY <= row1PosY + TileSizes[1]) {
+ itemRow = 1;
+ } else { // Y coordinate is outside of either row
+ return TOUCH_NO_ITEM;
+ }
+
+ UINTN ItemIndex = TOUCH_NO_ITEM;
+
+ itemPosX = AllocatePool(sizeof(UINTN) * Screen->EntryCount);
+ row0PosXRunning = row0PosX;
+ row1PosXRunning = row1PosX;
+ for (i = 0; i <= State->MaxIndex; i++) {
+ if (Screen->Entries[i]->Row == 0) {
+ itemPosX[i] = row0PosXRunning;
+ row0PosXRunning += TileSizes[0] + TILE_XSPACING;
+ } else {
+ itemPosX[i] = row1PosXRunning;
+ row1PosXRunning += TileSizes[1] + TILE_XSPACING;
+ }
+ }
+
+ for (i = State->FirstVisible; i <= State->MaxIndex; i++) {
+ if (Screen->Entries[i]->Row == 0 && itemRow == 0) {
+ if (i <= State->LastVisible) {
+ if(PosX >= itemPosX[i - State->FirstVisible] && PosX <= itemPosX[i - State->FirstVisible] + TileSizes[0]) {
+ ItemIndex = i;
+ break;
+ }
+ } // if
+ } else if (Screen->Entries[i]->Row == 1 && itemRow == 1) {
+ if(PosX >= itemPosX[i] && PosX <= itemPosX[i] + TileSizes[1]) {
+ ItemIndex = i;
+ break;
+ }
+ }
+ }
+
+ MyFreePool(itemPosX);
+
+ return ItemIndex;
+} // VOID FindMainMenuItem()
+
// Enable the user to edit boot loader options.
// Returns TRUE if the user exited with edited options; FALSE if the user
// pressed Esc to terminate the edit.
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) {
Style = GraphicsMenuStyle;
MainStyle = MainMenuStyle;
+ if (GlobalConfig.EnableTouch) {
+ // Check for touch availability
+ EFI_STATUS status = refit_call3_wrapper(BS->LocateProtocol, &TouchGuid, NULL, (VOID **) &TouchProtocol);
+ if (status == EFI_SUCCESS) {
+ TouchEnabled = TouchActive = TRUE;
+ }
+ }
}
while (!MenuExit) {
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() */