* 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 <http://www.gnu.org/licenses/>.
+ */
#include "global.h"
#include "screen.h"
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;
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) {
// 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);
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));
} // 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 ()
-inline UINTN ComputeRow0PosY(VOID) {
+UINTN ComputeRow0PosY(VOID) {
return ((UGAHeight / 2) - TileSizes[0] / 2);
} // UINTN ComputeRow0PosY()
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;
TileSizes[0] = (GlobalConfig.IconSizes[ICON_SIZE_BIG] * 9) / 8;
TileSizes[1] = (GlobalConfig.IconSizes[ICON_SIZE_SMALL] * 4) / 3;
- if (DefaultSelection != NULL) {
+ 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() */