--- lbbs/src/menu.c 2025/05/27 00:54:01 1.57 +++ lbbs/src/menu.c 2025/11/02 08:14:48 1.79 @@ -16,21 +16,21 @@ #include "bbs.h" #include "bbs_cmd.h" -#include "user_priv.h" #include "bbs_cmd.h" -#include "menu.h" -#include "log.h" +#include "common.h" #include "io.h" +#include "log.h" +#include "menu.h" #include "screen.h" -#include "common.h" -#include -#include +#include "user_priv.h" #include -#include #include +#include +#include +#include #include -#include #include +#include #define MENU_SCREEN_PATH_PREFIX "var/MENU_SCR_" #define MENU_CONF_DELIM_WITH_SPACE " ,\t\r\n" @@ -38,7 +38,10 @@ #define MENU_SET_RESERVED_LENGTH (sizeof(int16_t) * 4) -MENU_SET *p_bbs_menu; +#define MENU_SHMGET_RETRY_LIMIT 10 + +MENU_SET bbs_menu; +MENU_SET top10_menu; int load_menu(MENU_SET *p_menu_set, const char *conf_file) { @@ -59,6 +62,10 @@ int load_menu(MENU_SET *p_menu_set, cons int proj_id; key_t key; size_t size; + int retry_cnt; + + // 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(); @@ -78,40 +85,56 @@ 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; } // Allocate shared memory - proj_id = (int)(time(NULL) % getpid()); - key = ftok(conf_file, proj_id); - if (key == -1) - { - log_error("ftok(%s %d) error (%d)\n", conf_file, proj_id, errno); - return -2; - } - size = MENU_SET_RESERVED_LENGTH + sizeof(MENU) * MAX_MENUS + sizeof(MENU_ITEM) * MAX_MENUITEMS + sizeof(MENU_SCREEN) * MAX_MENUS + MAX_MENU_SCR_BUF_LENGTH * MAX_MENUS; - p_menu_set->shmid = shmget(key, size, IPC_CREAT | IPC_EXCL | 0600); - if (p_menu_set->shmid == -1) + + proj_id = (int)(time(NULL) % getpid()); + retry_cnt = 0; + + do { - log_error("shmget(size = %d) error (%d)\n", size, errno); - return -3; - } + key = ftok(conf_file, proj_id + retry_cnt); + if (key == -1) + { + log_error("ftok(%s %d) error (%d)\n", conf_file, proj_id, errno); + return -2; + } + + p_menu_set->shmid = shmget(key, size, IPC_CREAT | IPC_EXCL | 0600); + + if (p_menu_set->shmid == -1) + { + if (errno != EEXIST || retry_cnt + 1 >= MENU_SHMGET_RETRY_LIMIT) + { + log_error("shmget(conf_file=%s, size=%d) error (%d) %d times\n", + conf_file, size, errno, retry_cnt + 1); + break; + } + log_error("shmget(conf_file=%s, proj_id=%d, key=0x%x, size=%d) error (%d), retry ...\n", + conf_file, proj_id + retry_cnt, key, size, errno); + retry_cnt++; + } + } while (p_menu_set->shmid == -1); + p_menu_set->p_reserved = shmat(p_menu_set->shmid, NULL, 0); if (p_menu_set->p_reserved == (void *)-1) { 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 +142,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)) { @@ -161,6 +186,8 @@ int load_menu(MENU_SET *p_menu_set, cons p_menu->title.show = 0; p_menu->screen_show = 0; p_menu->page_item_limit = 0; + p_menu->use_filter = 0; + p_menu->filter_handler = NULL; q = strtok_r(NULL, MENU_CONF_DELIM_WITH_SPACE, &saveptr); if (q == NULL) @@ -653,6 +680,18 @@ int load_menu(MENU_SET *p_menu_set, cons return -1; } } + else if (strcmp(p, "use_filter") == 0) + { + p_menu->use_filter = 1; + + // Check syntax + q = strtok_r(NULL, MENU_CONF_DELIM_WITH_SPACE, &saveptr); + if (q != NULL) + { + log_error("Unknown extra content in menu config line %d\n", fin_line); + return -1; + } + } } } else // BEGIN of menu screen @@ -772,6 +811,16 @@ int load_menu(MENU_SET *p_menu_set, cons log_error("Undefined menu screen [%s]\n", p); return -1; } + + // Set menu->filter_handler of each menu pointing to filter + if (p_menu->use_filter == 1) + { + if ((p_menu->filter_handler = get_cmd_handler(p_menu->name)) == NULL) + { + log_error("Undefined menu filter handler [%s]\n", p_menu->name); + return -1; + } + } } for (menu_item_id = 0; menu_item_id < p_menu_set->menu_item_count; menu_item_id++) @@ -807,7 +856,7 @@ int load_menu(MENU_SET *p_menu_set, cons return 0; } -static int display_menu_cursor(MENU_SET *p_menu_set, int show) +int display_menu_cursor(MENU_SET *p_menu_set, int show) { MENU_ID menu_id; MENU_ITEM_ID menu_item_id; @@ -864,7 +913,7 @@ static int display_menu_current_page(MEN { if (p_menu->title.row == 0 && p_menu->title.col == 0) { - show_top(p_menu->title.text); + show_top(p_menu->title.text, BBS_name, ""); } else { @@ -956,7 +1005,16 @@ int display_menu(MENU_SET *p_menu_set) p_menu_set->choose_step--; return REDRAW; } - return EXITBBS; + 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]; @@ -965,12 +1023,13 @@ 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 && - checkpriv(&BBS_priv, 0, p_menu_item->priv) != 0 && - checklevel2(&BBS_priv, p_menu_item->level)) + !(p_menu->use_filter ? (p_menu->filter_handler((void *)p_menu_item) == 0) + : (checkpriv(&BBS_priv, 0, p_menu_item->priv) == 0 || + checklevel2(&BBS_priv, p_menu_item->level) == 0))) { menu_selectable = 1; } @@ -991,7 +1050,9 @@ int display_menu(MENU_SET *p_menu_set) p_menu_set->menu_item_page_id[menu_item_pos] = page_id; - if (checkpriv(&BBS_priv, 0, p_menu_item->priv) == 0 || checklevel2(&BBS_priv, p_menu_item->level) == 0) + if (p_menu->use_filter ? (p_menu->filter_handler((void *)p_menu_item) == 0) + : (checkpriv(&BBS_priv, 0, p_menu_item->priv) == 0 || + checklevel2(&BBS_priv, p_menu_item->level) == 0)) { p_menu_set->menu_item_display[menu_item_pos] = 0; p_menu_set->menu_item_r_row[menu_item_pos] = 0; @@ -1025,7 +1086,10 @@ int display_menu(MENU_SET *p_menu_set) if (!menu_selectable) { - log_error("No selectable menu item in current menu (%s)\n", p_menu->name); + moveto(p_menu->screen_row, p_menu->screen_col); + clrtoeol(); + prints("没有可选项"); + press_any_key(); return -1; } @@ -1070,7 +1134,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--; @@ -1094,7 +1160,6 @@ int menu_control(MENU_SET *p_menu_set, i switch (key) { case CR: - igetch_reset(); case KEY_RIGHT: if (p_menu_item->submenu) { @@ -1116,21 +1181,20 @@ int menu_control(MENU_SET *p_menu_set, i return ((*(p_menu_item->action_cmd_handler))((void *)(p_menu_item->name))); } break; + case KEY_ESC: case KEY_LEFT: 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 { + 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) @@ -1308,6 +1372,11 @@ int unload_menu(MENU_SET *p_menu_set) { int shmid; + if (p_menu_set == NULL) + { + return -1; + } + if (p_menu_set->p_menu_name_dict != NULL) { trie_dict_destroy(p_menu_set->p_menu_name_dict); @@ -1333,6 +1402,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 = (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; +} + int set_menu_shm_readonly(MENU_SET *p_menu_set) { void *p_shm; @@ -1344,7 +1438,7 @@ int set_menu_shm_readonly(MENU_SET *p_me log_error("shmat(menu_shm shmid = %d) error (%d)\n", p_menu_set->shmid, errno); return -1; } - + p_menu_set->p_reserved = p_shm; return 0;