--- lbbs/src/menu.c	2005/03/20 07:39:28	1.6
+++ lbbs/src/menu.c	2005/03/20 17:23:17	1.9
@@ -30,7 +30,7 @@ int
 load_menu (MENU_SET * p_menu_set, const char *conf_file)
 {
   FILE *fin, *fout;
-  int i = 0, j, k;
+  int i = 0, j;
   char buffer[256], screen_filename[256], temp[256];
   regmatch_t pmatch[10];
 
@@ -47,11 +47,11 @@ load_menu (MENU_SET * p_menu_set, const
 	case '#':
 	  break;
 	case '%':
-	  if (ireg ("^%S_([A-Za-z0-9_]+)", buffer, 1, pmatch) == 0)
+	  if (ireg ("^%S_([A-Za-z0-9_]+)", buffer, 2, pmatch) == 0)
 	    {
-	      strncpy (temp, buffer + pmatch[0].rm_so,
-		       pmatch[0].rm_eo - pmatch[0].rm_so);
-	      temp [pmatch[0].rm_eo - pmatch[0].rm_so] = '\0';
+	      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);
 
 	      if ((fout = fopen (screen_filename, "w")) == NULL)
@@ -194,7 +194,7 @@ load_menu (MENU_SET * p_menu_set, const
 	              continue;
 	            }
 	          if (ireg (
-	            "^title[[:space:]]*([0-9]+),"
+	            "^screen[[:space:]]*([0-9]+),"
 	            "[[:space:]]*([0-9]+),[[:space:]]*S_([A-Za-z0-9_]+)",
 	            buffer, 4, pmatch) == 0)
 	            {
@@ -267,7 +267,8 @@ display_menu (MENU * p_menu)
   show_top (p_menu->title.text);
 
   moveto (p_menu->screen.row, p_menu->screen.col); 
-  display_file (p_menu->screen.filename);
+  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;
@@ -323,6 +324,8 @@ menu_control (MENU_SET * p_menu_set, int
     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] =
@@ -333,10 +336,7 @@ menu_control (MENU_SET * p_menu_set, int
         }
       else
         {
-          if (strcmp (p_menu->items[p_menu->item_cur_pos]->action, "..") == 0)
-            return menu_control (p_menu_set, KEY_LEFT);
-          else
-            return (p_menu->items[p_menu->item_cur_pos]->action);
+          return (p_menu->items[p_menu->item_cur_pos]->action);
         }
     case KEY_LEFT:
       if (p_menu_set->menu_select_depth > 0)
@@ -359,24 +359,22 @@ menu_control (MENU_SET * p_menu_set, int
         }
     case KEY_UP:
       display_menu_cursor (p_menu, 0);
-      p_menu->item_cur_pos --;
-      while (!p_menu->items[p_menu->item_cur_pos]->display)
-        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)
-        p_menu->item_cur_pos --;
+      do
+      {
+         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;
     case KEY_DOWN:
       display_menu_cursor (p_menu, 0);
-      p_menu->item_cur_pos++;
-      while (!p_menu->items[p_menu->item_cur_pos]->display)
-        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)
-        p_menu->item_cur_pos ++;
+      do
+      {
+        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;
     default: