--- lbbs/src/screen.c 2025/05/16 12:23:57 1.53 +++ lbbs/src/screen.c 2025/05/17 05:56:17 1.55 @@ -14,12 +14,13 @@ * * ***************************************************************************/ +#include "screen.h" #include "bbs.h" #include "common.h" #include "str_process.h" #include "log.h" #include "io.h" -#include "screen.h" +#include "file_loader.h" #include #include #include @@ -29,7 +30,7 @@ #include #include #include -#include +#include #define ACTIVE_BOARD_HEIGHT 8 @@ -228,54 +229,37 @@ int display_file_ex(const char *filename { static int show_help = 1; char buffer[LINE_BUFFER_LEN]; - void *p_data; - int ch = 0; + int ch = KEY_NULL; int input_ok, line, max_lines; - long int c_line_current = 0; - long int c_line_total = 0; - int fd; - struct stat sb; - long *p_line_offsets; + long int line_current = 0; + const void *p_file_shm; + const void *p_data; + size_t data_len; + long line_total; + const long *p_line_offsets; long int len; long int percentile; - int loop = 1; - - if ((fd = open(filename, O_RDONLY)) < 0) - { - log_error("open(%s) error (%d)\n", filename, errno); - return -1; - } - - if (fstat(fd, &sb) < 0) - { - log_error("fstat(fd) error (%d)\n", errno); - return -1; - } - - p_data = mmap(NULL, (size_t)sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0L); - if (p_data == MAP_FAILED) - { - log_error("mmap() error (%d)\n", errno); - return -2; - } + int loop; - if (close(fd) < 0) + if ((p_file_shm = get_file_shm(filename)) == NULL) { - log_error("close(fd) error (%d)\n", errno); - return -1; + log_error("get_file_shm(%s) error\n", filename); + return KEY_NULL; } - p_line_offsets = (long *)malloc(sizeof(long) * MAX_FILE_LINES); - - c_line_total = split_data_lines(p_data, SCREEN_COLS, p_line_offsets, MAX_FILE_LINES); + 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; + loop = 1; while (!SYS_server_exit && loop) { - if (c_line_current >= c_line_total && c_line_total <= SCREEN_ROWS - 2) + if (line_current >= line_total && line_total <= SCREEN_ROWS - 2) { if (wait) { @@ -290,11 +274,11 @@ int display_file_ex(const char *filename break; } - if (c_line_current >= c_line_total || line >= max_lines) + if (line_current >= line_total || line >= max_lines) { - if (c_line_current - (line - 1) + (SCREEN_ROWS - 2) < c_line_total) + if (line_current - (line - 1) + (SCREEN_ROWS - 2) < line_total) { - percentile = (c_line_current - (line - 1) + (SCREEN_ROWS - 2)) * 100 / c_line_total; + percentile = (line_current - (line - 1) + (SCREEN_ROWS - 2)) * 100 / line_total; } else { @@ -318,23 +302,23 @@ int display_file_ex(const char *filename case KEY_TIMEOUT: goto cleanup; case KEY_HOME: - c_line_current = 0; + line_current = 0; line = begin_line; max_lines = SCREEN_ROWS - 1; clrline(begin_line, SCREEN_ROWS); break; case KEY_END: - c_line_current = c_line_total - (SCREEN_ROWS - 2); + line_current = line_total - (SCREEN_ROWS - 2); line = begin_line; max_lines = SCREEN_ROWS - 1; clrline(begin_line, SCREEN_ROWS); break; case KEY_UP: - if (c_line_current - line < 0) // Reach top + if (line_current - line < 0) // Reach top { break; } - c_line_current -= line; + line_current -= line; line = begin_line; // max_lines = begin_line + 1; // prints("\033[T"); // Scroll down 1 line @@ -343,11 +327,11 @@ int display_file_ex(const char *filename case CR: igetch_reset(); case KEY_DOWN: - if (c_line_current + ((SCREEN_ROWS - 2) - (line - 1)) >= c_line_total) // Reach bottom + if (line_current + ((SCREEN_ROWS - 2) - (line - 1)) >= line_total) // Reach bottom { break; } - c_line_current += ((SCREEN_ROWS - 2) - (line - 1)); + line_current += ((SCREEN_ROWS - 2) - (line - 1)); line = SCREEN_ROWS - 2; max_lines = SCREEN_ROWS - 1; moveto(SCREEN_ROWS, 0); @@ -356,14 +340,14 @@ int display_file_ex(const char *filename break; case KEY_PGUP: case Ctrl('B'): - if (c_line_current - line < 0) // Reach top + if (line_current - line < 0) // Reach top { break; } - c_line_current -= ((SCREEN_ROWS - 3) + (line - 1)); - if (c_line_current < 0) + line_current -= ((SCREEN_ROWS - 3) + (line - 1)); + if (line_current < 0) { - c_line_current = 0; + line_current = 0; } line = begin_line; max_lines = SCREEN_ROWS - 1; @@ -373,14 +357,14 @@ int display_file_ex(const char *filename case KEY_PGDN: case Ctrl('F'): case KEY_SPACE: - if (c_line_current + (SCREEN_ROWS - 2) - (line - 1) >= c_line_total) // Reach bottom + if (line_current + (SCREEN_ROWS - 2) - (line - 1) >= line_total) // Reach bottom { break; } - c_line_current += (SCREEN_ROWS - 3) - (line - 1); - if (c_line_current + SCREEN_ROWS - 2 > c_line_total) // No enough lines to display + line_current += (SCREEN_ROWS - 3) - (line - 1); + if (line_current + SCREEN_ROWS - 2 > line_total) // No enough lines to display { - c_line_current = c_line_total - (SCREEN_ROWS - 2); + line_current = line_total - (SCREEN_ROWS - 2); } line = begin_line; max_lines = SCREEN_ROWS - 1; @@ -405,7 +389,7 @@ int display_file_ex(const char *filename show_help = 1; // Refresh after display help information - c_line_current -= (line - 1); + line_current -= (line - 1); line = begin_line; max_lines = SCREEN_ROWS - 1; clrline(begin_line, SCREEN_ROWS); @@ -422,61 +406,55 @@ int display_file_ex(const char *filename continue; } - len = p_line_offsets[c_line_current + 1] - p_line_offsets[c_line_current]; + 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); len = LINE_BUFFER_LEN - 1; } - memcpy(buffer, (const char *)p_data + p_line_offsets[c_line_current], (size_t)len); + memcpy(buffer, (const char *)p_data + p_line_offsets[line_current], (size_t)len); buffer[len] = '\0'; moveto(line, 0); clrtoeol(); prints("%s", buffer); - c_line_current++; + line_current++; line++; } cleanup: - if (munmap(p_data, (size_t)sb.st_size) < 0) + if (shmdt(p_file_shm) == -1) { - log_error("munmap() error (%d)\n", errno); + log_error("shmdt() error (%d)\n", errno); } - free(p_line_offsets); - return ch; } int show_top(char *status) { - int end_of_line; - int display_len; + int truncate; + int status_len; + int section_name_len; int len; - char space1[LINE_BUFFER_LEN]; - char space2[LINE_BUFFER_LEN]; - - len = split_line(status, 20, &end_of_line, &display_len); - if (end_of_line) + len = split_line(status, 20, &truncate, &status_len); + if (truncate) { status[len] = '\0'; } - str_space(space1, 31 - display_len); - len = split_line(BBS_current_section_name, 20, &end_of_line, &display_len); - if (end_of_line) + len = split_line(BBS_current_section_name, 20, &truncate, §ion_name_len); + if (truncate) { status[len] = '\0'; } - str_space(space2, 30 - display_len); moveto(1, 0); clrtoeol(); - prints("\033[1;44;33m%s \033[37m%s%s%s\033[33m ÌÖÂÛÇø [%s]\033[m", - status, space1, BBS_name, space2, BBS_current_section_name); + 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); iflush(); return 0;