mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-13 14:59:34 +02:00
81dc1a7f89
NOTE: gfxterm_menu module removed, because of this change by upstream: commit ca2a91f43bf6e1df23a07c295534f871ddf2d401 Author: Glenn Washburn <development@efficientek.com> Date: Mon May 5 16:11:36 2025 -0500 tests: Disable gfxterm_menu and cmdline_cat tests This brings in the following changes from upstream: * a68a7dece loader/i386/pc/linux: Fix resource leak * de80acf36 loader/efi/linux: Unload previous Linux kernel/initrd before updating kernel size * 249db11d8 loader/efi/linux: Correctly terminate load_options member * f3b339af1 loader/efi/linux: Use sizeof() instead of constant * c2b2e0dcf loader/efi/linux: Use proper type for len variable * de4e8e2aa loader/efi/linux: Do not pass excessive size for source string * 8c8f96664 loader/efi/linux: Remove useless assignment * 8ebf155af include/grub/charset.h: Update documentation * 2f2ed28d5 Revert "lzma: Make sure we don't dereference past array" * 2539ede82 tests/util/grub-shell: Correct netboot and file_filter test failure * 8c2d4e64f normal/charset: Fix underflow and overflow in loop init * ba8eadde6 dl: Provide a fake grub_dl_set_persistent() and grub_dl_is_persistent() for the emu target * 409e72ced util/grub-protect: Correct uninit "err" variable * 5eca564b1 gnulib: Bring back the fix for resolving unused variable issue * ac1512b87 gnulib: Add patch to allow GRUB w/GCC-15 compile * db506b3b8 gnulib/regexec: Fix resource leak * bba7dd736 gnulib/regcomp: Fix resource leak * 91cb7ff6b tests/tpm2_key_protector_test: Add tests for SHA-384 PCR bank * 451e227e5 tpm2_key_protector: Dump the PCR bank for key unsealing * 11caacdb2 util/grub-protect: Fix the hash algorithm of PCR digest * ce23919ca build: Add new header files to dist to allow building from tar * e3b15bafd build: Remove extra_deps.lst from EXTRA_DIST * 40e261b89 lib/LzmaEnc: Validate "len" before subtracting * 86e8f2c4b osdep/unix/hostdisk: Fix signed integer overflow * 438f05581 disk/luks2: Add attempting to decrypt message to align with luks and geli modules * 20e6d0c4a osdep/linux/getroot: Detect DDF container similar to IMSM * b71bc0f8b fs/fshelp: Avoid possible NULL pointer deference * 272ff81cb fs/ntfs: Correct possible infinite loops/hangs * 8c95307a0 fs/ntfs: Correct possible access violations * 06914b614 fs/ntfs: Correct attribute vs attribute list validation * 0e1762c8a fs/ntfs: Correct regression with run list calculation * be303f8c1 lib/envblk: Ignore empty new lines while parsing env files * 34bd00ee2 fs/zfs: Fix another memory leak in ZFS code * ca2a91f43 tests: Disable gfxterm_menu and cmdline_cat tests Signed-off-by: Leah Rowe <leah@libreboot.org>
91 lines
3.2 KiB
Diff
91 lines
3.2 KiB
Diff
From dae0cfdbb484eb3576300ad9c4d2c362f4e8fa64 Mon Sep 17 00:00:00 2001
|
|
From: Leah Rowe <leah@libreboot.org>
|
|
Date: Sun, 31 Oct 2021 03:47:05 +0000
|
|
Subject: [PATCH 01/14] mitigate grub's missing characters for borders/arrow
|
|
characters
|
|
|
|
This cleans up the display on the main screen in GRUB.
|
|
|
|
Just don't draw a border, at all.
|
|
---
|
|
grub-core/normal/menu_text.c | 49 ++----------------------------------
|
|
1 file changed, 2 insertions(+), 47 deletions(-)
|
|
|
|
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
|
|
index 9c383e64a..8ec1dd1e8 100644
|
|
--- a/grub-core/normal/menu_text.c
|
|
+++ b/grub-core/normal/menu_text.c
|
|
@@ -108,47 +108,6 @@ grub_print_message_indented (const char *msg, int margin_left, int margin_right,
|
|
grub_print_message_indented_real (msg, margin_left, margin_right, term, 0);
|
|
}
|
|
|
|
-static void
|
|
-draw_border (struct grub_term_output *term, const struct grub_term_screen_geometry *geo)
|
|
-{
|
|
- int i;
|
|
-
|
|
- grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
|
|
-
|
|
- grub_term_gotoxy (term, (struct grub_term_coordinate) { geo->first_entry_x - 1,
|
|
- geo->first_entry_y - 1 });
|
|
- grub_putcode (GRUB_UNICODE_CORNER_UL, term);
|
|
- for (i = 0; i < geo->entry_width + 1; i++)
|
|
- grub_putcode (GRUB_UNICODE_HLINE, term);
|
|
- grub_putcode (GRUB_UNICODE_CORNER_UR, term);
|
|
-
|
|
- for (i = 0; i < geo->num_entries; i++)
|
|
- {
|
|
- grub_term_gotoxy (term, (struct grub_term_coordinate) { geo->first_entry_x - 1,
|
|
- geo->first_entry_y + i });
|
|
- grub_putcode (GRUB_UNICODE_VLINE, term);
|
|
- grub_term_gotoxy (term,
|
|
- (struct grub_term_coordinate) { geo->first_entry_x + geo->entry_width + 1,
|
|
- geo->first_entry_y + i });
|
|
- grub_putcode (GRUB_UNICODE_VLINE, term);
|
|
- }
|
|
-
|
|
- grub_term_gotoxy (term,
|
|
- (struct grub_term_coordinate) { geo->first_entry_x - 1,
|
|
- geo->first_entry_y - 1 + geo->num_entries + 1 });
|
|
- grub_putcode (GRUB_UNICODE_CORNER_LL, term);
|
|
- for (i = 0; i < geo->entry_width + 1; i++)
|
|
- grub_putcode (GRUB_UNICODE_HLINE, term);
|
|
- grub_putcode (GRUB_UNICODE_CORNER_LR, term);
|
|
-
|
|
- grub_term_setcolorstate (term, GRUB_TERM_COLOR_NORMAL);
|
|
-
|
|
- grub_term_gotoxy (term,
|
|
- (struct grub_term_coordinate) { geo->first_entry_x - 1,
|
|
- (geo->first_entry_y - 1 + geo->num_entries
|
|
- + GRUB_TERM_MARGIN + 1) });
|
|
-}
|
|
-
|
|
static int
|
|
print_message (int nested, int edit, struct grub_term_output *term, int dry_run)
|
|
{
|
|
@@ -167,10 +126,8 @@ command-line or ESC to discard edits and return to the GRUB menu."),
|
|
{
|
|
char *msg_translated;
|
|
|
|
- msg_translated = grub_xasprintf (_("Use the %C and %C keys to select which "
|
|
- "entry is highlighted."),
|
|
- GRUB_UNICODE_UPARROW,
|
|
- GRUB_UNICODE_DOWNARROW);
|
|
+ msg_translated = grub_xasprintf (_("Use the arrow keys to select which "
|
|
+ "entry is highlighted."));
|
|
if (!msg_translated)
|
|
return 0;
|
|
ret += grub_print_message_indented_real (msg_translated, STANDARD_MARGIN,
|
|
@@ -413,8 +370,6 @@ grub_menu_init_page (int nested, int edit,
|
|
|
|
grub_term_normal_color = grub_color_menu_normal;
|
|
grub_term_highlight_color = grub_color_menu_highlight;
|
|
- if (geo->border)
|
|
- draw_border (term, geo);
|
|
grub_term_normal_color = old_color_normal;
|
|
grub_term_highlight_color = old_color_highlight;
|
|
geo->timeout_y = geo->first_entry_y + geo->num_entries
|
|
--
|
|
2.39.5
|
|
|