--- lbbs/src/screen.c 2025/05/28 01:04:24 1.70 +++ lbbs/src/screen.c 2025/06/05 11:48:35 1.88 @@ -22,7 +22,6 @@ #include "io.h" #include "file_loader.h" #include -#include #include #include #include @@ -32,10 +31,13 @@ #include #include +#define _POSIX_C_SOURCE 200809L +#include + #define ACTIVE_BOARD_HEIGHT 8 #define STR_TOP_LEFT_MAX_LEN 40 -#define STR_TOP_CENTER_MAX_LEN 20 +#define STR_TOP_MIDDLE_MAX_LEN 20 #define STR_TOP_RIGHT_MAX_LEN 20 void moveto(int row, int col) @@ -220,8 +222,8 @@ int get_data(int row, int col, char *pro int len; moveto(row, col); - prints(prompt); - prints(buffer); + prints("%s", prompt); + prints("%s", buffer); iflush(); len = _str_input(buffer, buf_size, echo_mode); @@ -229,42 +231,40 @@ int get_data(int row, int col, char *pro return len; } -int display_file_ex(const char *filename, int begin_line, int wait) +int display_data(const void *p_data, long line_total, const long *p_line_offsets, int begin_line, int eof_exit, + display_data_key_handler key_handler, const char *help_filename) { static int show_help = 1; char buffer[LINE_BUFFER_LEN]; - int ch = KEY_NULL; + DISPLAY_CTX ctx; + int ch = 0; int input_ok, line, max_lines; long int line_current = 0; - const void *p_shm; - size_t data_len; - long line_total; - const void *p_data; - const long *p_line_offsets; long int len; long int percentile; int loop; - - 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; - } + int eol, display_len; clrline(begin_line, SCREEN_ROWS); line = begin_line; max_lines = SCREEN_ROWS - 1; + // update msg_ext with extended key handler + if (key_handler(&ch, &ctx) != 0) + { + return ch; + } + loop = 1; while (!SYS_server_exit && loop) { - if (line_current >= line_total && line_total <= SCREEN_ROWS - 2) + if (eof_exit > 0 && line_current >= line_total && line_total <= SCREEN_ROWS - 2) { - if (wait) + if (eof_exit == 1) { ch = press_any_key(); } - else + else // if (eof_exit == 2) { iflush(); } @@ -275,19 +275,39 @@ int display_file_ex(const char *filename if (line_current >= line_total || line >= max_lines) { + ctx.reach_begin = (line_current < line ? 1 : 0); + if (line_current - (line - 1) + (SCREEN_ROWS - 2) < line_total) { percentile = (line_current - (line - 1) + (SCREEN_ROWS - 2)) * 100 / line_total; + ctx.reach_end = 0; } else { percentile = 100; + ctx.reach_end = 1; + } + + ctx.line_top = line_current - (line - 1) + 1; + ctx.line_bottom = MIN(line_current - (line - 1) + (SCREEN_ROWS - 2), line_total); + + snprintf(buffer, sizeof(buffer), + "\033[1;44;33m第\033[32m%ld\033[33m-\033[32m%ld\033[33m行 (\033[32m%ld%%\033[33m) %s", + ctx.line_top, + ctx.line_bottom, + percentile, + ctx.msg); + + len = split_line(buffer, SCREEN_COLS, &eol, &display_len); + for (; display_len < SCREEN_COLS; display_len++) + { + buffer[len++] = ' '; } + buffer[len] = '\0'; + strncat(buffer, "\033[m", sizeof(buffer) - 1 - strnlen(buffer, sizeof(buffer))); moveto(SCREEN_ROWS, 0); - prints("\033[1;44;32m%s (%d%%)%s\033[33m │ 结束 ← │ ↑/↓/PgUp/PgDn 移动 │ ? 辅助说明 │ \033[m", - (percentile < 100 ? "下面还有喔" : "没有更多了"), percentile, - (percentile < 10 ? " " : (percentile < 100 ? " " : ""))); + prints("%s", buffer); iflush(); input_ok = 0; @@ -295,25 +315,40 @@ int display_file_ex(const char *filename { ch = igetch_t(MAX_DELAY_TIME); input_ok = 1; + + // extended key handler + if (key_handler(&ch, &ctx) != 0) + { + goto cleanup; + } + switch (ch) { case KEY_NULL: case KEY_TIMEOUT: goto cleanup; case KEY_HOME: + if (line_current - line < 0) // Reach begin + { + break; + } line_current = 0; line = begin_line; max_lines = SCREEN_ROWS - 1; clrline(begin_line, SCREEN_ROWS); break; case KEY_END: + if (line_total < SCREEN_ROWS - 2) + { + break; + } 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 (line_current - line < 0) // Reach top + if (line_current - line < 0) // Reach begin { break; } @@ -325,8 +360,9 @@ int display_file_ex(const char *filename break; case CR: igetch_reset(); + case KEY_SPACE: case KEY_DOWN: - if (line_current + ((SCREEN_ROWS - 2) - (line - 1)) >= line_total) // Reach bottom + if (line_current + ((SCREEN_ROWS - 2) - (line - 1)) >= line_total) // Reach end { break; } @@ -338,8 +374,7 @@ int display_file_ex(const char *filename prints("\033[S"); // Scroll up 1 line break; case KEY_PGUP: - case Ctrl('B'): - if (line_current - line < 0) // Reach top + if (line_current - line < 0) // Reach begin { break; } @@ -352,11 +387,8 @@ int display_file_ex(const char *filename max_lines = SCREEN_ROWS - 1; clrline(begin_line, SCREEN_ROWS); break; - case KEY_RIGHT: case KEY_PGDN: - case Ctrl('F'): - case KEY_SPACE: - if (line_current + (SCREEN_ROWS - 2) - (line - 1) >= line_total) // Reach bottom + if (line_current + (SCREEN_ROWS - 2) - (line - 1) >= line_total) // Reach end { break; } @@ -369,30 +401,29 @@ 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': loop = 0; break; - case '?': case 'h': - case 'H': - if (!show_help) + if (!show_help) // Not reentrant { break; } // Display help information show_help = 0; - display_file_ex(DATA_READ_HELP, begin_line, 1); + display_file(help_filename, begin_line, 1); show_help = 1; - + case KEY_F5: // Refresh after display help information line_current -= (line - 1); line = begin_line; max_lines = SCREEN_ROWS - 1; clrline(begin_line, SCREEN_ROWS); break; + case 0: // Refresh bottom line + break; default: input_ok = 0; break; @@ -407,10 +438,16 @@ int display_file_ex(const char *filename len = p_line_offsets[line_current + 1] - p_line_offsets[line_current]; if (len >= LINE_BUFFER_LEN) { - log_error("buffer overflow: len=%ld(%ld - %ld) line=%ld \n", + log_error("Buffer overflow: len=%ld(%ld - %ld) line=%ld \n", len, p_line_offsets[line_current + 1], p_line_offsets[line_current], line_current); len = LINE_BUFFER_LEN - 1; } + else if (len < 0) + { + log_error("Incorrect line offsets: len=%ld(%ld - %ld) line=%ld \n", + len, p_line_offsets[line_current + 1], p_line_offsets[line_current], line_current); + len = 0; + } memcpy(buffer, (const char *)p_data + p_line_offsets[line_current], (size_t)len); buffer[len] = '\0'; @@ -423,44 +460,79 @@ int display_file_ex(const char *filename } cleanup: - if (detach_file_shm(p_shm) < 0) + return ch; +} + +static int display_file_key_handler(int *p_key, DISPLAY_CTX *p_ctx) +{ + switch (*p_key) { - log_error("detach_file_shm(%s) error\n", filename); + case 0: // Set msg + snprintf(p_ctx->msg, sizeof(p_ctx->msg), + "| 返回[\033[32m←\033[33m,\033[32mESC\033[33m] | " + "移动[\033[32m↑\033[33m/\033[32m↓\033[33m/\033[32mPgUp\033[33m/\033[32mPgDn\033[33m] | " + "帮助[\033[32mh\033[33m] |"); + break; } - return ch; + return 0; } -int show_top(const char *str_left, const char *str_center) +int display_file(const char *filename, int begin_line, int eof_exit) { - int truncate; - int str_left_len; - int str_center_len; - int str_right_len; - int len; + int ret; + const void *p_shm; + size_t data_len; + long line_total; + const void *p_data; + const long *p_line_offsets; - len = split_line(str_left, STR_TOP_LEFT_MAX_LEN, &truncate, &str_left_len); - if (truncate) + if ((p_shm = get_file_shm_readonly(filename, &data_len, &line_total, &p_data, &p_line_offsets)) == NULL) { - log_error("Left string is truncated at len = %d\n", len); + log_error("get_file_shm(%s) error\n", filename); + return KEY_NULL; } - len = split_line(str_center, STR_TOP_CENTER_MAX_LEN, &truncate, &str_center_len); - if (truncate) - { - log_error("Center string is truncated at len = %d\n", len); - } + ret = display_data(p_data, line_total, p_line_offsets, begin_line, eof_exit, display_file_key_handler, DATA_READ_HELP); - len = split_line(BBS_current_section_name, STR_TOP_RIGHT_MAX_LEN, &truncate, &str_right_len); - if (truncate) + if (detach_file_shm(p_shm) < 0) { - log_error("Section name is truncated at len = %d\n", len); + log_error("detach_file_shm(%s) error\n", filename); } + return ret; +} + +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]; + 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(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", - str_left, 44 - str_left_len, str_center, 34 - str_center_len - str_right_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; } @@ -470,21 +542,22 @@ 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; + char str_tm_online[LINE_BUFFER_LEN]; 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) - { - log_error("Status string is truncated\n"); + msg_f[0] = '\0'; + msg_len = 0; + if (msg != NULL) + { + 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'; } @@ -492,13 +565,23 @@ int show_bottom(const char *msg) time_online = time(0) - BBS_login_tm; tm_online = gmtime(&time_online); + if (tm_online->tm_mday > 1) + { + snprintf(str_tm_online, sizeof(str_tm_online), + "\033[36m%2d\033[33m天\033[36m%2d\033[33m时", + tm_online->tm_mday - 1, tm_online->tm_hour); + } + else + { + snprintf(str_tm_online, sizeof(str_tm_online), + "\033[36m%2d\033[33m时\033[36m%2d\033[33m分", + tm_online->tm_hour, tm_online->tm_min); + } moveto(SCREEN_ROWS, 0); clrtoeol(); - 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, 21, msg_f, 9 - len_username, "", BBS_username, - tm_online->tm_mday - 1, tm_online->tm_hour, tm_online->tm_min); + prints("\033[1;44;33m时间[\033[36m%s\033[33m]%s%*s \033[33m帐号[\033[36m%s\033[33m][%s\033[33m]\033[m", + str_time, msg_f, 38 - msg_len - len_username, "", BBS_username, str_tm_online); return 0; }