Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

menu: Add option to hide help text

Browse Source
This commit is contained in:
mekb 2023-08-04 22:53:42 +10:00
parent 6be9666290
commit 29e93762f7
No known key found for this signature in database
GPG Key ID: 39F3751CDD35BB5F
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONFIG.md
View File

@ -69,6 +69,7 @@ Limine interface control options.
* `INTERFACE_BRANDING` - A string that will be displayed on top of the Limine interface. * `INTERFACE_BRANDING` - A string that will be displayed on top of the Limine interface.
* `INTERFACE_BRANDING_COLOUR` - A value between 0 and 7 specifying the colour of the branding string. Default is cyan (6). * `INTERFACE_BRANDING_COLOUR` - A value between 0 and 7 specifying the colour of the branding string. Default is cyan (6).
* `INTERFACE_BRANDING_COLOR` - Alias of `INTERFACE_BRANDING_COLOUR`. * `INTERFACE_BRANDING_COLOR` - Alias of `INTERFACE_BRANDING_COLOUR`.
* `INTERFACE_HELP_HIDDEN` - Hides the help text located at the top of the screen showing the key bindings.
Limine graphical terminal control options. They are ignored if using text mode. Limine graphical terminal control options. They are ignored if using text mode.

1
common/lib/misc.c
View File

@ -20,6 +20,7 @@ UINT32 efi_desc_ver = 0;
#endif #endif
bool editor_enabled = true; bool editor_enabled = true;
bool help_hidden = false;
bool parse_resolution(size_t *width, size_t *height, size_t *bpp, const char *buf) { bool parse_resolution(size_t *width, size_t *height, size_t *bpp, const char *buf) {
size_t res[3] = {0}; size_t res[3] = {0};

2
common/lib/misc.h
View File

@ -36,7 +36,7 @@ extern struct volume *boot_volume;
extern bool stage3_loaded; extern bool stage3_loaded;
#endif #endif
extern bool quiet, serial, editor_enabled, hash_mismatch_panic; extern bool quiet, serial, editor_enabled, help_hidden, hash_mismatch_panic;
bool parse_resolution(size_t *width, size_t *height, size_t *bpp, const char *buf); bool parse_resolution(size_t *width, size_t *height, size_t *bpp, const char *buf);

23
common/menu.c
View File

@ -692,6 +692,11 @@ noreturn void _menu(bool first_run) {
editor_enabled = strcmp(editor_enabled_str, "yes") == 0; editor_enabled = strcmp(editor_enabled_str, "yes") == 0;
} }
char *help_hidden_str = config_get_value(NULL, 0, "INTERFACE_HELP_HIDDEN");
if (help_hidden_str != NULL) {
help_hidden = strcmp(help_hidden_str, "yes") == 0;
}
menu_branding = config_get_value(NULL, 0, "INTERFACE_BRANDING"); menu_branding = config_get_value(NULL, 0, "INTERFACE_BRANDING");
if (menu_branding == NULL) if (menu_branding == NULL)
menu_branding = "Limine " LIMINE_VERSION; menu_branding = "Limine " LIMINE_VERSION;
@ -805,15 +810,17 @@ refresh:
print(serial ? "vvv" : "↓↓↓"); print(serial ? "vvv" : "↓↓↓");
} }
set_cursor_pos_helper(0, 3); if (!help_hidden) {
if (editor_enabled && selected_menu_entry->sub == NULL) { set_cursor_pos_helper(0, 3);
print(" \e[32mARROWS\e[0m Select \e[32mENTER\e[0m Boot \e[32mE\e[0m Edit"); if (editor_enabled && selected_menu_entry->sub == NULL) {
} else { print(" \e[32mARROWS\e[0m Select \e[32mENTER\e[0m Boot \e[32mE\e[0m Edit");
print(" \e[32mARROWS\e[0m Select \e[32mENTER\e[0m %s", } else {
selected_menu_entry->expanded ? "Collapse" : "Expand"); print(" \e[32mARROWS\e[0m Select \e[32mENTER\e[0m %s",
selected_menu_entry->expanded ? "Collapse" : "Expand");
}
set_cursor_pos_helper(terms[0]->cols - 13, 3);
print("\e[32mC\e[0m Console");
} }
set_cursor_pos_helper(terms[0]->cols - 13, 3);
print("\e[32mC\e[0m Console");
set_cursor_pos_helper(x, y); set_cursor_pos_helper(x, y);
} }