mark/iftop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pausing / order freeze now have persistent helpmsg lines.

Browse Source
This commit is contained in:
pdw
2002-10-25 14:10:05 +00:00
parent b198c0a3f0
commit 3c28e7ccfa
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -5,7 +5,7 @@
# $Id$ # $Id$
# #
VERSION = 0.10pre3 VERSION = 0.10pre4
# C compiler to use. # C compiler to use.
#CC = gcc #CC = gcc

17
ui.c
View File

@@ -82,7 +82,8 @@ int peaksent, peakrecv, peaktotal;
#define HELP_MSG_SIZE 80 #define HELP_MSG_SIZE 80
int showhelphint = 0; int showhelphint = 0;
int helptimer = 0; int persistenthelp = 0;
time_t helptimer = 0;
char helpmsg[HELP_MSG_SIZE]; char helpmsg[HELP_MSG_SIZE];
int dontshowdisplay = 0; int dontshowdisplay = 0;
@@ -598,7 +599,7 @@ void ui_tick(int print) {
if(print) { if(print) {
ui_print(); ui_print();
} }
else if(showhelphint && (time(NULL) - helptimer > HELP_TIME)) { else if(showhelphint && (time(NULL) - helptimer > HELP_TIME) && !persistenthelp) {
showhelphint = 0; showhelphint = 0;
ui_print(); ui_print();
} }
@@ -631,6 +632,7 @@ void showhelp(const char * s) {
strncpy(helpmsg, s, HELP_MSG_SIZE); strncpy(helpmsg, s, HELP_MSG_SIZE);
showhelphint = 1; showhelphint = 1;
helptimer = time(NULL); helptimer = time(NULL);
persistenthelp = 0;
tick(1); tick(1);
} }
@@ -769,7 +771,15 @@ void ui_loop() {
// Don't tick here, otherwise we get a bogus display // Don't tick here, otherwise we get a bogus display
break; break;
case 'P': case 'P':
options.paused = !options.paused; if(options.paused) {
options.paused = 0;
showhelp("Display unpaused");
}
else {
options.paused = 1;
showhelp("Display paused");
persistenthelp = 1;
}
break; break;
case 'o': case 'o':
if(options.freezeorder) { if(options.freezeorder) {
@@ -779,6 +789,7 @@ void ui_loop() {
else { else {
options.freezeorder = 1; options.freezeorder = 1;
showhelp("Order frozen"); showhelp("Order frozen");
persistenthelp = 1;
} }
break; break;
case '1': case '1':