diff options
| author | pbuetow <puppet@mx.buetow.org> | 2012-07-02 20:14:20 +0200 |
|---|---|---|
| committer | pbuetow <puppet@mx.buetow.org> | 2012-07-02 20:14:20 +0200 |
| commit | c8814fd96c8e14d2e4d44c6eb0fb76ef8eccbe52 (patch) | |
| tree | 8558c11b548fa67618c025631f041b92d683981a /lib | |
| parent | 1d961f0d6ea149e16ef6d693c8137b45db5250f1 (diff) | |
extended toggle messages, initial netusepeak param
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Loadbars/Main.pm | 25 | ||||
| -rw-r--r-- | lib/Loadbars/Shared.pm | 7 |
2 files changed, 19 insertions, 13 deletions
diff --git a/lib/Loadbars/Main.pm b/lib/Loadbars/Main.pm index 1f79a64..0537960 100644 --- a/lib/Loadbars/Main.pm +++ b/lib/Loadbars/Main.pm @@ -440,13 +440,13 @@ sub loop ($@) { cpu_set_showcores_re; $_->kill('USR1') for @threads; $sdl_redraw_background = 1; - display_info 'Toggled CPUs'; + display_info "Toggled CPUs $C{showcores}"; } elsif ( $key_name eq 'e' ) { $C{extended} = !$C{extended}; $sdl_redraw_background = 1; - display_info 'Toggled extended display'; + display_info "Toggled extended display $C{extended}"; } elsif ( $key_name eq 'h' ) { @@ -457,24 +457,29 @@ sub loop ($@) { } elsif ( $key_name eq 'm' ) { $C{showmem} = !$C{showmem}; - display_info 'Toggled show mem'; + display_info "Toggled show mem"; } elsif ( $key_name eq 'n' ) { $C{shownet} = !$C{shownet}; - display_info 'Toggled show net'; + display_info "Toggled show net $C{shownet}"; + + } + elsif ( $key_name eq 'p' ) { + $C{netusepeak} = !$C{netusepeak}; + display_info "Toggled net use peak $C{netusepeak}"; } elsif ( $key_name eq 't' ) { $C{showtext} = !$C{showtext}; $sdl_redraw_background = 1; - display_info 'Toggled text display'; + display_info "Toggled text display $C{showtext}"; } elsif ( $key_name eq 'u' ) { $C{showtexthost} = !$C{showtexthost}; $sdl_redraw_background = 1; - display_info 'Toggled number/hostname display'; + display_info "Toggled number/hostname display $C{showtexthost}"; } elsif ( $key_name eq 'q' ) { @@ -489,24 +494,24 @@ sub loop ($@) { } elsif ( $key_name eq 'a' ) { ++$C{cpuaverage}; - display_info "Set sample cpu average to $C{cpuaverage}"; + display_info "Set sample cpu average $C{cpuaverage}"; } elsif ( $key_name eq 'y' or $key_name eq 'z' ) { my $avg = $C{cpuaverage}; --$avg; $C{cpuaverage} = $avg > 1 ? $avg : 2; - display_info "Set sample cpu average to $C{cpuaverage}"; + display_info "Set sample cpu average $C{cpuaverage}"; } elsif ( $key_name eq 'd' ) { ++$C{netaverage}; - display_info "Set sample net average to $C{netaverage}"; + display_info "Set sample net average $C{netaverage}"; } elsif ( $key_name eq 'c' ) { my $avg = $C{netaverage}; --$avg; $C{netaverage} = $avg > 1 ? $avg : 2; - display_info "Set sample net average to $C{netaverage}"; + display_info "Set sample net average $C{netaverage}"; } elsif ( $key_name eq 's' ) { diff --git a/lib/Loadbars/Shared.pm b/lib/Loadbars/Shared.pm index 6ef7d68..3411a6b 100644 --- a/lib/Loadbars/Shared.pm +++ b/lib/Loadbars/Shared.pm @@ -41,21 +41,22 @@ our %I : shared; # Setting defaults %C = ( title => undef, - cpuaverage => 15, - netaverage => 15, barwidth => 35, + cpuaverage => 15, extended => 0, factor => 1, hasagent => 0, height => 230, maxwidth => 1250, + netaverage => 15, + netint => 'eth0', + netusepeak => 0, showcores => 0, showmem => 0, shownet => 0, showtext => 1, showtexthost => 0, sshopts => '', - netint => 'eth0', ); %I = ( |
