--- lbbs/src/screen.c 2025/05/17 12:28:47 1.60 +++ lbbs/src/screen.c 2025/05/19 06:55:06 1.65 @@ -48,7 +48,7 @@ void moveto(int row, int col) void clrtoeol() { - prints("\033[K"); + prints(CTRL_SEQ_CLR_LINE); } void clrline(int line_begin, int line_end) @@ -58,7 +58,7 @@ void clrline(int line_begin, int line_en for (i = line_begin; i <= line_end; i++) { moveto(i, 0); - prints("\033[K"); + prints(CTRL_SEQ_CLR_LINE); } } @@ -232,26 +232,21 @@ int display_file_ex(const char *filename int ch = KEY_NULL; int input_ok, line, max_lines; long int line_current = 0; - const void *p_file_shm; - const void *p_data; + const void *p_shm; size_t data_len; long line_total; + const void *p_data; const long *p_line_offsets; long int len; long int percentile; int loop; - if ((p_file_shm = get_file_shm(filename)) == NULL) + if ((p_shm = get_file_shm(filename, &data_len, &line_total, &p_data, &p_line_offsets)) == NULL) { log_error("get_file_shm(%s) error\n", filename); return KEY_NULL; } - data_len = *((size_t *)p_file_shm); - line_total = *((long *)(p_file_shm + sizeof(size_t))); - p_data = p_file_shm + sizeof(data_len) + sizeof(line_total); - p_line_offsets = p_data + data_len + 1; - clrline(begin_line, SCREEN_ROWS); line = begin_line; max_lines = SCREEN_ROWS - 1; @@ -408,7 +403,8 @@ int display_file_ex(const char *filename len = p_line_offsets[line_current + 1] - p_line_offsets[line_current]; if (len >= LINE_BUFFER_LEN) { - log_error("Error length exceeds buffer size: %d\n", len); + log_error("buffer overflow: len=%ld(%ld - %ld) line=%ld \n", + len, p_line_offsets[line_current + 1], p_line_offsets[line_current], line_current); len = LINE_BUFFER_LEN - 1; } @@ -423,11 +419,6 @@ int display_file_ex(const char *filename } cleanup: - if (shmdt(p_file_shm) == -1) - { - log_error("shmdt() error (%d)\n", errno); - } - return ch; } @@ -458,8 +449,7 @@ int show_top(const char *status) moveto(1, 0); clrtoeol(); prints("\033[1;44;33m%s\033[37m%*s%*s\033[33m ÌÖÂÛÇø [%s]\033[m", - status_f, 32, BBS_name, 26, "", BBS_current_section_name); - iflush(); + status_f, 44 - status_len, BBS_name, 26 - section_name_len, "", BBS_current_section_name); return 0; } @@ -498,7 +488,6 @@ int show_bottom(const char *msg) "[\033[36m%1d\033[33m:\033[36m%2d\033[33m:\033[36m%2d\033[33m]\033[m", str_time, 21, msg_f, 13 - len_username, "", BBS_username, tm_online->tm_mday - 1, tm_online->tm_hour, tm_online->tm_min); - iflush(); return 0; } @@ -506,37 +495,46 @@ int show_bottom(const char *msg) int show_active_board() { static int line_current = 0; - static const void *p_file_shm = NULL; - static const void *p_data; + static const void *p_shm = NULL; static size_t data_len; static long line_total; + static const void *p_data; static const long *p_line_offsets; + static time_t t_last_show = 0; + static int line_last = 0; + char buffer[LINE_BUFFER_LEN]; long int len; - if (p_file_shm == NULL) + if (p_shm == NULL) { - if ((p_file_shm = get_file_shm(DATA_ACTIVE_BOARD)) == NULL) + if ((p_shm = get_file_shm(DATA_ACTIVE_BOARD, &data_len, &line_total, &p_data, &p_line_offsets)) == NULL) { log_error("get_file_shm(%s) error\n", DATA_ACTIVE_BOARD); return KEY_NULL; } + } - data_len = *((size_t *)p_file_shm); - line_total = *((long *)(p_file_shm + sizeof(size_t))); - p_data = p_file_shm + sizeof(data_len) + sizeof(line_total); - p_line_offsets = p_data + data_len + 1; + if (time(0) - t_last_show >= 10) + { + line_last = line_current; + t_last_show = time(0); + } + else + { + line_current = line_last; } - clrline(3, 2 + ACTIVE_BOARD_HEIGHT); + clrline(2, 2 + ACTIVE_BOARD_HEIGHT); for (int i = 0; i < ACTIVE_BOARD_HEIGHT; i++) { len = p_line_offsets[line_current + 1] - p_line_offsets[line_current]; if (len >= LINE_BUFFER_LEN) { - log_error("Error length exceeds buffer size: %d\n", len); + log_error("buffer overflow: len=%ld(%ld - %ld) line=%ld \n", + len, p_line_offsets[line_current + 1], p_line_offsets[line_current], line_current); len = LINE_BUFFER_LEN - 1; } @@ -553,7 +551,6 @@ int show_active_board() break; } } - iflush(); return 0; }