summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2004-02-18 05:14:04 +0000
committerDimitri Sokolyuk <demon@dim13.org>2004-02-18 05:14:04 +0000
commit437b0f7b5a44421cf9eadf535116b7c9868bd249 (patch)
tree8811b720c88e75e6a0449f2881f2bd7bed700004
parent44ed13ab989c1bee6b41bc51dc43d5242342b9e8 (diff)
fix measure bar
-rw-r--r--output.c33
1 files changed, 18 insertions, 15 deletions
diff --git a/output.c b/output.c
index 8253231..971a096 100644
--- a/output.c
+++ b/output.c
@@ -37,12 +37,11 @@ int out(struct ifdata *diff) {
WINDOW *scr;
move(0,0);
-
+/*
mvprintw(YPOS, XPOS,
"IF: %s\n", ifdata.xname);
mvprintw(YPOS, XPOS + 25,
"BR: %d Mbps\n", ifdata.baudrate / 1000000);
-/*
mvprintw(YPOS + 2, XPOS,
"RX: %3lu kBps\n", diff->ibytes / 1024);
mvprintw(YPOS + 3, XPOS,
@@ -73,19 +72,19 @@ int out(struct ifdata *diff) {
dlo = delta(diff->obytes, ano);
mvprintw(YPOS + 2, XPOS,
- "/0 /.1 /.2 /.3 /.4 /.5 /.6 /.7 /.8 /.9 /1 x %3lu kBps",
+ "/0 /.1 /.2 /.3 /.4 /.5 /.6 /.7 /.8 /.9 /1 x %3lu kBps\n",
getmax(ani) / 1024);
mvprintw(YPOS + 3, XPOS - 3,
- "RX --------------------------------------------------- %3lu kBps",
+ "RX --------------------------------------------------- %3lu kBps\n",
diff->ibytes / 1024);
move(YPOS + 3, XPOS);
av(diff->ibytes / 1024, ilast, getmax(ani) / 1024);
mvprintw(YPOS + 8, XPOS,
- "/0 /.1 /.2 /.3 /.4 /.5 /.6 /.7 /.8 /.9 /1 x %3lu kBps",
+ "/0 /.1 /.2 /.3 /.4 /.5 /.6 /.7 /.8 /.9 /1 x %3lu kBps\n",
getmax(ano) / 1024);
mvprintw(YPOS + 9, XPOS - 3,
- "TX --------------------------------------------------- %3lu kBps",
+ "TX --------------------------------------------------- %3lu kBps\n",
diff->obytes / 1024);
move(YPOS + 9, XPOS);
av(diff->obytes / 1024, olast, getmax(ano) / 1024);
@@ -115,15 +114,19 @@ void av(u_long bytes, u_long avbytes, u_int max) {
if (max != 0) {
b = bytes * 50 / max;
avb = avbytes * 50 / max;
- min = ((bytes < avbytes)?bytes:avbytes) * 50 / max;
- for (i = 0; i < min; i++)
- addch('=');
- if (b > avb)
- for (i = min; i <= b; i++)
- addch(ACS_RARROW);
- else
- for (i = min; i <= avb; i++)
- addch(ACS_LARROW);
+ min = (b < avb)?b:avb;
+ if (b != 0 || avb != 0) {
+ for (i = 0; i < min; i++)
+ addch('=');
+ if (b < avb)
+ for (i = min; i <= avb; i++)
+ addch(ACS_LARROW);
+ else if (b > avb)
+ for (i = min; i <= b; i++)
+ addch(ACS_RARROW);
+ else
+ addch('=');
+ }
}
}