X-Git-Url: https://git.decadent.org.uk/gitweb/?p=ap-utils.git;a=blobdiff_plain;f=src%2Fap-config.c;fp=src%2Fap-config.c;h=e17926d75339ca318975b88d994cc50a957e9348;hp=c41525e89b6d640d95ada9b0d585dd4fcff4dd4e;hb=16204dfc7715783c2ebdfb55fc44fb9344613a76;hpb=17638f5bff2fddb825562f9242a364674aa5fb94

diff --git a/src/ap-config.c b/src/ap-config.c
index c41525e..e17926d 100644
--- a/src/ap-config.c
+++ b/src/ap-config.c
@@ -42,7 +42,7 @@ void config_menu()
 	 0},
 	{_("Wireless"), _("Set wireless options"), atmel_wireless, 0},
 	{_("Privacy"), MENU_ENCRYPT, wep, 0},
-	{_("MAC auth"), MENU_MAC, atmel_auth_mac, 0},
+	{_("Auth"), MENU_AUTH, atmel_auth, 0},
 	{_("Community"), MENU_COMMUNITY, AuthorizedSettings, 0},
 	{_("Radio"), _("Set radio signal power and antenna options"),
 	 power, 0},
@@ -54,7 +54,7 @@ void config_menu()
         {_("General"), _("Set general options"), nwn_wireless, 0},
         {_("Advanced"), _("Set advanced options"), advanced, 0},
         {_("Privacy"), MENU_ENCRYPT, nwn_wep, 0},
-        {_("MAC auth"), MENU_MAC, nwn_auth_mac, 0},
+        {_("MAC auth"), MENU_AUTH, nwn_auth_mac, 0},
         {_("Community"), MENU_COMMUNITY, AuthorizedSettings, 0},
         {"..", MAIN_MENU, NULL, 0},
         {0, 0, NULL, 0}
@@ -111,6 +111,7 @@ void stat_menu()
 	{_("Ethernet"), _("Get ethernet port statistics"), EthStat, 0},
 	{_("Wireless"), MENU_WIRELESS, WirelessStat, 0},
 	{_("Stations"), MENU_STAS, atmel_stations, 0},
+	{_("AP link"), MENU_APLINK, atmel_aplink, 0},
 	{_("KnownAPs"), _("Get info about known Access Points"), APs, 0},
 	{"..", MAIN_MENU, NULL, 0},
 	{0, 0, NULL, 0}
@@ -177,10 +178,19 @@ int main( /*int argc, char **argv */ )
     initscr();
     if (has_colors()) {
 	start_color();
-	init_pair(1, COLOR_BLACK, COLOR_CYAN);
-	init_pair(2, COLOR_BLACK, COLOR_WHITE);
-	init_pair(3, COLOR_BLACK, COLOR_GREEN);
-	init_pair(4, COLOR_WHITE, COLOR_RED);
+
+	/* Never trust that these are defined by default. */
+	init_pair (COLOR_RED, COLOR_RED, COLOR_BLACK );
+	init_pair (COLOR_GREEN, COLOR_GREEN, COLOR_BLACK);
+	init_pair (COLOR_YELLOW, COLOR_YELLOW, COLOR_BLACK);
+	init_pair (COLOR_BLUE, COLOR_BLUE, COLOR_BLACK);
+	init_pair (COLOR_MAGENTA, COLOR_MAGENTA, COLOR_BLACK );
+	init_pair (COLOR_CYAN, COLOR_CYAN, COLOR_BLACK);
+
+	init_pair(11, COLOR_BLACK, COLOR_CYAN);
+	init_pair(12, COLOR_BLACK, COLOR_WHITE);
+	init_pair(13, COLOR_BLACK, COLOR_GREEN);
+	init_pair(14, COLOR_WHITE, COLOR_RED);
     }
 
     noraw();
@@ -193,12 +203,12 @@ int main( /*int argc, char **argv */ )
 
 /* draw help win */
     win_for_help = newwin(1, COLS, LINES - 1, 0);
-    wattrset(win_for_help, COLOR_PAIR(1));
+    wattrset(win_for_help, COLOR_PAIR(11));
     print_help("");
 
 /* draw title win */
     win_for_title = newwin(1, COLS, 0, 0);
-    wattrset(win_for_title, COLOR_PAIR(1));
+    wattrset(win_for_title, COLOR_PAIR(11));
     for (i = 0; i < COLS; i++)
 	waddch(win_for_title, ' ');
     sprintf(message, _("Wireless Access Point Configurator ver. %s"),
@@ -211,7 +221,7 @@ int main( /*int argc, char **argv */ )
     sub_for_menu = derwin(win_for_menu, LINES - 5, MCOLS - 2, 2, 1);
     set_menu_win(NULL, win_for_menu);
     set_menu_sub(NULL, sub_for_menu);
-    attrset(COLOR_PAIR(1));
+    attrset(COLOR_PAIR(11));
 
     /* íÁÌÀÀ ÒÁÍËÕ */
     waddch(win_for_menu, ACS_BSSB);