--- lbbs/src/screen.c 2025/05/03 13:41:21 1.28 +++ lbbs/src/screen.c 2025/05/10 13:17:36 1.42 @@ -1,16 +1,15 @@ /*************************************************************************** screen.c - description ------------------- - begin : Mon Oct 18 2004 - copyright : (C) 2004 by Leaflet - email : leaflet@leafok.com + Copyright : (C) 2004-2025 by Leaflet + Email : leaflet@leafok.com ***************************************************************************/ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * + * the Free Software Foundation; either version 3 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ @@ -23,10 +22,11 @@ #include "screen.h" #include #include -#include -#include #include #include +#include +#include +#include #define ACTIVE_BOARD_HEIGHT 8 @@ -82,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) @@ -102,24 +102,28 @@ void set_input_echo(int echo) } } -static int _str_input(char *buffer, int buffer_length, int echo_mode) +static int _str_input(char *buffer, int buf_size, int echo_mode) { - char buf[256], ch; - int c, offset = 0, len, loop = 1, i, hz = 0; + int c; + int offset = 0; + int hz = 0; - for (i = 0; i < buffer_length && buffer[i] != '\0'; i++) - { - offset++; - } + buffer[buf_size - 1] = '\0'; + for (offset = 0; offset < buf_size - 1 && buffer[offset] != '\0'; offset++) + ; - while (c = igetch_t(60)) + while ((c = igetch_t(MIN(MAX_DELAY_TIME, 60)))) { - if (c == KEY_NULL || c == KEY_TIMEOUT || c == CR) + if (c == CR) { igetch(1); // Cleanup remaining '\n' in the buffer break; } - if (c == LF) + if (c == KEY_TIMEOUT) + { + return -1; + } + if (c == KEY_NULL || c == LF) { continue; } @@ -127,9 +131,19 @@ static int _str_input(char *buffer, int { if (offset > 0) { - buffer[--offset] = '\0'; - prints("\b \b"); - // clrtoeol (); + offset--; + if (buffer[offset] < 0 || buffer[offset] > 127) + { + prints("\033[D \033[D"); + offset--; + if (offset < 0) // should not happen + { + log_error("Offset of buffer is negative\n"); + offset = 0; + } + } + buffer[offset] = '\0'; + prints("\033[D \033[D"); iflush(); } continue; @@ -140,11 +154,19 @@ static int _str_input(char *buffer, int } if (c > 127 && c <= 255) { + if (!hz && offset + 2 > buf_size - 1) // No enough space for Chinese character + { + igetch(1); // Cleanup remaining input + outc('\a'); + iflush(); + continue; + } hz = (!hz); } - if (offset >= buffer_length) + if (offset + 1 > buf_size - 1) { outc('\a'); + iflush(); continue; } buffer[offset++] = (char)c; @@ -164,33 +186,35 @@ static int _str_input(char *buffer, int } } - prints("\r\n"); - iflush(); - return offset; } -int str_input(char *buffer, int buffer_length, int echo_mode) +int str_input(char *buffer, int buf_size, int echo_mode) { - int offset; + int len; - memset(buffer, '\0', buffer_length); + buffer[0] = '\0'; - offset = _str_input(buffer, buffer_length, echo_mode); + len = _str_input(buffer, buf_size, echo_mode); - return offset; + prints("\r\n"); + iflush(); + + return len; }; -int get_data(int row, int col, char *prompt, char *buffer, int buffer_length, int echo_mode) +int get_data(int row, int col, char *prompt, char *buffer, int buf_size, int echo_mode) { int len; + igetch(1); // Cleanup input buffer + moveto(row, col); prints(prompt); prints(buffer); iflush(); - len = _str_input(buffer, buffer_length, echo_mode); + len = _str_input(buffer, buf_size, echo_mode); return len; } @@ -199,7 +223,7 @@ int display_file(const char *filename) { char buffer[LINE_BUFFER_LEN]; FILE *fin; - int i; + size_t i; if ((fin = fopen(filename, "r")) == NULL) { @@ -225,16 +249,16 @@ int display_file(const char *filename) int display_file_ex(const char *filename, int begin_line, int wait) { + static int show_help = 1; char buffer[LINE_BUFFER_LEN]; - char temp[LINE_BUFFER_LEN]; int ch = 0; int input_ok, line, max_lines; - long int c_line_current = 0, c_line_total = 0; + long int c_line_current = 0; + long int c_line_total = 0; FILE *fin; - struct stat f_stat; long *p_line_offsets; - int len; - int percentile; + long int len; + long int percentile; int loop = 1; if ((fin = fopen(filename, "r")) == NULL) @@ -253,7 +277,7 @@ int display_file_ex(const char *filename while (loop) { - if (c_line_current >= c_line_total) + if (c_line_current >= c_line_total && c_line_total <= screen_rows - 2) { if (wait) { @@ -268,7 +292,7 @@ int display_file_ex(const char *filename break; } - if (line >= max_lines) + if (c_line_current >= c_line_total || line >= max_lines) { if (c_line_current - (line - 1) + (screen_rows - 2) < c_line_total) { @@ -276,13 +300,13 @@ int display_file_ex(const char *filename } else { - log_error("P100 reached\n"); percentile = 100; } moveto(screen_rows, 0); - prints("\033[1;44;32m下面还有喔 (%d%%)\033[33m │ 结束 ← │ ↑/↓/PgUp/PgDn 移动 │ ? 辅助说明 │ \033[m", - percentile); + 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; @@ -292,6 +316,9 @@ int display_file_ex(const char *filename input_ok = 1; switch (ch) { + case KEY_NULL: + case KEY_TIMEOUT: + goto cleanup; case KEY_UP: if (c_line_current - line < 0) // Reach top { @@ -299,9 +326,9 @@ 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: @@ -348,8 +375,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': @@ -358,10 +383,15 @@ int display_file_ex(const char *filename case '?': case 'h': case 'H': + if (!show_help) + { + break; + } + // Display help information - strcpy(temp, app_home_dir); - strcat(temp, "data/read_help.txt"); - display_file_ex(temp, begin_line, 1); + show_help = 0; + display_file_ex(DATA_READ_HELP, begin_line, 1); + show_help = 1; // Refresh after display help information c_line_current -= (line - 1); @@ -373,6 +403,8 @@ int display_file_ex(const char *filename input_ok = 0; break; } + + BBS_last_access_tm = time(0); } continue; @@ -385,7 +417,7 @@ int display_file_ex(const char *filename log_error("Error length exceeds buffer size: %d\n", len); len = LINE_BUFFER_LEN - 1; } - if (fgets(buffer, len + 1, fin) == NULL) + if (fgets(buffer, (int)len + 1, fin) == NULL) { log_error("Reach EOF\n"); break; @@ -397,6 +429,7 @@ int display_file_ex(const char *filename line++; } +cleanup: free(p_line_offsets); fclose(fin); @@ -405,15 +438,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; + unsigned 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) + { + status[len] = '\0'; + } + str_space(space1, 31 - display_len); - str_space(buffer, 20 - strlen(BBS_current_section_name)); + 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; @@ -422,23 +471,21 @@ int show_top(char *status) int show_bottom(char *msg) { char str_time[LINE_BUFFER_LEN]; - char str_time_onine[20]; - 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 - strlen(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(); @@ -451,14 +498,13 @@ int show_active_board() char buffer[LINE_BUFFER_LEN]; FILE *fin; static int line; - int len; + unsigned int len; int end_of_line; - - sprintf(filename, "%sdata/active_board.txt", app_home_dir); + int display_len; clrline(3, 2 + ACTIVE_BOARD_HEIGHT); - if ((fin = fopen(filename, "r")) == NULL) + if ((fin = fopen(DATA_ACTIVE_BOARD, "r")) == NULL) { log_error("Unable to open file %s\n", filename); return -1; @@ -482,7 +528,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);