--- lbbs/src/menu.c 2025/04/30 09:18:19 1.22 +++ lbbs/src/menu.c 2025/05/05 02:54:27 1.26 @@ -31,13 +31,17 @@ #include #include +#define MENU_TEMP_DIR "var" + MENU_SET bbs_menu; int load_menu(MENU_SET *p_menu_set, const char *conf_file) { FILE *fin, *fout; int i = 0, j; - char buffer[256], screen_filename[256], temp[256]; + char buffer[LINE_BUFFER_LEN]; + char screen_filename[FILE_PATH_LEN]; + char temp[LINE_BUFFER_LEN]; regmatch_t pmatch[10]; if ((fin = fopen(conf_file, "r")) == NULL) @@ -48,7 +52,7 @@ int load_menu(MENU_SET *p_menu_set, cons strcpy(p_menu_set->conf_file, conf_file); - while (fgets(buffer, 255, fin)) + while (fgets(buffer, sizeof(buffer), fin)) { switch (buffer[0]) { @@ -60,7 +64,7 @@ int load_menu(MENU_SET *p_menu_set, cons strncpy(temp, buffer + pmatch[1].rm_so, pmatch[1].rm_eo - pmatch[1].rm_so); temp[pmatch[1].rm_eo - pmatch[1].rm_so] = '\0'; - sprintf(screen_filename, "%sMENU_SCR_%s", app_temp_dir, temp); + sprintf(screen_filename, "%s/MENU_SCR_%s", MENU_TEMP_DIR, temp); if ((fout = fopen(screen_filename, "w")) == NULL) { @@ -68,7 +72,7 @@ int load_menu(MENU_SET *p_menu_set, cons return -2; } - while (fgets(buffer, 255, fin)) + while (fgets(buffer, sizeof(buffer), fin)) { if (buffer[0] != '%') fputs(buffer, fout); @@ -94,7 +98,7 @@ int load_menu(MENU_SET *p_menu_set, cons j = 0; - while (fgets(buffer, 255, fin)) + while (fgets(buffer, sizeof(buffer), fin)) { if (buffer[0] == '#') { @@ -246,7 +250,7 @@ int load_menu(MENU_SET *p_menu_set, cons pmatch[3].rm_eo - pmatch[3].rm_so); temp[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0'; sprintf(p_menu_set->p_menu[i]->screen.filename, - "%sMENU_SCR_%s", app_temp_dir, temp); + "%s/MENU_SCR_%s", MENU_TEMP_DIR, temp); continue; } } @@ -283,59 +287,77 @@ static void display_menu_cursor(MENU *p_ { moveto((p_menu->items[p_menu->item_cur_pos])->r_row, (p_menu->items[p_menu->item_cur_pos])->r_col - 2); - prints(show ? ">" : " "); + outc(show ? '>' : ' '); iflush(); } int display_menu(MENU *p_menu) { - int i, row, col, menu_selectable = 0; + int row = 0; + int col = 0; + int menu_selectable = 0; if (p_menu == NULL) + { return -1; + } if (p_menu->title.show) + { show_top(p_menu->title.text); + } if (p_menu->screen.show) { moveto(p_menu->screen.row, p_menu->screen.col); if (display_file(p_menu->screen.filename) != 0) + { log_error("Display menu screen <%s> failed!\n", p_menu->screen.filename); + } } - row = p_menu->items[0]->row; - col = p_menu->items[0]->col; - - for (i = 0; i < p_menu->item_count; i++) + for (int i = 0; i < p_menu->item_count; i++) { + if (p_menu->items[i]->row != 0) + { + row = p_menu->items[i]->row; + } + if (p_menu->items[i]->col != 0) + { + col = p_menu->items[i]->col; + } + if (checkpriv(&BBS_priv, 0, p_menu->items[i]->priv) == 0 || checklevel(&BBS_priv, p_menu->items[i]->level) == 0) { p_menu->items[i]->display = 0; + p_menu->items[i]->r_row = 0; + p_menu->items[i]->r_col = 0; } else { p_menu->items[i]->display = 1; - menu_selectable = 1; + if (!menu_selectable) + { + p_menu->item_cur_pos = i; + menu_selectable = 1; + } - if (p_menu->items[i]->row != 0) - row = p_menu->items[i]->row; - else - row++; p_menu->items[i]->r_row = row; - if (p_menu->items[i]->col != 0) - col = p_menu->items[i]->col; p_menu->items[i]->r_col = col; + moveto(row, col); - prints(p_menu->items[i]->text); - iflush(); + prints("%s", p_menu->items[i]->text); + + row++; } } if (!menu_selectable) + { return -1; + } display_menu_cursor(p_menu, 1); @@ -357,25 +379,31 @@ int menu_control(MENU_SET *p_menu_set, i MENU *p_menu; if (p_menu_set->menu_count == 0) + { return 0; + } p_menu = p_menu_set->p_menu_select[p_menu_set->menu_select_depth]; switch (key) { case CR: + igetch(1); // Cleanup remaining '\n' in the buffer case KEY_RIGHT: if (p_menu->items[p_menu->item_cur_pos]->submenu) { if (strcmp(p_menu->items[p_menu->item_cur_pos]->action, "..") == 0) + { return menu_control(p_menu_set, KEY_LEFT); + } p_menu_set->menu_select_depth++; - p_menu = - p_menu_set->p_menu_select[p_menu_set->menu_select_depth] = - get_menu(p_menu_set, - p_menu->items[p_menu->item_cur_pos]->action); + p_menu = get_menu(p_menu_set, p_menu->items[p_menu->item_cur_pos]->action); + p_menu_set->p_menu_select[p_menu_set->menu_select_depth] = p_menu; + if (display_menu(p_menu) != 0) + { return menu_control(p_menu_set, KEY_LEFT); + } break; } else @@ -388,15 +416,21 @@ int menu_control(MENU_SET *p_menu_set, i { p_menu_set->menu_select_depth--; if (display_current_menu(p_menu_set) != 0) + { return menu_control(p_menu_set, KEY_LEFT); + } break; } else { display_menu_cursor(p_menu, 0); p_menu->item_cur_pos = p_menu->item_count - 1; - while (!p_menu->items[p_menu->item_cur_pos]->display || p_menu->items[p_menu->item_cur_pos]->priv != 0 || p_menu->items[p_menu->item_cur_pos]->level != 0) + while (!p_menu->items[p_menu->item_cur_pos]->display || + p_menu->items[p_menu->item_cur_pos]->priv != 0 || + p_menu->items[p_menu->item_cur_pos]->level != 0) + { p_menu->item_cur_pos--; + } display_menu_cursor(p_menu, 1); break; } @@ -406,7 +440,9 @@ int menu_control(MENU_SET *p_menu_set, i { p_menu->item_cur_pos--; if (p_menu->item_cur_pos < 0) + { p_menu->item_cur_pos = p_menu->item_count - 1; + } } while (!p_menu->items[p_menu->item_cur_pos]->display); display_menu_cursor(p_menu, 1); break; @@ -416,7 +452,9 @@ int menu_control(MENU_SET *p_menu_set, i { p_menu->item_cur_pos++; if (p_menu->item_cur_pos >= p_menu->item_count) + { p_menu->item_cur_pos = 0; + } } while (!p_menu->items[p_menu->item_cur_pos]->display); display_menu_cursor(p_menu, 1); break; @@ -454,7 +492,6 @@ int menu_control(MENU_SET *p_menu_set, i void unload_menu(MENU_SET *p_menu_set) { MENU *p_menu; - MENU_ITEM *p_menuitem; int i, j; for (i = 0; i < p_menu_set->menu_count; i++) @@ -475,9 +512,9 @@ void unload_menu(MENU_SET *p_menu_set) int reload_menu(MENU_SET *p_menu_set) { int result; - char conf_file[256]; + char conf_file[FILE_PATH_LEN]; - strcpy(conf_file, p_menu_set->conf_file); + strncpy(conf_file, p_menu_set->conf_file, sizeof(conf_file)); unload_menu(p_menu_set); result = load_menu(p_menu_set, conf_file);