--- lbbs/src/screen.c 2025/06/17 13:18:55 1.100 +++ lbbs/src/screen.c 2025/10/14 05:28:15 1.109 @@ -14,30 +14,52 @@ * * ***************************************************************************/ -#include "screen.h" #include "bbs.h" #include "common.h" -#include "str_process.h" -#include "log.h" -#include "io.h" #include "editor.h" #include "file_loader.h" -#include +#include "io.h" +#include "log.h" +#include "login.h" +#include "screen.h" +#include "str_process.h" #include +#include +#include #include -#include #include -#include -#include -#include +#include #include +#include #include +#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 +#define STR_TOP_LEFT_MAX_LEN 80 +#define STR_TOP_MIDDLE_MAX_LEN 40 +#define STR_TOP_RIGHT_MAX_LEN 80 + +static const char *get_time_str(char *s, size_t len) +{ + static const char *weekday[] = { + "天", "一", "二", "三", "四", "五", "六"}; + time_t curtime; + struct tm local_tm; + + time(&curtime); + localtime_r(&curtime, &local_tm); + size_t j = strftime(s, len, "%b %d %H:%M 星期", &local_tm); + + if (j == 0 || j + strlen(weekday[local_tm.tm_wday]) + 1 > len) + { + return NULL; + } + + strncat(s, weekday[local_tm.tm_wday], len - 1 - j); + + return s; +} void moveto(int row, int col) { @@ -85,7 +107,7 @@ int press_any_key() moveto(SCREEN_ROWS, 0); clrtoeol(); - prints(" \033[1;33m...\033[0;37m"); + prints(" \033[1;33m按任意键继续...\033[0;37m"); iflush(); return igetch_t(MIN(MAX_DELAY_TIME, 60)); @@ -108,95 +130,146 @@ void set_input_echo(int echo) } } -static int _str_input(char *buffer, int buf_size, int echo_mode) +static int _str_input(char *buffer, int buf_size, int max_display_len, int echo_mode) { - int c; + int ch; int offset = 0; - int hz = 0; + int eol; + int display_len; + char input_str[4]; + int str_len = 0; + char c; buffer[buf_size - 1] = '\0'; - for (offset = 0; offset < buf_size - 1 && buffer[offset] != '\0'; offset++) - ; + offset = split_line(buffer, max_display_len, &eol, &display_len, 0); igetch_reset(); while (!SYS_server_exit) { - c = igetch_t(MIN(MAX_DELAY_TIME, 60)); + ch = igetch_t(MIN(MAX_DELAY_TIME, 60)); - if (c == CR) + if (ch == CR) { igetch_reset(); break; } - else if (c == KEY_TIMEOUT || c == KEY_NULL) // timeout or broken pipe + else if (ch == KEY_TIMEOUT || ch == KEY_NULL) // timeout or broken pipe { return -1; } - else if (c == LF || c == '\0') + else if (ch == LF || ch == '\0') { continue; } - else if (c == BACKSPACE) + else if (ch == BACKSPACE) { if (offset > 0) { offset--; - if (buffer[offset] < 0 || buffer[offset] > 127) + if (buffer[offset] < 0 || buffer[offset] > 127) // UTF8 { - prints("\033[D \033[D"); - offset--; - if (offset < 0) // should not happen + while (offset > 0 && (buffer[offset] & 0b11000000) != 0b11000000) { - log_error("Offset of buffer is negative\n"); - offset = 0; + offset--; } + display_len--; + prints("\033[D \033[D"); } buffer[offset] = '\0'; + display_len--; prints("\033[D \033[D"); iflush(); } continue; } - else if (c > 255 || iscntrl(c)) + else if (ch > 255 || iscntrl(ch)) { continue; } - else if (c > 127 && c <= 255) + else if ((ch & 0xff80) == 0x80) // head of multi-byte character { - if (!hz && offset + 2 > buf_size - 1) // No enough space for Chinese character + str_len = 0; + c = (char)(ch & 0b11110000); + while (c & 0b10000000) + { + input_str[str_len] = (char)(ch - 256); + str_len++; + c = (c & 0b01111111) << 1; + + if ((c & 0b10000000) == 0) // Input completed + { + break; + } + + // Expect additional bytes of input + ch = igetch(100); // 0.1 second + if (ch == KEY_NULL || ch == KEY_TIMEOUT) // Ignore received bytes if no futher input + { +#ifdef _DEBUG + log_error("Ignore %d bytes of incomplete UTF8 character\n", str_len); +#endif + str_len = 0; + break; + } + } + + if (str_len == 0) // Incomplete input + { + continue; + } + + if (offset + str_len > buf_size - 1 || display_len + 2 > max_display_len) // No enough space for Chinese character { - igetch(0); // Ignore 1 character outc('\a'); iflush(); continue; } - hz = (!hz); - } - if (offset + 1 > buf_size - 1) - { - outc('\a'); - iflush(); - continue; + memcpy(buffer + offset, input_str, (size_t)str_len); + offset += str_len; + buffer[offset] = '\0'; + display_len += 2; + + switch (echo_mode) + { + case DOECHO: + prints(input_str); + break; + case NOECHO: + prints("**"); + break; + } } + else if (ch >= 32 && ch < 127) // Printable character + { + if (offset + 1 > buf_size - 1 || display_len + 1 > max_display_len) + { + outc('\a'); + iflush(); + continue; + } - buffer[offset++] = (char)c; - buffer[offset] = '\0'; + buffer[offset++] = (char)ch; + buffer[offset] = '\0'; + display_len++; - switch (echo_mode) - { - case DOECHO: - outc((char)c); - break; - case NOECHO: - outc('*'); - break; + switch (echo_mode) + { + case DOECHO: + outc((char)ch); + break; + case NOECHO: + outc('*'); + break; + } } - if (!hz) + else // Invalid character { - iflush(); + continue; } + + iflush(); } return offset; @@ -208,7 +281,7 @@ int str_input(char *buffer, int buf_size buffer[0] = '\0'; - len = _str_input(buffer, buf_size, echo_mode); + len = _str_input(buffer, buf_size, buf_size, echo_mode); prints("\r\n"); iflush(); @@ -216,16 +289,279 @@ int str_input(char *buffer, int buf_size return len; }; -int get_data(int row, int col, char *prompt, char *buffer, int buf_size, int echo_mode) +int get_data(int row, int col, char *prompt, char *buffer, int buf_size, int max_display_len) { - int len; + int len = 0; + int col_cur = 0; + int ch; + int offset = 0; + int eol; + int display_len; + char input_str[4]; + int str_len = 0; + char c; + + buffer[buf_size - 1] = '\0'; + offset = split_line(buffer, max_display_len, &eol, &display_len, 0); + buffer[offset] = '\0'; + len = offset; + col_cur = col + str_length(prompt, 1) + display_len; moveto(row, col); prints("%s", prompt); prints("%s", buffer); + prints("%*s", max_display_len - display_len, ""); + moveto(row, col_cur); iflush(); - len = _str_input(buffer, buf_size, echo_mode); + igetch_reset(); + + while (!SYS_server_exit) + { + ch = igetch_t(MIN(MAX_DELAY_TIME, 60)); + + if (ch == CR) + { + igetch_reset(); + break; + } + else if (ch == KEY_TIMEOUT || ch == KEY_NULL) // timeout or broken pipe + { + return -1; + } + else if (ch == LF || ch == '\0') + { + continue; + } + else if (ch == BACKSPACE) + { + if (offset > 0) + { + str_len = 1; + offset--; + if (buffer[offset] < 0 || buffer[offset] > 127) // UTF8 + { + while (offset > 0 && (buffer[offset] & 0b11000000) != 0b11000000) + { + str_len++; + offset--; + } + display_len--; + col_cur--; + } + + memmove(buffer + offset, buffer + offset + str_len, (size_t)(len - offset - str_len)); + len -= str_len; + buffer[len] = '\0'; + display_len--; + col_cur--; + + moveto(row, col_cur); + prints("%s", buffer + offset); + prints("%*s", max_display_len - display_len, ""); + moveto(row, col_cur); + iflush(); + } + continue; + } + else if (ch == KEY_DEL) + { + if (offset < len) + { + if ((buffer[offset] & 0x80) == 0x80) // head of multi-byte character + { + str_len = 0; + c = (char)(buffer[offset] & 0b11110000); + while (c & 0b10000000) + { + str_len++; + c = (c & 0b01111111) << 1; + } + display_len--; + } + else + { + str_len = 1; + } + + memmove(buffer + offset, buffer + offset + str_len, (size_t)(len - offset - str_len)); + len -= str_len; + buffer[len] = '\0'; + display_len--; + + moveto(row, col_cur); + prints("%s", buffer + offset); + prints("%*s", max_display_len - display_len, ""); + moveto(row, col_cur); + iflush(); + } + continue; + } + else if (ch == KEY_LEFT) + { + if (offset > 0) + { + str_len = 1; + offset--; + if (buffer[offset] < 0 || buffer[offset] > 127) // UTF8 + { + while (offset > 0 && (buffer[offset] & 0b11000000) != 0b11000000) + { + str_len++; + offset--; + } + col_cur--; + } + col_cur--; + + moveto(row, col_cur); + iflush(); + } + continue; + } + else if (ch == KEY_RIGHT) + { + if (offset < len) + { + str_len = 0; + if ((buffer[offset] & 0x80) == 0x80) // head of multi-byte character + { + c = (char)(buffer[offset] & 0b11110000); + while (c & 0b10000000) + { + str_len++; + c = (c & 0b01111111) << 1; + } + col_cur++; + } + else + { + str_len = 1; + } + + col_cur++; + offset += str_len; + + moveto(row, col_cur); + iflush(); + } + continue; + } + else if (ch == KEY_HOME || ch == KEY_UP) + { + if (offset > 0) + { + offset = 0; + col_cur = col + str_length(prompt, 1); + + moveto(row, col_cur); + iflush(); + } + continue; + } + else if (ch == KEY_END || ch == KEY_DOWN) + { + if (offset < len) + { + offset = len; + col_cur = col + str_length(prompt, 1) + display_len; + + moveto(row, col_cur); + iflush(); + } + continue; + } + else if (ch > 255 || iscntrl(ch)) + { + continue; + } + else if ((ch & 0xff80) == 0x80) // head of multi-byte character + { + str_len = 0; + c = (char)(ch & 0b11110000); + while (c & 0b10000000) + { + input_str[str_len] = (char)(ch - 256); + str_len++; + c = (c & 0b01111111) << 1; + + if ((c & 0b10000000) == 0) // Input completed + { + break; + } + + // Expect additional bytes of input + ch = igetch(100); // 0.1 second + if (ch == KEY_NULL || ch == KEY_TIMEOUT) // Ignore received bytes if no futher input + { +#ifdef _DEBUG + log_error("Ignore %d bytes of incomplete UTF8 character\n", str_len); +#endif + str_len = 0; + break; + } + } + + if (str_len == 0) // Incomplete input + { + continue; + } + + if (len + str_len > buf_size - 1 || display_len + 2 > max_display_len) // No enough space for Chinese character + { + outc('\a'); + iflush(); + continue; + } + + memmove(buffer + offset + str_len, buffer + offset, (size_t)(len - offset)); + memcpy(buffer + offset, input_str, (size_t)str_len); + len += str_len; + buffer[len] = '\0'; + display_len += 2; + + moveto(row, col_cur); + prints("%s", buffer + offset); + prints("%*s", max_display_len - display_len, ""); + + col_cur += 2; + + moveto(row, col_cur); + iflush(); + + offset += str_len; + } + else if (ch >= 32 && ch < 127) // Printable character + { + if (len + 1 > buf_size - 1 || display_len + 1 > max_display_len) + { + outc('\a'); + iflush(); + continue; + } + + memmove(buffer + offset + 1, buffer + offset, (size_t)(len - offset)); + buffer[offset] = (char)ch; + len++; + buffer[len] = '\0'; + display_len++; + + moveto(row, col_cur); + prints("%s", buffer + offset); + prints("%*s", max_display_len - display_len, ""); + + col_cur++; + + moveto(row, col_cur); + iflush(); + + offset++; + } + else // Invalid character + { + continue; + } + } return len; } @@ -293,7 +629,7 @@ int display_data(const void *p_data, lon ctx.line_bottom = MIN(line_current - (output_current_row - screen_begin_row) + screen_row_total, display_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", + "\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, @@ -372,7 +708,8 @@ int display_data(const void *p_data, lon output_end_row = SCREEN_ROWS - 1; moveto(SCREEN_ROWS, 0); clrtoeol(); - prints("\033[S"); // Scroll up 1 line + // prints("\033[S"); // Scroll up 1 line + prints("\n"); // Legacy Cterm only works with this line break; case KEY_PGUP: if (line_current - output_current_row < 0) // Reach begin @@ -469,9 +806,9 @@ static int display_file_key_handler(int { 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] |"); + "| 返回[\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; } @@ -493,6 +830,11 @@ int display_file(const char *filename, i return KEY_NULL; } + if (user_online_update("VIEW_FILE") < 0) + { + log_error("user_online_update(VIEW_FILE) error\n"); + } + ret = display_data(p_data, line_total, p_line_offsets, eof_exit, display_file_key_handler, DATA_READ_HELP); if (detach_file_shm(p_shm) < 0) @@ -516,23 +858,24 @@ int show_top(const char *str_left, const 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, 1); + len = split_line(str_left_f, STR_TOP_LEFT_MAX_LEN / 2, &eol, &str_left_len, 1); 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, 1); + len = split_line(str_middle, STR_TOP_MIDDLE_MAX_LEN / 2, &eol, &str_middle_len, 1); 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, 1); + len = split_line(str_right, STR_TOP_RIGHT_MAX_LEN / 2, &eol, &str_right_len, 1); str_right_f[len] = '\0'; moveto(1, 0); clrtoeol(); - 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); + prints("\033[1;44;33m%s\033[37m%*s%s\033[33m%*s%s\033[m", + str_left_f, 44 - str_left_len - str_middle_len, "", + str_middle_f, 36 - str_right_len, "", str_right_f); return 0; } @@ -568,19 +911,19 @@ int show_bottom(const char *msg) if (tm_online->tm_mday > 1) { snprintf(str_tm_online, sizeof(str_tm_online), - "\033[36m%2d\033[33m\033[36m%2d\033[33mʱ", + "\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", + "\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[33mʺ[\033[36m%s\033[33m][%s\033[33m]\033[m", + 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;