--- lbbs/src/screen.c	2025/05/28 06:03:58	1.72
+++ lbbs/src/screen.c	2025/05/30 00:20:53	1.80
@@ -222,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);
@@ -231,27 +231,17 @@ 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 wait)
 {
 	static int show_help = 1;
 	char buffer[LINE_BUFFER_LEN];
 	int ch = KEY_NULL;
 	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;
@@ -286,10 +276,24 @@ int display_file_ex(const char *filename
 				percentile = 100;
 			}
 
+			snprintf(buffer, sizeof(buffer),
+					 "\033[1;44;33m第\033[32m%ld\033[33m-\033[32m%ld\033[33m行 (\033[32m%ld%%\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] │",
+					 line_current - (line - 1) + 1,
+					 MIN(line_current - (line - 1) + (SCREEN_ROWS - 2), line_total),
+					 percentile);
+
+			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          │ 结束 ← <q> │ ↑/↓/PgUp/PgDn 移动 │ ? 辅助说明 │     \033[m",
-				   (percentile < 100 ? "下面还有喔" : "没有更多了"), percentile,
-				   (percentile < 10 ? "  " : (percentile < 100 ? " " : "")));
+			prints("%s", buffer);
 			iflush();
 
 			input_ok = 0;
@@ -327,6 +331,7 @@ 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
 					{
@@ -340,7 +345,6 @@ 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
 					{
 						break;
@@ -354,10 +358,7 @@ 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
 					{
 						break;
@@ -371,14 +372,11 @@ 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)
 					{
 						break;
@@ -386,7 +384,7 @@ int display_file_ex(const char *filename
 
 					// Display help information
 					show_help = 0;
-					display_file_ex(DATA_READ_HELP, begin_line, 1);
+					display_file(DATA_READ_HELP, begin_line, 1);
 					show_help = 1;
 
 					// Refresh after display help information
@@ -425,6 +423,26 @@ int display_file_ex(const char *filename
 	}
 
 cleanup:
+	return ch;
+}
+
+int display_file(const char *filename, int begin_line, int wait)
+{
+	int ch = KEY_NULL;
+	const void *p_shm;
+	size_t data_len;
+	long line_total;
+	const void *p_data;
+	const long *p_line_offsets;
+
+	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;
+	}
+
+	ch = display_data(p_data, line_total, p_line_offsets, begin_line, wait);
+
 	if (detach_file_shm(p_shm) < 0)
 	{
 		log_error("detach_file_shm(%s) error\n", filename);
@@ -433,7 +451,7 @@ cleanup:
 	return ch;
 }
 
-int show_top(const char *str_left, const char *str_middle)
+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];
@@ -454,15 +472,15 @@ int show_top(const char *str_left, const
 	len = split_line(str_middle, STR_TOP_MIDDLE_MAX_LEN, &eol, &str_middle_len);
 	str_middle_f[len] = '\0';
 
-	strncpy(str_right_f, BBS_current_section_name, sizeof(str_right_f) - 1);
+	strncpy(str_right_f, str_right, sizeof(str_right_f) - 1);
 	str_right_f[sizeof(str_right_f) - 1] = '\0';
-	len = split_line(BBS_current_section_name, STR_TOP_RIGHT_MAX_LEN, &eol, &str_right_len);
+	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_f, 44 - str_left_len, str_middle_f, 34 - str_middle_len - str_right_len, "", str_right_f);
+	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;
 }
@@ -472,7 +490,7 @@ int show_bottom(const char *msg)
 	char str_time[LINE_BUFFER_LEN];
 	time_t time_online;
 	struct tm *tm_online;
-	char msg_f[21];
+	char msg_f[LINE_BUFFER_LEN];
 	int eol;
 	int msg_len;
 	int len;
@@ -480,11 +498,15 @@ int show_bottom(const char *msg)
 
 	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, &eol, &msg_len);
-	msg_f[len] = '\0';
+	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';
+	}
 
 	len_username = (int)strnlen(BBS_username, sizeof(BBS_username));
 
@@ -493,9 +515,9 @@ int show_bottom(const char *msg)
 
 	moveto(SCREEN_ROWS, 0);
 	clrtoeol();
-	prints("\033[1;44;33m[\033[36m%s\033[33m]%*s%*s帐号[\033[36m%s\033[33m]"
+	prints("\033[1;44;33m时间[\033[36m%s\033[33m]%s%*s \033[33m帐号[\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,
+		   str_time, msg_f, 35 - msg_len - len_username, "", BBS_username,
 		   tm_online->tm_mday - 1, tm_online->tm_hour, tm_online->tm_min);
 
 	return 0;