--- lbbs/src/screen.c 2025/05/19 07:18:56 1.66 +++ lbbs/src/screen.c 2025/05/28 10:26:21 1.74 @@ -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) @@ -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: @@ -365,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': @@ -419,37 +426,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, const char *str_right) { - 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, str_right, sizeof(str_right_f) - 1); + str_right_f[sizeof(str_right_f) - 1] = '\0'; + 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", - status_f, 44 - status_len, BBS_name, 26 - section_name_len, "", BBS_current_section_name); + 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; } @@ -460,7 +474,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; @@ -470,12 +484,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)); @@ -509,7 +519,7 @@ int show_active_board() 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;