--- lbbs/src/menu.c 2025/07/02 04:17:33 1.71 +++ lbbs/src/menu.c 2025/10/18 12:06:10 1.75 @@ -39,6 +39,7 @@ #define MENU_SET_RESERVED_LENGTH (sizeof(int16_t) * 4) MENU_SET bbs_menu; +MENU_SET top10_menu; int load_menu(MENU_SET *p_menu_set, const char *conf_file) { @@ -102,7 +103,7 @@ 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, size = %d) error (%d)\n", conf_file, proj_id, size, errno); return -3; } p_menu_set->p_reserved = shmat(p_menu_set->shmid, NULL, 0); @@ -111,10 +112,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; @@ -988,7 +989,7 @@ int display_menu(MENU_SET *p_menu_set) return EXITMENU; } - if(p_menu->item_count <= 0) // empty menu + if (p_menu->item_count <= 0) // empty menu { moveto(p_menu->screen_row, p_menu->screen_col); clrtoeol(); @@ -1140,7 +1141,6 @@ int menu_control(MENU_SET *p_menu_set, i switch (key) { case CR: - igetch_reset(); case KEY_RIGHT: if (p_menu_item->submenu) { @@ -1167,14 +1167,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 { @@ -1402,10 +1395,10 @@ 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;