--- lbbs/include/menu.h	2025/05/15 05:14:57	1.16
+++ lbbs/include/menu.h	2025/05/18 08:53:21	1.19
@@ -19,6 +19,7 @@
 
 #include "common.h"
 #include "trie_dict.h"
+#include "bbs_cmd.h"
 #include <stdint.h>
 #include <sys/shm.h>
 
@@ -39,10 +40,11 @@ typedef uint64_t MENU_SCREEN_ID;
 
 struct menu_item_t
 {
-	int16_t row, col, r_row, r_col;
+	int16_t row, col;
 	char action[MAX_MENUACTION_LENGTH];
 	MENU_ID action_menu_id;
-	int8_t submenu, display;
+	bbs_cmd_handler action_cmd_handler;
+	int8_t submenu;
 	int priv, level;
 	char name[MAX_MENUNAME_LENGTH];
 	char text[MAX_MENUITEM_LENGTH];
@@ -69,6 +71,7 @@ struct menu_t
 {
 	char name[MAX_MENUNAME_LENGTH];
 	MENU_TITLE title;
+	char screen_name[MAX_MENU_SCR_NAME_LENGTH];
 	MENU_SCREEN_ID screen_id;
 	int8_t screen_show;
 	int16_t screen_row, screen_col;
@@ -94,6 +97,9 @@ struct menu_set_t
 	MENU_ID menu_id_path[MAX_MENU_DEPTH];
 	int16_t menu_item_pos[MAX_MENU_DEPTH];
 	int16_t choose_step;
+	int8_t menu_item_display[MAX_ITEMS_PER_MENU];
+	int16_t menu_item_r_row[MAX_ITEMS_PER_MENU];
+	int16_t menu_item_r_col[MAX_ITEMS_PER_MENU];
 };
 typedef struct menu_set_t MENU_SET;