--- lbbs/src/screen.c 2025/05/28 05:47:37 1.71 +++ lbbs/src/screen.c 2025/05/29 02:45:23 1.77 @@ -371,6 +371,7 @@ int display_file_ex(const char *filename max_lines = SCREEN_ROWS - 1; clrline(begin_line, SCREEN_ROWS); break; + case KEY_ESC: case KEY_LEFT: case 'q': case 'Q': @@ -433,7 +434,7 @@ cleanup: return ch; } -int show_top(const char *str_left, const char *str_middle) +int show_top(const char *str_left, const char *str_middle, const char *str_right) { char str_left_f[STR_TOP_LEFT_MAX_LEN + 1]; char str_middle_f[STR_TOP_MIDDLE_MAX_LEN + 1]; @@ -454,15 +455,15 @@ int show_top(const char *str_left, const 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); + strncpy(str_right_f, str_right, 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); + len = split_line(str_right, 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", - str_left_f, 44 - str_left_len, str_middle_f, 34 - str_middle_len - str_right_len, "", str_right_f); + prints("\033[1;44;33m%s\033[37m%*s\033[33m%*s\033[m", + str_left_f, 44 - str_left_len, str_middle_f, 36, str_right_f); return 0; } @@ -472,21 +473,21 @@ int show_bottom(const char *msg) char str_time[LINE_BUFFER_LEN]; time_t time_online; struct tm *tm_online; - char msg_f[21]; - int truncate; + char msg_f[LINE_BUFFER_LEN]; + int eol; int msg_len; int len; int len_username; get_time_str(str_time, sizeof(str_time)); - strncpy(msg_f, msg, sizeof(msg_f) - 1); - msg_f[sizeof(msg_f) - 1] = '\0'; - - len = split_line(msg_f, 20, &truncate, &msg_len); - if (truncate) + msg_f[0] = '\0'; + msg_len = 0; + if (msg != NULL) { - log_error("Status string is truncated\n"); + strncpy(msg_f, msg, sizeof(msg_f) - 1); + msg_f[sizeof(msg_f) - 1] = '\0'; + len = split_line(msg_f, 23, &eol, &msg_len); msg_f[len] = '\0'; } @@ -497,9 +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]" + prints("\033[1;44;33m时间[\033[36m%s\033[33m]%s%*s \033[33m帐号[\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, 9 - len_username, "", BBS_username, + str_time, msg_f, 35 - msg_len - len_username, "", BBS_username, tm_online->tm_mday - 1, tm_online->tm_hour, tm_online->tm_min); return 0;