--- lbbs/src/menu.c 2025/06/24 10:01:24 1.68 +++ lbbs/src/menu.c 2025/10/18 13:23:50 1.76 @@ -38,7 +38,8 @@ #define MENU_SET_RESERVED_LENGTH (sizeof(int16_t) * 4) -MENU_SET *p_bbs_menu; +MENU_SET bbs_menu; +MENU_SET top10_menu; int load_menu(MENU_SET *p_menu_set, const char *conf_file) { @@ -60,6 +61,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) @@ -99,7 +103,8 @@ int load_menu(MENU_SET *p_menu_set, cons p_menu_set->shmid = shmget(key, size, IPC_CREAT | IPC_EXCL | 0600); if (p_menu_set->shmid == -1) { - log_error("shmget(size = %d) error (%d)\n", size, errno); + log_error("shmget(conf_file=%s, proj_id=%d, key=%d, size=%d) error (%d)\n", + conf_file, proj_id, key, size, errno); return -3; } p_menu_set->p_reserved = shmat(p_menu_set->shmid, NULL, 0); @@ -108,10 +113,10 @@ int load_menu(MENU_SET *p_menu_set, cons log_error("shmat() error (%d)\n", errno); return -3; } - 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_pool = (char *)(p_menu_set->p_reserved) + MENU_SET_RESERVED_LENGTH; + p_menu_set->p_menu_item_pool = (char *)(p_menu_set->p_menu_pool) + sizeof(MENU) * MAX_MENUS; + p_menu_set->p_menu_screen_pool = (char *)(p_menu_set->p_menu_item_pool) + sizeof(MENU_ITEM) * MAX_MENUITEMS; + p_menu_set->p_menu_screen_buf = (char *)(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->menu_count = 0; @@ -119,6 +124,7 @@ 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)) @@ -984,6 +990,15 @@ int display_menu(MENU_SET *p_menu_set) return EXITMENU; } + if (p_menu->item_count <= 0) // empty menu + { + moveto(p_menu->screen_row, p_menu->screen_col); + clrtoeol(); + prints("没有可选项"); + press_any_key(); + 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); @@ -1055,7 +1070,7 @@ int display_menu(MENU_SET *p_menu_set) { moveto(p_menu->screen_row, p_menu->screen_col); clrtoeol(); - prints("ûпѡ"); + prints("没有可选项"); press_any_key(); return -1; } @@ -1127,7 +1142,6 @@ int menu_control(MENU_SET *p_menu_set, i switch (key) { case CR: - igetch_reset(); case KEY_RIGHT: if (p_menu_item->submenu) { @@ -1154,14 +1168,7 @@ int menu_control(MENU_SET *p_menu_set, i if (p_menu_set->choose_step > 0) { p_menu_set->choose_step--; - if (p_menu_set->choose_step == 0) - { - return REDRAW; - } - if (display_menu(p_menu_set) != 0) - { - return menu_control(p_menu_set, KEY_LEFT); - } + return REDRAW; } else { @@ -1389,12 +1396,16 @@ int get_menu_shm_readonly(MENU_SET *p_me } 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_pool = (char *)(p_menu_set->p_reserved) + MENU_SET_RESERVED_LENGTH; + p_menu_set->p_menu_item_pool = (char *)(p_menu_set->p_menu_pool) + sizeof(MENU) * MAX_MENUS; + p_menu_set->p_menu_screen_pool = (char *)(p_menu_set->p_menu_item_pool) + sizeof(MENU_ITEM) * MAX_MENUITEMS; + p_menu_set->p_menu_screen_buf = (char *)(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; }