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

boot: fixup returning from editor to menu

Browse Source
This commit is contained in:
K. Lange 2021-10-26 16:33:03 +09:00
parent d17394b6a0
commit 627932d8ab
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
boot/menu.c
View File

@ -31,9 +31,12 @@ void toggle(int ndx, int value, char *str) {
}
}
void show_menu(void) {
if (detect_qemu()) return;
static int timeout_shown = 0;
int s;
int timeout = 4;
@ -48,28 +51,30 @@ void show_menu(void) {
sel_max += base_sel + 1;
clear_();
draw_logo(10);
if (!timeout_shown) {
timeout_shown = 1;
draw_logo(10);
while (1) {
move_cursor(0,15);
*timeout_val = timeout + '0';
set_attr(0x08);
print_banner("Press <Enter> to boot now, <e> to edit command line,");
print_banner("or use \030/\031/\032/\033 to select a menu option.");
print_banner(timeout_msg);
while (1) {
move_cursor(0,15);
*timeout_val = timeout + '0';
set_attr(0x08);
print_banner("Press <Enter> to boot now, <e> to edit command line,");
print_banner("or use \030/\031/\032/\033 to select a menu option.");
print_banner(timeout_msg);
s = read_scancode(!!timeout);
if (timeout && s == -1) {
timeout--;
if (!timeout) {
boot_mode = boot_mode_names[sel].index;
return;
s = read_scancode(1);
if (timeout && s == -1) {
timeout--;
if (!timeout) {
boot_mode = boot_mode_names[sel].index;
return;
}
continue;
}
continue;
}
clear_();
goto _key_read;
clear_();
goto _key_read;
}
}
do {
@ -112,7 +117,7 @@ void show_menu(void) {
}
read_again:
s = read_scancode(!!timeout);
s = read_scancode(0);
_key_read:
timeout = 0;
if (s == 0x50) { /* DOWN */