diff options
| author | pbuetow <puppet@mx.buetow.org> | 2012-07-04 17:53:22 +0200 |
|---|---|---|
| committer | pbuetow <puppet@mx.buetow.org> | 2012-07-04 17:53:22 +0200 |
| commit | 30de92afbd65755536946b470d7ba225da78a68f (patch) | |
| tree | ae79ca4f09a433181018af74e0f3cb51a3cbcd67 /lib | |
| parent | 75eb9dceec5ead9e64758e947e952192fd3582e5 (diff) | |
mem togle hk is now 2 and net togle is 3
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Loadbars/HelpDispatch.pm | 6 | ||||
| -rw-r--r-- | lib/Loadbars/Main.pm | 32 |
2 files changed, 27 insertions, 11 deletions
diff --git a/lib/Loadbars/HelpDispatch.pm b/lib/Loadbars/HelpDispatch.pm index c92b6ed..3ea0bdb 100644 --- a/lib/Loadbars/HelpDispatch.pm +++ b/lib/Loadbars/HelpDispatch.pm @@ -106,7 +106,7 @@ END netlink => { menupos => 6, help => -'Force interface link speed (mbit, 10mbit, 100mbit, gbit, 10gbit or mbytes/s number', +'Force interface link speed (mbit, 10mbit, 100mbit, gbit, 10gbit or a mbytes/s number e.g. 3 for 3mbit', mode => 6, type => 's' }, @@ -260,7 +260,7 @@ END type => 'i' }, showmem_hot => - { menupos => 17, cmd => 'm', help => 'Toggle show mem', mode => 1 }, + { menupos => 17, cmd => '2', help => 'Toggle show mem', mode => 1 }, shownet => { menupos => 17, @@ -269,7 +269,7 @@ END type => 'i' }, shownet_hot => - { menupos => 17, cmd => 'n', help => 'Toggle show net', mode => 1 }, + { menupos => 17, cmd => '3', help => 'Toggle show net', mode => 1 }, showtexthost => { menupos => 18, diff --git a/lib/Loadbars/Main.pm b/lib/Loadbars/Main.pm index 06c0657..e607573 100644 --- a/lib/Loadbars/Main.pm +++ b/lib/Loadbars/Main.pm @@ -297,8 +297,12 @@ sub net_link () { } }; - display_warn "$linkspeed bytes/s is no valid link speed" - unless $linkspeed > 0; + my $mbit = $linkspeed / $I{bytes_mbit}; + + display_warn "$mbit mbit/s is no valid reference link speed" + unless $mbit > 0; + + display_info "Setting reference linkspeed to $mbit mbit/s"; return $linkspeed; } @@ -435,9 +439,9 @@ sub loop ($@) { my %net_history; my %net_history_stamps; my %net_last_value; + my $net_int_number = 0; my $net_max_bytes = net_link; - printf "my $net_max_bytes = net_link\n"; my $sdl_redraw_background = 0; my $sdl_font_height = 14; @@ -466,6 +470,18 @@ sub loop ($@) { display_info "Toggled CPUs $C{showcores}"; } + elsif ( $key_name eq '2' ) { + $C{showmem} = !$C{showmem}; + display_info "Toggled show mem"; + + } + elsif ( $key_name eq '3' ) { + $C{shownet} = !$C{shownet}; + $net_int_number = 0; + display_info "Toggled show net $C{shownet}"; + display_info "Net interface speed reference is " . ($net_max_bytes / $I{bytes_mbit}) . 'mbit/s' if $C{shownet}; + } + elsif ( $key_name eq 'e' ) { $C{extended} = !$C{extended}; $sdl_redraw_background = 1; @@ -479,13 +495,13 @@ sub loop ($@) { } elsif ( $key_name eq 'm' ) { - $C{showmem} = !$C{showmem}; - display_info "Toggled show mem"; + display_warn "Toggled show mem hotkey 'm' is deprecated. Please use '2' hotkey instead"; + } - elsif ( $key_name eq 'n' ) { - $C{shownet} = !$C{shownet}; - display_info "Toggled show net $C{shownet}"; + elsif ( $key_name eq 'h' ) { + ++$net_int_number; + display_info "Using next net interface. To reset press '3' hotkey twice"; } elsif ( $key_name eq 't' ) { |