--- lbbs/src/screen.c 2025/05/08 08:05:58 1.40 +++ lbbs/src/screen.c 2025/05/15 14:17:53 1.52 @@ -20,12 +20,16 @@ #include "log.h" #include "io.h" #include "screen.h" +#include #include #include -#include -#include #include #include +#include +#include +#include +#include +#include #define ACTIVE_BOARD_HEIGHT 8 @@ -81,7 +85,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) @@ -97,7 +101,7 @@ void set_input_echo(int echo) prints("\xff\xfb\x01\xff\xfb\x03"); iflush(); igetch(0); - igetch(1); + igetch_reset(); } } @@ -108,20 +112,29 @@ 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++) + ; + + igetch_reset(); - while ((c = igetch_t(60))) + while (!SYS_server_exit) { - if (c == KEY_NULL || c == KEY_TIMEOUT || c == CR) + c = igetch_t(MIN(MAX_DELAY_TIME, 60)); + + if (c == CR) { - igetch(1); // Cleanup remaining '\n' in the buffer + igetch_reset(); break; } - if (c == LF) + else if (c == KEY_TIMEOUT || c == KEY_NULL) // timeout or broken pipe + { + return -1; + } + else if (c == LF || c == '\0') { continue; } - if (c == BACKSPACE) + else if (c == BACKSPACE) { if (offset > 0) { @@ -142,29 +155,32 @@ 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 { - igetch(1); // Cleanup remaining input + igetch(0); // Ignore 1 character outc('\a'); iflush(); continue; } hz = (!hz); } + if (offset + 1 > buf_size - 1) { outc('\a'); iflush(); continue; } + buffer[offset++] = (char)c; buffer[offset] = '\0'; + switch (echo_mode) { case DOECHO: @@ -201,8 +217,6 @@ int get_data(int row, int col, char *pro { int len; - igetch(1); // Cleanup input buffer - moveto(row, col); prints(prompt); prints(buffer); @@ -213,63 +227,56 @@ int get_data(int row, int col, char *pro return len; } -int display_file(const char *filename) -{ - char buffer[LINE_BUFFER_LEN]; - FILE *fin; - size_t i; - - if ((fin = fopen(filename, "r")) == NULL) - { - return -1; - } - - while (fgets(buffer, sizeof(buffer) - 1, fin)) - { - i = strnlen(buffer, sizeof(buffer) - 1); - if (buffer[i - 1] == '\n' && buffer[i - 2] != '\r') - { - buffer[i - 1] = '\r'; - buffer[i] = '\n'; - buffer[i + 1] = '\0'; - } - prints(buffer); - iflush(); - } - fclose(fin); - - return 0; -} - int display_file_ex(const char *filename, int begin_line, int wait) { static int show_help = 1; char buffer[LINE_BUFFER_LEN]; + void *p_data; int ch = 0; int input_ok, line, max_lines; long int c_line_current = 0; long int c_line_total = 0; - FILE *fin; + int fd; + struct stat sb; long *p_line_offsets; long int len; long int percentile; int loop = 1; - if ((fin = fopen(filename, "r")) == NULL) + if ((fd = open(filename, O_RDONLY)) < 0) + { + log_error("open(%s) error (%d)\n", filename, errno); + return -1; + } + + if (fstat(fd, &sb) < 0) { - log_error("Unable to open file %s\n", filename); + log_error("fstat(fd) error (%d)\n", errno); + return -1; + } + + p_data = mmap(NULL, (size_t)sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0L); + if (p_data == MAP_FAILED) + { + log_error("mmap() error (%d)\n", errno); + return -2; + } + + if (close(fd) < 0) + { + log_error("close(fd) error (%d)\n", errno); return -1; } p_line_offsets = (long *)malloc(sizeof(long) * MAX_FILE_LINES); - c_line_total = split_file_lines(fin, screen_cols, p_line_offsets, MAX_FILE_LINES); + c_line_total = split_data_lines(p_data, screen_cols, p_line_offsets, MAX_FILE_LINES); clrline(begin_line, screen_rows); line = begin_line; max_lines = screen_rows - 1; - while (loop) + while (!SYS_server_exit && loop) { if (c_line_current >= c_line_total && c_line_total <= screen_rows - 2) { @@ -304,12 +311,27 @@ int display_file_ex(const char *filename iflush(); input_ok = 0; - while (!input_ok) + while (!SYS_server_exit && !input_ok) { ch = igetch_t(MAX_DELAY_TIME); input_ok = 1; switch (ch) { + case KEY_NULL: + case KEY_TIMEOUT: + goto cleanup; + case KEY_HOME: + c_line_current = 0; + line = begin_line; + max_lines = screen_rows - 1; + clrline(begin_line, screen_rows); + break; + case KEY_END: + c_line_current = c_line_total - (screen_rows - 2); + line = begin_line; + max_lines = screen_rows - 1; + clrline(begin_line, screen_rows); + break; case KEY_UP: if (c_line_current - line < 0) // Reach top { @@ -321,8 +343,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; @@ -366,8 +389,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': @@ -393,26 +414,27 @@ int display_file_ex(const char *filename clrline(begin_line, screen_rows); break; default: + log_std("Input: %d\n", ch); input_ok = 0; break; } + + BBS_last_access_tm = time(0); } continue; } - fseek(fin, p_line_offsets[c_line_current], SEEK_SET); len = p_line_offsets[c_line_current + 1] - p_line_offsets[c_line_current]; if (len >= LINE_BUFFER_LEN) { log_error("Error length exceeds buffer size: %d\n", len); len = LINE_BUFFER_LEN - 1; } - if (fgets(buffer, (int)len + 1, fin) == NULL) - { - log_error("Reach EOF\n"); - break; - } + + memcpy(buffer, (const char *)p_data + p_line_offsets[c_line_current], (size_t)len); + buffer[len] = '\0'; + moveto(line, 0); clrtoeol(); prints("%s", buffer); @@ -420,8 +442,13 @@ int display_file_ex(const char *filename line++; } +cleanup: + if (munmap(p_data, (size_t)sb.st_size) < 0) + { + log_error("munmap() error (%d)\n", errno); + } + free(p_line_offsets); - fclose(fin); return ch; } @@ -430,7 +457,7 @@ int show_top(char *status) { int end_of_line; int display_len; - unsigned int len; + int len; char space1[LINE_BUFFER_LEN]; char space2[LINE_BUFFER_LEN]; @@ -488,7 +515,7 @@ int show_active_board() char buffer[LINE_BUFFER_LEN]; FILE *fin; static int line; - unsigned int len; + int len; int end_of_line; int display_len;