--- lbbs/src/screen.c 2025/05/18 07:41:34 1.62 +++ lbbs/src/screen.c 2025/05/28 05:47:37 1.71 @@ -22,7 +22,6 @@ #include "io.h" #include "file_loader.h" #include -#include #include #include #include @@ -32,8 +31,15 @@ #include #include +#define _POSIX_C_SOURCE 200809L +#include + #define ACTIVE_BOARD_HEIGHT 8 +#define STR_TOP_LEFT_MAX_LEN 40 +#define STR_TOP_MIDDLE_MAX_LEN 20 +#define STR_TOP_RIGHT_MAX_LEN 20 + void moveto(int row, int col) { if (row >= 0) @@ -48,7 +54,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 +64,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); } } @@ -241,7 +247,7 @@ int display_file_ex(const char *filename long int percentile; int loop; - if ((p_shm = get_file_shm(filename, &data_len, &line_total, &p_data, &p_line_offsets)) == 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; @@ -293,7 +299,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: @@ -419,38 +425,44 @@ int display_file_ex(const char *filename } cleanup: + if (detach_file_shm(p_shm) < 0) + { + 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_middle) { - char status_f[21]; - int truncate; - int status_len; - int section_name_len; + char str_left_f[STR_TOP_LEFT_MAX_LEN + 1]; + char str_middle_f[STR_TOP_MIDDLE_MAX_LEN + 1]; + char str_right_f[STR_TOP_RIGHT_MAX_LEN + 1]; + int str_left_len; + int str_middle_len; + int str_right_len; + int eol; int len; - strncpy(status_f, status, sizeof(status_f) - 1); - status_f[sizeof(status_f) - 1] = '\0'; - - len = split_line(status_f, 20, &truncate, &status_len); - if (truncate) - { - log_error("Status string is truncated\n"); - status_f[len] = '\0'; - } - - len = split_line(BBS_current_section_name, 20, &truncate, §ion_name_len); - if (truncate) - { - log_error("Section name is truncated\n"); - } + strncpy(str_left_f, str_left, sizeof(str_left_f) - 1); + str_left_f[sizeof(str_left_f) - 1] = '\0'; + len = split_line(str_left_f, STR_TOP_LEFT_MAX_LEN, &eol, &str_left_len); + str_left_f[len] = '\0'; + + strncpy(str_middle_f, str_middle, sizeof(str_middle_f) - 1); + str_middle_f[sizeof(str_middle_f) - 1] = '\0'; + len = split_line(str_middle, STR_TOP_MIDDLE_MAX_LEN, &eol, &str_middle_len); + str_middle_f[len] = '\0'; + + strncpy(str_right_f, BBS_current_section_name, sizeof(str_right_f) - 1); + str_right_f[sizeof(str_right_f) - 1] = '\0'; + len = split_line(BBS_current_section_name, STR_TOP_RIGHT_MAX_LEN, &eol, &str_right_len); + str_right_f[len] = '\0'; 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_f, 44 - str_left_len, str_middle_f, 34 - str_middle_len - str_right_len, "", str_right_f); return 0; } @@ -486,10 +498,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; } @@ -503,19 +514,32 @@ int show_active_board() 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_shm == NULL) { - if ((p_shm = get_file_shm(DATA_ACTIVE_BOARD, &data_len, &line_total, &p_data, &p_line_offsets)) == 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; } } - clrline(3, 2 + ACTIVE_BOARD_HEIGHT); + if (time(0) - t_last_show >= 10) + { + line_last = line_current; + t_last_show = time(0); + } + else + { + line_current = line_last; + } + + clrline(2, 2 + ACTIVE_BOARD_HEIGHT); for (int i = 0; i < ACTIVE_BOARD_HEIGHT; i++) { @@ -540,7 +564,6 @@ int show_active_board() break; } } - iflush(); return 0; }