--- lbbs/src/menu.c 2005/03/19 13:46:26 1.4 +++ lbbs/src/menu.c 2005/03/19 15:54:14 1.5 @@ -70,14 +70,14 @@ load_menu (MENU_SET * p_menu_set, const break; } - if (ireg ("^%menu ([A-Za-z0-9_]+)", buffer, 1, pmatch) == 0) + if (ireg ("^%menu ([A-Za-z0-9_]+)", buffer, 2, pmatch) == 0) { p_menu_set->p_menu[i] = malloc (sizeof (MENU)); strncpy (p_menu_set->p_menu[i]->name, - buffer + pmatch[0].rm_so, - pmatch[0].rm_eo - pmatch[0].rm_so + 1); - + buffer + pmatch[1].rm_so, + pmatch[1].rm_eo - pmatch[1].rm_so + 1); + j = 0; while (fgets (buffer, 255, fin)) @@ -97,31 +97,31 @@ load_menu (MENU_SET * p_menu_set, const "^!([A-Za-z0-9_.]+)[[:space:]]*([0-9]+)," "[[:space:]]*([0-9]+),[[:space:]]*([0-9]+)," "[[:space:]]*\"([A-Za-z0-9_]+)\",[[:space:]]*\"([^\"]+)\"", - buffer, 6, pmatch) == 0) + buffer, 7, pmatch) == 0) { p_menu_set->p_menu[i]->items[j] = malloc (sizeof (MENU_ITEM)); p_menu_set->p_menu[i]->items[j]->submenu = 1; strncpy (p_menu_set->p_menu[i]->items[j]->action, - buffer + pmatch[0].rm_so, - pmatch[0].rm_eo - pmatch[0].rm_so + 1); - strncpy (temp, buffer + pmatch[1].rm_so, pmatch[1].rm_eo - pmatch[1].rm_so + 1); - p_menu_set->p_menu[i]->items[j]->row = atoi (temp); strncpy (temp, buffer + pmatch[2].rm_so, pmatch[2].rm_eo - pmatch[2].rm_so + 1); - p_menu_set->p_menu[i]->items[j]->col = atoi (temp); + p_menu_set->p_menu[i]->items[j]->row = atoi (temp); strncpy (temp, buffer + pmatch[3].rm_so, pmatch[3].rm_eo - pmatch[3].rm_so + 1); - p_menu_set->p_menu[i]->items[j]->priv = atoi (temp); - strncpy (p_menu_set->p_menu[i]->items[j]->name, + p_menu_set->p_menu[i]->items[j]->col = atoi (temp); + strncpy (temp, buffer + pmatch[4].rm_so, pmatch[4].rm_eo - pmatch[4].rm_so + 1); - strncpy (p_menu_set->p_menu[i]->items[j]->text, + p_menu_set->p_menu[i]->items[j]->priv = atoi (temp); + strncpy (p_menu_set->p_menu[i]->items[j]->name, buffer + pmatch[5].rm_so, pmatch[5].rm_eo - pmatch[5].rm_so + 1); + strncpy (p_menu_set->p_menu[i]->items[j]->text, + buffer + pmatch[6].rm_so, + pmatch[6].rm_eo - pmatch[6].rm_so + 1); j++; continue; } @@ -129,68 +129,68 @@ load_menu (MENU_SET * p_menu_set, const "^@([A-Za-z0-9_]+)[[:space:]]*([0-9]+)," "[[:space:]]*([0-9]+),[[:space:]]*([0-9]+)," "[[:space:]]*\"([A-Za-z0-9_]+)\",[[:space:]]*\"([^\"]+)\"", - buffer, 6, pmatch) == 0) + buffer, 7, pmatch) == 0) { p_menu_set->p_menu[i]->items[j] = malloc (sizeof (MENU_ITEM)); p_menu_set->p_menu[i]->items[j]->submenu = 0; strncpy (p_menu_set->p_menu[i]->items[j]->action, - buffer + pmatch[0].rm_so, - pmatch[0].rm_eo - pmatch[0].rm_so + 1); - strncpy (temp, buffer + pmatch[1].rm_so, pmatch[1].rm_eo - pmatch[1].rm_so + 1); - p_menu_set->p_menu[i]->items[j]->row = atoi (temp); strncpy (temp, buffer + pmatch[2].rm_so, pmatch[2].rm_eo - pmatch[2].rm_so + 1); - p_menu_set->p_menu[i]->items[j]->col = atoi (temp); + p_menu_set->p_menu[i]->items[j]->row = atoi (temp); strncpy (temp, buffer + pmatch[3].rm_so, pmatch[3].rm_eo - pmatch[3].rm_so + 1); - p_menu_set->p_menu[i]->items[j]->priv = atoi (temp); - strncpy (p_menu_set->p_menu[i]->items[j]->name, + p_menu_set->p_menu[i]->items[j]->col = atoi (temp); + strncpy (temp, buffer + pmatch[4].rm_so, pmatch[4].rm_eo - pmatch[4].rm_so + 1); - strncpy (p_menu_set->p_menu[i]->items[j]->text, + p_menu_set->p_menu[i]->items[j]->priv = atoi (temp); + strncpy (p_menu_set->p_menu[i]->items[j]->name, buffer + pmatch[5].rm_so, pmatch[5].rm_eo - pmatch[5].rm_so + 1); + strncpy (p_menu_set->p_menu[i]->items[j]->text, + buffer + pmatch[6].rm_so, + pmatch[6].rm_eo - pmatch[6].rm_so + 1); j++; continue; } if (ireg ( "^title[[:space:]]*([0-9]+)," "[[:space:]]*([0-9]+),[[:space:]]*\"([^\"]+)\"", - buffer, 3, pmatch) == 0) + buffer, 4, pmatch) == 0) { strncpy (temp, - buffer + pmatch[0].rm_so, - pmatch[0].rm_eo - pmatch[0].rm_so + 1); - p_menu_set->p_menu[i]->title.row = atoi (temp); - strncpy (temp, buffer + pmatch[1].rm_so, pmatch[1].rm_eo - pmatch[1].rm_so + 1); - p_menu_set->p_menu[i]->title.col = atoi (temp); - strncpy (p_menu_set->p_menu[i]->title.text, + p_menu_set->p_menu[i]->title.row = atoi (temp); + strncpy (temp, buffer + pmatch[2].rm_so, pmatch[2].rm_eo - pmatch[2].rm_so + 1); + p_menu_set->p_menu[i]->title.col = atoi (temp); + strncpy (p_menu_set->p_menu[i]->title.text, + buffer + pmatch[3].rm_so, + pmatch[3].rm_eo - pmatch[3].rm_so + 1); continue; } if (ireg ( "^title[[:space:]]*([0-9]+)," "[[:space:]]*([0-9]+),[[:space:]]*S_([A-Za-z0-9_]+)", - buffer, 3, pmatch) == 0) + buffer, 4, pmatch) == 0) { strncpy (temp, - buffer + pmatch[0].rm_so, - pmatch[0].rm_eo - pmatch[0].rm_so + 1); - p_menu_set->p_menu[i]->screen.row = atoi (temp); - strncpy (temp, buffer + pmatch[1].rm_so, pmatch[1].rm_eo - pmatch[1].rm_so + 1); - p_menu_set->p_menu[i]->screen.col = atoi (temp); + p_menu_set->p_menu[i]->screen.row = atoi (temp); strncpy (temp, buffer + pmatch[2].rm_so, pmatch[2].rm_eo - pmatch[2].rm_so + 1); + p_menu_set->p_menu[i]->screen.col = atoi (temp); + strncpy (temp, + buffer + pmatch[3].rm_so, + pmatch[3].rm_eo - pmatch[3].rm_so + 1); sprintf (p_menu_set->p_menu[i]->screen.filename, "%sMENU_SCR_%s", app_temp_dir, temp); continue; @@ -214,13 +214,18 @@ MENU * get_menu (MENU_SET * p_menu_set, const char * menu_name) { int i; + for (i = 0; i < p_menu_set->menu_count; i++) { if (strcmp(p_menu_set->p_menu[i]->name, menu_name) == 0) { +log_std ("%s %s\n", p_menu_set->p_menu[i]->name, menu_name); return p_menu_set->p_menu[i]; } } + +log_std ("%d:)\n", i); + return NULL; } void @@ -237,6 +242,9 @@ display_menu (MENU * p_menu) { int i, row, col, menu_selectable = 0; + if (p_menu == NULL) + return -1; + show_top (p_menu->title.text); moveto (p_menu->screen.row, p_menu->screen.col); @@ -257,14 +265,12 @@ display_menu (MENU * p_menu) menu_selectable = 1; - if (p_menu->items[i]->row == 0) - row ++; - else + if (p_menu->items[i]->row != 0) row = p_menu->items[i]->row; - p_menu->items[i]->r_row = row; - if (p_menu->items[i]->col == 0) - col ++; 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);