--- lbbs/src/screen.c 2025/05/17 12:28:47 1.60 +++ lbbs/src/screen.c 2025/05/28 01:04:24 1.70 @@ -34,6 +34,10 @@ #define ACTIVE_BOARD_HEIGHT 8 +#define STR_TOP_LEFT_MAX_LEN 40 +#define STR_TOP_CENTER_MAX_LEN 20 +#define STR_TOP_RIGHT_MAX_LEN 20 + void moveto(int row, int col) { if (row >= 0) @@ -48,7 +52,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 +62,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 +236,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_readonly(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; @@ -298,7 +297,7 @@ int display_file_ex(const char *filename input_ok = 1; switch (ch) { - // case KEY_NULL: + case KEY_NULL: case KEY_TIMEOUT: goto cleanup; case KEY_HOME: @@ -408,7 +407,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,43 +423,44 @@ int display_file_ex(const char *filename } cleanup: - if (shmdt(p_file_shm) == -1) + if (detach_file_shm(p_shm) < 0) { - log_error("shmdt() error (%d)\n", errno); + log_error("detach_file_shm(%s) error\n", filename); } return ch; } -int show_top(const char *status) +int show_top(const char *str_left, const char *str_center) { - char status_f[21]; int truncate; - int status_len; - int section_name_len; + int str_left_len; + int str_center_len; + int str_right_len; int len; - strncpy(status_f, status, sizeof(status_f) - 1); - status_f[sizeof(status_f) - 1] = '\0'; + len = split_line(str_left, STR_TOP_LEFT_MAX_LEN, &truncate, &str_left_len); + if (truncate) + { + log_error("Left string is truncated at len = %d\n", len); + } - len = split_line(status_f, 20, &truncate, &status_len); + len = split_line(str_center, STR_TOP_CENTER_MAX_LEN, &truncate, &str_center_len); if (truncate) { - log_error("Status string is truncated\n"); - status_f[len] = '\0'; + log_error("Center string is truncated at len = %d\n", len); } - len = split_line(BBS_current_section_name, 20, &truncate, §ion_name_len); + len = split_line(BBS_current_section_name, STR_TOP_RIGHT_MAX_LEN, &truncate, &str_right_len); if (truncate) { - log_error("Section name is truncated\n"); + log_error("Section name is truncated at len = %d\n", len); } 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(); + str_left, 44 - str_left_len, str_center, 34 - str_center_len - str_right_len, "", BBS_current_section_name); return 0; } @@ -495,10 +496,9 @@ int show_bottom(const char *msg) moveto(SCREEN_ROWS, 0); clrtoeol(); prints("\033[1;44;33m[\033[36m%s\033[33m]%*s%*s帐号[\033[36m%s\033[33m]" - "[\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, + "[\033[36m%1d\033[33m天\033[36m%2d\033[33m时\033[36m%2d\033[33m分]\033[m", + str_time, 21, msg_f, 9 - len_username, "", BBS_username, tm_online->tm_mday - 1, tm_online->tm_hour, tm_online->tm_min); - iflush(); return 0; } @@ -506,37 +506,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_readonly(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 +562,6 @@ int show_active_board() break; } } - iflush(); return 0; }