--- lbbs/src/menu.c 2025/05/15 05:14:57 1.40 +++ lbbs/src/menu.c 2025/12/18 02:56:00 1.92 @@ -1,53 +1,58 @@ -/*************************************************************************** - menu.c - description - ------------------- - Copyright : (C) 2004-2025 by Leaflet - Email : leaflet@leafok.com - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 3 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ +/* SPDX-License-Identifier: GPL-3.0-or-later */ +/* + * menu + * - configurable user interactive menu feature + * + * Copyright (C) 2004-2025 Leaflet + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #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 +#include +#include -#define MENU_SCREEN_PATH_PREFIX "var/MENU_SCR_" -#define MENU_CONF_DELIM_WITH_SPACE " ,\t\r\n" -#define MENU_CONF_DELIM_WITHOUT_SPACE "\r\n" +enum _menu_constant_t +{ + MENU_SET_RESERVED_LENGTH = sizeof(int16_t) * 4, +}; -#define MENU_SET_RESERVED_LENGTH (sizeof(int16_t) * 4) +static const char MENU_CONF_DELIM_WITH_SPACE[] = " ,\t\r\n"; +static const char MENU_CONF_DELIM_WITHOUT_SPACE[] = "\r\n"; -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) { + char filepath[FILE_PATH_LEN]; + int fd; + size_t size; + void *p_shm; FILE *fin; int fin_line = 0; char buffer[LINE_BUFFER_LEN]; 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; @@ -55,16 +60,22 @@ int load_menu(MENU_SET *p_menu_set, cons MENU_ID menu_id; MENU_ITEM_ID menu_item_id; MENU_SCREEN_ID screen_id; - int proj_id; - key_t key; - size_t size; + + if (p_menu_set == NULL || conf_file == NULL) + { + log_error("NULL pointer error\n"); + return -1; + } + + // 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) { log_error("trie_dict_create() error\n"); - return -3; + return -1; } // Use trie_dict to search screen_id by menu screen name @@ -72,45 +83,65 @@ int load_menu(MENU_SET *p_menu_set, cons if (p_menu_set->p_menu_screen_dict == NULL) { log_error("trie_dict_create() error\n"); - return -3; + return -1; } 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) + + strncpy(filepath, conf_file, sizeof(filepath) - 1); + filepath[sizeof(filepath) - 1] = '\0'; + snprintf(p_menu_set->shm_name, sizeof(p_menu_set->shm_name), "/MENU_SHM_%s", basename(filepath)); + + if (shm_unlink(p_menu_set->shm_name) == -1 && errno != ENOENT) + { + log_error("shm_unlink(%s) error (%d)\n", p_menu_set->shm_name, errno); + return -2; + } + + if ((fd = shm_open(p_menu_set->shm_name, O_CREAT | O_EXCL | O_RDWR, 0600)) == -1) { - log_error("shmget(size = %d) error (%d)\n", size, errno); - return -3; + log_error("shm_open(%s) error (%d)\n", p_menu_set->shm_name, errno); + return -2; + } + if (ftruncate(fd, (off_t)size) == -1) + { + log_error("ftruncate(size=%d) error (%d)\n", size, errno); + close(fd); + return -2; } - p_menu_set->p_reserved = shmat(p_menu_set->shmid, NULL, 0); - if (p_menu_set->p_reserved == (void *)-1) + + p_shm = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0L); + if (p_shm == MAP_FAILED) { - 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; + log_error("mmap() error (%d)\n", errno); + close(fd); + return -2; + } + + if (close(fd) < 0) + { + log_error("close(fd) error (%d)\n", errno); + return -1; + } + + p_menu_set->shm_size = size; + 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->menu_count = 0; @@ -118,6 +149,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)) { @@ -159,6 +192,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 +203,7 @@ int load_menu(MENU_SET *p_menu_set, cons return -1; } p = q; - while (isalnum(*q) || *q == '_') + while (isalnum((int)*q) || *q == '_' || *q == '-') { q++; } @@ -250,7 +286,7 @@ int load_menu(MENU_SET *p_menu_set, cons else { q = p; - while (isalnum(*q) || *q == '_') + while (isalnum((int)*q) || *q == '_' || *q == '-') { q++; } @@ -277,7 +313,7 @@ int load_menu(MENU_SET *p_menu_set, cons return -1; } p = q; - while (isdigit(*q)) + while (isdigit((int)*q)) { q++; } @@ -296,7 +332,7 @@ int load_menu(MENU_SET *p_menu_set, cons return -1; } p = q; - while (isdigit(*q)) + while (isdigit((int)*q)) { q++; } @@ -315,7 +351,7 @@ int load_menu(MENU_SET *p_menu_set, cons return -1; } p = q; - while (isdigit(*q)) + while (isdigit((int)*q)) { q++; } @@ -334,7 +370,7 @@ int load_menu(MENU_SET *p_menu_set, cons return -1; } p = q; - while (isdigit(*q)) + while (isdigit((int)*q)) { q++; } @@ -356,6 +392,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 +429,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 != '\"') @@ -421,7 +475,7 @@ int load_menu(MENU_SET *p_menu_set, cons return -1; } p = q; - while (isdigit(*q)) + while (isdigit((int)*q)) { q++; } @@ -440,7 +494,7 @@ int load_menu(MENU_SET *p_menu_set, cons return -1; } p = q; - while (isdigit(*q)) + while (isdigit((int)*q)) { q++; } @@ -462,6 +516,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 +534,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; @@ -499,7 +562,7 @@ int load_menu(MENU_SET *p_menu_set, cons return -1; } p = q; - while (isdigit(*q)) + while (isdigit((int)*q)) { q++; } @@ -518,7 +581,7 @@ int load_menu(MENU_SET *p_menu_set, cons return -1; } p = q; - while (isdigit(*q)) + while (isdigit((int)*q)) { q++; } @@ -537,7 +600,7 @@ int load_menu(MENU_SET *p_menu_set, cons return -1; } p = q; - while (isalnum(*q) || *q == '_') + while (isalnum((int)*q) || *q == '_' || *q == '-') { q++; } @@ -546,12 +609,87 @@ int load_menu(MENU_SET *p_menu_set, cons log_error("Error menu screen name in menu config line %d\n", fin_line); return -1; } - if (trie_dict_get(p_menu_set->p_menu_screen_dict, p, (int64_t *)&screen_id) != 1) + strncpy(p_menu->screen_name, p, sizeof(p_menu->screen_name) - 1); + p_menu->screen_name[sizeof(p_menu->screen_name) - 1] = '\0'; + + // 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, "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((int)*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((int)*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((int)*q)) + { + q++; + } + if (*q != '\0') { - log_error("Undefined menu screen [%s]\n", p); + log_error("Error menu page item limit in menu config line %d\n", fin_line); return -1; } - p_menu->screen_id = screen_id; + 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); @@ -576,7 +714,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((int)*q) || *q == '_' || *q == '-') { q++; } @@ -628,6 +766,14 @@ int load_menu(MENU_SET *p_menu_set, cons break; } + // Clear line + if (p_menu_set->p_menu_screen_buf_free + strlen(CTRL_SEQ_CLR_LINE) > q) + { + log_error("Menu screen buffer depleted (%p + %d > %p)\n", p_menu_set->p_menu_screen_buf_free, q, strlen(CTRL_SEQ_CLR_LINE)); + return -3; + } + p_menu_set->p_menu_screen_buf_free = stpcpy(p_menu_set->p_menu_screen_buf_free, CTRL_SEQ_CLR_LINE); + p = buffer; while (*p != '\0') { @@ -663,15 +809,46 @@ int load_menu(MENU_SET *p_menu_set, cons } fclose(fin); - // Set menu_item->action_menu_id of each menu item pointing to a submenu to the menu_id of the corresponding submenu + for (menu_id = 0; menu_id < p_menu_set->menu_count; menu_id++) + { + p_menu = get_menu_by_id(p_menu_set, menu_id); + + if (trie_dict_get(p_menu_set->p_menu_screen_dict, p_menu->screen_name, (int64_t *)(&(p_menu->screen_id))) != 1) + { + 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++) { p_menu_item = get_menu_item_by_id(p_menu_set, menu_item_id); - if (p_menu_item->submenu == 1 && strcmp(p_menu_item->action, "..") != 0) + + // Set menu_item->action_cmd_handler of each menu item pointing to bbs_cmd + if (p_menu_item->submenu == 0) + { + if ((p_menu_item->action_cmd_handler = get_cmd_handler(p_menu_item->action)) == NULL) + { + log_error("Undefined menu action cmd handler [%s]\n", p_menu_item->action); + return -1; + } + } + // Set menu_item->action_menu_id of each menu item pointing to a submenu to the menu_id of the corresponding submenu + else if (strcmp(p_menu_item->action, "..") != 0) { 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; @@ -686,7 +863,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; @@ -711,24 +888,23 @@ static int display_menu_cursor(MENU_SET return -1; } - moveto(p_menu_item->r_row, p_menu_item->r_col - 2); + 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); @@ -738,25 +914,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) @@ -768,14 +938,112 @@ 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(); } - for (int16_t i = 0; i < p_menu->item_count; i++) + 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 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); + if (p_menu_item == NULL) + { + log_error("get_menu_item_by_id(%d) return NULL pointer\n", menu_item_id); + return EXITMENU; + } + + 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++) { - menu_item_id = p_menu->items[i]; + 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->row != 0) @@ -787,34 +1055,53 @@ 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_item->display = 0; - p_menu_item->r_row = 0; - p_menu_item->r_col = 0; + p_menu_set->menu_item_display[menu_item_pos] = 0; + p_menu_set->menu_item_r_row[menu_item_pos] = 0; + p_menu_set->menu_item_r_col[menu_item_pos] = 0; } else { - p_menu_item->display = 1; + p_menu_set->menu_item_display[menu_item_pos] = 1; if (!menu_selectable) { - p_menu_set->menu_item_pos[p_menu_set->choose_step] = i; + p_menu_set->menu_item_pos[p_menu_set->choose_step] = menu_item_pos; menu_selectable = 1; } - p_menu_item->r_row = row; - p_menu_item->r_col = col; - - moveto(row, col); - prints("%s", p_menu_item->text); + p_menu_set->menu_item_r_row[menu_item_pos] = row; + p_menu_set->menu_item_r_col[menu_item_pos] = col; 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; } @@ -830,10 +1117,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]; @@ -841,27 +1131,40 @@ 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_debug("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) { case CR: - igetch_reset(); case KEY_RIGHT: if (p_menu_item->submenu) { @@ -880,20 +1183,23 @@ int menu_control(MENU_SET *p_menu_set, i } else { - return (exec_cmd(p_menu_item->action, p_menu_item->name)); + 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 (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) @@ -906,7 +1212,7 @@ int menu_control(MENU_SET *p_menu_set, i return -1; } - if (!p_menu_item->display || p_menu_item->priv != 0 || p_menu_item->level != 0) + if (!p_menu_set->menu_item_display[menu_item_pos] || p_menu_item->priv != 0 || p_menu_item->level != 0) { menu_item_pos--; } @@ -919,6 +1225,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 @@ -927,6 +1235,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); @@ -935,10 +1244,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_item->display); + 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 @@ -947,7 +1266,59 @@ 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); + if (p_menu_item == NULL) + { + log_error("get_menu_item_by_id(%d) return NULL pointer\n", menu_item_id); + return -1; + } + 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: + display_menu_cursor(p_menu_set, 0); + menu_item_pos = 0; + while (menu_item_pos < p_menu->item_count - 1) + { + 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 (p_menu_set->menu_item_display[menu_item_pos]) + { + break; + } + + 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: + display_menu_cursor(p_menu_set, 0); + menu_item_pos = p_menu->item_count - 1; + while (menu_item_pos > 0) + { 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) @@ -955,16 +1326,27 @@ 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_item->display); + + if (p_menu_set->menu_item_display[menu_item_pos]) + { + break; + } + + 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: if (isalnum(key)) { - for (int16_t i = 0; i < p_menu->item_count; i++) + for (menu_item_pos = 0; menu_item_pos < p_menu->item_count; menu_item_pos++) { - menu_item_id = p_menu->items[i]; + 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) { @@ -972,23 +1354,33 @@ int menu_control(MENU_SET *p_menu_set, i return -1; } - if (toupper(key) == toupper(p_menu_item->name[0]) && p_menu_item->display) + if (toupper(key) == toupper(p_menu_item->name[0]) && p_menu_set->menu_item_display[menu_item_pos]) { display_menu_cursor(p_menu_set, 0); - p_menu_set->menu_item_pos[p_menu_set->choose_step] = i; + 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) { + if (p_menu_set == NULL) + { + log_error("NULL pointer error\n"); + return -1; + } + if (p_menu_set->p_menu_name_dict != NULL) { trie_dict_destroy(p_menu_set->p_menu_name_dict); @@ -1001,48 +1393,100 @@ int unload_menu(MENU_SET *p_menu_set) p_menu_set->p_menu_screen_dict = NULL; } - unload_menu_shm(p_menu_set); + detach_menu_shm(p_menu_set); - if (shmctl(p_menu_set->shmid, IPC_RMID, NULL) == -1) + if (shm_unlink(p_menu_set->shm_name) == -1 && errno != ENOENT) { - log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", p_menu_set->shmid, errno); - return -1; + log_error("shm_unlink(%s) error (%d)\n", p_menu_set->shm_name, errno); + return -2; } return 0; } -int load_menu_shm(MENU_SET *p_menu_set) +int get_menu_shm_readonly(MENU_SET *p_menu_set) { - // Mount shared memory - 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 -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_screen_buf_free = p_menu_set->p_menu_screen_buf; + int fd; + void *p_shm; + struct stat sb; + size_t size; - // 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); + if (p_menu_set == NULL) + { + log_error("NULL pointer error\n"); + return -1; + } + + if ((fd = shm_open(p_menu_set->shm_name, O_RDONLY, 0600)) == -1) + { + log_error("shm_open(%s) error (%d)\n", p_menu_set->shm_name, errno); + return -2; + } + + if (fstat(fd, &sb) < 0) + { + log_error("fstat(fd) error (%d)\n", errno); + close(fd); + return -2; + } + + size = (size_t)sb.st_size; + + p_shm = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0L); + if (p_shm == MAP_FAILED) + { + log_error("mmap() error (%d)\n", errno); + close(fd); + return -2; + } + + if (close(fd) < 0) + { + log_error("close(fd) error (%d)\n", errno); + return -1; + } + + p_menu_set->shm_size = size; + 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; - p_menu_set->p_menu_name_dict = NULL; - p_menu_set->p_menu_screen_dict = NULL; + return 0; +} + +int set_menu_shm_readonly(MENU_SET *p_menu_set) +{ + if (p_menu_set == NULL) + { + log_error("NULL pointer error\n"); + return -1; + } + + if (p_menu_set->p_reserved != NULL && mprotect(p_menu_set->p_reserved, p_menu_set->shm_size, PROT_READ) < 0) + { + log_error("mprotect() error (%d)\n", errno); + return -2; + } return 0; } -int unload_menu_shm(MENU_SET *p_menu_set) +int detach_menu_shm(MENU_SET *p_menu_set) { + if (p_menu_set == NULL) + { + log_error("NULL pointer error\n"); + return -1; + } + p_menu_set->menu_count = 0; p_menu_set->menu_item_count = 0; p_menu_set->menu_screen_count = 0; @@ -1054,10 +1498,13 @@ 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; - if (shmdt(p_menu_set->p_reserved) == -1) + p_menu_set->p_menu_name_dict = NULL; + p_menu_set->p_menu_screen_dict = NULL; + + if (p_menu_set->p_reserved != NULL && munmap(p_menu_set->p_reserved, p_menu_set->shm_size) < 0) { - log_error("shmdt() error (%d)\n", errno); - return -1; + log_error("munmap() error (%d)\n", errno); + return -2; } p_menu_set->p_reserved = NULL;