X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2Finput.c;h=ff9604d516751d4cfa12196db5134a10fab45352;hb=63444196dd1edb154f81d9418b3d0bc2367163e5;hp=b77dd835bbaf5e85688c48c10c8fc9c01f1862d9;hpb=db905ff22705494136f504425cf0c75bb94cb81c;p=ap-utils.git

diff --git a/lib/input.c b/lib/input.c
index b77dd83..ff9604d 100644
--- a/lib/input.c
+++ b/lib/input.c
@@ -42,8 +42,9 @@ get_mac(char *mac, int row, int col)
     char message[MAC_LEN+1], mess[MAC_LEN/MAC_BYTES+1];
     int i;
 
-    get_value(message, row, col, MAC_LEN+1, HEX_STRING, 0, 0, NULL);
-    if (strlen(message) < 12) i = 255;
+    message[0] = '\0';
+    while (strlen(message) != 12)
+	get_value(message, row, col, MAC_LEN+1, HEX_STRING, 0, 0, NULL);
 
     for (i = 0; i < MAC_BYTES; i++) {
 	mess[0] = message[2 * i];
@@ -135,7 +136,7 @@ get_value(char *value, int row, int col, int len,
     }
 
     echo();
-    wattrset(main_sub, COLOR_PAIR(2));
+    wattrset(main_sub, COLOR_PAIR(12));
 get_value_again:
     wmove(main_sub, row, col);
     for (i = 0; i < (unsigned int)len - 1; i++)
@@ -166,8 +167,8 @@ get_value_again:
 		value[i--] = 0;
 		wmove(main_sub, row, col + i);
 		waddch(main_sub, ' ');
-		/* put backspace to move cursor back */
-		wechochar(main_sub, 0x08);
+		wmove(main_sub, row, col + i);
+		wrefresh(main_sub);
 	    }
 	    continue;
 	} else if (c == 0x0D) {
@@ -220,7 +221,7 @@ get_pass(char *value, int row, int col, int len)
 {
     int i, j = 0;
 
-    wattrset(main_sub, COLOR_PAIR(2));
+    wattrset(main_sub, COLOR_PAIR(12));
     wmove(main_sub, row, col);
     for (i = 0; i < len - 1; i++)
 	waddch(main_sub, ' ');
@@ -293,7 +294,7 @@ int menu_choose(int brow, int bcol, char **names, unsigned int num)
     else
 	choose_menu = newwin(nrow, ncol, brow - nrow + 3, bcol + MCOLS);
     sub_choose_menu = derwin(choose_menu, nrow - 2, ncol - 2, 1, 1);
-    attrset(COLOR_PAIR(1));
+    attrset(COLOR_PAIR(11));
 
     mvwaddch(choose_menu, 0, 0, ACS_ULCORNER);
     mvwaddch(choose_menu, 0, ncol - 1, ACS_URCORNER);
@@ -392,7 +393,7 @@ int wait_key()
 
 	/* error occured */
 	if (i == -1) {
-	    print_helperr(SELECT);
+	    print_helperr(ERR_SELECT);
 	    getch();
 	}