summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COPYING5
-rw-r--r--COPYING.FONT281
-rw-r--r--WISHLIST2
-rw-r--r--font.pngbin0 -> 14883 bytes
-rwxr-xr-xloadbars.pl153
5 files changed, 369 insertions, 72 deletions
diff --git a/COPYING b/COPYING
index 0b7d0ed..dfbb167 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-# loadbars (c) 2010, Dipl.-Inform. (FH) Paul Buetow
+# loadbars (c) 2010, 2011 Dipl.-Inform. (FH) Paul Buetow
#
# E-Mail: loadbars@mx.buetow.org WWW: http://loadbars.buetow.org
#
@@ -26,3 +26,6 @@
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+
+The font.png has its own license (see COPYING.FONT). It has been taken
+from the freedroid project (www.freedroid.org).
diff --git a/COPYING.FONT b/COPYING.FONT
new file mode 100644
index 0000000..84c2682
--- /dev/null
+++ b/COPYING.FONT
@@ -0,0 +1,281 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
diff --git a/WISHLIST b/WISHLIST
index 7304c9c..3ac48d9 100644
--- a/WISHLIST
+++ b/WISHLIST
@@ -1,3 +1 @@
- Summarized CPU status, summarizing all involved servers
-- Extended documentation for the website
-- Final release v0.1 some day
diff --git a/font.png b/font.png
new file mode 100644
index 0000000..02e9eb1
--- /dev/null
+++ b/font.png
Binary files differ
diff --git a/loadbars.pl b/loadbars.pl
index 637ad8b..3e7e165 100755
--- a/loadbars.pl
+++ b/loadbars.pl
@@ -42,7 +42,8 @@ use SDL::Rect;
use SDL::Color;
use SDL::Event;
-#use SDL::TTF qw();
+use SDL::Surface;
+use SDL::Font;
use Time::HiRes qw(usleep gettimeofday);
@@ -52,12 +53,27 @@ use threads::shared;
use constant {
DEPTH => 8,
PROMPT => 'loadbars> ',
- VERSION => 'loadbars v0.1-beta8-pre6',
+ VERSION => 'loadbars v0.1.0',
COPYRIGHT => '2010-2011 (c) Paul Buetow <loadbars@mx.buetow.org>',
NULL => 0,
MSG_SET_DIMENSION => 1,
- MSG_TOGGLE_FULLSCREEN => 2,
- MSG_DISPLAY_HELP => 3,
+ MSG_TOGGLE_TXT => 2,
+ FONT => SDL::Font->new('font.png'),
+ BLACK => SDL::Color->new(-r => 0x00, -g => 0x00, -b => 0x00),
+ BLUE => SDL::Color->new(-r => 0x00, -g => 0x00, -b => 0xff),
+ GREEN => SDL::Color->new(-r => 0x00, -g => 0x90, -b => 0x00),
+ ORANGE => SDL::Color->new(-r => 0xff, -g => 0x70, -b => 0x00),
+ PURPLE => SDL::Color->new(-r => 0xa0, -g => 0x20, -b => 0xf0),
+ RED => SDL::Color->new(-r => 0xff, -g => 0x00, -b => 0x00),
+ WHITE => SDL::Color->new(-r => 0xff, -g => 0xff, -b => 0xff),
+ YELLOW0 => SDL::Color->new(-r => 0xff, -g => 0xa0, -b => 0x00),
+ YELLOW => SDL::Color->new(-r => 0xff, -g => 0xc0, -b => 0x00),
+ SYSTEM_PURPLE => 30,
+ USER_WHITE => 99,
+ USER_RED => 90,
+ USER_ORANGE => 70,
+ USER_YELLOW0 => 50,
+ RESERVERD_HEIGHT => 50,
};
$| = 1;
@@ -72,7 +88,8 @@ my $MSG :shared;
inter => 0.1,
sshopts => '',
cpuregexp => 'cpu',
- toggle => 1,
+ toggletxt => 1,
+ togglecpu => 1,
factor => 1,
width => 1200,
height => 200,
@@ -119,7 +136,10 @@ BASH
my $cmd = $host eq 'localhost' ? $bash
: "ssh -o StrictHostKeyChecking=no $CONF{sshopts} $host '$bash'";
- my $pid = open2 my $out, my $in, $cmd or die "Error: $!\n";
+ my $pid = open2 my $out, my $in, $cmd or do {
+ say "Warning: $!";
+ return;
+ };
$SIG{STOP} = sub {
say "Shutting down get_stat($host) & PID $pid";
@@ -183,12 +203,12 @@ sub wait_for_stats () {
sleep 1 until %STATS;
}
-sub draw_background ($$$) {
- my ($app, $colors, $rect) = @_;
+sub draw_background ($$) {
+ my ($app, $rect) = @_;
$rect->width($CONF{width});
$rect->height($CONF{height});
- $app->fill($rect, $colors->{black});
+ $app->fill($rect, BLACK);
$app->update($rect);
}
@@ -197,20 +217,8 @@ sub null ($) {
return defined $arg ? $arg : 0;
}
-sub display_colors_help ($) {
- my $colors = shift;
-
- my $help = SDL::App->new(
- -width => 400,
- -height => 400,
- -depth => DEPTH,
- -title => VERSION,
- -resizeable => 0,
- );
-}
-
-sub graph_stats ($$) {
- my ($app, $colors) = @_;
+sub graph_stats ($) {
+ my ($app) = @_;
wait_for_stats;
@@ -221,6 +229,7 @@ sub graph_stats ($$) {
my %prev_stats;
my %last_loads;
my $rect_bg = SDL::Rect->new();
+ my $display_txt = $CONF{toggletxt};
# Toggle CPUs
$SIG{USR1} = sub { wait_for_stats };
@@ -231,13 +240,11 @@ sub graph_stats ($$) {
$width = $CONF{width} / $num_stats - 1;
$app->resize($CONF{width}, $CONF{height});
- # FS not yet supported
- } elsif ($MSG == MSG_TOGGLE_FULLSCREEN) {
- $app->fullscreen();
-
- } elsif ($MSG == MSG_DISPLAY_HELP) {
- display_colors_help($colors);
+ } elsif ($MSG == MSG_TOGGLE_TXT) {
+ $display_txt = $CONF{toggletxt};
}
+
+ $MSG = NULL;
};
my ($t1, $t2) = (Time::HiRes::time(), undef);
@@ -254,7 +261,7 @@ sub graph_stats ($$) {
$num_stats = $new_num_stats;
$width = $CONF{width} / $num_stats - 1;
- draw_background $app, $colors, $rect_bg;
+ draw_background $app, $rect_bg;
}
for my $key (sort keys %STATS) {
@@ -318,17 +325,24 @@ sub graph_stats ($$) {
my $system_n_user = sum @load_average{qw(user system)};
- $app->fill($rect_iowait, $colors->{black});
- $app->fill($rect_nice, $colors->{green});
- $app->fill($rect_system, $colors->{blue});
- $app->fill($rect_system, $load_average{system} > 30
- ? $colors->{purple}
- : $colors->{blue});
- $app->fill($rect_user, $system_n_user > 99 ? $colors->{white}
- : ($system_n_user > 90 ? $colors->{red}
- : ($system_n_user > 70 ? $colors->{orange}
- : ($system_n_user > 50 ? $colors->{yellow0}
- : ($colors->{yellow})))));
+ $app->fill($rect_iowait, BLACK);
+ $app->fill($rect_nice, GREEN);
+ $app->fill($rect_system, BLUE);
+ $app->fill($rect_system, $load_average{system} > SYSTEM_PURPLE
+ ? PURPLE
+ : BLUE);
+ $app->fill($rect_user, $system_n_user > USER_WHITE ? WHITE
+ : ($system_n_user > USER_RED ? RED
+ : ($system_n_user > USER_ORANGE ? ORANGE
+ : ($system_n_user > USER_YELLOW0 ? YELLOW0
+ : (YELLOW)))));
+
+ if ($display_txt) {
+ $app->print($x, 5, sprintf "%d%s", $load_average{nice}, 'ni');
+ $app->print($x, 25, sprintf "%d%s", $load_average{user}, 'us');
+ $app->print($x, 45, sprintf "%d%s", $load_average{system}, 'sy');
+ $app->print($x, 65, sprintf "%d%s", $system_n_user, 'su');
+ }
$app->update($_) for $rect_nice, $rect_iowait, $rect_system, $rect_user;
$x += $width + 1;
@@ -351,30 +365,19 @@ TIMEKEEPER:
sub thr_display_stats () {
my $app = SDL::App->new(
-width => $CONF{width},
- -height => $CONF{height},
+ -height => $CONF{height}.
-depth => DEPTH,
-title => VERSION,
-resizeable => 0,
);
- my $colors = {
- black => SDL::Color->new(-r => 0x00, -g => 0x00, -b => 0x00),
- blue => SDL::Color->new(-r => 0x00, -g => 0x00, -b => 0xff),
- green => SDL::Color->new(-r => 0x00, -g => 0x90, -b => 0x00),
- orange => SDL::Color->new(-r => 0xff, -g => 0x70, -b => 0x00),
- purple => SDL::Color->new(-r => 0xa0, -g => 0x20, -b => 0xf0),
- red => SDL::Color->new(-r => 0xff, -g => 0x00, -b => 0x00),
- white => SDL::Color->new(-r => 0xff, -g => 0xff, -b => 0xff),
- yellow0 => SDL::Color->new(-r => 0xff, -g => 0xa0, -b => 0x00),
- yellow => SDL::Color->new(-r => 0xff, -g => 0xc0, -b => 0x00),
- };
-
$SIG{STOP} = sub {
say "Shutting down display_stats";
threads->exit();
};
- graph_stats $app, $colors;;
+
+ graph_stats $app
}
sub send_message ($$) {
@@ -402,17 +405,17 @@ sub stop_threads (@) {
return undef;
}
-sub set_toggle_regexp () {
- $CONF{cpuregexp} = $CONF{toggle} ? 'cpu ' : 'cpu';
+sub set_togglecpu_regexp () {
+ $CONF{cpuregexp} = $CONF{togglecpu} ? 'cpu ' : 'cpu';
return undef;
}
-sub toggle_cpus ($@) {
+sub togglecpu ($@) {
my ($display, @threads) = @_;
- $CONF{toggle} = ! $CONF{toggle};
- set_toggle_regexp;
+ $CONF{togglecpu} = ! $CONF{togglecpu};
+ set_togglecpu_regexp;
$_->kill('USR1') for @threads;
%STATS = ();
@@ -421,15 +424,17 @@ sub toggle_cpus ($@) {
return undef;
}
-sub toggle_fullscreen ($) {
- my $display = shift;
+sub toggletxt ($@) {
+ my ($display, @threads) = @_;
- send_message $display, MSG_TOGGLE_FULLSCREEN;
+ $CONF{toggletxt} = ! $CONF{toggletxt};
+
+ $MSG = MSG_TOGGLE_TXT;
+ $display->kill('USR2');
return undef;
}
-
sub set_value (*;*) {
my ($key, $type) = @_;
@@ -452,6 +457,7 @@ sub set_dimensions ($) {
return 0;
}
+
sub dispatch_table () {
my $hosts = '';
@@ -469,10 +475,10 @@ sub dispatch_table () {
hosts => { menupos => 4, help => 'Comma separated list of hosts', var => \$hosts, mode => 6, type => 's' },
inter => { menupos => 4, cmd => 'i', help => 'Set update interval in seconds (default 0.1)', mode => 7, type => 's' },
quit => { menupos => 5, cmd => 'q', help => 'Quit', mode => 1, cb => sub { -1 } },
- colorshelp => { menupos => 5, cmd => 'l', help => 'Shows colors', mode => 1, cb => sub { -1 } },
samples => { menupos => 4, cmd => 's', help => 'Set number of samples until ssh reconnects', mode => 7, type => 'i' },
sshopts => { menupos => 7, cmd => 'o', help => 'Set SSH options', mode => 7, type => 's' },
- toggle => { menupos => 4, cmd => '1', help => 'Toggle CPUs (0 or 1)', mode => 7, type => 'i', cb => \&toggle_cpus },
+ togglecpu => { menupos => 4, cmd => '1', help => 'Toggle CPUs (0 or 1)', mode => 7, type => 'i', cb => \&togglecpu },
+ toggletxt => { menupos => 4, cmd => '2', help => 'Toggle display text (0 or 1)', mode => 7, type => 'i', cb => \&toggletxt },
version => { menupos => 3, cmd => 'v', help => 'Print version', mode => 1, cb => sub { say VERSION . ' ' . COPYRIGHT } },
width => { menupos => 2, help => 'Set windows width', mode => 6, type => 'i' },
);
@@ -485,6 +491,14 @@ sub dispatch_table () {
} keys %d;
+ my $textdesc = <<END;
+Explonation text display:
+ ni = Nice cpu usage
+ us = User cpu usage
+ sy = System cpu sage
+ su = System & user cpu usage
+END
+
my $closure = sub ($;$) {
my ($arg, @rest) = @_;
@@ -508,13 +522,14 @@ sub dispatch_table () {
(exists $cb->{cb} ? $cb->{cb} : sub { set_value $cmd })->(@args);
} elsif ($arg eq 'help') {
- join "\n", map {
+ (join "\n", map {
"$_\t- $d_by_short{$_}{help}"
} grep {
$d_by_short{$_}{mode} & 1 and exists $d_by_short{$_}{help}
- } sort { $d_by_short{$a}{menupos} <=> $d_by_short{$b}{menupos} } sort keys %d_by_short
+ } sort { $d_by_short{$a}{menupos} <=> $d_by_short{$b}{menupos} } sort keys %d_by_short)
+ . "\n\n$textdesc";
} elsif ($arg eq 'usage') {
join "\n", map {
@@ -567,7 +582,7 @@ sub main () {
exit 0;
}
- set_toggle_regexp;
+ set_togglecpu_regexp;
my @hosts = split ',', $$hosts;