diff options
| author | Jan Janssen <medhefgo@web.de> | 2023-01-06 17:07:23 +0100 |
|---|---|---|
| committer | Jan Janssen <medhefgo@web.de> | 2023-02-21 14:44:53 +0100 |
| commit | b3e25576290820f16181d7921498caf527b574b3 (patch) | |
| tree | bbb4dedc6bc0a99ab27f7ae29e2ed9061aa98f77 /src/boot | |
| parent | 65d40db7de6b104ab020850272b59df1e6415cd3 (diff) | |
| download | systemd-b3e25576290820f16181d7921498caf527b574b3.tar.gz | |
boot: Use C escape sequence for control chars
This makes things less magical by emphasizing that these are just
regular ascii/unicode chars.
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/efi/boot.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c index 6d4da0c51c..95b9f30df0 100644 --- a/src/boot/efi/boot.c +++ b/src/boot/efi/boot.c @@ -264,7 +264,7 @@ static bool line_edit(char16_t **line_in, size_t x_max, size_t y_pos) { case KEYPRESS(EFI_CONTROL_PRESSED, 0, 'w'): case KEYPRESS(EFI_CONTROL_PRESSED, 0, CHAR_CTRL('w')): - case KEYPRESS(EFI_ALT_PRESSED, 0, CHAR_BACKSPACE): + case KEYPRESS(EFI_ALT_PRESSED, 0, '\b'): /* backward-kill-word */ clear = 0; if ((first + cursor) > 0 && line[first + cursor-1] == ' ') { @@ -307,17 +307,17 @@ static bool line_edit(char16_t **line_in, size_t x_max, size_t y_pos) { len = first + cursor; continue; - case KEYPRESS(0, 0, CHAR_LINEFEED): - case KEYPRESS(0, 0, CHAR_CARRIAGE_RETURN): + case KEYPRESS(0, 0, '\n'): + case KEYPRESS(0, 0, '\r'): case KEYPRESS(0, SCAN_F3, 0): /* EZpad Mini 4s firmware sends malformed events */ - case KEYPRESS(0, SCAN_F3, CHAR_CARRIAGE_RETURN): /* Teclast X98+ II firmware sends malformed events */ + case KEYPRESS(0, SCAN_F3, '\r'): /* Teclast X98+ II firmware sends malformed events */ if (!streq16(line, *line_in)) { free(*line_in); *line_in = TAKE_PTR(line); } return true; - case KEYPRESS(0, 0, CHAR_BACKSPACE): + case KEYPRESS(0, 0, '\b'): if (len == 0) continue; if (first == 0 && cursor == 0) @@ -828,7 +828,7 @@ static bool menu_run( if (firmware_setup) { firmware_setup = false; - if (key == KEYPRESS(0, 0, CHAR_CARRIAGE_RETURN)) + if (IN_SET(key, KEYPRESS(0, 0, '\r'), KEYPRESS(0, 0, '\n'))) reboot_into_firmware(); continue; } @@ -877,10 +877,10 @@ static bool menu_run( idx_highlight = config->entry_count-1; break; - case KEYPRESS(0, 0, CHAR_LINEFEED): - case KEYPRESS(0, 0, CHAR_CARRIAGE_RETURN): + case KEYPRESS(0, 0, '\n'): + case KEYPRESS(0, 0, '\r'): case KEYPRESS(0, SCAN_F3, 0): /* EZpad Mini 4s firmware sends malformed events */ - case KEYPRESS(0, SCAN_F3, CHAR_CARRIAGE_RETURN): /* Teclast X98+ II firmware sends malformed events */ + case KEYPRESS(0, SCAN_F3, '\r'): /* Teclast X98+ II firmware sends malformed events */ case KEYPRESS(0, SCAN_RIGHT, 0): exit = true; break; |