--- lbbs/src/menu.c 2025/05/28 07:30:23 1.59 +++ lbbs/src/menu.c 2025/06/24 10:01:24 1.68 @@ -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" @@ -78,7 +78,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 +119,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->allow_exit = 0; while (fgets(buffer, sizeof(buffer), fin)) { @@ -161,6 +162,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 +656,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 +787,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 +832,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; @@ -956,7 +981,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]; @@ -965,12 +990,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 +1017,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 +1053,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 +1101,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--; @@ -1116,6 +1149,7 @@ 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) { @@ -1131,6 +1165,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) @@ -1308,6 +1347,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 +1377,27 @@ 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; + + return 0; +} + int set_menu_shm_readonly(MENU_SET *p_menu_set) { void *p_shm; @@ -1344,7 +1409,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;