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

menu: Properly handly high number of entries

This commit is contained in:
mintsuki 2022-10-07 07:35:08 +02:00
parent ea412cfae7
commit 15737894cb
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
common/menu.c
View File

@ -493,7 +493,7 @@ refresh:
goto refresh; goto refresh;
} }
static size_t print_tree(const char *shift, size_t level, size_t base_index, size_t selected_entry, static size_t print_tree(size_t offset, size_t window, const char *shift, size_t level, size_t base_index, size_t selected_entry,
struct menu_entry *current_entry, struct menu_entry *current_entry,
struct menu_entry **selected_menu_entry) { struct menu_entry **selected_menu_entry) {
size_t max_entries = 0; size_t max_entries = 0;
@ -506,6 +506,12 @@ static size_t print_tree(const char *shift, size_t level, size_t base_index, siz
for (;;) { for (;;) {
if (current_entry == NULL) if (current_entry == NULL)
break; break;
if (!no_print && base_index + max_entries < offset) {
goto skip_line;
}
if (!no_print && base_index + max_entries >= offset + window) {
goto skip_line;
}
if (!no_print) print("%s", shift); if (!no_print) print("%s", shift);
if (level) { if (level) {
for (size_t i = level - 1; i > 0; i--) { for (size_t i = level - 1; i > 0; i--) {
@ -536,8 +542,9 @@ static size_t print_tree(const char *shift, size_t level, size_t base_index, siz
if (!no_print) print("\e[7m"); if (!no_print) print("\e[7m");
} }
if (!no_print) print(" %s \e[27m\n", current_entry->name); if (!no_print) print(" %s \e[27m\n", current_entry->name);
skip_line:
if (current_entry->sub && current_entry->expanded) { if (current_entry->sub && current_entry->expanded) {
max_entries += print_tree(shift, level + 1, base_index + max_entries + 1, max_entries += print_tree(offset, window, shift, level + 1, base_index + max_entries + 1,
selected_entry, selected_entry,
current_entry->sub, current_entry->sub,
selected_menu_entry); selected_menu_entry);
@ -696,7 +703,7 @@ noreturn void _menu(bool first_run) {
if (!skip_timeout && !timeout) { if (!skip_timeout && !timeout) {
// Use print tree to load up selected_menu_entry and determine if the // Use print tree to load up selected_menu_entry and determine if the
// default entry is valid. // default entry is valid.
print_tree(NULL, 0, 0, selected_entry, menu_tree, &selected_menu_entry); print_tree(0, 0, NULL, 0, 0, selected_entry, menu_tree, &selected_menu_entry);
if (selected_menu_entry == NULL || selected_menu_entry->sub != NULL) { if (selected_menu_entry == NULL || selected_menu_entry->sub != NULL) {
quiet = false; quiet = false;
print("Default entry is not valid or directory, booting to menu.\n"); print("Default entry is not valid or directory, booting to menu.\n");
@ -708,7 +715,16 @@ noreturn void _menu(bool first_run) {
menu_init_term(); menu_init_term();
size_t tree_offset = 0;
refresh: refresh:
if (selected_entry >= tree_offset + term->rows - 10) {
tree_offset = selected_entry - (term->rows - 11);
}
if (selected_entry < tree_offset) {
tree_offset = selected_entry;
}
term->autoflush = false; term->autoflush = false;
term->disable_cursor(term); term->disable_cursor(term);
@ -767,7 +783,7 @@ refresh:
set_cursor_pos_helper(x, y + 2); set_cursor_pos_helper(x, y + 2);
} }
size_t max_entries = print_tree(serial ? "| " : "\xb3 ", 0, 0, selected_entry, menu_tree, size_t max_entries = print_tree(tree_offset, term->rows - 10, serial ? "| " : "\xb3 ", 0, 0, selected_entry, menu_tree,
&selected_menu_entry); &selected_menu_entry);
{ {
@ -831,7 +847,7 @@ timeout_aborted:
int ent = (c - '0') - 1; int ent = (c - '0') - 1;
if (ent < (int)max_entries) { if (ent < (int)max_entries) {
selected_entry = ent; selected_entry = ent;
print_tree(NULL, 0, 0, selected_entry, menu_tree, print_tree(0, 0, NULL, 0, 0, selected_entry, menu_tree,
&selected_menu_entry); &selected_menu_entry);
goto autoboot; goto autoboot;
} }