--- lbbs/src/menu.c	2005/03/20 14:49:24	1.8
+++ lbbs/src/menu.c	2005/03/21 13:27:00	1.12
@@ -51,8 +51,8 @@ load_menu (MENU_SET * p_menu_set, const
 	    {
 	      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);
+	      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)
 		{
@@ -77,146 +77,171 @@ load_menu (MENU_SET * p_menu_set, const
 	      p_menu_set->p_menu[i] = malloc (sizeof (MENU));
 
 	      strncpy (p_menu_set->p_menu[i]->name,
-	        buffer + pmatch[1].rm_so,
-	        pmatch[1].rm_eo - pmatch[1].rm_so);
-              p_menu_set->p_menu[i]->name[pmatch[1].rm_eo - pmatch[1].rm_so] = '\0';
+		       buffer + pmatch[1].rm_so,
+		       pmatch[1].rm_eo - pmatch[1].rm_so);
+	      p_menu_set->p_menu[i]->name[pmatch[1].rm_eo - pmatch[1].rm_so] =
+		'\0';
 
 	      j = 0;
-	      
+
 	      while (fgets (buffer, 255, fin))
-	        {
+		{
 		  if (buffer[0] == '#')
-		  {
-		    break;
-		  }
+		    {
+		      continue;
+		    }
 		  if (buffer[0] == '%')
-		  {
-                    p_menu_set->p_menu[i]->item_count = j;
-                    p_menu_set->p_menu[i]->item_cur_pos = 0;
-		    i++;
-		    break;
-		  }
-	          if (ireg (
-	            "^!([A-Za-z0-9_.]+)[[:space:]]*([0-9]+),"
-	            "[[:space:]]*([0-9]+),[[:space:]]*([0-9]+),"
-	            "[[:space:]]*\"([A-Za-z0-9_]+)\",[[:space:]]*\"([^\"]+)\"",
-	            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[1].rm_so,
-	                pmatch[1].rm_eo - pmatch[1].rm_so);
-	              p_menu_set->p_menu[i]->items[j]->action[pmatch[1].rm_eo - pmatch[1].rm_so] = '\0';
-                      strncpy (temp,
-	                buffer + pmatch[2].rm_so,
-	                pmatch[2].rm_eo - pmatch[2].rm_so);
-                      temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0';
-	              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);
-	              temp[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0';
-                      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);
-                      temp[pmatch[4].rm_eo - pmatch[4].rm_so] = '\0';
-                      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);
-                      p_menu_set->p_menu[i]->items[j]->name[pmatch[5].rm_eo - pmatch[5].rm_so] = '\0';
-	              strncpy (p_menu_set->p_menu[i]->items[j]->text,
-	                buffer + pmatch[6].rm_so,
-	                pmatch[6].rm_eo - pmatch[6].rm_so);
-                      p_menu_set->p_menu[i]->items[j]->text[pmatch[6].rm_eo - pmatch[6].rm_so] = '\0';
-	              j++;
-	              continue;
-	            }
-	          if (ireg (
-	            "^@([A-Za-z0-9_]+)[[:space:]]*([0-9]+),"
-	            "[[:space:]]*([0-9]+),[[:space:]]*([0-9]+),"
-	            "[[:space:]]*\"([A-Za-z0-9_]+)\",[[:space:]]*\"([^\"]+)\"",
-	            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[1].rm_so,
-	                pmatch[1].rm_eo - pmatch[1].rm_so);
-                      p_menu_set->p_menu[i]->items[j]->action[pmatch[0].rm_eo - pmatch[0].rm_so] = '\0';
-	              strncpy (temp,
-	                buffer + pmatch[2].rm_so,
-	                pmatch[2].rm_eo - pmatch[2].rm_so);
-                      temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0';
-	              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);
-                      temp[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0';
-	              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);
-                      temp[pmatch[4].rm_eo - pmatch[4].rm_so] = '\0';
-	              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);
-                      p_menu_set->p_menu[i]->items[j]->name[pmatch[5].rm_eo - pmatch[5].rm_so] = '\0';
-	              strncpy (p_menu_set->p_menu[i]->items[j]->text,
-	                buffer + pmatch[6].rm_so,
-	                pmatch[6].rm_eo - pmatch[6].rm_so);
-                      p_menu_set->p_menu[i]->items[j]->text[pmatch[6].rm_eo - pmatch[6].rm_so] = '\0';
-	              j++;
-	              continue;
-	            }
-	          if (ireg (
-	            "^title[[:space:]]*([0-9]+),"
-	            "[[:space:]]*([0-9]+),[[:space:]]*\"([^\"]+)\"",
-	            buffer, 4, pmatch) == 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';
-	              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);
-                      temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0';
-	              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);
-                      p_menu_set->p_menu[i]->title.text[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0';
-	              continue;
-	            }
-	          if (ireg (
-	            "^title[[:space:]]*([0-9]+),"
-	            "[[:space:]]*([0-9]+),[[:space:]]*S_([A-Za-z0-9_]+)",
-	            buffer, 4, pmatch) == 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';
-	              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);
-                      temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0';
-	              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);
-                      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);
-	              continue;
-	            }
-	        }
+		    {
+		      p_menu_set->p_menu[i]->item_count = j;
+		      p_menu_set->p_menu[i]->item_cur_pos = 0;
+		      i++;
+		      break;
+		    }
+		  if (ireg ("^!([A-Za-z0-9_.]+)[[:space:]]*([0-9]+),"
+			    "[[:space:]]*([0-9]+),[[:space:]]*([0-9]+),"
+			    "[[:space:]]*([0-9]+),[[:space:]]*\"([A-Za-z0-9_]+)\","
+			    "[[:space:]]*\"([^\"]+)\"",
+			    buffer, 8, 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[1].rm_so,
+			       pmatch[1].rm_eo - pmatch[1].rm_so);
+		      p_menu_set->p_menu[i]->items[j]->action[pmatch[1].
+							      rm_eo -
+							      pmatch[1].
+							      rm_so] = '\0';
+		      strncpy (temp, buffer + pmatch[2].rm_so,
+			       pmatch[2].rm_eo - pmatch[2].rm_so);
+		      temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0';
+		      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);
+		      temp[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0';
+		      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);
+		      temp[pmatch[4].rm_eo - pmatch[4].rm_so] = '\0';
+		      p_menu_set->p_menu[i]->items[j]->priv = atoi (temp);
+		      strncpy (temp,
+			       buffer + pmatch[5].rm_so,
+			       pmatch[5].rm_eo - pmatch[5].rm_so);
+		      temp[pmatch[5].rm_eo - pmatch[5].rm_so] = '\0';
+		      p_menu_set->p_menu[i]->items[j]->level = atoi (temp);
+		      strncpy (p_menu_set->p_menu[i]->items[j]->name,
+			       buffer + pmatch[6].rm_so,
+			       pmatch[6].rm_eo - pmatch[6].rm_so);
+		      p_menu_set->p_menu[i]->items[j]->name[pmatch[6].rm_eo -
+							    pmatch[6].rm_so] =
+			'\0';
+		      strncpy (p_menu_set->p_menu[i]->items[j]->text,
+			       buffer + pmatch[7].rm_so,
+			       pmatch[7].rm_eo - pmatch[7].rm_so);
+		      p_menu_set->p_menu[i]->items[j]->text[pmatch[7].rm_eo -
+							    pmatch[7].rm_so] =
+			'\0';
+		      j++;
+		      continue;
+		    }
+		  if (ireg ("^@([A-Za-z0-9_]+)[[:space:]]*([0-9]+),"
+			    "[[:space:]]*([0-9]+),[[:space:]]*([0-9]+),"
+			    "[[:space:]]*([0-9]+),[[:space:]]*\"([A-Za-z0-9_]+)\","
+			    "[[:space:]]*\"([^\"]+)\"",
+			    buffer, 8, 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[1].rm_so,
+			       pmatch[1].rm_eo - pmatch[1].rm_so);
+		      p_menu_set->p_menu[i]->items[j]->action[pmatch[1].
+							      rm_eo -
+							      pmatch[1].
+							      rm_so] = '\0';
+		      strncpy (temp, buffer + pmatch[2].rm_so,
+			       pmatch[2].rm_eo - pmatch[2].rm_so);
+		      temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0';
+		      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);
+		      temp[pmatch[3].rm_eo - pmatch[3].rm_so] = '\0';
+		      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);
+		      temp[pmatch[4].rm_eo - pmatch[4].rm_so] = '\0';
+		      p_menu_set->p_menu[i]->items[j]->priv = atoi (temp);
+		      strncpy (temp,
+			       buffer + pmatch[5].rm_so,
+			       pmatch[5].rm_eo - pmatch[5].rm_so);
+		      temp[pmatch[5].rm_eo - pmatch[5].rm_so] = '\0';
+		      p_menu_set->p_menu[i]->items[j]->level = atoi (temp);
+		      strncpy (p_menu_set->p_menu[i]->items[j]->name,
+			       buffer + pmatch[6].rm_so,
+			       pmatch[6].rm_eo - pmatch[6].rm_so);
+		      p_menu_set->p_menu[i]->items[j]->name[pmatch[6].rm_eo -
+							    pmatch[6].rm_so] =
+			'\0';
+		      strncpy (p_menu_set->p_menu[i]->items[j]->text,
+			       buffer + pmatch[7].rm_so,
+			       pmatch[7].rm_eo - pmatch[7].rm_so);
+		      p_menu_set->p_menu[i]->items[j]->text[pmatch[7].rm_eo -
+							    pmatch[7].rm_so] =
+			'\0';
+		      j++;
+		      continue;
+		    }
+		  if (ireg ("^title[[:space:]]*([0-9]+),"
+			    "[[:space:]]*([0-9]+),[[:space:]]*\"([^\"]+)\"",
+			    buffer, 4, pmatch) == 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';
+		      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);
+		      temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0';
+		      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);
+		      p_menu_set->p_menu[i]->title.text[pmatch[3].rm_eo -
+							pmatch[3].rm_so] =
+			'\0';
+		      continue;
+		    }
+		  if (ireg ("^screen[[:space:]]*([0-9]+),"
+			    "[[:space:]]*([0-9]+),[[:space:]]*S_([A-Za-z0-9_]+)",
+			    buffer, 4, pmatch) == 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';
+		      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);
+		      temp[pmatch[2].rm_eo - pmatch[2].rm_so] = '\0';
+		      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);
+		      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);
+		      continue;
+		    }
+		}
 	    }
 	  break;
 	}
