Merge commit 'upstream/1.5'

[ap-utils.git] / ap-gl / ap-gl.c

diff --git a/ap-gl/ap-gl.c b/ap-gl/ap-gl.c
index 610d949c43635e6b30e696942c7bd5fccdd736cf..b947255bb6c69c408bd7ff175778753dc0522c91 100644 (file)
--- a/ap-gl/ap-gl.c
+++ b/ap-gl/ap-gl.c
@@ -1,5 +1,5 @@
 /*
- *      ap-config.c from Wireless Access Point Utilites for Unix
+ *      ap-gl.c from Wireless Access Point Utilites for Unix
  *
  * Copyright (c) 2002 Roman Festchook <roma at polesye dot net>
  *
@@ -29,7 +29,7 @@
 
 WINDOW *win_for_menu, *sub_for_menu, *win_for_help, *main_win, *main_sub;
 char *community, *name;
-int sockfd, atmel410_filter = 1, wait_mode = WAIT_FOREVER;
+int atmel410_filter = 1, wait_mode = WAIT_FOREVER;
 struct in_addr ap_ip;
 char *prog_title = "Wireless AP Configurator for GlobalSun";
 char set_oeminfo_allowed = 0;
@@ -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},
@@ -131,10 +131,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();
@@ -147,12 +156,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"),
@@ -165,7 +174,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);