--- lbbs/src/screen.c 2025/05/08 08:05:58 1.40 +++ lbbs/src/screen.c 2025/05/10 14:37:04 1.43 @@ -22,10 +22,11 @@ #include "screen.h" #include #include -#include -#include #include #include +#include +#include +#include #define ACTIVE_BOARD_HEIGHT 8 @@ -81,7 +82,7 @@ int press_any_key() prints(" \033[1;33m°´ÈÎÒâ¼ü¼ÌÐø...\033[0;37m"); iflush(); - return igetch_t(60); + return igetch_t(MIN(MAX_DELAY_TIME, 60)); } void set_input_echo(int echo) @@ -108,20 +109,25 @@ static int _str_input(char *buffer, int int hz = 0; buffer[buf_size - 1] = '\0'; - for (offset = 0; offset < buf_size - 1 && buffer[offset] != '\0'; offset++); + for (offset = 0; offset < buf_size - 1 && buffer[offset] != '\0'; offset++) + ; - while ((c = igetch_t(60))) + while ((c = igetch_t(MIN(MAX_DELAY_TIME, 60)))) { - if (c == KEY_NULL || c == KEY_TIMEOUT || c == CR) + if (c == CR) { igetch(1); // Cleanup remaining '\n' in the buffer break; } - if (c == LF) + else if (c == KEY_TIMEOUT) + { + return -1; + } + else if (c == KEY_NULL || c == LF) { continue; } - if (c == BACKSPACE) + else if (c == BACKSPACE) { if (offset > 0) { @@ -142,11 +148,11 @@ static int _str_input(char *buffer, int } continue; } - if (c > 255 || iscntrl(c)) + else if (c > 255 || iscntrl(c)) { continue; } - if (c > 127 && c <= 255) + else if (c > 127 && c <= 255) { if (!hz && offset + 2 > buf_size - 1) // No enough space for Chinese character { @@ -157,14 +163,17 @@ static int _str_input(char *buffer, int } hz = (!hz); } + if (offset + 1 > buf_size - 1) { outc('\a'); iflush(); continue; } + buffer[offset++] = (char)c; buffer[offset] = '\0'; + switch (echo_mode) { case DOECHO: @@ -310,6 +319,8 @@ int display_file_ex(const char *filename input_ok = 1; switch (ch) { + case KEY_TIMEOUT: + goto cleanup; case KEY_UP: if (c_line_current - line < 0) // Reach top { @@ -366,8 +377,6 @@ int display_file_ex(const char *filename max_lines = screen_rows - 1; clrline(begin_line, screen_rows); break; - case KEY_NULL: - case KEY_TIMEOUT: case KEY_LEFT: case 'q': case 'Q': @@ -396,6 +405,8 @@ int display_file_ex(const char *filename input_ok = 0; break; } + + BBS_last_access_tm = time(0); } continue; @@ -420,6 +431,7 @@ int display_file_ex(const char *filename line++; } +cleanup: free(p_line_offsets); fclose(fin);