--- lbbs/src/menu.c 2025/05/18 06:57:56 1.46 +++ lbbs/src/menu.c 2025/05/19 02:18:39 1.50 @@ -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; @@ -167,7 +168,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 +251,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 +357,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 +394,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 +481,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 +499,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 +565,7 @@ int load_menu(MENU_SET *p_menu_set, cons return -1; } p = q; - while (isalnum(*q) || *q == '_') + while (isalnum(*q) || *q == '_' || *q == '-') { q++; } @@ -546,12 +574,8 @@ 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) - { - log_error("Undefined menu screen [%s]\n", p); - return -1; - } - p_menu->screen_id = screen_id; + 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); @@ -576,7 +600,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++; } @@ -628,6 +652,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,6 +695,17 @@ int load_menu(MENU_SET *p_menu_set, cons } fclose(fin); + 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; + } + } + 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); @@ -681,7 +724,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; @@ -723,7 +766,6 @@ 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; } @@ -759,14 +801,22 @@ int display_menu(MENU_SET *p_menu_set) if (menu_item_pos > 0 && checkpriv(&BBS_priv, 0, p_menu_item->priv) != 0 && - checklevel(&BBS_priv, p_menu_item->level) != 0) + checklevel2(&BBS_priv, p_menu_item->level)) { menu_selectable = 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); + } + else + { + moveto(p_menu->title.row, p_menu->title.col); + prints("%s", p_menu->title.text); + } } if (p_menu->screen_show) @@ -778,9 +828,11 @@ 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 (menu_item_pos = 0; menu_item_pos < p_menu->item_count; menu_item_pos++) @@ -797,7 +849,7 @@ 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) + if (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; @@ -901,6 +953,10 @@ int menu_control(MENU_SET *p_menu_set, i { return menu_control(p_menu_set, KEY_LEFT); } + if (p_menu_set->choose_step == 0) + { + return REDRAW; + } } else { @@ -1042,7 +1098,7 @@ int menu_control(MENU_SET *p_menu_set, i break; } - return 0; + return NOREDRAW; } int unload_menu(MENU_SET *p_menu_set)