shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

sd-boot: Add compile-time color support

Browse Source 
Fixes: #10139
This commit is contained in:
Jan Janssen 2021-08-14 14:38:43 +02:00
parent 8a8e5666ce
commit e313e934db
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson_options.txt
View File

@ -430,6 +430,14 @@ option('sbat-distro-version', type : 'string',
description : 'SBAT distribution package version, e.g. 248-7.fc34') description : 'SBAT distribution package version, e.g. 248-7.fc34')
option('sbat-distro-url', type : 'string', option('sbat-distro-url', type : 'string',
description : 'SBAT distribution URL, e.g. https://src.fedoraproject.org/rpms/systemd') description : 'SBAT distribution URL, e.g. https://src.fedoraproject.org/rpms/systemd')
option('efi-color-normal', type : 'string', value : 'lightgray,black',
description : 'general boot loader color in "foreground,background" form, see constants from eficon.h')
option('efi-color-entry', type : 'string', value : 'lightgray,black',
description : 'boot loader color for entries')
option('efi-color-highlight', type : 'string', value : 'black,lightgray',
description : 'boot loader color for selected entries')
option('efi-color-edit', type : 'string', value : 'lightgray,black',
description : 'boot loader color for option line edit')
option('bashcompletiondir', type : 'string', option('bashcompletiondir', type : 'string',
description : 'directory for bash completion scripts ["no" disables]') description : 'directory for bash completion scripts ["no" disables]')

29
src/boot/efi/boot.c
View File

