--- lbbs/src/menu.c	2025/05/25 06:53:29	1.56
+++ lbbs/src/menu.c	2025/06/21 02:15:18	1.67
@@ -16,21 +16,21 @@
 
 #include "bbs.h"
 #include "bbs_cmd.h"
-#include "user_priv.h"
 #include "bbs_cmd.h"
-#include "menu.h"
-#include "log.h"
+#include "common.h"
 #include "io.h"
+#include "log.h"
+#include "menu.h"
 #include "screen.h"
-#include "common.h"
-#include <string.h>
-#include <stdio.h>
+#include "user_priv.h"
 #include <ctype.h>
-#include <stdlib.h>
 #include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
-#include <sys/shm.h>
 #include <sys/ipc.h>
+#include <sys/shm.h>
 
 #define MENU_SCREEN_PATH_PREFIX "var/MENU_SCR_"
 #define MENU_CONF_DELIM_WITH_SPACE " ,\t\r\n"
@@ -161,6 +161,8 @@ int load_menu(MENU_SET *p_menu_set, cons
 				p_menu->title.show = 0;
 				p_menu->screen_show = 0;
 				p_menu->page_item_limit = 0;
+				p_menu->use_filter = 0;
+				p_menu->filter_handler = NULL;
 
 				q = strtok_r(NULL, MENU_CONF_DELIM_WITH_SPACE, &saveptr);
 				if (q == NULL)
@@ -653,6 +655,18 @@ int load_menu(MENU_SET *p_menu_set, cons
 							return -1;
 						}
 					}
+					else if (strcmp(p, "use_filter") == 0)
+					{
+						p_menu->use_filter = 1;
+
+						// Check syntax
+						q = strtok_r(NULL, MENU_CONF_DELIM_WITH_SPACE, &saveptr);
+						if (q != NULL)
+						{
+							log_error("Unknown extra content in menu config line %d\n", fin_line);
+							return -1;
+						}
+					}
 				}
 			}
 			else // BEGIN of menu screen
@@ -772,6 +786,16 @@ int load_menu(MENU_SET *p_menu_set, cons
 			log_error("Undefined menu screen [%s]\n", p);
 			return -1;
 		}
+
+		// Set menu->filter_handler of each menu pointing to filter
+		if (p_menu->use_filter == 1)
+		{
+			if ((p_menu->filter_handler = get_cmd_handler(p_menu->name)) == NULL)
+			{
+				log_error("Undefined menu filter handler [%s]\n", p_menu->name);
+				return -1;
+			}
+		}
 	}
 
 	for (menu_item_id = 0; menu_item_id < p_menu_set->menu_item_count; menu_item_id++)
@@ -807,7 +831,7 @@ int load_menu(MENU_SET *p_menu_set, cons
 	return 0;
 }
 
-static int display_menu_cursor(MENU_SET *p_menu_set, int show)
+int display_menu_cursor(MENU_SET *p_menu_set, int show)
 {
 	MENU_ID menu_id;
 	MENU_ITEM_ID menu_item_id;
@@ -864,7 +888,7 @@ static int display_menu_current_page(MEN
 	{
 		if (p_menu->title.row == 0 && p_menu->title.col == 0)
 		{
-			show_top(p_menu->title.text);
+			show_top(p_menu->title.text, BBS_name, "");
 		}
 		else
 		{
@@ -969,8 +993,9 @@ int display_menu(MENU_SET *p_menu_set)
 	}
 
 	if (menu_item_pos > 0 &&
-		checkpriv(&BBS_priv, 0, p_menu_item->priv) != 0 &&
-		checklevel2(&BBS_priv, p_menu_item->level))
+		!(p_menu->use_filter ? (p_menu->filter_handler((void *)p_menu_item) == 0)
+							 : (checkpriv(&BBS_priv, 0, p_menu_item->priv) == 0 ||
+								checklevel2(&BBS_priv, p_menu_item->level) == 0)))
 	{
 		menu_selectable = 1;
 	}
@@ -991,7 +1016,9 @@ int display_menu(MENU_SET *p_menu_set)
 
 		p_menu_set->menu_item_page_id[menu_item_pos] = page_id;
 
-		if (checkpriv(&BBS_priv, 0, p_menu_item->priv) == 0 || checklevel2(&BBS_priv, p_menu_item->level) == 0)
+		if (p_menu->use_filter ? (p_menu->filter_handler((void *)p_menu_item) == 0)
+							   : (checkpriv(&BBS_priv, 0, p_menu_item->priv) == 0 ||
+								  checklevel2(&BBS_priv, p_menu_item->level) == 0))
 		{
 			p_menu_set->menu_item_display[menu_item_pos] = 0;
 			p_menu_set->menu_item_r_row[menu_item_pos] = 0;
@@ -1025,7 +1052,10 @@ int display_menu(MENU_SET *p_menu_set)
 
 	if (!menu_selectable)
 	{
-		log_error("No selectable menu item in current menu (%s)\n", p_menu->name);
+		moveto(p_menu->screen_row, p_menu->screen_col);
+		clrtoeol();
+		prints("没有可选项");
+		press_any_key();
 		return -1;
 	}
 
@@ -1116,6 +1146,7 @@ int menu_control(MENU_SET *p_menu_set, i
 			return ((*(p_menu_item->action_cmd_handler))((void *)(p_menu_item->name)));
 		}
 		break;
+	case KEY_ESC:
 	case KEY_LEFT:
 		if (p_menu_set->choose_step > 0)
 		{
@@ -1306,6 +1337,13 @@ int menu_control(MENU_SET *p_menu_set, i
 
 int unload_menu(MENU_SET *p_menu_set)
 {
+	int shmid;
+
+	if (p_menu_set == NULL)
+	{
+		return -1;
+	}
+
 	if (p_menu_set->p_menu_name_dict != NULL)
 	{
 		trie_dict_destroy(p_menu_set->p_menu_name_dict);
@@ -1318,11 +1356,13 @@ int unload_menu(MENU_SET *p_menu_set)
 		p_menu_set->p_menu_screen_dict = NULL;
 	}
 
+	shmid = p_menu_set->shmid;
+
 	detach_menu_shm(p_menu_set);
 
-	if (shmctl(p_menu_set->shmid, IPC_RMID, NULL) == -1)
+	if (shmctl(shmid, IPC_RMID, NULL) == -1)
 	{
-		log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", p_menu_set->shmid, errno);
+		log_error("shmctl(shmid=%d, IPC_RMID) error (%d)\n", shmid, errno);
 		return -1;
 	}
 
@@ -1337,10 +1377,10 @@ int set_menu_shm_readonly(MENU_SET *p_me
 	p_shm = shmat(p_menu_set->shmid, p_menu_set->p_reserved, SHM_RDONLY | SHM_REMAP);
 	if (p_shm == (void *)-1)
 	{
-		log_error("shmat() error (%d)\n", errno);
+		log_error("shmat(menu_shm shmid = %d) error (%d)\n", p_menu_set->shmid, errno);
 		return -1;
 	}
-	
+
 	p_menu_set->p_reserved = p_shm;
 
 	return 0;