Browse Source

allow Q key to quit on any page

master
Brad Parker 11 years ago
parent
commit
ebc620a65f
  1. 22
      tui/main.cpp

22
tui/main.cpp

@ -78,7 +78,7 @@ void mainmenu(WINDOW *window) {
mvwaddstr(window, 5, 2, "3. Wireless"); mvwaddstr(window, 5, 2, "3. Wireless");
cyan(window); cyan(window);
mvwaddstr(window, 7, 2, "0. Quit"); mvwaddstr(window, 7, 2, "q. Quit");
magenta(window); magenta(window);
mvwaddstr(window, 9, 2, "Enter selection: "); mvwaddstr(window, 9, 2, "Enter selection: ");
@ -88,7 +88,9 @@ void mainmenu(WINDOW *window) {
char c = getch(); char c = getch();
if(c < '0' || c > '3') { if(c < '0' || c > '3') {
mainmenu(window); if(c != 27 && c != 'q') { // allow escape in addition to 0 for quit
mainmenu(window);
}
}else{ }else{
if(c == '1') { if(c == '1') {
interfaceMenu(window); interfaceMenu(window);
@ -157,10 +159,12 @@ void arpMenu(WINDOW *window) {
arpChar: arpChar:
char c = getch(); char c = getch();
if(c != '0') { if(c != '0' && c != 27 && c != 'q') {
goto arpChar; goto arpChar;
}else{ }else{
mainmenu(window); if(c != 'q') {
mainmenu(window);
}
} }
} }
@ -202,13 +206,16 @@ void interfaceMenu(WINDOW *window) {
mvwaddstr(window, y + 1, 2, "0. Back to main menu"); mvwaddstr(window, y + 1, 2, "0. Back to main menu");
magenta(window); magenta(window);
mvwaddstr(window, y + 3, 2, "Enter selection: "); mvwaddstr(window, y + 3, 2, "q. Quit");
mvwaddstr(window, y + 5, 2, "Enter selection: ");
wrefresh(window); wrefresh(window);
char c = getch(); char c = getch();
if(c < '0' || c > lastInterface) { if(c < '0' || c > lastInterface) {
interfaceMenu(window); if(c != 'q') {
interfaceMenu(window);
}
}else{ }else{
if(c == '0') { if(c == '0') {
mainmenu(window); mainmenu(window);
@ -272,8 +279,7 @@ void interfaceSelect(WINDOW *window, QString interface) {
if(c < '0' || c > (count + '0' - 1)) { if(c < '0' || c > (count + '0' - 1)) {
if(c == 'q') { if(c == 'q') {
quit(window); // no-op, just quit
exit(0);
}else if(c == 'a') { }else if(c == 'a') {
wdeleteln(window); wdeleteln(window);
mvwaddstr(window, y + 7, 2, "Enter IP address to add: "); mvwaddstr(window, y + 7, 2, "Enter IP address to add: ");

Loading…
Cancel
Save