--- lbbs/src/screen.c 2025/05/28 05:47:37 1.71 +++ lbbs/src/screen.c 2025/05/28 07:30:23 1.73 @@ -433,7 +433,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 +454,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; } @@ -473,7 +473,7 @@ int show_bottom(const char *msg) time_t time_online; struct tm *tm_online; char msg_f[21]; - int truncate; + int eol; int msg_len; int len; int len_username; @@ -483,12 +483,8 @@ int show_bottom(const char *msg) 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) - { - log_error("Status string is truncated\n"); - msg_f[len] = '\0'; - } + len = split_line(msg_f, 20, &eol, &msg_len); + msg_f[len] = '\0'; len_username = (int)strnlen(BBS_username, sizeof(BBS_username));