--- lbbs/src/screen.c 2025/05/06 12:10:22 1.38 +++ lbbs/src/screen.c 2025/05/15 13:02:33 1.51 @@ -22,10 +22,11 @@ #include "screen.h" #include #include -#include -#include #include #include +#include +#include +#include #define ACTIVE_BOARD_HEIGHT 8 @@ -81,7 +82,7 @@ int press_any_key() prints(" \033[1;33m按任意键继续...\033[0;37m"); iflush(); - return igetch_t(60); + return igetch_t(MIN(MAX_DELAY_TIME, 60)); } void set_input_echo(int echo) @@ -97,7 +98,7 @@ void set_input_echo(int echo) prints("\xff\xfb\x01\xff\xfb\x03"); iflush(); igetch(0); - igetch(1); + igetch_reset(); } } @@ -108,20 +109,29 @@ static int _str_input(char *buffer, int int hz = 0; buffer[buf_size - 1] = '\0'; - for (offset = 0; offset < buf_size - 1 && buffer[offset] != '\0'; offset++); + for (offset = 0; offset < buf_size - 1 && buffer[offset] != '\0'; offset++) + ; + + igetch_reset(); - while ((c = igetch_t(60))) + while (!SYS_server_exit) { - if (c == KEY_NULL || c == KEY_TIMEOUT || c == CR) + c = igetch_t(MIN(MAX_DELAY_TIME, 60)); + + if (c == CR) { - igetch(1); // Cleanup remaining '\n' in the buffer + igetch_reset(); break; } - if (c == LF) + else if (c == KEY_TIMEOUT || c == KEY_NULL) // timeout or broken pipe + { + return -1; + } + else if (c == LF || c == '\0') { continue; } - if (c == BACKSPACE) + else if (c == BACKSPACE) { if (offset > 0) { @@ -142,29 +152,32 @@ static int _str_input(char *buffer, int } continue; } - if (c > 255 || iscntrl(c)) + else if (c > 255 || iscntrl(c)) { continue; } - if (c > 127 && c <= 255) + else if (c > 127 && c <= 255) { if (!hz && offset + 2 > buf_size - 1) // No enough space for Chinese character { - igetch(1); // Cleanup remaining input + igetch(0); // Ignore 1 character outc('\a'); iflush(); continue; } hz = (!hz); } + if (offset + 1 > buf_size - 1) { outc('\a'); iflush(); continue; } + buffer[offset++] = (char)c; buffer[offset] = '\0'; + switch (echo_mode) { case DOECHO: @@ -201,8 +214,6 @@ int get_data(int row, int col, char *pro { int len; - igetch(1); // Cleanup input buffer - moveto(row, col); prints(prompt); prints(buffer); @@ -269,7 +280,7 @@ int display_file_ex(const char *filename line = begin_line; max_lines = screen_rows - 1; - while (loop) + while (!SYS_server_exit && loop) { if (c_line_current >= c_line_total && c_line_total <= screen_rows - 2) { @@ -298,18 +309,33 @@ int display_file_ex(const char *filename } moveto(screen_rows, 0); - prints("\033[1;44;32m%s (%d%%)%s\033[33m │ 结束 ← │ ↑/↓/PgUp/PgDn 移动 │ ? 辅助说明 │ \033[m", + prints("\033[1;44;32m%s (%d%%)%s\033[33m │ 结束 ← │ ↑/↓/PgUp/PgDn 移动 │ ? 辅助说明 │ \033[m", (percentile < 100 ? "下面还有喔" : "没有更多了"), percentile, (percentile < 10 ? " " : (percentile < 100 ? " " : ""))); iflush(); input_ok = 0; - while (!input_ok) + while (!SYS_server_exit && !input_ok) { ch = igetch_t(MAX_DELAY_TIME); input_ok = 1; switch (ch) { + case KEY_NULL: + case KEY_TIMEOUT: + goto cleanup; + case KEY_HOME: + c_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 = begin_line; + max_lines = screen_rows - 1; + clrline(begin_line, screen_rows); + break; case KEY_UP: if (c_line_current - line < 0) // Reach top { @@ -317,12 +343,13 @@ int display_file_ex(const char *filename } c_line_current -= line; line = begin_line; - max_lines = begin_line + 1; - prints("\033[T"); // Scroll down 1 line - // max_lines = screen_rows - 1; // Legacy Fterm only works with this line + // max_lines = begin_line + 1; + // prints("\033[T"); // Scroll down 1 line + max_lines = screen_rows - 1; // Legacy Fterm only works with this line break; - case KEY_DOWN: case CR: + igetch_reset(); + case KEY_DOWN: if (c_line_current + ((screen_rows - 2) - (line - 1)) >= c_line_total) // Reach bottom { break; @@ -366,8 +393,6 @@ int display_file_ex(const char *filename max_lines = screen_rows - 1; clrline(begin_line, screen_rows); break; - case KEY_NULL: - case KEY_TIMEOUT: case KEY_LEFT: case 'q': case 'Q': @@ -393,9 +418,12 @@ int display_file_ex(const char *filename clrline(begin_line, screen_rows); break; default: + log_std("Input: %d\n", ch); input_ok = 0; break; } + + BBS_last_access_tm = time(0); } continue; @@ -420,6 +448,7 @@ int display_file_ex(const char *filename line++; } +cleanup: free(p_line_offsets); fclose(fin); @@ -428,15 +457,31 @@ int display_file_ex(const char *filename int show_top(char *status) { - char buffer[LINE_BUFFER_LEN]; + int end_of_line; + int display_len; + int len; - str_space(buffer, 20 - (int)strnlen(BBS_current_section_name, sizeof(BBS_current_section_name))); + char space1[LINE_BUFFER_LEN]; + char space2[LINE_BUFFER_LEN]; + + len = split_line(status, 20, &end_of_line, &display_len); + if (end_of_line) + { + 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) + { + status[len] = '\0'; + } + str_space(space2, 30 - display_len); moveto(1, 0); clrtoeol(); - prints("\033[1;44;33m%-20s \033[37m%20s" - " %s\033[33m讨论区 [%s]\033[m", - status, BBS_name, buffer, BBS_current_section_name); + 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); iflush(); return 0; @@ -445,22 +490,21 @@ int show_top(char *status) int show_bottom(char *msg) { char str_time[LINE_BUFFER_LEN]; - char buffer[LINE_BUFFER_LEN]; + char space[LINE_BUFFER_LEN]; time_t time_online; struct tm *tm_online; get_time_str(str_time, sizeof(str_time)); - str_space(buffer, 33 - (int)strnlen(BBS_username, sizeof(BBS_username))); + str_space(space, 34 - (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帐号[\033[36m%s\033[33m]" "[\033[36m%1d\033[33m:\033[36m%2d\033[33m:\033[36m%2d\033[33m]\033[m", - str_time, buffer, BBS_username, tm_online->tm_mday - 1, + str_time, space, BBS_username, tm_online->tm_mday - 1, tm_online->tm_hour, tm_online->tm_min); iflush(); @@ -473,8 +517,9 @@ int show_active_board() char buffer[LINE_BUFFER_LEN]; FILE *fin; static int line; - unsigned int len; + int len; int end_of_line; + int display_len; clrline(3, 2 + ACTIVE_BOARD_HEIGHT); @@ -502,7 +547,7 @@ int show_active_board() break; } line++; - len = split_line(buffer, screen_cols, &end_of_line); + len = split_line(buffer, screen_cols, &end_of_line, &display_len); buffer[len] = '\0'; // Truncate over-length line moveto(3 + i, 0); prints("%s", buffer);