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

menu: Cleanup way escaping editor is handled and check for \n instead of \r in main menu

Browse Source
This commit is contained in:
mintsuki 2020-12-15 07:45:59 +01:00
parent 22ba144d98
commit 9538d62068
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
limine-pxe.bin
View File

Binary file not shown.

BIN
limine.bin
View File

Binary file not shown.

BIN
stage2.map
View File

Binary file not shown.

14
stage2/menu.c
View File

@ -86,7 +86,7 @@ static size_t get_prev_line(size_t index, const char *buffer) {
return offset; return offset;
} }
static char *config_entry_editor(bool *ret, const char *orig_entry) { static char *config_entry_editor(const char *orig_entry) {
size_t cursor_offset = 0; size_t cursor_offset = 0;
size_t entry_size = strlen(orig_entry); size_t entry_size = strlen(orig_entry);
@ -169,13 +169,11 @@ refresh:
} }
break; break;
case GETCHAR_F10: case GETCHAR_F10:
*ret = false;
disable_cursor(); disable_cursor();
return buffer; return buffer;
case '\e': case '\e':
*ret = true;
disable_cursor(); disable_cursor();
return (char *)orig_entry; return NULL;
default: default:
if (strlen(buffer) < EDITOR_MAX_BUFFER_SIZE - 1) { if (strlen(buffer) < EDITOR_MAX_BUFFER_SIZE - 1) {
for (size_t i = strlen(buffer); ; i--) { for (size_t i = strlen(buffer); ; i--) {
@ -387,7 +385,7 @@ timeout_aborted:
if (++selected_entry == max_entries) if (++selected_entry == max_entries)
selected_entry = 0; selected_entry = 0;
goto refresh; goto refresh;
case '\r': case '\n':
autoboot: autoboot:
if (selected_menu_entry->sub != NULL) { if (selected_menu_entry->sub != NULL) {
selected_menu_entry->expanded = !selected_menu_entry->expanded; selected_menu_entry->expanded = !selected_menu_entry->expanded;
@ -408,10 +406,10 @@ timeout_aborted:
if (selected_menu_entry->sub != NULL) if (selected_menu_entry->sub != NULL)
goto refresh; goto refresh;
enable_cursor(); enable_cursor();
bool ret; char *new_body = config_entry_editor(selected_menu_entry->body);
selected_menu_entry->body = config_entry_editor(&ret, selected_menu_entry->body); if (new_body == NULL)
if (ret)
goto refresh; goto refresh;
selected_menu_entry->body = new_body;
goto autoboot; goto autoboot;
} }
} }