--- lbbs/src/screen.c 2025/06/10 06:47:04 1.91 +++ lbbs/src/screen.c 2025/06/17 02:06:48 1.99 @@ -14,6 +14,8 @@ * * ***************************************************************************/ +#define _POSIX_C_SOURCE 200809L + #include "screen.h" #include "bbs.h" #include "common.h" @@ -24,6 +26,7 @@ #include "file_loader.h" #include #include +#include #include #include #include @@ -32,9 +35,6 @@ #include #include -#define _POSIX_C_SOURCE 200809L -#include - #define ACTIVE_BOARD_HEIGHT 8 #define STR_TOP_LEFT_MAX_LEN 40 @@ -240,18 +240,17 @@ int display_data(const void *p_data, lon DISPLAY_CTX ctx; int ch = 0; int input_ok; - int screen_current_row; const int screen_begin_row = 1; - int screen_end_row = SCREEN_ROWS - 1; - const int screen_row_total = screen_end_row - screen_begin_row + 1; + const int screen_row_total = SCREEN_ROWS - screen_begin_row; + int output_current_row = screen_begin_row; + int output_end_row = SCREEN_ROWS - 1; long int line_current = 0; long int len; long int percentile; int loop; int eol, display_len; - clrline(screen_begin_row, SCREEN_ROWS); - screen_current_row = screen_begin_row; + clrline(output_current_row, SCREEN_ROWS); // update msg_ext with extended key handler if (key_handler(&ch, &ctx) != 0) @@ -277,13 +276,13 @@ int display_data(const void *p_data, lon break; } - if (line_current >= display_line_total || screen_current_row > screen_end_row) + if (line_current >= display_line_total || output_current_row > output_end_row) { - ctx.reach_begin = (line_current < screen_current_row ? 1 : 0); + ctx.reach_begin = (line_current < output_current_row ? 1 : 0); - if (line_current - (screen_current_row - screen_begin_row) + screen_row_total < display_line_total) + if (line_current - (output_current_row - screen_begin_row) + screen_row_total < display_line_total) { - percentile = (line_current - (screen_current_row - screen_begin_row) + screen_row_total) * 100 / display_line_total; + percentile = (line_current - (output_current_row - screen_begin_row) + screen_row_total) * 100 / display_line_total; ctx.reach_end = 0; } else @@ -292,8 +291,8 @@ int display_data(const void *p_data, lon ctx.reach_end = 1; } - ctx.line_top = line_current - (screen_current_row - screen_begin_row) + 1; - ctx.line_bottom = MIN(line_current - (screen_current_row - screen_begin_row) + screen_row_total, display_line_total); + ctx.line_top = line_current - (output_current_row - screen_begin_row) + 1; + 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", @@ -302,7 +301,7 @@ int display_data(const void *p_data, lon percentile, ctx.msg); - len = split_line(buffer, SCREEN_COLS, &eol, &display_len); + len = split_line(buffer, SCREEN_COLS, &eol, &display_len, 1); for (; display_len < SCREEN_COLS; display_len++) { buffer[len++] = ' '; @@ -332,14 +331,14 @@ int display_data(const void *p_data, lon case KEY_TIMEOUT: goto cleanup; case KEY_HOME: - if (line_current - screen_current_row < 0) // Reach begin + if (line_current - output_current_row < 0) // Reach begin { break; } line_current = 0; - screen_current_row = screen_begin_row; - screen_end_row = SCREEN_ROWS - 1; - clrline(screen_begin_row, SCREEN_ROWS); + output_current_row = screen_begin_row; + output_end_row = SCREEN_ROWS - 1; + clrline(output_current_row, SCREEN_ROWS); break; case KEY_END: if (display_line_total < screen_row_total) @@ -347,63 +346,63 @@ int display_data(const void *p_data, lon break; } line_current = display_line_total - screen_row_total; - screen_current_row = screen_begin_row; - screen_end_row = SCREEN_ROWS - 1; - clrline(screen_begin_row, SCREEN_ROWS); + output_current_row = screen_begin_row; + output_end_row = SCREEN_ROWS - 1; + clrline(output_current_row, SCREEN_ROWS); break; case KEY_UP: - if (line_current - screen_current_row < 0) // Reach begin + if (line_current - output_current_row < 0) // Reach begin { break; } - line_current -= screen_current_row; - screen_current_row = screen_begin_row; + line_current -= output_current_row; + output_current_row = screen_begin_row; // screen_end_line = screen_begin_line; // prints("\033[T"); // Scroll down 1 line - screen_end_row = SCREEN_ROWS - 1; // Legacy Fterm only works with this line + output_end_row = SCREEN_ROWS - 1; // Legacy Fterm only works with this line break; case CR: igetch_reset(); case KEY_SPACE: case KEY_DOWN: - if (line_current + (screen_row_total - (screen_current_row - screen_begin_row)) >= display_line_total) // Reach end + if (line_current + (screen_row_total - (output_current_row - screen_begin_row)) >= display_line_total) // Reach end { break; } - line_current += (screen_row_total - (screen_current_row - screen_begin_row)); - screen_current_row = screen_row_total; - screen_end_row = SCREEN_ROWS - 1; + line_current += (screen_row_total - (output_current_row - screen_begin_row)); + output_current_row = screen_row_total; + output_end_row = SCREEN_ROWS - 1; moveto(SCREEN_ROWS, 0); clrtoeol(); prints("\033[S"); // Scroll up 1 line break; case KEY_PGUP: - if (line_current - screen_current_row < 0) // Reach begin + if (line_current - output_current_row < 0) // Reach begin { break; } - line_current -= ((screen_row_total - 1) + (screen_current_row - screen_begin_row)); + line_current -= ((screen_row_total - 1) + (output_current_row - screen_begin_row)); if (line_current < 0) { line_current = 0; } - screen_current_row = screen_begin_row; - screen_end_row = SCREEN_ROWS - 1; - clrline(screen_begin_row, SCREEN_ROWS); + output_current_row = screen_begin_row; + output_end_row = SCREEN_ROWS - 1; + clrline(output_current_row, SCREEN_ROWS); break; case KEY_PGDN: - if (line_current + screen_row_total - (screen_current_row - screen_begin_row) >= display_line_total) // Reach end + if (line_current + screen_row_total - (output_current_row - screen_begin_row) >= display_line_total) // Reach end { break; } - line_current += (screen_row_total - 1) - (screen_current_row - screen_begin_row); + line_current += (screen_row_total - 1) - (output_current_row - screen_begin_row); if (line_current + screen_row_total > display_line_total) // No enough lines to display { line_current = display_line_total - screen_row_total; } - screen_current_row = screen_begin_row; - screen_end_row = SCREEN_ROWS - 1; - clrline(screen_begin_row, SCREEN_ROWS); + output_current_row = screen_begin_row; + output_end_row = SCREEN_ROWS - 1; + clrline(output_current_row, SCREEN_ROWS); break; case KEY_ESC: case KEY_LEFT: @@ -420,39 +419,10 @@ int display_data(const void *p_data, lon show_help = 1; case KEY_F5: // Refresh after display help information - line_current -= (screen_current_row - screen_begin_row); - screen_current_row = screen_begin_row; - screen_end_row = SCREEN_ROWS - 1; - clrline(screen_begin_row, SCREEN_ROWS); - break; - case KEY_F2: // For test only - EDITOR_DATA *p_editor_data; - // size_t data_new_len = strlen(p_data) + LINE_BUFFER_LEN; - - // char *p_data_new = malloc(data_new_len); - // if (p_data_new == NULL) - // { - // break; - // } - p_editor_data = editor_data_load(p_data); - if (p_editor_data == NULL) - { - // free(p_data_new); - break; - } - - editor_display(p_editor_data); - // editor_data_save(p_editor_data, p_data_new, data_new_len); - editor_data_cleanup(p_editor_data); - p_editor_data = NULL; - // free(p_data_new); - // p_data_new = NULL; - - // Refresh after display editor - line_current -= (screen_current_row - screen_begin_row); - screen_current_row = screen_begin_row; - screen_end_row = SCREEN_ROWS - 1; - clrline(screen_begin_row, SCREEN_ROWS); + line_current -= (output_current_row - screen_begin_row); + output_current_row = screen_begin_row; + output_end_row = SCREEN_ROWS - 1; + clrline(output_current_row, SCREEN_ROWS); break; case 0: // Refresh bottom line break; @@ -461,7 +431,7 @@ int display_data(const void *p_data, lon break; } - BBS_last_access_tm = time(0); + BBS_last_access_tm = time(NULL); } continue; @@ -484,11 +454,11 @@ int display_data(const void *p_data, lon memcpy(buffer, (const char *)p_data + p_line_offsets[line_current], (size_t)len); buffer[len] = '\0'; - moveto(screen_current_row, 0); + moveto(output_current_row, 0); clrtoeol(); prints("%s", buffer); line_current++; - screen_current_row++; + output_current_row++; } cleanup: @@ -548,17 +518,17 @@ 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); + len = split_line(str_left_f, STR_TOP_LEFT_MAX_LEN, &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); + len = split_line(str_middle, STR_TOP_MIDDLE_MAX_LEN, &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); + len = split_line(str_right, STR_TOP_RIGHT_MAX_LEN, &eol, &str_right_len, 1); str_right_f[len] = '\0'; moveto(1, 0); @@ -589,13 +559,13 @@ 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, 23, &eol, &msg_len); + len = split_line(msg_f, 23, &eol, &msg_len, 1); msg_f[len] = '\0'; } len_username = (int)strnlen(BBS_username, sizeof(BBS_username)); - time_online = time(0) - BBS_login_tm; + time_online = time(NULL) - BBS_login_tm; tm_online = gmtime(&time_online); if (tm_online->tm_mday > 1) { @@ -642,10 +612,10 @@ int show_active_board() } } - if (time(0) - t_last_show >= 10) + if (time(NULL) - t_last_show >= 10) { line_last = line_current; - t_last_show = time(0); + t_last_show = time(NULL); } else {