--- lbbs/src/menu.c	2005/03/19 08:23:05	1.2
+++ lbbs/src/menu.c	2005/03/19 13:46:26	1.4
@@ -15,6 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "bbs.h"
 #include "menu.h"
 #include "io.h"
 #include "common.h"
@@ -25,10 +26,10 @@
 MENU_SET bbs_menu;
 
 int
-load_menu (MENU *p_menu, const char *conf_file)
+load_menu (MENU_SET * p_menu_set, const char *conf_file)
 {
   FILE *fin, *fout;
-  int i = 0;
+  int i = 0, j;
   char buffer[256], screen_filename[256], temp[256];
   regmatch_t pmatch[10];
 
@@ -39,117 +40,332 @@ load_menu (MENU *p_menu, const char *con
     }
 
   while (fgets (buffer, 255, fin))
-  {
-  	switch (buffer[0])
-  	{
-  	  case '#':
-  	  	break;
-  	  case '%':
-  	  	if (ireg ("^%S_([A-Za-z0-9_]+)", buffer, 1, pmatch) == 0)
-  	  	{
-  	  	  strncpy (temp, buffer + pmatch[0].rm_so, 
-  	  	    pmatch[0].rm_eo - pmatch[0].rm_so + 1);
-  	  	  sprintf (screen_filename, "%sMENU_SCR_%s",
-  	  	    app_temp_dir, temp);
-  	  	    
-  	  	  if ((fout = fopen (screen_filename, "w")) == NULL)
-                   {
-                          log_error ("Open %s failed", screen_filename);
-                         return -2;
-                    }
-
-  	  	  while (fgets (buffer, 255, fin))
-  	  	  {
-  	  	  	if (buffer[0] != '%')
-    	  	  	fputs (buffer, fout);
-        	  	 else
-    	        	   break;
-    	          }
-    	  
-        	  fclose (fout);
-        	  break;
-  	  	}
-  	  	
-  	  	if (ireg ("^%S_([A-Za-z0-9_]+)", buffer, 1, pmatch) == 0)
-  	  	{
-  	  	}
-  	  	break;
-	  }	
-      fscanf (fin, "%d %d %s ", &((p_menu->items[i]).row),
-  	&((p_menu->items[i]).col), &((p_menu->items[i]).name));
-      fgets ((p_menu->items[i]).text, MAX_MENUITEM_LENGTH, fin);
-      i++;      
+    {
+      switch (buffer[0])
+	{
+	case '#':
+	  break;
+	case '%':
+	  if (ireg ("^%S_([A-Za-z0-9_]+)", buffer, 1, pmatch) == 0)
+	    {
+	      strncpy (temp, buffer + pmatch[0].rm_so,
+		       pmatch[0].rm_eo - pmatch[0].rm_so + 1);
+	      sprintf (screen_filename, "%sMENU_SCR_%s", app_temp_dir, temp);
+
+	      if ((fout = fopen (screen_filename, "w")) == NULL)
+		{
+		  log_error ("Open %s failed", screen_filename);
+		  return -2;
+		}
+
+	      while (fgets (buffer, 255, fin))
+		{
+		  if (buffer[0] != '%')
+		    fputs (buffer, fout);
+		  else
+		    break;
+		}
+
+	      fclose (fout);
+	      break;
+	    }
+
+	  if (ireg ("^%menu ([A-Za-z0-9_]+)", buffer, 1, 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);
+	      
+	      j = 0;
+	      
+	      while (fgets (buffer, 255, fin))
+	        {
+		  if (buffer[0] == '#')
+		  {
+		    break;
+		  }
+		  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, 6, 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);
+	              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,
+	                buffer + pmatch[4].rm_so,
+	                pmatch[4].rm_eo - pmatch[4].rm_so + 1);
+	              strncpy (p_menu_set->p_menu[i]->items[j]->text,
+	                buffer + pmatch[5].rm_so,
+	                pmatch[5].rm_eo - pmatch[5].rm_so + 1);
+	              j++;
+	              continue;
+	            }
+	          if (ireg (
+	            "^@([A-Za-z0-9_]+)[[:space:]]*([0-9]+),"
+	            "[[:space:]]*([0-9]+),[[:space:]]*([0-9]+),"
+	            "[[:space:]]*\"([A-Za-z0-9_]+)\",[[:space:]]*\"([^\"]+)\"",
+	            buffer, 6, 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);
+	              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,
+	                buffer + pmatch[4].rm_so,
+	                pmatch[4].rm_eo - pmatch[4].rm_so + 1);
+	              strncpy (p_menu_set->p_menu[i]->items[j]->text,
+	                buffer + pmatch[5].rm_so,
+	                pmatch[5].rm_eo - pmatch[5].rm_so + 1);
+	              j++;
+	              continue;
+	            }
+	          if (ireg (
+	            "^title[[:space:]]*([0-9]+),"
+	            "[[:space:]]*([0-9]+),[[:space:]]*\"([^\"]+)\"",
+	            buffer, 3, 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,
+	                buffer + pmatch[2].rm_so,
+	                pmatch[2].rm_eo - pmatch[2].rm_so + 1);
+	              continue;
+	            }
+	          if (ireg (
+	            "^title[[:space:]]*([0-9]+),"
+	            "[[:space:]]*([0-9]+),[[:space:]]*S_([A-Za-z0-9_]+)",
+	            buffer, 3, 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);
+	              strncpy (temp,
+	                buffer + pmatch[2].rm_so,
+	                pmatch[2].rm_eo - pmatch[2].rm_so + 1);
+	              sprintf (p_menu_set->p_menu[i]->screen.filename, 
+	                "%sMENU_SCR_%s", app_temp_dir, temp);
+	              continue;
+	            }
+	        }
+	    }
+	  break;
+	}
     }
