--- lbbs/src/screen.c 2025/05/10 13:17:36 1.42 +++ lbbs/src/screen.c 2025/05/16 14:09:31 1.54 @@ -14,25 +14,26 @@ * * ***************************************************************************/ +#include "screen.h" #include "bbs.h" #include "common.h" #include "str_process.h" #include "log.h" #include "io.h" -#include "screen.h" +#include "file_loader.h" +#include #include #include #include #include +#include #include #include #include +#include #define ACTIVE_BOARD_HEIGHT 8 -int screen_rows = 24; -int screen_cols = 80; - void moveto(int row, int col) { if (row >= 0) @@ -76,7 +77,7 @@ void clearscr() int press_any_key() { - moveto(screen_rows, 0); + moveto(SCREEN_ROWS, 0); clrtoeol(); prints(" \033[1;33m按任意键继续...\033[0;37m"); @@ -98,7 +99,7 @@ void set_input_echo(int echo) prints("\xff\xfb\x01\xff\xfb\x03"); iflush(); igetch(0); - igetch(1); + igetch_reset(); } } @@ -112,22 +113,26 @@ static int _str_input(char *buffer, int for (offset = 0; offset < buf_size - 1 && buffer[offset] != '\0'; offset++) ; - while ((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; } - if (c == KEY_TIMEOUT) + else if (c == KEY_TIMEOUT || c == KEY_NULL) // timeout or broken pipe { return -1; } - if (c == KEY_NULL || c == LF) + else if (c == LF || c == '\0') { continue; } - if (c == BACKSPACE) + else if (c == BACKSPACE) { if (offset > 0) { @@ -148,29 +153,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: @@ -207,8 +215,6 @@ int get_data(int row, int col, char *pro { int len; - igetch(1); // Cleanup input buffer - moveto(row, col); prints(prompt); prints(buffer); @@ -219,65 +225,41 @@ 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]; - int ch = 0; + int ch = KEY_NULL; int input_ok, line, max_lines; - long int c_line_current = 0; - long int c_line_total = 0; - FILE *fin; - long *p_line_offsets; + long int line_current = 0; + const FILE_MMAP *p_file_mmap; long int len; long int percentile; - int loop = 1; + int loop; - if ((fin = fopen(filename, "r")) == NULL) + if ((p_file_mmap = get_file_mmap(filename)) == NULL) { - log_error("Unable to open file %s\n", filename); - return -1; - } - - p_line_offsets = (long *)malloc(sizeof(long) * MAX_FILE_LINES); + if (load_file_mmap(filename) < 0) + { + log_error("load_file_mmap(%s) error\n", filename); + return KEY_NULL; + } - c_line_total = split_file_lines(fin, screen_cols, p_line_offsets, MAX_FILE_LINES); + if ((p_file_mmap = get_file_mmap(filename)) == NULL) + { + log_error("get_file_mmap(%s) error\n", filename); + return KEY_NULL; + } + } - clrline(begin_line, screen_rows); + clrline(begin_line, SCREEN_ROWS); line = begin_line; - max_lines = screen_rows - 1; + max_lines = SCREEN_ROWS - 1; - while (loop) + loop = 1; + while (!SYS_server_exit && loop) { - if (c_line_current >= c_line_total && c_line_total <= screen_rows - 2) + if (line_current >= p_file_mmap->line_total && p_file_mmap->line_total <= SCREEN_ROWS - 2) { if (wait) { @@ -292,25 +274,25 @@ int display_file_ex(const char *filename break; } - if (c_line_current >= c_line_total || line >= max_lines) + if (line_current >= p_file_mmap->line_total || line >= max_lines) { - if (c_line_current - (line - 1) + (screen_rows - 2) < c_line_total) + if (line_current - (line - 1) + (SCREEN_ROWS - 2) < p_file_mmap->line_total) { - percentile = (c_line_current - (line - 1) + (screen_rows - 2)) * 100 / c_line_total; + percentile = (line_current - (line - 1) + (SCREEN_ROWS - 2)) * 100 / p_file_mmap->line_total; } else { percentile = 100; } - moveto(screen_rows, 0); + moveto(SCREEN_ROWS, 0); prints("\033[1;44;32m%s (%d%%)%s\033[33m │ 结束 ← │ ↑/↓/PgUp/PgDn 移动 │ ? 辅助说明 │ \033[m", (percentile < 100 ? "下面还有喔" : "没有更多了"), percentile, (percentile < 10 ? " " : (percentile < 100 ? " " : ""))); iflush(); input_ok = 0; - while (!input_ok) + while (!SYS_server_exit && !input_ok) { ch = igetch_t(MAX_DELAY_TIME); input_ok = 1; @@ -319,61 +301,74 @@ int display_file_ex(const char *filename case KEY_NULL: case KEY_TIMEOUT: goto cleanup; + case KEY_HOME: + line_current = 0; + line = begin_line; + max_lines = SCREEN_ROWS - 1; + clrline(begin_line, SCREEN_ROWS); + break; + case KEY_END: + line_current = p_file_mmap->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 + if (line_current - line < 0) // Reach top { break; } - c_line_current -= line; + line_current -= line; line = begin_line; // max_lines = begin_line + 1; // prints("\033[T"); // Scroll down 1 line - max_lines = screen_rows - 1; // Legacy Fterm only works with this line + max_lines = SCREEN_ROWS - 1; // Legacy Fterm only works with this line break; - case KEY_DOWN: case CR: - if (c_line_current + ((screen_rows - 2) - (line - 1)) >= c_line_total) // Reach bottom + igetch_reset(); + case KEY_DOWN: + if (line_current + ((SCREEN_ROWS - 2) - (line - 1)) >= p_file_mmap->line_total) // Reach bottom { break; } - c_line_current += ((screen_rows - 2) - (line - 1)); - line = screen_rows - 2; - max_lines = screen_rows - 1; - moveto(screen_rows, 0); + line_current += ((SCREEN_ROWS - 2) - (line - 1)); + line = SCREEN_ROWS - 2; + max_lines = SCREEN_ROWS - 1; + moveto(SCREEN_ROWS, 0); clrtoeol(); prints("\033[S"); // Scroll up 1 line break; case KEY_PGUP: case Ctrl('B'): - if (c_line_current - line < 0) // Reach top + if (line_current - line < 0) // Reach top { break; } - c_line_current -= ((screen_rows - 3) + (line - 1)); - if (c_line_current < 0) + line_current -= ((SCREEN_ROWS - 3) + (line - 1)); + if (line_current < 0) { - c_line_current = 0; + line_current = 0; } line = begin_line; - max_lines = screen_rows - 1; - clrline(begin_line, screen_rows); + max_lines = SCREEN_ROWS - 1; + clrline(begin_line, SCREEN_ROWS); break; case KEY_RIGHT: case KEY_PGDN: case Ctrl('F'): case KEY_SPACE: - if (c_line_current + (screen_rows - 2) - (line - 1) >= c_line_total) // Reach bottom + if (line_current + (SCREEN_ROWS - 2) - (line - 1) >= p_file_mmap->line_total) // Reach bottom { break; } - c_line_current += (screen_rows - 3) - (line - 1); - if (c_line_current + screen_rows - 2 > c_line_total) // No enough lines to display + line_current += (SCREEN_ROWS - 3) - (line - 1); + if (line_current + SCREEN_ROWS - 2 > p_file_mmap->line_total) // No enough lines to display { - c_line_current = c_line_total - (screen_rows - 2); + line_current = p_file_mmap->line_total - (SCREEN_ROWS - 2); } line = begin_line; - max_lines = screen_rows - 1; - clrline(begin_line, screen_rows); + max_lines = SCREEN_ROWS - 1; + clrline(begin_line, SCREEN_ROWS); break; case KEY_LEFT: case 'q': @@ -394,12 +389,13 @@ int display_file_ex(const char *filename show_help = 1; // Refresh after display help information - c_line_current -= (line - 1); + line_current -= (line - 1); line = begin_line; - max_lines = screen_rows - 1; - clrline(begin_line, screen_rows); + max_lines = SCREEN_ROWS - 1; + clrline(begin_line, SCREEN_ROWS); break; default: + log_std("Input: %d\n", ch); input_ok = 0; break; } @@ -410,29 +406,24 @@ int display_file_ex(const char *filename 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]; + len = p_file_mmap->line_offsets[line_current + 1] - p_file_mmap->line_offsets[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_file_mmap->p_data + p_file_mmap->line_offsets[line_current], (size_t)len); + buffer[len] = '\0'; + moveto(line, 0); clrtoeol(); prints("%s", buffer); - c_line_current++; + line_current++; line++; } cleanup: - free(p_line_offsets); - fclose(fin); - return ch; } @@ -440,7 +431,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]; @@ -481,7 +472,7 @@ int show_bottom(char *msg) time_online = time(0) - BBS_login_tm; tm_online = gmtime(&time_online); - moveto(screen_rows, 0); + moveto(SCREEN_ROWS, 0); clrtoeol(); prints("\033[1;44;33m[\033[36m%s\033[33m]%s帐号[\033[36m%s\033[33m]" "[\033[36m%1d\033[33m:\033[36m%2d\033[33m:\033[36m%2d\033[33m]\033[m", @@ -498,7 +489,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; @@ -528,7 +519,7 @@ int show_active_board() break; } line++; - len = split_line(buffer, screen_cols, &end_of_line, &display_len); + len = split_line(buffer, SCREEN_COLS, &end_of_line, &display_len); buffer[len] = '\0'; // Truncate over-length line moveto(3 + i, 0); prints("%s", buffer);