--- lbbs/src/screen.c 2025/05/17 05:56:17 1.55 +++ lbbs/src/screen.c 2025/05/17 12:28:47 1.60 @@ -298,7 +298,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: @@ -395,7 +395,6 @@ int display_file_ex(const char *filename clrline(begin_line, SCREEN_ROWS); break; default: - log_std("Input: %d\n", ch); input_ok = 0; break; } @@ -432,53 +431,73 @@ cleanup: return ch; } -int show_top(char *status) +int show_top(const char *status) { + char status_f[21]; int truncate; int status_len; int section_name_len; int len; - len = split_line(status, 20, &truncate, &status_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) { - status[len] = '\0'; + 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) { - status[len] = '\0'; + log_error("Section name is truncated\n"); } moveto(1, 0); clrtoeol(); - prints("\033[1;44;33m%s \033[37m%*s%*s\033[33m ÌÖÂÛÇø [%s]\033[m", - status, (39 - status_len), BBS_name, (30 - section_name_len), "", BBS_current_section_name); + 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(); return 0; } -int show_bottom(char *msg) +int show_bottom(const char *msg) { char str_time[LINE_BUFFER_LEN]; - char space[LINE_BUFFER_LEN]; time_t time_online; struct tm *tm_online; + char msg_f[21]; + int truncate; + int msg_len; + int len; + int len_username; get_time_str(str_time, sizeof(str_time)); - str_space(space, 34 - (int)strnlen(BBS_username, sizeof(BBS_username))); + + 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_username = (int)strnlen(BBS_username, sizeof(BBS_username)); time_online = time(0) - BBS_login_tm; tm_online = gmtime(&time_online); moveto(SCREEN_ROWS, 0); clrtoeol(); - prints("\033[1;44;33m[\033[36m%s\033[33m]%sÕʺÅ[\033[36m%s\033[33m]" + 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, space, BBS_username, tm_online->tm_mday - 1, - tm_online->tm_hour, tm_online->tm_min); + 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; @@ -486,48 +505,55 @@ int show_bottom(char *msg) int show_active_board() { - char filename[FILE_PATH_LEN]; - char buffer[LINE_BUFFER_LEN]; - FILE *fin; - static int line; - int len; - int end_of_line; - int display_len; + static int line_current = 0; + static const void *p_file_shm = NULL; + static const void *p_data; + static size_t data_len; + static long line_total; + static const long *p_line_offsets; - clrline(3, 2 + ACTIVE_BOARD_HEIGHT); - - if ((fin = fopen(DATA_ACTIVE_BOARD, "r")) == NULL) - { - log_error("Unable to open file %s\n", filename); - return -1; - } + char buffer[LINE_BUFFER_LEN]; + long int len; - for (int i = 0; i < line; i++) + if (p_file_shm == NULL) { - if (fgets(buffer, sizeof(buffer), fin) == NULL) + if ((p_file_shm = get_file_shm(DATA_ACTIVE_BOARD)) == NULL) { - line = 0; - rewind(fin); - break; + 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; } + clrline(3, 2 + ACTIVE_BOARD_HEIGHT); + for (int i = 0; i < ACTIVE_BOARD_HEIGHT; i++) { - if (fgets(buffer, sizeof(buffer), fin) == NULL) + len = p_line_offsets[line_current + 1] - p_line_offsets[line_current]; + if (len >= LINE_BUFFER_LEN) { - line = 0; - break; + log_error("Error length exceeds buffer size: %d\n", len); + len = LINE_BUFFER_LEN - 1; } - line++; - len = split_line(buffer, SCREEN_COLS, &end_of_line, &display_len); - buffer[len] = '\0'; // Truncate over-length line + + memcpy(buffer, (const char *)p_data + p_line_offsets[line_current], (size_t)len); + buffer[len] = '\0'; + moveto(3 + i, 0); prints("%s", buffer); + + line_current++; + if (line_current >= line_total) + { + line_current = 0; + break; + } } iflush(); - fclose(fin); - return 0; }