--- lbbs/src/screen.c 2025/05/11 11:33:44 1.45 +++ lbbs/src/screen.c 2025/05/15 05:14:57 1.49 @@ -98,7 +98,7 @@ void set_input_echo(int echo) prints("\xff\xfb\x01\xff\xfb\x03"); iflush(); igetch(0); - igetch(1); + igetch_reset(); } } @@ -112,11 +112,15 @@ static int _str_input(char *buffer, int for (offset = 0; offset < buf_size - 1 && buffer[offset] != '\0'; offset++) ; - while (!SYS_server_exit && (c = igetch_t(MIN(MAX_DELAY_TIME, 60)))) + igetch_reset(); + + while (!SYS_server_exit) { + c = igetch_t(MIN(MAX_DELAY_TIME, 60)); + if (c == CR) { - igetch(1); // Cleanup remaining '\n' in the buffer + igetch_reset(); break; } else if (c == KEY_TIMEOUT || c == KEY_NULL) // timeout or broken pipe @@ -156,7 +160,7 @@ static int _str_input(char *buffer, int { if (!hz && offset + 2 > buf_size - 1) // No enough space for Chinese character { - igetch(1); // Cleanup remaining input + igetch(0); // Ignore 1 character outc('\a'); iflush(); continue; @@ -210,8 +214,6 @@ int get_data(int row, int col, char *pro { int len; - igetch(1); // Cleanup input buffer - moveto(row, col); prints(prompt); prints(buffer); @@ -319,6 +321,7 @@ int display_file_ex(const char *filename input_ok = 1; switch (ch) { + case KEY_NULL: case KEY_TIMEOUT: goto cleanup; case KEY_UP: @@ -332,8 +335,9 @@ int display_file_ex(const char *filename // prints("\033[T"); // Scroll down 1 line max_lines = screen_rows - 1; // Legacy Fterm only works with this line break; - case KEY_DOWN: case CR: + igetch_reset(); + case KEY_DOWN: if (c_line_current + ((screen_rows - 2) - (line - 1)) >= c_line_total) // Reach bottom { break;