-  
-    fclose (fin);
+  fclose (fin);
+
+  p_menu_set->menu_count = i;
+  p_menu_set->menu_select_depth = 0;
+  p_menu_set->p_menu_select[p_menu_set->menu_select_depth]
+    = (i == 0 ? NULL : p_menu_set->p_menu[0]);
 
-  p_menu->item_count = i;
-  p_menu->item_cur_pos = 0;
-  
   return 0;
 }
 
+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];
+    }
+  }
+}
+
 void
-display_menu_cursor (MENU *p_menu, int show)
+display_menu_cursor (MENU * p_menu, int show)
 {
-  moveto ((p_menu->items[p_menu->item_cur_pos]).row,
-    (p_menu->items[p_menu->item_cur_pos]).col - 2);
+  moveto ((p_menu->items[p_menu->item_cur_pos])->r_row,
+	  (p_menu->items[p_menu->item_cur_pos])->r_col - 2);
   prints (show ? ">" : " ");
   iflush ();
 }
 
 int
-display_menu (MENU *p_menu)
+display_menu (MENU * p_menu)
 {
-  int i;
-  
+  int i, row, col, menu_selectable = 0;
+
+  show_top (p_menu->title.text);
+
+  moveto (p_menu->screen.row, p_menu->screen.col); 
+  display_file (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++)
-  {
-    moveto ((p_menu->items[i]).row, (p_menu->items[i]).col);
-    prints ((p_menu->items[i]).text);
-    iflush ();
-  }
+    {
+      if (checkpriv (&BBS_priv, 0, p_menu->items[i]->priv) == 0)
+      {
+      	p_menu->items[i]->display = 0;
+      }
+      else
+      {
+      	p_menu->items[i]->display = 1;
+
+        menu_selectable = 1;
+        
+        if (p_menu->items[i]->row == 0)
+          row ++;
+        else
+          row = p_menu->items[i]->row;
+        p_menu->items[i]->r_row = row;
+        if (p_menu->items[i]->col == 0)
+          col ++;
+        else
+          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;
+
   display_menu_cursor (p_menu, 1);
 
   return 0;
 }
 
-char
-menu_control (MENU *p_menu, int key)
+const char *
+menu_control (MENU_SET * p_menu_set, int key)
 {
   int i;
-  
+  MENU *p_menu;
+
+  if (p_menu_set->menu_count == 0)
+    return "";
+
+  p_menu = p_menu_set->p_menu_select[p_menu_set->menu_select_depth];
+
   switch (key)
     {
     case CR:
     case KEY_RIGHT:
-      return ((p_menu->items[p_menu->item_cur_pos]).key);
+      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;
+        }
+      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);
+        }
+    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;
+        }
+      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;
+        }
     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;
+	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;
     case KEY_DOWN:
       display_menu_cursor (p_menu, 0);
-      p_menu->item_cur_pos ++;
+      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;
+	p_menu->item_cur_pos = 0;
+      while (!p_menu->items[p_menu->item_cur_pos]->display)
+        p_menu->item_cur_pos ++;
       display_menu_cursor (p_menu, 1);
       break;
     default:
       for (i = 0; i < p_menu->item_count; i++)
-      {
-      	if (toupper(key) == toupper((p_menu->items[i]).key))
-      	{
-          display_menu_cursor (p_menu, 0);
-          p_menu->item_cur_pos = i;
-          display_menu_cursor (p_menu, 1);
-          break;
-        }
-      }
+	{
+	  if (toupper (key) == toupper (p_menu->items[i]->name[0]))
+	    {
+	      display_menu_cursor (p_menu, 0);
+	      p_menu->item_cur_pos = i;
+	      display_menu_cursor (p_menu, 1);
+	      break;
+	    }
+	}
     }
 
-  return '\0';
+  return "";
 }