--- lbbs/src/menu.c 2025/05/18 08:53:21 1.47 +++ lbbs/src/menu.c 2025/06/21 02:15:18 1.67 @@ -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" @@ -48,6 +48,7 @@ int load_menu(MENU_SET *p_menu_set, cons char temp[LINE_BUFFER_LEN]; char *p = NULL; char *q = NULL; + char *r = NULL; char *saveptr = NULL; MENU *p_menu = NULL; MENU_ITEM *p_menu_item = NULL; @@ -159,6 +160,9 @@ int load_menu(MENU_SET *p_menu_set, cons p_menu->item_count = 0; 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) @@ -167,7 +171,7 @@ int load_menu(MENU_SET *p_menu_set, cons return -1; } p = q; - while (isalnum(*q) || *q == '_') + while (isalnum(*q) || *q == '_' || *q == '-') { q++; } @@ -250,7 +254,7 @@ int load_menu(MENU_SET *p_menu_set, cons else { q = p; - while (isalnum(*q) || *q == '_') + while (isalnum(*q) || *q == '_' || *q == '-') { q++; } @@ -356,6 +360,15 @@ int load_menu(MENU_SET *p_menu_set, cons p = q; while (*q != '\0' && *q != '\"') { + if (*q == '\\') + { + r = q; + while (*r != '\0') + { + *r = *(r + 1); + r++; + } + } q++; } if (*q != '\"' || *(q + 1) != '\0') @@ -384,6 +397,15 @@ int load_menu(MENU_SET *p_menu_set, cons p = q; while (*q != '\0' && *q != '\"') { + if (*q == '\\') + { + r = q; + while (*r != '\0') + { + *r = *(r + 1); + r++; + } + } q++; } if (*q != '\"') @@ -462,6 +484,15 @@ int load_menu(MENU_SET *p_menu_set, cons p = q; while (*q != '\0' && *q != '\"') { + if (*q == '\\') + { + r = q; + while (*r != '\0') + { + *r = *(r + 1); + r++; + } + } q++; } if (*q != '\"') @@ -471,7 +502,7 @@ int load_menu(MENU_SET *p_menu_set, cons } *q = '\0'; - if (q - p > sizeof(p_menu_item->text) - 1) + if (q - p > sizeof(p_menu->title.text) - 1) { log_error("Too longer menu title text in menu config line %d\n", fin_line); return -1; @@ -537,7 +568,7 @@ int load_menu(MENU_SET *p_menu_set, cons return -1; } p = q; - while (isalnum(*q) || *q == '_') + while (isalnum(*q) || *q == '_' || *q == '-') { q++; } @@ -557,6 +588,85 @@ int load_menu(MENU_SET *p_menu_set, cons return -1; } } + else if (strcmp(p, "page") == 0) + { + // Menu page row + q = strtok_r(NULL, MENU_CONF_DELIM_WITH_SPACE, &saveptr); + if (q == NULL) + { + log_error("Error menu page row in menu config line %d\n", fin_line); + return -1; + } + p = q; + while (isdigit(*q)) + { + q++; + } + if (*q != '\0') + { + log_error("Error menu page row in menu config line %d\n", fin_line); + return -1; + } + p_menu->page_row = (int16_t)atoi(p); + + // Menu page col + q = strtok_r(NULL, MENU_CONF_DELIM_WITH_SPACE, &saveptr); + if (q == NULL) + { + log_error("Error menu page col in menu config line %d\n", fin_line); + return -1; + } + p = q; + while (isdigit(*q)) + { + q++; + } + if (*q != '\0') + { + log_error("Error menu page col in menu config line %d\n", fin_line); + return -1; + } + p_menu->page_col = (int16_t)atoi(p); + + // Menu page item limit + q = strtok_r(NULL, MENU_CONF_DELIM_WITH_SPACE, &saveptr); + if (q == NULL) + { + log_error("Error menu page item limit in menu config line %d\n", fin_line); + return -1; + } + p = q; + while (isdigit(*q)) + { + q++; + } + if (*q != '\0') + { + log_error("Error menu page item limit in menu config line %d\n", fin_line); + return -1; + } + p_menu->page_item_limit = (int16_t)atoi(p); + + // 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 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 @@ -572,7 +682,7 @@ int load_menu(MENU_SET *p_menu_set, cons p_screen = get_menu_screen_by_id(p_menu_set, screen_id); q = p; - while (isalnum(*q) || *q == '_') + while (isalnum(*q) || *q == '_' || *q == '-') { q++; } @@ -676,6 +786,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++) @@ -696,7 +816,7 @@ int load_menu(MENU_SET *p_menu_set, cons { if (trie_dict_get(p_menu_set->p_menu_name_dict, p_menu_item->action, (int64_t *)&menu_id) != 1) { - log_error("Undefined menu action [%s]\n", p_menu_item->action); + log_error("Undefined sub menu id [%s]\n", p_menu_item->action); return -1; } p_menu_item->action_menu_id = menu_id; @@ -711,7 +831,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; @@ -738,22 +858,21 @@ static int display_menu_cursor(MENU_SET moveto(p_menu_set->menu_item_r_row[menu_item_pos], p_menu_set->menu_item_r_col[menu_item_pos] - 2); outc(show ? '>' : ' '); - iflush(); return 0; } -int display_menu(MENU_SET *p_menu_set) +static int display_menu_current_page(MENU_SET *p_menu_set) { int16_t row = 0; int16_t col = 0; - int menu_selectable = 0; MENU_ID menu_id; MENU_ITEM_ID menu_item_id; MENU *p_menu; MENU_ITEM *p_menu_item; - MENU_SCREEN *p_menu_screen; int16_t menu_item_pos; + int16_t page_id = 0; + MENU_SCREEN *p_menu_screen; menu_id = p_menu_set->menu_id_path[p_menu_set->choose_step]; p_menu = get_menu_by_id(p_menu_set, menu_id); @@ -763,25 +882,19 @@ int display_menu(MENU_SET *p_menu_set) 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); - if (p_menu_item == NULL) - { - log_error("get_menu_item_by_id(%d) return NULL pointer\n", menu_item_id); - return -1; - } - - if (menu_item_pos > 0 && - checkpriv(&BBS_priv, 0, p_menu_item->priv) != 0 && - checklevel(&BBS_priv, p_menu_item->level) != 0) - { - menu_selectable = 1; - } + clrline(p_menu->page_row, p_menu->page_row + p_menu->page_item_limit - 1); if (p_menu->title.show) { - show_top(p_menu->title.text); + if (p_menu->title.row == 0 && p_menu->title.col == 0) + { + show_top(p_menu->title.text, BBS_name, ""); + } + else + { + moveto(p_menu->title.row, p_menu->title.col); + prints("%s", p_menu->title.text); + } } if (p_menu->screen_show) @@ -793,9 +906,98 @@ int display_menu(MENU_SET *p_menu_set) return -1; } - moveto(p_menu->screen_row, p_menu->screen_col); + row = p_menu->screen_row; + col = p_menu->screen_col; + + moveto(row, col); prints("%s", p_menu_set->p_menu_screen_buf + p_menu_screen->buf_offset); - iflush(); + } + + menu_item_pos = p_menu_set->menu_item_pos[p_menu_set->choose_step]; + page_id = p_menu_set->menu_item_page_id[menu_item_pos]; + + while (menu_item_pos >= 0) + { + if (p_menu_set->menu_item_page_id[menu_item_pos] != page_id) + { + menu_item_pos++; + break; + } + + if (menu_item_pos == 0) + { + break; + } + + menu_item_pos--; + } + + for (; menu_item_pos < p_menu->item_count; menu_item_pos++) + { + if (p_menu_set->menu_item_page_id[menu_item_pos] != page_id) + { + break; + } + + menu_item_id = p_menu->items[menu_item_pos]; + p_menu_item = get_menu_item_by_id(p_menu_set, menu_item_id); + + if (p_menu_set->menu_item_display[menu_item_pos] == 0) + { + continue; + } + + row = p_menu_set->menu_item_r_row[menu_item_pos]; + col = p_menu_set->menu_item_r_col[menu_item_pos]; + + moveto(row, col); + prints("%s", p_menu_item->text); + } + + return 0; +} + +int display_menu(MENU_SET *p_menu_set) +{ + int16_t row = 0; + int16_t col = 0; + int menu_selectable = 0; + MENU_ID menu_id; + MENU_ITEM_ID menu_item_id; + MENU *p_menu; + MENU_ITEM *p_menu_item; + int16_t menu_item_pos; + int16_t page_id = 0; + int page_item_count = 0; + + menu_id = p_menu_set->menu_id_path[p_menu_set->choose_step]; + p_menu = get_menu_by_id(p_menu_set, menu_id); + if (p_menu == NULL) + { + log_error("get_menu_by_id(%d) return NULL pointer\n", menu_id); + if (p_menu_set->choose_step > 0) + { + p_menu_set->choose_step--; + return REDRAW; + } + return EXITBBS; + } + + 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); + if (p_menu_item == NULL) + { + log_error("get_menu_item_by_id(%d) return NULL pointer\n", menu_item_id); + menu_item_pos = 0; + } + + if (menu_item_pos > 0 && + !(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; } for (menu_item_pos = 0; menu_item_pos < p_menu->item_count; menu_item_pos++) @@ -812,7 +1014,11 @@ int display_menu(MENU_SET *p_menu_set) col = p_menu_item->col; } - if (checkpriv(&BBS_priv, 0, p_menu_item->priv) == 0 || checklevel(&BBS_priv, p_menu_item->level) == 0) + p_menu_set->menu_item_page_id[menu_item_pos] = page_id; + + 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; @@ -831,15 +1037,30 @@ int display_menu(MENU_SET *p_menu_set) p_menu_set->menu_item_r_row[menu_item_pos] = row; p_menu_set->menu_item_r_col[menu_item_pos] = col; - moveto(row, col); - prints("%s", p_menu_item->text); - row++; + + page_item_count++; + if (p_menu->page_item_limit > 0 && page_item_count >= p_menu->page_item_limit) + { + page_id++; + page_item_count = 0; + row = p_menu->page_row; + col = p_menu->page_col; + } } } if (!menu_selectable) { + moveto(p_menu->screen_row, p_menu->screen_col); + clrtoeol(); + prints("没有可选项"); + press_any_key(); + return -1; + } + + if (display_menu_current_page(p_menu_set) != 0) + { return -1; } @@ -855,10 +1076,13 @@ int menu_control(MENU_SET *p_menu_set, i MENU *p_menu; MENU_ITEM *p_menu_item; int16_t menu_item_pos; + int16_t page_id; + int require_page_change = 0; if (p_menu_set->menu_count == 0) { - return 0; + log_error("Empty menu set\n"); + return EXITBBS; } menu_id = p_menu_set->menu_id_path[p_menu_set->choose_step]; @@ -866,21 +1090,35 @@ int menu_control(MENU_SET *p_menu_set, i if (p_menu == NULL) { log_error("get_menu_by_id(%d) return NULL pointer\n", menu_id); - return -1; + if (p_menu_set->choose_step > 0) + { + p_menu_set->choose_step--; + return REDRAW; + } + return EXITBBS; } if (p_menu->item_count == 0) { - return 0; + log_error("Empty menu (%s)\n", p_menu->name); + if (p_menu_set->choose_step > 0) + { + p_menu_set->choose_step--; + return REDRAW; + } + return EXITBBS; } menu_item_pos = p_menu_set->menu_item_pos[p_menu_set->choose_step]; + page_id = p_menu_set->menu_item_page_id[menu_item_pos]; + menu_item_id = p_menu->items[menu_item_pos]; p_menu_item = get_menu_item_by_id(p_menu_set, menu_item_id); if (p_menu_item == NULL) { log_error("get_menu_item_by_id(%d) return NULL pointer\n", menu_item_id); - return -1; + p_menu_set->menu_item_pos[p_menu_set->choose_step] = 0; + return REDRAW; } switch (key) @@ -908,10 +1146,15 @@ 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); @@ -944,6 +1187,8 @@ int menu_control(MENU_SET *p_menu_set, i display_menu_cursor(p_menu_set, 1); } break; + case KEY_PGUP: + require_page_change = 1; case KEY_UP: display_menu_cursor(p_menu_set, 0); do @@ -952,6 +1197,7 @@ int menu_control(MENU_SET *p_menu_set, i if (menu_item_pos < 0) { menu_item_pos = p_menu->item_count - 1; + require_page_change = 0; } menu_item_id = p_menu->items[menu_item_pos]; p_menu_item = get_menu_item_by_id(p_menu_set, menu_item_id); @@ -960,10 +1206,20 @@ int menu_control(MENU_SET *p_menu_set, i log_error("get_menu_item_by_id(%d) return NULL pointer\n", menu_item_id); return -1; } - } while (!p_menu_set->menu_item_display[menu_item_pos]); + if (require_page_change && p_menu_set->menu_item_page_id[menu_item_pos] != page_id) + { + require_page_change = 0; + } + } while (require_page_change || !p_menu_set->menu_item_display[menu_item_pos]); p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos; + if (p_menu_set->menu_item_page_id[menu_item_pos] != page_id) + { + display_menu_current_page(p_menu_set); + } display_menu_cursor(p_menu_set, 1); break; + case KEY_PGDN: + require_page_change = 1; case KEY_DOWN: display_menu_cursor(p_menu_set, 0); do @@ -972,6 +1228,7 @@ int menu_control(MENU_SET *p_menu_set, i if (menu_item_pos >= p_menu->item_count) { menu_item_pos = 0; + require_page_change = 0; } menu_item_id = p_menu->items[menu_item_pos]; p_menu_item = get_menu_item_by_id(p_menu_set, menu_item_id); @@ -980,12 +1237,19 @@ int menu_control(MENU_SET *p_menu_set, i log_error("get_menu_item_by_id(%d) return NULL pointer\n", menu_item_id); return -1; } - } while (!p_menu_set->menu_item_display[menu_item_pos]); + if (require_page_change && p_menu_set->menu_item_page_id[menu_item_pos] != page_id) + { + require_page_change = 0; + } + } while (require_page_change || !p_menu_set->menu_item_display[menu_item_pos]); p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos; + if (p_menu_set->menu_item_page_id[menu_item_pos] != page_id) + { + display_menu_current_page(p_menu_set); + } display_menu_cursor(p_menu_set, 1); break; case KEY_HOME: - case KEY_PGUP: display_menu_cursor(p_menu_set, 0); menu_item_pos = 0; while (menu_item_pos < p_menu->item_count - 1) @@ -1006,10 +1270,13 @@ int menu_control(MENU_SET *p_menu_set, i menu_item_pos++; } p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos; + if (p_menu_set->menu_item_page_id[menu_item_pos] != page_id) + { + display_menu_current_page(p_menu_set); + } display_menu_cursor(p_menu_set, 1); break; case KEY_END: - case KEY_PGDN: display_menu_cursor(p_menu_set, 0); menu_item_pos = p_menu->item_count - 1; while (menu_item_pos > 0) @@ -1030,6 +1297,10 @@ int menu_control(MENU_SET *p_menu_set, i menu_item_pos--; } p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos; + if (p_menu_set->menu_item_page_id[menu_item_pos] != page_id) + { + display_menu_current_page(p_menu_set); + } display_menu_cursor(p_menu_set, 1); break; default: @@ -1049,19 +1320,30 @@ int menu_control(MENU_SET *p_menu_set, i { display_menu_cursor(p_menu_set, 0); p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos; + if (p_menu_set->menu_item_page_id[menu_item_pos] != page_id) + { + display_menu_current_page(p_menu_set); + } display_menu_cursor(p_menu_set, 1); - return 0; + break; } } } break; } - return 0; + return NOREDRAW; } 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); @@ -1074,51 +1356,37 @@ int unload_menu(MENU_SET *p_menu_set) p_menu_set->p_menu_screen_dict = NULL; } - unload_menu_shm(p_menu_set); + shmid = p_menu_set->shmid; + + detach_menu_shm(p_menu_set); - if (shmctl(p_menu_set->shmid, IPC_RMID, NULL) == -1) + if (shmctl(shmid, IPC_RMID, NULL) == -1) { - log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", p_menu_set->shmid, errno); + log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", shmid, errno); return -1; } return 0; } -int load_menu_shm(MENU_SET *p_menu_set) +int set_menu_shm_readonly(MENU_SET *p_menu_set) { - // Mount shared memory - if (p_menu_set->p_reserved == NULL) + void *p_shm; + + // Remap shared memory in read-only mode + p_shm = shmat(p_menu_set->shmid, p_menu_set->p_reserved, SHM_RDONLY | SHM_REMAP); + if (p_shm == (void *)-1) { - p_menu_set->p_reserved = shmat(p_menu_set->shmid, NULL, SHM_RDONLY); - if (p_menu_set->p_reserved == (void *)-1) - { - log_error("shmat() error (%d)\n", errno); - return -1; - } + log_error("shmat(menu_shm shmid = %d) error (%d)\n", p_menu_set->shmid, errno); + return -1; } - 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; - - // Restore status varaibles into reserved memory area - p_menu_set->menu_count = *((int16_t *)p_menu_set->p_reserved); - p_menu_set->menu_item_count = *(((int16_t *)p_menu_set->p_reserved) + 1); - p_menu_set->menu_screen_count = *(((int16_t *)p_menu_set->p_reserved) + 2); - - p_menu_set->choose_step = 0; - p_menu_set->menu_id_path[0] = 0; - - p_menu_set->p_menu_name_dict = NULL; - p_menu_set->p_menu_screen_dict = NULL; + p_menu_set->p_reserved = p_shm; return 0; } -int unload_menu_shm(MENU_SET *p_menu_set) +int detach_menu_shm(MENU_SET *p_menu_set) { p_menu_set->menu_count = 0; p_menu_set->menu_item_count = 0; @@ -1131,11 +1399,15 @@ int unload_menu_shm(MENU_SET *p_menu_set p_menu_set->p_menu_screen_buf = NULL; p_menu_set->p_menu_screen_buf_free = NULL; + p_menu_set->p_menu_name_dict = NULL; + p_menu_set->p_menu_screen_dict = NULL; + if (p_menu_set->p_reserved != NULL && shmdt(p_menu_set->p_reserved) == -1) { log_error("shmdt() error (%d)\n", errno); return -1; } + p_menu_set->p_reserved = NULL; return 0;