--- lbbs/include/menu.h 2025/06/21 02:15:18 1.26 +++ lbbs/include/menu.h 2025/10/18 12:06:10 1.31 @@ -25,9 +25,9 @@ #define MAX_MENU_NAME_LENGTH 30 #define MAX_ITEMS_PER_MENU 256 #define MAX_MENUITEM_NAME_LENGTH 256 -#define MAX_MENUITEM_TEXT_LENGTH 100 +#define MAX_MENUITEM_TEXT_LENGTH 200 #define MAX_MENUITEM_ACTION_LENGTH 30 -#define MAX_MENUTITLE_TEXT_LENGTH 50 +#define MAX_MENUTITLE_TEXT_LENGTH 100 #define MAX_MENU_SCR_NAME_LENGTH 20 #define MAX_MENU_SCR_BUF_LENGTH 2000 #define MAX_MENUS 256 @@ -105,14 +105,17 @@ struct menu_set_t int16_t menu_item_r_row[MAX_ITEMS_PER_MENU]; int16_t menu_item_r_col[MAX_ITEMS_PER_MENU]; int16_t menu_item_page_id[MAX_ITEMS_PER_MENU]; + int8_t allow_exit; }; typedef struct menu_set_t MENU_SET; -extern MENU_SET *p_bbs_menu; +extern MENU_SET bbs_menu; +extern MENU_SET top10_menu; extern int load_menu(MENU_SET *p_menu_set, const char *conf_file); extern int unload_menu(MENU_SET *p_menu_set); +extern int get_menu_shm_readonly(MENU_SET *p_menu_set); extern int set_menu_shm_readonly(MENU_SET *p_menu_set); extern int detach_menu_shm(MENU_SET *p_menu_set); @@ -136,7 +139,7 @@ inline MENU *get_menu_by_id(MENU_SET *p_ return NULL; } - return (p_menu_set->p_menu_pool + sizeof(MENU) * menu_id); + return (MENU *)((char *)(p_menu_set->p_menu_pool) + sizeof(MENU) * menu_id); } inline MENU_ITEM *get_menu_item_by_id(MENU_SET *p_menu_set, MENU_ITEM_ID menu_item_id) @@ -146,7 +149,7 @@ inline MENU_ITEM *get_menu_item_by_id(ME return NULL; } - return (p_menu_set->p_menu_item_pool + sizeof(MENU_ITEM) * menu_item_id); + return (MENU_ITEM *)((char *)(p_menu_set->p_menu_item_pool) + sizeof(MENU_ITEM) * menu_item_id); } inline MENU_SCREEN *get_menu_screen_by_id(MENU_SET *p_menu_set, MENU_SCREEN_ID menu_screen_id) @@ -156,7 +159,7 @@ inline MENU_SCREEN *get_menu_screen_by_i return NULL; } - return (p_menu_set->p_menu_screen_pool + sizeof(MENU_ITEM) * menu_screen_id); + return (MENU_SCREEN *)((char *)(p_menu_set->p_menu_screen_pool) + sizeof(MENU_ITEM) * menu_screen_id); } #endif //_MENU_H_