--- lbbs/src/menu.c	2025/05/19 02:16:24	1.49
+++ lbbs/src/menu.c	2025/05/28 10:26:21	1.60
@@ -160,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)
@@ -585,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
@@ -770,17 +838,17 @@ static int display_menu_cursor(MENU_SET
 	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);
@@ -790,27 +858,13 @@ 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 &&
-		checklevel2(&BBS_priv, p_menu_item->level))
-	{
-		menu_selectable = 1;
-	}
+	clrline(p_menu->page_row, p_menu->page_row + p_menu->page_item_limit - 1);
 
 	if (p_menu->title.show)
 	{
 		if (p_menu->title.row == 0 && p_menu->title.col == 0)
 		{
-			show_top(p_menu->title.text);
+			show_top(p_menu->title.text, BBS_name, "");
 		}
 		else
 		{
@@ -835,6 +889,92 @@ int display_menu(MENU_SET *p_menu_set)
 		prints("%s", p_menu_set->p_menu_screen_buf + p_menu_screen->buf_offset);
 	}
 
+	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);
+		if (p_menu_set->choose_step > 0)
+		{
+			p_menu_set->choose_step--;
+			return REDRAW;
+		}
+		return EXITBBS;
+	}
+
+	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);
+		menu_item_pos = 0;
+	}
+
+	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++)
 	{
 		menu_item_id = p_menu->items[menu_item_pos];
@@ -849,7 +989,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;
@@ -868,15 +1010,27 @@ 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;
+			}
 		}
 	}
 
 	if (!menu_selectable)
 	{
+		log_error("No selectable menu item in current menu (%s)\n", p_menu->name);
+		return -1;
+	}
+
+	if (display_menu_current_page(p_menu_set) != 0)
+	{
 		return -1;
 	}
 
@@ -892,10 +1046,13 @@ 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)
 	{
-		return 0;
+		log_error("Empty menu set\n");
+		return EXITBBS;
 	}
 
 	menu_id = p_menu_set->menu_id_path[p_menu_set->choose_step];
@@ -903,21 +1060,35 @@ int menu_control(MENU_SET *p_menu_set, i
 	if (p_menu == NULL)
 	{
 		log_error("get_menu_by_id(%d) return NULL pointer\n", menu_id);
-		return -1;
+		if (p_menu_set->choose_step > 0)
+		{
+			p_menu_set->choose_step--;
+			return REDRAW;
+		}
+		return EXITBBS;
 	}
 
 	if (p_menu->item_count == 0)
 	{
-		return 0;
+		log_error("Empty menu (%s)\n", p_menu->name);
+		if (p_menu_set->choose_step > 0)
+		{
+			p_menu_set->choose_step--;
+			return REDRAW;
+		}
+		return EXITBBS;
 	}
 
 	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)
 	{
 		log_error("get_menu_item_by_id(%d) return NULL pointer\n", menu_item_id);
-		return -1;
+		p_menu_set->menu_item_pos[p_menu_set->choose_step] = 0;
+		return REDRAW;
 	}
 
 	switch (key)
@@ -945,18 +1116,19 @@ int menu_control(MENU_SET *p_menu_set, i
 			return ((*(p_menu_item->action_cmd_handler))((void *)(p_menu_item->name)));
 		}
 		break;
+	case KEY_ESC:
 	case KEY_LEFT:
 		if (p_menu_set->choose_step > 0)
 		{
 			p_menu_set->choose_step--;
-			if (display_menu(p_menu_set) != 0)
-			{
-				return menu_control(p_menu_set, KEY_LEFT);
-			}
 			if (p_menu_set->choose_step == 0)
 			{
 				return REDRAW;
 			}
+			if (display_menu(p_menu_set) != 0)
+			{
+				return menu_control(p_menu_set, KEY_LEFT);
+			}
 		}
 		else
 		{
@@ -985,6 +1157,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
@@ -993,6 +1167,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);
@@ -1001,10 +1176,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
@@ -1013,6 +1198,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);
@@ -1021,12 +1207,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)
@@ -1047,10 +1240,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)
@@ -1071,6 +1267,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:
@@ -1090,8 +1290,12 @@ 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;
 				}
 			}
 		}
@@ -1103,6 +1307,13 @@ int menu_control(MENU_SET *p_menu_set, i
 
 int unload_menu(MENU_SET *p_menu_set)
 {
+	int shmid;
+
+	if (p_menu_set == NULL)
+	{
+		return -1;
+	}
+
 	if (p_menu_set->p_menu_name_dict != NULL)
 	{
 		trie_dict_destroy(p_menu_set->p_menu_name_dict);
@@ -1115,51 +1326,37 @@ int unload_menu(MENU_SET *p_menu_set)
 		p_menu_set->p_menu_screen_dict = NULL;
 	}
 
-	unload_menu_shm(p_menu_set);
+	shmid = p_menu_set->shmid;
 
-	if (shmctl(p_menu_set->shmid, IPC_RMID, NULL) == -1)
+	detach_menu_shm(p_menu_set);
+
+	if (shmctl(shmid, IPC_RMID, NULL) == -1)
 	{
-		log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", p_menu_set->shmid, errno);
+		log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", shmid, errno);
 		return -1;
 	}
 
 	return 0;
 }
 
-int load_menu_shm(MENU_SET *p_menu_set)
+int set_menu_shm_readonly(MENU_SET *p_menu_set)
 {
-	// Mount shared memory
-	if (p_menu_set->p_reserved == NULL)
+	void *p_shm;
+
+	// Remap shared memory in read-only mode
+	p_shm = shmat(p_menu_set->shmid, p_menu_set->p_reserved, SHM_RDONLY | SHM_REMAP);
+	if (p_shm == (void *)-1)
 	{
-		p_menu_set->p_reserved = shmat(p_menu_set->shmid, NULL, SHM_RDONLY);
-		if (p_menu_set->p_reserved == (void *)-1)
-		{
-			log_error("shmat() error (%d)\n", errno);
-			return -1;
-		}
+		log_error("shmat(menu_shm shmid = %d) error (%d)\n", p_menu_set->shmid, errno);
+		return -1;
 	}
-
-	p_menu_set->p_menu_pool = p_menu_set->p_reserved + MENU_SET_RESERVED_LENGTH;
-	p_menu_set->p_menu_item_pool = p_menu_set->p_menu_pool + sizeof(MENU) * MAX_MENUS;
-	p_menu_set->p_menu_screen_pool = p_menu_set->p_menu_item_pool + sizeof(MENU_ITEM) * MAX_MENUITEMS;
-	p_menu_set->p_menu_screen_buf = p_menu_set->p_menu_screen_pool + sizeof(MENU_SCREEN) * MAX_MENUS;
-	p_menu_set->p_menu_screen_buf_free = p_menu_set->p_menu_screen_buf;
-
-	// Restore status varaibles into reserved memory area
-	p_menu_set->menu_count = *((int16_t *)p_menu_set->p_reserved);
-	p_menu_set->menu_item_count = *(((int16_t *)p_menu_set->p_reserved) + 1);
-	p_menu_set->menu_screen_count = *(((int16_t *)p_menu_set->p_reserved) + 2);
-
-	p_menu_set->choose_step = 0;
-	p_menu_set->menu_id_path[0] = 0;
-
-	p_menu_set->p_menu_name_dict = NULL;
-	p_menu_set->p_menu_screen_dict = NULL;
+	
+	p_menu_set->p_reserved = p_shm;
 
 	return 0;
 }
 
-int unload_menu_shm(MENU_SET *p_menu_set)
+int detach_menu_shm(MENU_SET *p_menu_set)
 {
 	p_menu_set->menu_count = 0;
 	p_menu_set->menu_item_count = 0;
@@ -1172,11 +1369,15 @@ int unload_menu_shm(MENU_SET *p_menu_set
 	p_menu_set->p_menu_screen_buf = NULL;
 	p_menu_set->p_menu_screen_buf_free = NULL;
 
+	p_menu_set->p_menu_name_dict = NULL;
+	p_menu_set->p_menu_screen_dict = NULL;
+
 	if (p_menu_set->p_reserved != NULL && shmdt(p_menu_set->p_reserved) == -1)
 	{
 		log_error("shmdt() error (%d)\n", errno);
 		return -1;
 	}
+
 	p_menu_set->p_reserved = NULL;
 
 	return 0;