/[LeafOK_CVS]/lbbs/src/menu.c
ViewVC logotype

Diff of /lbbs/src/menu.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.54 by sysadm, Tue May 20 12:18:24 2025 UTC Revision 1.61 by sysadm, Thu May 29 01:21:44 2025 UTC
# Line 807  int load_menu(MENU_SET *p_menu_set, cons Line 807  int load_menu(MENU_SET *p_menu_set, cons
807          return 0;          return 0;
808  }  }
809    
810  static int display_menu_cursor(MENU_SET *p_menu_set, int show)  int display_menu_cursor(MENU_SET *p_menu_set, int show)
811  {  {
812          MENU_ID menu_id;          MENU_ID menu_id;
813          MENU_ITEM_ID menu_item_id;          MENU_ITEM_ID menu_item_id;
# Line 864  static int display_menu_current_page(MEN Line 864  static int display_menu_current_page(MEN
864          {          {
865                  if (p_menu->title.row == 0 && p_menu->title.col == 0)                  if (p_menu->title.row == 0 && p_menu->title.col == 0)
866                  {                  {
867                          show_top(p_menu->title.text);                          show_top(p_menu->title.text, BBS_name, "");
868                  }                  }
869                  else                  else
870                  {                  {
# Line 1116  int menu_control(MENU_SET *p_menu_set, i Line 1116  int menu_control(MENU_SET *p_menu_set, i
1116                          return ((*(p_menu_item->action_cmd_handler))((void *)(p_menu_item->name)));                          return ((*(p_menu_item->action_cmd_handler))((void *)(p_menu_item->name)));
1117                  }                  }
1118                  break;                  break;
1119            case KEY_ESC:
1120          case KEY_LEFT:          case KEY_LEFT:
1121                  if (p_menu_set->choose_step > 0)                  if (p_menu_set->choose_step > 0)
1122                  {                  {
# Line 1306  int menu_control(MENU_SET *p_menu_set, i Line 1307  int menu_control(MENU_SET *p_menu_set, i
1307    
1308  int unload_menu(MENU_SET *p_menu_set)  int unload_menu(MENU_SET *p_menu_set)
1309  {  {
1310            int shmid;
1311    
1312            if (p_menu_set == NULL)
1313            {
1314                    return -1;
1315            }
1316    
1317          if (p_menu_set->p_menu_name_dict != NULL)          if (p_menu_set->p_menu_name_dict != NULL)
1318          {          {
1319                  trie_dict_destroy(p_menu_set->p_menu_name_dict);                  trie_dict_destroy(p_menu_set->p_menu_name_dict);
# Line 1318  int unload_menu(MENU_SET *p_menu_set) Line 1326  int unload_menu(MENU_SET *p_menu_set)
1326                  p_menu_set->p_menu_screen_dict = NULL;                  p_menu_set->p_menu_screen_dict = NULL;
1327          }          }
1328    
1329          unload_menu_shm(p_menu_set);          shmid = p_menu_set->shmid;
1330    
1331            detach_menu_shm(p_menu_set);
1332    
1333          if (shmctl(p_menu_set->shmid, IPC_RMID, NULL) == -1)          if (shmctl(shmid, IPC_RMID, NULL) == -1)
1334          {          {
1335                  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);
1336                  return -1;                  return -1;
1337          }          }
1338    
1339          return 0;          return 0;
1340  }  }
1341    
1342  int load_menu_shm(MENU_SET *p_menu_set)  int set_menu_shm_readonly(MENU_SET *p_menu_set)
1343  {  {
1344          void *p_shm;          void *p_shm;
1345    
1346          // Mount shared memory          // Remap shared memory in read-only mode
1347          p_shm = shmat(p_menu_set->shmid, NULL, SHM_RDONLY);          p_shm = shmat(p_menu_set->shmid, p_menu_set->p_reserved, SHM_RDONLY | SHM_REMAP);
1348          if (p_shm == (void *)-1)          if (p_shm == (void *)-1)
1349          {          {
1350                  log_error("shmat() error (%d)\n", errno);                  log_error("shmat(menu_shm shmid = %d) error (%d)\n", p_menu_set->shmid, errno);
1351                  return -1;                  return -1;
1352          }          }
1353            
         if (p_menu_set->p_reserved != NULL && shmdt(p_menu_set->p_reserved) == -1)  
         {  
                 log_error("shmdt() error (%d)\n", errno);  
                 return -2;  
         }  
1354          p_menu_set->p_reserved = p_shm;          p_menu_set->p_reserved = p_shm;
1355    
         p_menu_set->p_menu_pool = p_menu_set->p_reserved + MENU_SET_RESERVED_LENGTH;  
         p_menu_set->p_menu_item_pool = p_menu_set->p_menu_pool + sizeof(MENU) * MAX_MENUS;  
         p_menu_set->p_menu_screen_pool = p_menu_set->p_menu_item_pool + sizeof(MENU_ITEM) * MAX_MENUITEMS;  
         p_menu_set->p_menu_screen_buf = p_menu_set->p_menu_screen_pool + sizeof(MENU_SCREEN) * MAX_MENUS;  
         p_menu_set->p_menu_screen_buf_free = p_menu_set->p_menu_screen_buf;  
   
         // Restore status varaibles into reserved memory area  
         p_menu_set->menu_count = *((int16_t *)p_menu_set->p_reserved);  
         p_menu_set->menu_item_count = *(((int16_t *)p_menu_set->p_reserved) + 1);  
         p_menu_set->menu_screen_count = *(((int16_t *)p_menu_set->p_reserved) + 2);  
   
         p_menu_set->choose_step = 0;  
         p_menu_set->menu_id_path[0] = 0;  
   
         p_menu_set->p_menu_name_dict = NULL;  
         p_menu_set->p_menu_screen_dict = NULL;  
   
1356          return 0;          return 0;
1357  }  }
1358    
1359  int unload_menu_shm(MENU_SET *p_menu_set)  int detach_menu_shm(MENU_SET *p_menu_set)
1360  {  {
1361          p_menu_set->menu_count = 0;          p_menu_set->menu_count = 0;
1362          p_menu_set->menu_item_count = 0;          p_menu_set->menu_item_count = 0;
# Line 1381  int unload_menu_shm(MENU_SET *p_menu_set Line 1369  int unload_menu_shm(MENU_SET *p_menu_set
1369          p_menu_set->p_menu_screen_buf = NULL;          p_menu_set->p_menu_screen_buf = NULL;
1370          p_menu_set->p_menu_screen_buf_free = NULL;          p_menu_set->p_menu_screen_buf_free = NULL;
1371    
1372            p_menu_set->p_menu_name_dict = NULL;
1373            p_menu_set->p_menu_screen_dict = NULL;
1374    
1375          if (p_menu_set->p_reserved != NULL && shmdt(p_menu_set->p_reserved) == -1)          if (p_menu_set->p_reserved != NULL && shmdt(p_menu_set->p_reserved) == -1)
1376          {          {
1377                  log_error("shmdt() error (%d)\n", errno);                  log_error("shmdt() error (%d)\n", errno);
1378                  return -1;                  return -1;
1379          }          }
1380    
1381          p_menu_set->p_reserved = NULL;          p_menu_set->p_reserved = NULL;
1382    
1383          return 0;          return 0;

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
webmaster@leafok.com
 ViewVC Help
Powered by ViewVC 1.3.0-beta1