--- lbbs/src/menu.c 2025/06/21 02:15:18 1.67 +++ lbbs/src/menu.c 2025/06/25 01:50:14 1.69 @@ -38,7 +38,7 @@ #define MENU_SET_RESERVED_LENGTH (sizeof(int16_t) * 4) -MENU_SET *p_bbs_menu; +MENU_SET bbs_menu; int load_menu(MENU_SET *p_menu_set, const char *conf_file) { @@ -60,6 +60,9 @@ int load_menu(MENU_SET *p_menu_set, cons key_t key; size_t size; + // Initialize the data structure + memset(p_menu_set, 0, sizeof(*p_menu_set)); + // Use trie_dict to search menu_id by menu name p_menu_set->p_menu_name_dict = trie_dict_create(); if (p_menu_set->p_menu_name_dict == NULL) @@ -78,7 +81,7 @@ int load_menu(MENU_SET *p_menu_set, cons if ((fin = fopen(conf_file, "r")) == NULL) { - log_error("Open %s failed", conf_file); + log_error("Open %s failed\n", conf_file); return -2; } @@ -119,6 +122,8 @@ int load_menu(MENU_SET *p_menu_set, cons p_menu_set->menu_screen_count = 0; p_menu_set->choose_step = 0; p_menu_set->menu_id_path[0] = 0; + p_menu_set->menu_item_pos[0] = 0; + p_menu_set->allow_exit = 0; while (fgets(buffer, sizeof(buffer), fin)) { @@ -980,7 +985,7 @@ int display_menu(MENU_SET *p_menu_set) p_menu_set->choose_step--; return REDRAW; } - return EXITBBS; + return EXITMENU; } menu_item_pos = p_menu_set->menu_item_pos[p_menu_set->choose_step]; @@ -989,7 +994,7 @@ int display_menu(MENU_SET *p_menu_set) if (p_menu_item == NULL) { log_error("get_menu_item_by_id(%d) return NULL pointer\n", menu_item_id); - menu_item_pos = 0; + return EXITMENU; } if (menu_item_pos > 0 && @@ -1100,7 +1105,9 @@ int menu_control(MENU_SET *p_menu_set, i if (p_menu->item_count == 0) { +#ifdef _DEBUG log_error("Empty menu (%s)\n", p_menu->name); +#endif if (p_menu_set->choose_step > 0) { p_menu_set->choose_step--; @@ -1162,6 +1169,11 @@ int menu_control(MENU_SET *p_menu_set, i } else { + if (p_menu_set->allow_exit) + { + return EXITMENU; + } + display_menu_cursor(p_menu_set, 0); menu_item_pos = p_menu->item_count - 1; while (menu_item_pos >= 0) @@ -1368,6 +1380,31 @@ int unload_menu(MENU_SET *p_menu_set) return 0; } + +int get_menu_shm_readonly(MENU_SET *p_menu_set) +{ + void *p_shm; + + p_shm = shmat(p_menu_set->shmid, NULL, SHM_RDONLY); + if (p_shm == (void *)-1) + { + log_error("shmat(menu_shm shmid = %d) error (%d)\n", p_menu_set->shmid, errno); + return -1; + } + + p_menu_set->p_reserved = p_shm; + 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; + + p_menu_set->choose_step = 0; + p_menu_set->menu_id_path[0] = 0; + p_menu_set->menu_item_pos[0] = 0; + + return 0; +} int set_menu_shm_readonly(MENU_SET *p_menu_set) {