Minor cleanups

[refind] / refind / menu.c

diff --git a/refind/menu.c b/refind/menu.c
index 9d5c3160e6883e51738702fe9b08e579d8cc14c5..dc3121df2af2ea094909d64e3c481e903684e661 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
+ */
 
 #include "global.h"
 #include "screen.h"
@@ -49,6 +62,7 @@
 #include "config.h"
 #include "libeg.h"
 #include "libegint.h"
+#include "line_edit.h"
 #include "../include/refit_call_wrapper.h"
 
 #include "../include/egemb_back_selected_small.h"
@@ -367,7 +381,6 @@ static UINTN RunGenericMenu(IN REFIT_MENU_SCREEN *Screen, IN MENU_STYLE_FUNC Sty
     CHAR16 TimeoutMessage[256];
     CHAR16 KeyAsString[2];
     UINTN MenuExit;
-//     EG_PIXEL Black = { 0x0, 0x0, 0x0, 0 };
 
     if (Screen->TimeoutSeconds > 0) {
         HaveTimeout = TRUE;
@@ -445,17 +458,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);
@@ -741,12 +775,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
@@ -1031,7 +1066,7 @@ static VOID PaintIcon(IN EG_EMBEDDED_IMAGE *BuiltInIcon, IN CHAR16 *ExternalFile
    }
 } // static VOID ()
 
-inline UINTN ComputeRow0PosY(VOID) {
+UINTN ComputeRow0PosY(VOID) {
    return ((UGAHeight / 2) - TileSizes[0] / 2);
 } // UINTN ComputeRow0PosY()