--- lbbs/src/menu.c	2025/05/18 08:53:21	1.47
+++ lbbs/src/menu.c	2025/05/19 06:26:07	1.51
@@ -48,6 +48,7 @@ int load_menu(MENU_SET *p_menu_set, cons
 	char temp[LINE_BUFFER_LEN];
 	char *p = NULL;
 	char *q = NULL;
+	char *r = NULL;
 	char *saveptr = NULL;
 	MENU *p_menu = NULL;
 	MENU_ITEM *p_menu_item = NULL;
@@ -159,6 +160,7 @@ int load_menu(MENU_SET *p_menu_set, cons
 				p_menu->item_count = 0;
 				p_menu->title.show = 0;
 				p_menu->screen_show = 0;
+				p_menu->page_item_limit = 0;
 
 				q = strtok_r(NULL, MENU_CONF_DELIM_WITH_SPACE, &saveptr);
 				if (q == NULL)
@@ -167,7 +169,7 @@ int load_menu(MENU_SET *p_menu_set, cons
 					return -1;
 				}
 				p = q;
-				while (isalnum(*q) || *q == '_')
+				while (isalnum(*q) || *q == '_' || *q == '-')
 				{
 					q++;
 				}
@@ -250,7 +252,7 @@ int load_menu(MENU_SET *p_menu_set, cons
 						else
 						{
 							q = p;
-							while (isalnum(*q) || *q == '_')
+							while (isalnum(*q) || *q == '_' || *q == '-')
 							{
 								q++;
 							}
@@ -356,6 +358,15 @@ int load_menu(MENU_SET *p_menu_set, cons
 						p = q;
 						while (*q != '\0' && *q != '\"')
 						{
+							if (*q == '\\')
+							{
+								r = q;
+								while (*r != '\0')
+								{
+									*r = *(r + 1);
+									r++;
+								}
+							}
 							q++;
 						}
 						if (*q != '\"' || *(q + 1) != '\0')
@@ -384,6 +395,15 @@ int load_menu(MENU_SET *p_menu_set, cons
 						p = q;
 						while (*q != '\0' && *q != '\"')
 						{
+							if (*q == '\\')
+							{
+								r = q;
+								while (*r != '\0')
+								{
+									*r = *(r + 1);
+									r++;
+								}
+							}
 							q++;
 						}
 						if (*q != '\"')
@@ -462,6 +482,15 @@ int load_menu(MENU_SET *p_menu_set, cons
 						p = q;
 						while (*q != '\0' && *q != '\"')
 						{
+							if (*q == '\\')
+							{
+								r = q;
+								while (*r != '\0')
+								{
+									*r = *(r + 1);
+									r++;
+								}
+							}
 							q++;
 						}
 						if (*q != '\"')
@@ -471,7 +500,7 @@ int load_menu(MENU_SET *p_menu_set, cons
 						}
 						*q = '\0';
 
-						if (q - p > sizeof(p_menu_item->text) - 1)
+						if (q - p > sizeof(p_menu->title.text) - 1)
 						{
 							log_error("Too longer menu title text in menu config line %d\n", fin_line);
 							return -1;
@@ -537,7 +566,7 @@ int load_menu(MENU_SET *p_menu_set, cons
 							return -1;
 						}
 						p = q;
-						while (isalnum(*q) || *q == '_')
+						while (isalnum(*q) || *q == '_' || *q == '-')
 						{
 							q++;
 						}
@@ -557,6 +586,73 @@ int load_menu(MENU_SET *p_menu_set, cons
 							return -1;
 						}
 					}
+					else if (strcmp(p, "page") == 0)
+					{
+						// Menu page row
+						q = strtok_r(NULL, MENU_CONF_DELIM_WITH_SPACE, &saveptr);
+						if (q == NULL)
+						{
+							log_error("Error menu page row in menu config line %d\n", fin_line);
+							return -1;
+						}
+						p = q;
+						while (isdigit(*q))
+						{
+							q++;
+						}
+						if (*q != '\0')
+						{
+							log_error("Error menu page row in menu config line %d\n", fin_line);
+							return -1;
+						}
+						p_menu->page_row = (int16_t)atoi(p);
+
+						// Menu page col
+						q = strtok_r(NULL, MENU_CONF_DELIM_WITH_SPACE, &saveptr);
+						if (q == NULL)
+						{
+							log_error("Error menu page col in menu config line %d\n", fin_line);
+							return -1;
+						}
+						p = q;
+						while (isdigit(*q))
+						{
+							q++;
+						}
+						if (*q != '\0')
+						{
+							log_error("Error menu page col in menu config line %d\n", fin_line);
+							return -1;
+						}
+						p_menu->page_col = (int16_t)atoi(p);
+
+						// Menu page item limit
+						q = strtok_r(NULL, MENU_CONF_DELIM_WITH_SPACE, &saveptr);
+						if (q == NULL)
+						{
+							log_error("Error menu page item limit in menu config line %d\n", fin_line);
+							return -1;
+						}
+						p = q;
+						while (isdigit(*q))
+						{
+							q++;
+						}
+						if (*q != '\0')
+						{
+							log_error("Error menu page item limit in menu config line %d\n", fin_line);
+							return -1;
+						}
+						p_menu->page_item_limit = (int16_t)atoi(p);
+
+						// Check syntax
+						q = strtok_r(NULL, MENU_CONF_DELIM_WITH_SPACE, &saveptr);
+						if (q != NULL)
+						{
+							log_error("Unknown extra content in menu config line %d\n", fin_line);
+							return -1;
+						}
+					}
 				}
 			}
 			else // BEGIN of menu screen
@@ -572,7 +668,7 @@ int load_menu(MENU_SET *p_menu_set, cons
 				p_screen = get_menu_screen_by_id(p_menu_set, screen_id);
 
 				q = p;
-				while (isalnum(*q) || *q == '_')
+				while (isalnum(*q) || *q == '_' || *q == '-')
 				{
 					q++;
 				}
@@ -696,7 +792,7 @@ int load_menu(MENU_SET *p_menu_set, cons
 		{
 			if (trie_dict_get(p_menu_set->p_menu_name_dict, p_menu_item->action, (int64_t *)&menu_id) != 1)
 			{
-				log_error("Undefined menu action [%s]\n", p_menu_item->action);
+				log_error("Undefined sub menu id [%s]\n", p_menu_item->action);
 				return -1;
 			}
 			p_menu_item->action_menu_id = menu_id;
@@ -738,22 +834,21 @@ static int display_menu_cursor(MENU_SET
 
 	moveto(p_menu_set->menu_item_r_row[menu_item_pos], p_menu_set->menu_item_r_col[menu_item_pos] - 2);
 	outc(show ? '>' : ' ');
-	iflush();
 
 	return 0;
 }
 
-int display_menu(MENU_SET *p_menu_set)
+static int display_menu_current_page(MENU_SET *p_menu_set)
 {
 	int16_t row = 0;
 	int16_t col = 0;
-	int menu_selectable = 0;
 	MENU_ID menu_id;
 	MENU_ITEM_ID menu_item_id;
 	MENU *p_menu;
 	MENU_ITEM *p_menu_item;
-	MENU_SCREEN *p_menu_screen;
 	int16_t menu_item_pos;
+	int16_t page_id = 0;
+	MENU_SCREEN *p_menu_screen;
 
 	menu_id = p_menu_set->menu_id_path[p_menu_set->choose_step];
 	p_menu = get_menu_by_id(p_menu_set, menu_id);
@@ -763,25 +858,19 @@ int display_menu(MENU_SET *p_menu_set)
 		return -1;
 	}
 
-	menu_item_pos = p_menu_set->menu_item_pos[p_menu_set->choose_step];
-	menu_item_id = p_menu->items[menu_item_pos];
-	p_menu_item = get_menu_item_by_id(p_menu_set, menu_item_id);
-	if (p_menu_item == NULL)
-	{
-		log_error("get_menu_item_by_id(%d) return NULL pointer\n", menu_item_id);
-		return -1;
-	}
-
-	if (menu_item_pos > 0 &&
-		checkpriv(&BBS_priv, 0, p_menu_item->priv) != 0 &&
-		checklevel(&BBS_priv, p_menu_item->level) != 0)
-	{
-		menu_selectable = 1;
-	}
+	clrline(p_menu->page_row, p_menu->page_row + p_menu->page_item_limit - 1);
 
 	if (p_menu->title.show)
 	{
-		show_top(p_menu->title.text);
+		if (p_menu->title.row == 0 && p_menu->title.col == 0)
+		{
+			show_top(p_menu->title.text);
+		}
+		else
+		{
+			moveto(p_menu->title.row, p_menu->title.col);
+			prints("%s", p_menu->title.text);
+		}
 	}
 
 	if (p_menu->screen_show)
@@ -793,9 +882,92 @@ int display_menu(MENU_SET *p_menu_set)
 			return -1;
 		}
 
-		moveto(p_menu->screen_row, p_menu->screen_col);
+		row = p_menu->screen_row;
+		col = p_menu->screen_col;
+
+		moveto(row, col);
 		prints("%s", p_menu_set->p_menu_screen_buf + p_menu_screen->buf_offset);
-		iflush();
+	}
+
+	menu_item_pos = p_menu_set->menu_item_pos[p_menu_set->choose_step];
+	page_id = p_menu_set->menu_item_page_id[menu_item_pos];
+
+	while (menu_item_pos >= 0)
+	{
+		if (p_menu_set->menu_item_page_id[menu_item_pos] != page_id)
+		{
+			menu_item_pos++;
+			break;
+		}
+
+		if (menu_item_pos == 0)
+		{
+			break;
+		}
+
+		menu_item_pos--;
+	}
+
+	for (; menu_item_pos < p_menu->item_count; menu_item_pos++)
+	{
+		if (p_menu_set->menu_item_page_id[menu_item_pos] != page_id)
+		{
+			break;
+		}
+
+		menu_item_id = p_menu->items[menu_item_pos];
+		p_menu_item = get_menu_item_by_id(p_menu_set, menu_item_id);
+
+		if (p_menu_set->menu_item_display[menu_item_pos] == 0)
+		{
+			continue;
+		}
+
+		row = p_menu_set->menu_item_r_row[menu_item_pos];
+		col = p_menu_set->menu_item_r_col[menu_item_pos];
+
+		moveto(row, col);
+		prints("%s", p_menu_item->text);
+	}
+
+	return 0;
+}
+
+int display_menu(MENU_SET *p_menu_set)
+{
+	int16_t row = 0;
+	int16_t col = 0;
+	int menu_selectable = 0;
+	MENU_ID menu_id;
+	MENU_ITEM_ID menu_item_id;
+	MENU *p_menu;
+	MENU_ITEM *p_menu_item;
+	int16_t menu_item_pos;
+	int16_t page_id = 0;
+	int page_item_count = 0;
+
+	menu_id = p_menu_set->menu_id_path[p_menu_set->choose_step];
+	p_menu = get_menu_by_id(p_menu_set, menu_id);
+	if (p_menu == NULL)
+	{
+		log_error("get_menu_by_id(%d) return NULL pointer\n", menu_id);
+		return -1;
+	}
+
+	menu_item_pos = p_menu_set->menu_item_pos[p_menu_set->choose_step];
+	menu_item_id = p_menu->items[menu_item_pos];
+	p_menu_item = get_menu_item_by_id(p_menu_set, menu_item_id);
+	if (p_menu_item == NULL)
+	{
+		log_error("get_menu_item_by_id(%d) return NULL pointer\n", menu_item_id);
+		return -1;
+	}
+
+	if (menu_item_pos > 0 &&
+		checkpriv(&BBS_priv, 0, p_menu_item->priv) != 0 &&
+		checklevel2(&BBS_priv, p_menu_item->level))
+	{
+		menu_selectable = 1;
 	}
 
 	for (menu_item_pos = 0; menu_item_pos < p_menu->item_count; menu_item_pos++)
@@ -812,7 +984,9 @@ int display_menu(MENU_SET *p_menu_set)
 			col = p_menu_item->col;
 		}
 
-		if (checkpriv(&BBS_priv, 0, p_menu_item->priv) == 0 || checklevel(&BBS_priv, p_menu_item->level) == 0)
+		p_menu_set->menu_item_page_id[menu_item_pos] = page_id;
+
+		if (checkpriv(&BBS_priv, 0, p_menu_item->priv) == 0 || checklevel2(&BBS_priv, p_menu_item->level) == 0)
 		{
 			p_menu_set->menu_item_display[menu_item_pos] = 0;
 			p_menu_set->menu_item_r_row[menu_item_pos] = 0;
@@ -831,10 +1005,16 @@ int display_menu(MENU_SET *p_menu_set)
 			p_menu_set->menu_item_r_row[menu_item_pos] = row;
 			p_menu_set->menu_item_r_col[menu_item_pos] = col;
 
-			moveto(row, col);
-			prints("%s", p_menu_item->text);
-
 			row++;
+
+			page_item_count++;
+			if (p_menu->page_item_limit > 0 && page_item_count >= p_menu->page_item_limit)
+			{
+				page_id++;
+				page_item_count = 0;
+				row = p_menu->page_row;
+				col = p_menu->page_col;
+			}
 		}
 	}
 
@@ -843,6 +1023,8 @@ int display_menu(MENU_SET *p_menu_set)
 		return -1;
 	}
 
+	display_menu_current_page(p_menu_set);
+
 	display_menu_cursor(p_menu_set, 1);
 
 	return 0;
@@ -855,6 +1037,8 @@ int menu_control(MENU_SET *p_menu_set, i
 	MENU *p_menu;
 	MENU_ITEM *p_menu_item;
 	int16_t menu_item_pos;
+	int16_t page_id;
+	int require_page_change = 0;
 
 	if (p_menu_set->menu_count == 0)
 	{
@@ -875,6 +1059,8 @@ int menu_control(MENU_SET *p_menu_set, i
 	}
 
 	menu_item_pos = p_menu_set->menu_item_pos[p_menu_set->choose_step];
+	page_id = p_menu_set->menu_item_page_id[menu_item_pos];
+
 	menu_item_id = p_menu->items[menu_item_pos];
 	p_menu_item = get_menu_item_by_id(p_menu_set, menu_item_id);
 	if (p_menu_item == NULL)
@@ -916,6 +1102,10 @@ int menu_control(MENU_SET *p_menu_set, i
 			{
 				return menu_control(p_menu_set, KEY_LEFT);
 			}
+			if (p_menu_set->choose_step == 0)
+			{
+				return REDRAW;
+			}
 		}
 		else
 		{
@@ -944,6 +1134,8 @@ int menu_control(MENU_SET *p_menu_set, i
 			display_menu_cursor(p_menu_set, 1);
 		}
 		break;
+	case KEY_PGUP:
+		require_page_change = 1;
 	case KEY_UP:
 		display_menu_cursor(p_menu_set, 0);
 		do
@@ -952,6 +1144,7 @@ int menu_control(MENU_SET *p_menu_set, i
 			if (menu_item_pos < 0)
 			{
 				menu_item_pos = p_menu->item_count - 1;
+				require_page_change = 0;
 			}
 			menu_item_id = p_menu->items[menu_item_pos];
 			p_menu_item = get_menu_item_by_id(p_menu_set, menu_item_id);
@@ -960,10 +1153,20 @@ int menu_control(MENU_SET *p_menu_set, i
 				log_error("get_menu_item_by_id(%d) return NULL pointer\n", menu_item_id);
 				return -1;
 			}
-		} while (!p_menu_set->menu_item_display[menu_item_pos]);
+			if (require_page_change && p_menu_set->menu_item_page_id[menu_item_pos] != page_id)
+			{
+				require_page_change = 0;
+			}
+		} while (require_page_change || !p_menu_set->menu_item_display[menu_item_pos]);
 		p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos;
+		if (p_menu_set->menu_item_page_id[menu_item_pos] != page_id)
+		{
+			display_menu_current_page(p_menu_set);
+		}
 		display_menu_cursor(p_menu_set, 1);
 		break;
+	case KEY_PGDN:
+		require_page_change = 1;
 	case KEY_DOWN:
 		display_menu_cursor(p_menu_set, 0);
 		do
@@ -972,6 +1175,7 @@ int menu_control(MENU_SET *p_menu_set, i
 			if (menu_item_pos >= p_menu->item_count)
 			{
 				menu_item_pos = 0;
+				require_page_change = 0;
 			}
 			menu_item_id = p_menu->items[menu_item_pos];
 			p_menu_item = get_menu_item_by_id(p_menu_set, menu_item_id);
@@ -980,12 +1184,19 @@ int menu_control(MENU_SET *p_menu_set, i
 				log_error("get_menu_item_by_id(%d) return NULL pointer\n", menu_item_id);
 				return -1;
 			}
-		} while (!p_menu_set->menu_item_display[menu_item_pos]);
+			if (require_page_change && p_menu_set->menu_item_page_id[menu_item_pos] != page_id)
+			{
+				require_page_change = 0;
+			}
+		} while (require_page_change || !p_menu_set->menu_item_display[menu_item_pos]);
 		p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos;
+		if (p_menu_set->menu_item_page_id[menu_item_pos] != page_id)
+		{
+			display_menu_current_page(p_menu_set);
+		}
 		display_menu_cursor(p_menu_set, 1);
 		break;
 	case KEY_HOME:
-	case KEY_PGUP:
 		display_menu_cursor(p_menu_set, 0);
 		menu_item_pos = 0;
 		while (menu_item_pos < p_menu->item_count - 1)
@@ -1006,10 +1217,13 @@ int menu_control(MENU_SET *p_menu_set, i
 			menu_item_pos++;
 		}
 		p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos;
+		if (p_menu_set->menu_item_page_id[menu_item_pos] != page_id)
+		{
+			display_menu_current_page(p_menu_set);
+		}
 		display_menu_cursor(p_menu_set, 1);
 		break;
 	case KEY_END:
-	case KEY_PGDN:
 		display_menu_cursor(p_menu_set, 0);
 		menu_item_pos = p_menu->item_count - 1;
 		while (menu_item_pos > 0)
@@ -1030,6 +1244,10 @@ int menu_control(MENU_SET *p_menu_set, i
 			menu_item_pos--;
 		}
 		p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos;
+		if (p_menu_set->menu_item_page_id[menu_item_pos] != page_id)
+		{
+			display_menu_current_page(p_menu_set);
+		}
 		display_menu_cursor(p_menu_set, 1);
 		break;
 	default:
@@ -1049,15 +1267,19 @@ int menu_control(MENU_SET *p_menu_set, i
 				{
 					display_menu_cursor(p_menu_set, 0);
 					p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos;
+					if (p_menu_set->menu_item_page_id[menu_item_pos] != page_id)
+					{
+						display_menu_current_page(p_menu_set);
+					}
 					display_menu_cursor(p_menu_set, 1);
-					return 0;
+					break;
 				}
 			}
 		}
 		break;
 	}
 
-	return 0;
+	return NOREDRAW;
 }
 
 int unload_menu(MENU_SET *p_menu_set)