@ -24,9 +24,6 @@
/* magic string to find in the binary image */ /* magic string to find in the binary image */
static const char _used_ _section_(".sdmagic") magic[] = "#### LoaderInfo: systemd-boot " GIT_VERSION " ####"; static const char _used_ _section_(".sdmagic") magic[] = "#### LoaderInfo: systemd-boot " GIT_VERSION " ####";
#define COLOR_NORMAL (EFI_LIGHTGRAY|EFI_BACKGROUND_BLACK)
#define COLOR_HIGHLIGHT (EFI_BLACK|EFI_BACKGROUND_LIGHTGRAY)
enum loader_type { enum loader_type {
LOADER_UNDEFINED, LOADER_UNDEFINED,
LOADER_EFI, LOADER_EFI,
@ -141,8 +138,9 @@ static BOOLEAN line_edit(
} }
print[j] = '\0'; print[j] = '\0';
print_at(0, y_pos, COLOR_NORMAL, print); /* See comment at call site. */
uefi_call_wrapper(ST->ConOut->SetCursorPosition, 3, ST->ConOut, cursor, y_pos); print_at(1, y_pos, COLOR_EDIT, print);
uefi_call_wrapper(ST->ConOut->SetCursorPosition, 3, ST->ConOut, cursor + 1, y_pos);
err = console_key_read(&key, 0); err = console_key_read(&key, 0);
if (EFI_ERROR(err)) if (EFI_ERROR(err))
@ -532,6 +530,7 @@ static BOOLEAN menu_run(
graphics_mode(FALSE); graphics_mode(FALSE);
uefi_call_wrapper(ST->ConIn->Reset, 2, ST->ConIn, FALSE); uefi_call_wrapper(ST->ConIn->Reset, 2, ST->ConIn, FALSE);
uefi_call_wrapper(ST->ConOut->EnableCursor, 2, ST->ConOut, FALSE); uefi_call_wrapper(ST->ConOut->EnableCursor, 2, ST->ConOut, FALSE);
uefi_call_wrapper(ST->ConOut->SetAttribute, 2, ST->ConOut, COLOR_NORMAL);
/* draw a single character to make ClearScreen work on some firmware */ /* draw a single character to make ClearScreen work on some firmware */
Print(L" "); Print(L" ");
@ -609,19 +608,19 @@ static BOOLEAN menu_run(
if (i < idx_first || i > idx_last) if (i < idx_first || i > idx_last)
continue; continue;
print_at(x_start, y_start + i - idx_first, print_at(x_start, y_start + i - idx_first,
(i == idx_highlight) ? COLOR_HIGHLIGHT : COLOR_NORMAL, (i == idx_highlight) ? COLOR_HIGHLIGHT : COLOR_ENTRY,
lines[i]); lines[i]);
if ((INTN)i == config->idx_default_efivar) if ((INTN)i == config->idx_default_efivar)
print_at(x_start, y_start + i - idx_first, print_at(x_start, y_start + i - idx_first,
(i == idx_highlight) ? COLOR_HIGHLIGHT : COLOR_NORMAL, (i == idx_highlight) ? COLOR_HIGHLIGHT : COLOR_ENTRY,
(CHAR16*) L"=>"); (CHAR16*) L"=>");
} }
refresh = FALSE; refresh = FALSE;
} else if (highlight) { } else if (highlight) {
print_at(x_start, y_start + idx_highlight_prev - idx_first, COLOR_NORMAL, lines[idx_highlight_prev]); print_at(x_start, y_start + idx_highlight_prev - idx_first, COLOR_ENTRY, lines[idx_highlight_prev]);
print_at(x_start, y_start + idx_highlight - idx_first, COLOR_HIGHLIGHT, lines[idx_highlight]); print_at(x_start, y_start + idx_highlight - idx_first, COLOR_HIGHLIGHT, lines[idx_highlight]);
if ((INTN)idx_highlight_prev == config->idx_default_efivar) if ((INTN)idx_highlight_prev == config->idx_default_efivar)
print_at(x_start , y_start + idx_highlight_prev - idx_first, COLOR_NORMAL, (CHAR16*) L"=>"); print_at(x_start , y_start + idx_highlight_prev - idx_first, COLOR_ENTRY, (CHAR16*) L"=>");
if ((INTN)idx_highlight == config->idx_default_efivar) if ((INTN)idx_highlight == config->idx_default_efivar)
print_at(x_start, y_start + idx_highlight - idx_first, COLOR_HIGHLIGHT, (CHAR16*) L"=>"); print_at(x_start, y_start + idx_highlight - idx_first, COLOR_HIGHLIGHT, (CHAR16*) L"=>");
highlight = FALSE; highlight = FALSE;
@ -802,10 +801,14 @@ static BOOLEAN menu_run(
/* only the options of configured entries can be edited */ /* only the options of configured entries can be edited */
if (!config->editor || config->entries[idx_highlight]->type == LOADER_UNDEFINED) if (!config->editor || config->entries[idx_highlight]->type == LOADER_UNDEFINED)
break; break;
print_at(0, y_max - 1, COLOR_NORMAL, clearline + 1); /* The edit line may end up on the last line of the screen. And even though we're
if (line_edit(config->entries[idx_highlight]->options, &config->options_edit, x_max-1, y_max-1)) * not telling the firmware to advance the line, it still does in this one case,
exit = TRUE; * causing a scroll to happen that screws with our beautiful boot loader output.
print_at(0, y_max - 1, COLOR_NORMAL, clearline + 1); * Since we cannot paint the last character of the edit line, we simply start
* at x-offset 1 for symmetry. */
print_at(1, y_max - 1, COLOR_EDIT, clearline + 2);
exit = line_edit(config->entries[idx_highlight]->options, &config->options_edit, x_max-2, y_max-1);
print_at(1, y_max - 1, COLOR_NORMAL, clearline + 2);
break; break;
case KEYPRESS(0, 0, 'v'): case KEYPRESS(0, 0, 'v'):

7
src/boot/efi/meson.build
View File

@ -103,6 +103,13 @@ if have_gnu_efi
efi_conf.set10('ENABLE_TPM', get_option('tpm')) efi_conf.set10('ENABLE_TPM', get_option('tpm'))
efi_conf.set('SD_TPM_PCR', get_option('tpm-pcrindex')) efi_conf.set('SD_TPM_PCR', get_option('tpm-pcrindex'))
foreach ctype : ['color-normal', 'color-entry', 'color-highlight', 'color-edit']
c = get_option('efi-' + ctype).split(',')
fg = 'EFI_' + c[0].strip().underscorify().to_upper()
bg = 'EFI_BACKGROUND_' + c[1].strip().underscorify().to_upper()
efi_conf.set(ctype.underscorify().to_upper(), '(' + fg + '|' + bg + ')')
endforeach
if get_option('sbat-distro') != '' if get_option('sbat-distro') != ''
efi_conf.set_quoted('SBAT_PROJECT', meson.project_name()) efi_conf.set_quoted('SBAT_PROJECT', meson.project_name())
efi_conf.set_quoted('PROJECT_VERSION', meson.project_version()) efi_conf.set_quoted('PROJECT_VERSION', meson.project_version())