--- lbbs/src/bbs_net.c 2025/05/15 05:14:57 1.41 +++ lbbs/src/bbs_net.c 2025/06/04 13:42:53 1.46 @@ -124,7 +124,6 @@ int load_bbsnet_conf(const char *file_co p_menu_item->submenu = 0; p_menu_item->priv = 0; p_menu_item->level = 0; - p_menu_item->display = 0; p_menu_item->name[0] = (char)(menu_item_id < MAXSTATION / 2 ? 'A' + menu_item_id : 'a' + menu_item_id); p_menu_item->name[1] = '\0'; @@ -358,7 +357,7 @@ int bbsnet_connect(int n) else if (events[i].data.fd == STDIN_FILENO) { ch = igetch(0); - if (ch == Ctrl('C')) + if (ch == Ctrl('C') || ch == KEY_ESC) { goto cleanup; } @@ -386,7 +385,7 @@ int bbsnet_connect(int n) prints("\033[1;31m连接成功!\033[m\r\n"); iflush(); - log_std("BBSNET connect to %s:%d\n", remote_addr, remote_port); + log_common("BBSNET connect to %s:%d\n", remote_addr, remote_port); ev.events = EPOLLIN | EPOLLOUT | EPOLLET; ev.data.fd = sock; @@ -457,7 +456,7 @@ int bbsnet_connect(int n) } else if (ret == 0) // broken pipe { - log_std("read(STDIN) EOF\n"); + log_common("read(STDIN) EOF\n"); stdin_read_wait = 0; loop = 0; break; @@ -497,7 +496,7 @@ int bbsnet_connect(int n) } else if (ret == 0) // broken pipe { - log_std("write(socket) EOF\n"); + log_common("write(socket) EOF\n"); sock_write_wait = 0; loop = 0; break; @@ -542,7 +541,7 @@ int bbsnet_connect(int n) } else if (ret == 0) // broken pipe { - log_std("read(socket) EOF\n"); + log_common("read(socket) EOF\n"); sock_read_wait = 0; loop = 0; break; @@ -581,7 +580,7 @@ int bbsnet_connect(int n) } else if (ret == 0) // broken pipe { - log_std("write(STDOUT) EOF\n"); + log_common("write(STDOUT) EOF\n"); stdout_write_wait = 0; loop = 0; break; @@ -623,7 +622,7 @@ cleanup: t_used = time(0) - t_used; tm_used = gmtime(&t_used); - log_std("BBSNET disconnect, %d days %d hours %d minutes %d seconds used\n", + log_common("BBSNET disconnect, %d days %d hours %d minutes %d seconds used\n", tm_used->tm_mday - 1, tm_used->tm_hour, tm_used->tm_min, tm_used->tm_sec); @@ -655,20 +654,22 @@ bbsnet_refresh() return 0; } -int bbsnet_selchange(int new_pos) +int bbsnet_selchange() { + int i = bbsnet_menu.menu_item_pos[0]; + moveto(20, 0); clrtoeol(); prints("|\x1b[1m单位:\x1b[1;33m%-18s\x1b[m 站名:\x1b[1;33m%s\x1b[m", - bbsnet_conf[new_pos].host2, bbsnet_conf[new_pos].host1); + bbsnet_conf[i].host2, bbsnet_conf[i].host1); moveto(20, 79); prints("|"); moveto(21, 0); clrtoeol(); - prints("|\x1b[1m连往:\x1b[1;33m%-20s", bbsnet_conf[new_pos].ip); - if (bbsnet_conf[new_pos].port != 23) + prints("|\x1b[1m连往:\x1b[1;33m%-20s", bbsnet_conf[i].ip); + if (bbsnet_conf[i].port != 23) { - prints(" %d", bbsnet_conf[new_pos].port); + prints(" %d", bbsnet_conf[i].port); } prints("\x1b[m"); moveto(21, 79); @@ -680,7 +681,7 @@ int bbsnet_selchange(int new_pos) int bbs_net() { - int ch, pos, i; + int ch, i; load_bbsnet_conf(CONF_BBSNET); @@ -688,9 +689,8 @@ int bbs_net() clearscr(); bbsnet_refresh(); - pos = bbsnet_menu.menu_item_pos[0]; display_menu(&bbsnet_menu); - bbsnet_selchange(pos); + bbsnet_selchange(); while (!SYS_server_exit) { @@ -698,6 +698,7 @@ int bbs_net() switch (ch) { case KEY_NULL: // broken pipe + case KEY_ESC: case Ctrl('C'): // user cancel goto cleanup; case KEY_TIMEOUT: @@ -708,42 +709,46 @@ int bbs_net() continue; case CR: igetch_reset(); - pos = bbsnet_menu.menu_item_pos[0]; - bbsnet_connect(pos); + bbsnet_connect(bbsnet_menu.menu_item_pos[0]); bbsnet_refresh(); display_menu(&bbsnet_menu); - bbsnet_selchange(pos); + bbsnet_selchange(); break; case KEY_UP: for (i = 0; i < STATION_PER_LINE; i++) { menu_control(&bbsnet_menu, KEY_UP); } - pos = bbsnet_menu.menu_item_pos[0]; - bbsnet_selchange(pos); + bbsnet_selchange(); break; case KEY_DOWN: for (i = 0; i < STATION_PER_LINE; i++) { menu_control(&bbsnet_menu, KEY_DOWN); } - pos = bbsnet_menu.menu_item_pos[0]; - bbsnet_selchange(pos); + bbsnet_selchange(); break; case KEY_LEFT: menu_control(&bbsnet_menu, KEY_UP); - pos = bbsnet_menu.menu_item_pos[0]; - bbsnet_selchange(pos); + bbsnet_selchange(); break; case KEY_RIGHT: menu_control(&bbsnet_menu, KEY_DOWN); - pos = bbsnet_menu.menu_item_pos[0]; - bbsnet_selchange(pos); + bbsnet_selchange(); + break; + case KEY_HOME: + case KEY_PGUP: + menu_control(&bbsnet_menu, KEY_PGUP); + bbsnet_selchange(); + break; + case KEY_END: + case KEY_PGDN: + menu_control(&bbsnet_menu, KEY_PGDN); + bbsnet_selchange(); break; default: menu_control(&bbsnet_menu, ch); - pos = bbsnet_menu.menu_item_pos[0]; - bbsnet_selchange(pos); + bbsnet_selchange(); break; } BBS_last_access_tm = time(0);