X-Git-Url: https://code.delx.au/refind/blobdiff_plain/e0f6b77e5692ec112bb803202ae27f8c5d55de50..480ba418c97ece5557ac0efc5dc189ff19fb8b8f:/refind/icns.c diff --git a/refind/icns.c b/refind/icns.c index a9b3f01..5e74bb2 100644 --- a/refind/icns.c +++ b/refind/icns.c @@ -38,6 +38,7 @@ #include "lib.h" #include "icns.h" #include "config.h" +#include "mystrings.h" #include "../refind/screen.h" // @@ -47,35 +48,39 @@ typedef struct { EG_IMAGE *Image; CHAR16 *FileName; - UINTN PixelSize; + UINTN IconSize; } BUILTIN_ICON; BUILTIN_ICON BuiltinIconTable[BUILTIN_ICON_COUNT] = { - { NULL, L"func_about.icns", 48 }, - { NULL, L"func_reset.icns", 48 }, - { NULL, L"func_shutdown.icns", 48 }, - { NULL, L"func_exit.icns", 48 }, - { NULL, L"tool_shell.icns", 48 }, - { NULL, L"tool_part.icns", 48 }, - { NULL, L"tool_rescue.icns", 48 }, - { NULL, L"tool_apple_rescue.icns", 48 }, - { NULL, L"tool_mok_tool.icns", 48 }, - { NULL, L"vol_internal.icns", 32 }, - { NULL, L"vol_external.icns", 32 }, - { NULL, L"vol_optical.icns", 32 }, + { NULL, L"func_about", ICON_SIZE_SMALL }, + { NULL, L"func_reset", ICON_SIZE_SMALL }, + { NULL, L"func_shutdown", ICON_SIZE_SMALL }, + { NULL, L"func_exit", ICON_SIZE_SMALL }, + { NULL, L"func_firmware", ICON_SIZE_SMALL }, + { NULL, L"func_csr_rotate", ICON_SIZE_SMALL }, + { NULL, L"tool_shell", ICON_SIZE_SMALL }, + { NULL, L"tool_part", ICON_SIZE_SMALL }, + { NULL, L"tool_rescue", ICON_SIZE_SMALL }, + { NULL, L"tool_apple_rescue", ICON_SIZE_SMALL }, + { NULL, L"tool_windows_rescue", ICON_SIZE_SMALL }, + { NULL, L"tool_mok_tool", ICON_SIZE_SMALL }, + { NULL, L"tool_memtest", ICON_SIZE_SMALL }, + { NULL, L"tool_netboot", ICON_SIZE_SMALL }, + { NULL, L"vol_internal", ICON_SIZE_BADGE }, + { NULL, L"vol_external", ICON_SIZE_BADGE }, + { NULL, L"vol_optical", ICON_SIZE_BADGE }, + { NULL, L"vol_net", ICON_SIZE_BADGE }, }; EG_IMAGE * BuiltinIcon(IN UINTN Id) { - CHAR16 FileName[256]; - if (Id >= BUILTIN_ICON_COUNT) return NULL; if (BuiltinIconTable[Id].Image == NULL) { - SPrint(FileName, 255, L"%s\\%s", GlobalConfig.IconsDir ? GlobalConfig.IconsDir : DEFAULT_ICONS_DIR, - BuiltinIconTable[Id].FileName); - BuiltinIconTable[Id].Image = LoadIcnsFallback(SelfDir, FileName, BuiltinIconTable[Id].PixelSize); + BuiltinIconTable[Id].Image = egFindIcon(BuiltinIconTable[Id].FileName, GlobalConfig.IconSizes[BuiltinIconTable[Id].IconSize]); + if (BuiltinIconTable[Id].Image == NULL) + BuiltinIconTable[Id].Image = DummyImage(GlobalConfig.IconSizes[BuiltinIconTable[Id].IconSize]); } // if return BuiltinIconTable[Id].Image; @@ -86,54 +91,43 @@ EG_IMAGE * BuiltinIcon(IN UINTN Id) // // Load an OS icon from among the comma-delimited list provided in OSIconName. +// Searches for icons with extensions in the ICON_EXTENSIONS list (via +// egFindIcon()). +// Returns image data. On failure, returns an ugly "dummy" icon. EG_IMAGE * LoadOSIcon(IN CHAR16 *OSIconName OPTIONAL, IN CHAR16 *FallbackIconName, BOOLEAN BootLogo) { - EG_IMAGE *Image; - CHAR16 *CutoutName; - CHAR16 FileName[256]; + EG_IMAGE *Image = NULL; + CHAR16 *CutoutName, BaseName[256]; UINTN Index = 0; if (GlobalConfig.TextOnly) // skip loading if it's not used anyway return NULL; - // try the names from OSIconName - while ((CutoutName = FindCommaDelimited(OSIconName, Index++)) != NULL) { - SPrint(FileName, 255, L"%s\\%s_%s.icns", GlobalConfig.IconsDir ? GlobalConfig.IconsDir : DEFAULT_ICONS_DIR, - BootLogo ? L"boot" : L"os", CutoutName); + // First, try to find an icon from the OSIconName list.... + while (((CutoutName = FindCommaDelimited(OSIconName, Index++)) != NULL) && (Image == NULL)) { + SPrint(BaseName, 255, L"%s_%s", BootLogo ? L"boot" : L"os", CutoutName); + Image = egFindIcon(BaseName, GlobalConfig.IconSizes[ICON_SIZE_BIG]); + } - // try to load it - Image = egLoadIcon(SelfDir, FileName, 128); - if (Image != NULL) { - MyFreePool(CutoutName); - return Image; - } - MyFreePool(CutoutName); - } // while + // If that fails, try again using the FallbackIconName.... + if (Image == NULL) { + SPrint(BaseName, 255, L"%s_%s", BootLogo ? L"boot" : L"os", FallbackIconName); + Image = egFindIcon(BaseName, GlobalConfig.IconSizes[ICON_SIZE_BIG]); + } - // try the fallback name - SPrint(FileName, 255, L"%s\\%s_%s.icns", GlobalConfig.IconsDir ? GlobalConfig.IconsDir : DEFAULT_ICONS_DIR, - BootLogo ? L"boot" : L"os", FallbackIconName); - Image = egLoadIcon(SelfDir, FileName, 128); - if (Image != NULL) - return Image; + // If that fails and if BootLogo was set, try again using the "os_" start of the name.... + if (BootLogo && (Image == NULL)) { + SPrint(BaseName, 255, L"os_%s", FallbackIconName); + Image = egFindIcon(BaseName, GlobalConfig.IconSizes[ICON_SIZE_BIG]); + } - // try the fallback name with os_ instead of boot_ - if (BootLogo) - return LoadOSIcon(NULL, FallbackIconName, FALSE); + // If all of these fail, return the dummy image.... + if (Image == NULL) + Image = DummyImage(GlobalConfig.IconSizes[ICON_SIZE_BIG]); - return DummyImage(128); + return Image; } /* EG_IMAGE * LoadOSIcon() */ -// -// Load an image from a .icns file -// - -EG_IMAGE * LoadIcns(IN EFI_FILE_HANDLE BaseDir, IN CHAR16 *FileName, IN UINTN PixelSize) -{ - if (GlobalConfig.TextOnly) // skip loading if it's not used anyway - return NULL; - return egLoadIcon(BaseDir, FileName, PixelSize); -} static EG_PIXEL BlackPixel = { 0x00, 0x00, 0x00, 0 }; //static EG_PIXEL YellowPixel = { 0x00, 0xff, 0xff, 0 }; @@ -143,11 +137,11 @@ EG_IMAGE * DummyImage(IN UINTN PixelSize) EG_IMAGE *Image; UINTN x, y, LineOffset; CHAR8 *Ptr, *YPtr; - + Image = egCreateFilledImage(PixelSize, PixelSize, TRUE, &BlackPixel); - + LineOffset = PixelSize * 4; - + YPtr = (CHAR8 *)Image->PixelData + ((PixelSize - 32) >> 1) * (LineOffset + 4); for (y = 0; y < 32; y++) { Ptr = YPtr; @@ -168,16 +162,3 @@ EG_IMAGE * DummyImage(IN UINTN PixelSize) return Image; } - -EG_IMAGE * LoadIcnsFallback(IN EFI_FILE_HANDLE BaseDir, IN CHAR16 *FileName, IN UINTN PixelSize) -{ - EG_IMAGE *Image; - if (GlobalConfig.TextOnly) // skip loading if it's not used anyway - return NULL; - - Image = LoadIcns(BaseDir, FileName, PixelSize); - if (Image == NULL) { - Image = DummyImage(PixelSize); - } - return Image; -}