Improve 'Shortcut Key' Handling

dakanji · Nov 12, 2024 · d3ff12c · d3ff12c
1 parent cb2d13b
commit d3ff12c
Show file tree

Hide file tree

Showing 6 changed files with 372 additions and 213 deletions.
diff --git a/BootMaster/global.h b/BootMaster/global.h
@@ -429,8 +429,7 @@ typedef struct _refit_menu_entry {
     CHAR16                    *Title;
     UINTN                      Tag;
     UINTN                      Row;
-    CHAR16                     ShortcutDigit;
-    CHAR16                     ShortcutLetter;
+    CHAR16                     ShortcutKey;
     EG_IMAGE                  *Image;
     EG_IMAGE                  *BadgeImage;
     struct _refit_menu_screen *SubScreen;

diff --git a/BootMaster/launch_legacy.c b/BootMaster/launch_legacy.c
@@ -746,19 +746,14 @@ VOID AddLegacyEntry (
     REFIT_MENU_SCREEN *SubScreen;
     CHAR16            *VolDesc;
     CHAR16            *LegacyTitle;
-    CHAR16             ShortcutLetter;
 
 
-    ShortcutLetter = 0;
     if (LoaderTitle == NULL) {
         if (Volume->OSName == NULL) {
             LoaderTitle = L"Legacy Bootcode";
         }
         else {
             LoaderTitle = Volume->OSName;
-            if (LoaderTitle[0] == 'W' || LoaderTitle[0] == 'L') {
-                ShortcutLetter = LoaderTitle[0];
-            }
         }
     }
 
@@ -796,18 +791,19 @@ VOID AddLegacyEntry (
 
     SetVolumeBadgeIcon (Volume);
 
-    Entry->me.Row            = 0;
-    Entry->Enabled           = TRUE;
-    Entry->me.Tag            = TAG_LEGACY;
-    Entry->me.Title          = LegacyTitle;
-    Entry->me.SubScreen      = NULL; // Initial Setting
-    Entry->me.ShortcutLetter = ShortcutLetter;
-    Entry->me.Image          = LoadOSIcon (Volume->OSIconName, L"legacy", FALSE);
-    Entry->Volume            = CopyVolume (Volume);
-    Entry->me.BadgeImage     = egCopyImage (Volume->VolBadgeImage);
-    Entry->LoadOptions       = (Volume->DiskKind == DISK_KIND_OPTICAL)
-                               ? L"CD"
-                               : ((Volume->DiskKind == DISK_KIND_EXTERNAL) ? L"USB" : L"HD");
+    Entry->me.Row         = 0;
+    Entry->Enabled        = TRUE;
+    Entry->me.Tag         = TAG_LEGACY;
+    Entry->me.Title       = LegacyTitle;
+    Entry->me.SubScreen   = NULL; // Initial Setting
+    Entry->me.ShortcutKey = 0;
+    Entry->me.Image       = LoadOSIcon (Volume->OSIconName, L"legacy", FALSE);
+    Entry->Volume         = CopyVolume (Volume);
+    Entry->me.BadgeImage  = egCopyImage (Volume->VolBadgeImage);
+    Entry->LoadOptions    = (Volume->DiskKind == DISK_KIND_OPTICAL)
+                            ? L"CD"
+                            : (Volume->DiskKind == DISK_KIND_EXTERNAL)
+                                ? L"USB" : L"HD";
 
     #if REFIT_DEBUG > 0
     LOG_MSG(
@@ -927,10 +923,10 @@ VOID AddLegacyEntryUEFI (
     );
     #endif
 
-    Entry->me.Row            = 0;
-    Entry->me.Tag            = TAG_LEGACY_UEFI;
-    Entry->me.SubScreen      = NULL; // Initial Setting
-    Entry->me.ShortcutLetter = 0;
+    Entry->me.Row         = 0;
+    Entry->me.Tag         = TAG_LEGACY_UEFI;
+    Entry->me.SubScreen   = NULL; // Initial Setting
+    Entry->me.ShortcutKey = 0;
     if (GlobalConfig.HelpIcon) {
         Entry->me.Image = egFindIcon (
             L"os_legacy",

diff --git a/BootMaster/menu.c b/BootMaster/menu.c
@@ -107,13 +107,13 @@ BOOLEAN SubScreenBoot        = FALSE;
 REFIT_MENU_ENTRY MenuEntryNo = {
     L"No",
     TAG_RETURN,
-    1, 0, 0,
+    1, 0,
     NULL, NULL, NULL
 };
 REFIT_MENU_ENTRY MenuEntryYes = {
     L"Yes",
     TAG_RETURN,
-    1, 0, 0,
+    1, 0,
     NULL, NULL, NULL
 };
 
@@ -604,14 +604,14 @@ INTN FindMenuShortcutEntry (
             }
 
             if (Shortcut[0]) {
-                for (i = 0; i < Screen->EntryCount; i++) {
-                    if (Screen->Entries[i]->ShortcutDigit  == Shortcut[0] ||
-                        Screen->Entries[i]->ShortcutLetter == Shortcut[0]
-                    ) {
-                        FoundMatch = TRUE;
-                        break;
-                    }
-                } // for
+                if (Shortcut[0] != 0 && Shortcut[0] != 'O') {
+                    for (i = 0; i < Screen->EntryCount; i++) {
+                        if (Screen->Entries[i]->ShortcutKey == Shortcut[0]) {
+                            FoundMatch = TRUE;
+                            break;
+                        }
+                    } // for
+                }
             }
         } // if/else StrLen (Shortcut) > 1