@@ -231,18 +256,18 @@ load_menu (MENU_SET * p_menu_set, const
   return 0;
 }
 
-MENU * 
-get_menu (MENU_SET * p_menu_set, const char * menu_name)
+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)
     {
-      return p_menu_set->p_menu[i];
+      if (strcmp (p_menu_set->p_menu[i]->name, menu_name) == 0)
+	{
+	  return p_menu_set->p_menu[i];
+	}
     }
-  }
 
   return NULL;
 }
@@ -266,38 +291,40 @@ 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);
+  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++)
     {
-      if (checkpriv (&BBS_priv, 0, p_menu->items[i]->priv) == 0)
-      {
-      	p_menu->items[i]->display = 0;
-      }
+      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;
+	}
       else
-      {
-      	p_menu->items[i]->display = 1;
+	{
+	  p_menu->items[i]->display = 1;
+
+	  menu_selectable = 1;
 
-        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 ();
-      }
+	  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 ();
+	}
     }
-  
+
   if (!menu_selectable)
     return -1;
 
@@ -306,6 +333,16 @@ display_menu (MENU * p_menu)
   return 0;
 }
 
+int
+display_current_menu (MENU_SET * p_menu_set)
+{
+  MENU *p_menu;
+
+  p_menu = p_menu_set->p_menu_select[p_menu_set->menu_select_depth];
+
+  return display_menu (p_menu);
+}
+
 const char *
 menu_control (MENU_SET * p_menu_set, int key)
 {
@@ -322,59 +359,61 @@ menu_control (MENU_SET * p_menu_set, int
     case CR:
     case KEY_RIGHT:
       if (p_menu->items[p_menu->item_cur_pos]->submenu)
-        {
-          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);
-          if (display_menu (p_menu) != 0)
-            return menu_control (p_menu_set, KEY_LEFT);
-          break;
-        }
+	{
+	  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);
+	  if (display_menu (p_menu) != 0)
+	    return menu_control (p_menu_set, KEY_LEFT);
+	  break;
+	}
       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)
-        {
-          p_menu_set->menu_select_depth --;
-          p_menu =
-            p_menu_set->p_menu_select[p_menu_set->menu_select_depth];
-          if (display_menu (p_menu) != 0)
-            return menu_control (p_menu_set, KEY_LEFT);
-          break;
-        }
+	{
+	  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->item_cur_pos --;
-          display_menu_cursor (p_menu, 1);
-          break;
-        }
+	{
+	  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)
+	    p_menu->item_cur_pos--;
+	  display_menu_cursor (p_menu, 1);
+	  break;
+	}
     case KEY_UP:
       display_menu_cursor (p_menu, 0);
       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);
+	{
+	  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);
       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);
+	{
+	  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: