--- lbbs/src/menu.c	2025/05/15 05:14:57	1.40
+++ lbbs/src/menu.c	2025/05/18 08:53:21	1.47
@@ -546,12 +546,8 @@ int load_menu(MENU_SET *p_menu_set, cons
 							log_error("Error menu screen name in menu config line %d\n", fin_line);
 							return -1;
 						}
-						if (trie_dict_get(p_menu_set->p_menu_screen_dict, p, (int64_t *)&screen_id) != 1)
-						{
-							log_error("Undefined menu screen [%s]\n", p);
-							return -1;
-						}
-						p_menu->screen_id = screen_id;
+						strncpy(p_menu->screen_name, p, sizeof(p_menu->screen_name) - 1);
+						p_menu->screen_name[sizeof(p_menu->screen_name) - 1] = '\0';
 
 						// Check syntax
 						q = strtok_r(NULL, MENU_CONF_DELIM_WITH_SPACE, &saveptr);
@@ -628,6 +624,14 @@ int load_menu(MENU_SET *p_menu_set, cons
 						break;
 					}
 
+					// Clear line
+					if (p_menu_set->p_menu_screen_buf_free + strlen(CTRL_SEQ_CLR_LINE) > q)
+					{
+						log_error("Menu screen buffer depleted (%p + %d > %p)\n", p_menu_set->p_menu_screen_buf_free, q, strlen(CTRL_SEQ_CLR_LINE));
+						return -3;
+					}
+					p_menu_set->p_menu_screen_buf_free = stpcpy(p_menu_set->p_menu_screen_buf_free, CTRL_SEQ_CLR_LINE);
+
 					p = buffer;
 					while (*p != '\0')
 					{
@@ -663,11 +667,32 @@ int load_menu(MENU_SET *p_menu_set, cons
 	}
 	fclose(fin);
 
-	// Set menu_item->action_menu_id of each menu item pointing to a submenu to the menu_id of the corresponding submenu
+	for (menu_id = 0; menu_id < p_menu_set->menu_count; menu_id++)
+	{
+		p_menu = get_menu_by_id(p_menu_set, menu_id);
+
+		if (trie_dict_get(p_menu_set->p_menu_screen_dict, p_menu->screen_name, (int64_t *)(&(p_menu->screen_id))) != 1)
+		{
+			log_error("Undefined menu screen [%s]\n", p);
+			return -1;
+		}
+	}
+
 	for (menu_item_id = 0; menu_item_id < p_menu_set->menu_item_count; menu_item_id++)
 	{
 		p_menu_item = get_menu_item_by_id(p_menu_set, menu_item_id);
-		if (p_menu_item->submenu == 1 && strcmp(p_menu_item->action, "..") != 0)
+
+		// Set menu_item->action_cmd_handler of each menu item pointing to bbs_cmd
+		if (p_menu_item->submenu == 0)
+		{
+			if ((p_menu_item->action_cmd_handler = get_cmd_handler(p_menu_item->action)) == NULL)
+			{
+				log_error("Undefined menu action cmd handler [%s]\n", p_menu_item->action);
+				return -1;
+			}
+		}
+		// Set menu_item->action_menu_id of each menu item pointing to a submenu to the menu_id of the corresponding submenu
+		else if (strcmp(p_menu_item->action, "..") != 0)
 		{
 			if (trie_dict_get(p_menu_set->p_menu_name_dict, p_menu_item->action, (int64_t *)&menu_id) != 1)
 			{
@@ -711,7 +736,7 @@ static int display_menu_cursor(MENU_SET
 		return -1;
 	}
 
-	moveto(p_menu_item->r_row, p_menu_item->r_col - 2);
+	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();
 
@@ -773,9 +798,9 @@ int display_menu(MENU_SET *p_menu_set)
 		iflush();
 	}
 
-	for (int16_t i = 0; i < p_menu->item_count; i++)
+	for (menu_item_pos = 0; menu_item_pos < p_menu->item_count; menu_item_pos++)
 	{
-		menu_item_id = p_menu->items[i];
+		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->row != 0)
@@ -789,22 +814,22 @@ int display_menu(MENU_SET *p_menu_set)
 
 		if (checkpriv(&BBS_priv, 0, p_menu_item->priv) == 0 || checklevel(&BBS_priv, p_menu_item->level) == 0)
 		{
-			p_menu_item->display = 0;
-			p_menu_item->r_row = 0;
-			p_menu_item->r_col = 0;
+			p_menu_set->menu_item_display[menu_item_pos] = 0;
+			p_menu_set->menu_item_r_row[menu_item_pos] = 0;
+			p_menu_set->menu_item_r_col[menu_item_pos] = 0;
 		}
 		else
 		{
-			p_menu_item->display = 1;
+			p_menu_set->menu_item_display[menu_item_pos] = 1;
 
 			if (!menu_selectable)
 			{
-				p_menu_set->menu_item_pos[p_menu_set->choose_step] = i;
+				p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos;
 				menu_selectable = 1;
 			}
 
-			p_menu_item->r_row = row;
-			p_menu_item->r_col = col;
+			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);
@@ -880,7 +905,7 @@ int menu_control(MENU_SET *p_menu_set, i
 		}
 		else
 		{
-			return (exec_cmd(p_menu_item->action, p_menu_item->name));
+			return ((*(p_menu_item->action_cmd_handler))((void *)(p_menu_item->name)));
 		}
 		break;
 	case KEY_LEFT:
@@ -906,7 +931,7 @@ int menu_control(MENU_SET *p_menu_set, i
 					return -1;
 				}
 
-				if (!p_menu_item->display || p_menu_item->priv != 0 || p_menu_item->level != 0)
+				if (!p_menu_set->menu_item_display[menu_item_pos] || p_menu_item->priv != 0 || p_menu_item->level != 0)
 				{
 					menu_item_pos--;
 				}
@@ -935,7 +960,7 @@ 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_item->display);
+		} while (!p_menu_set->menu_item_display[menu_item_pos]);
 		p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos;
 		display_menu_cursor(p_menu_set, 1);
 		break;
@@ -955,16 +980,64 @@ 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_item->display);
+		} while (!p_menu_set->menu_item_display[menu_item_pos]);
+		p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos;
+		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)
+		{
+			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 (p_menu_set->menu_item_display[menu_item_pos])
+			{
+				break;
+			}
+
+			menu_item_pos++;
+		}
+		p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos;
+		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)
+		{
+			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 (p_menu_set->menu_item_display[menu_item_pos])
+			{
+				break;
+			}
+
+			menu_item_pos--;
+		}
 		p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos;
 		display_menu_cursor(p_menu_set, 1);
 		break;
 	default:
 		if (isalnum(key))
 		{
-			for (int16_t i = 0; i < p_menu->item_count; i++)
+			for (menu_item_pos = 0; menu_item_pos < p_menu->item_count; menu_item_pos++)
 			{
-				menu_item_id = p_menu->items[i];
+				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)
 				{
@@ -972,10 +1045,10 @@ int menu_control(MENU_SET *p_menu_set, i
 					return -1;
 				}
 
-				if (toupper(key) == toupper(p_menu_item->name[0]) && p_menu_item->display)
+				if (toupper(key) == toupper(p_menu_item->name[0]) && p_menu_set->menu_item_display[menu_item_pos])
 				{
 					display_menu_cursor(p_menu_set, 0);
-					p_menu_set->menu_item_pos[p_menu_set->choose_step] = i;
+					p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos;
 					display_menu_cursor(p_menu_set, 1);
 					return 0;
 				}
@@ -1015,12 +1088,16 @@ int unload_menu(MENU_SET *p_menu_set)
 int load_menu_shm(MENU_SET *p_menu_set)
 {
 	// Mount shared memory
-	p_menu_set->p_reserved = shmat(p_menu_set->shmid, NULL, SHM_RDONLY);
-	if (p_menu_set->p_reserved == (void *)-1)
+	if (p_menu_set->p_reserved == NULL)
 	{
-		log_error("shmat() error (%d)\n", errno);
-		return -3;
+		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;
+		}
 	}
+
 	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;
@@ -1054,12 +1131,11 @@ 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;
 
-	if (shmdt(p_menu_set->p_reserved) == -1)
+	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;