X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=bfd7700da0a011442e2822b97433533d27f45c0c;hb=09c40605dd6922b1ac8d08767614697f51e094b2;hp=ceac24e278890d1275fa6f904761d1993355061e;hpb=a89e605f6679f19b1365061bad1ba93b36293814;p=spider.git diff --git a/perl/console.pl b/perl/console.pl index ceac24e2..bfd7700d 100755 --- a/perl/console.pl +++ b/perl/console.pl @@ -28,6 +28,7 @@ BEGIN { use Msg; use DXVars; use DXDebug; +use DXUtil; use IO::File; use Curses; @@ -67,6 +68,14 @@ sub do_initscr init_pair(4, COLOR_CYAN, $background); init_pair(5, COLOR_BLUE, $background); init_pair(6, COLOR_MAGENTA, $background); + init_pair(7, COLOR_RED, COLOR_BLUE); + init_pair(8, COLOR_YELLOW, COLOR_BLUE); + init_pair(9, COLOR_GREEN, COLOR_BLUE); + init_pair(10, COLOR_CYAN, COLOR_BLUE); + init_pair(11, COLOR_BLUE, COLOR_RED); + init_pair(12, COLOR_MAGENTA, COLOR_BLUE); + init_pair(13, COLOR_YELLOW, COLOR_GREEN); + init_pair(14, COLOR_RED, COLOR_GREEN); } $top = $scr->subwin(LINES()-4, COLS, 0, 0); @@ -176,7 +185,10 @@ sub show_screen } my $shl = @shistory; my $add = "-$spos-$shl"; - $scr->addstr(LINES()-4, 0, '-' x (COLS() - (length($call) + length($add)))); + my $time = ztime(time); + my $str = "-" . $time . '-' x (COLS() - (length($call) + length($add) + length($time) + 1)); + $scr->addstr(LINES()-4, 0, $str); + $scr->attrset($mycallcolor) if $has_colors; $scr->addstr("$call"); $scr->attrset(COLOR_PAIR(0)) if $has_colors; @@ -188,9 +200,11 @@ sub show_screen # add a line to the end of the top screen sub addtotop { - my $inbuf = shift; - push @shistory, $inbuf; - shift @shistory if @shistory > $maxshist; + while (@_) { + my $inbuf = shift; + push @shistory, $inbuf; + shift @shistory if @shistory > $maxshist; + } show_screen(); } @@ -412,7 +426,7 @@ if (! $conn) { $SIG{'INT'} = \&sig_term; $SIG{'TERM'} = \&sig_term; #$SIG{'WINCH'} = \&do_resize; -$SIG{'HUP'} = 'IGNORE'; +$SIG{'HUP'} = \&sig_term; do_initscr(); @@ -424,15 +438,21 @@ $conn->send_now("I$call|set/nobeep"); Msg->set_event_handler(\*STDIN, "read" => \&rec_stdin); +my $lastmin = 0; for (;;) { my $t; Msg->event_loop(1, 1); - $top->refresh() if $top->is_wintouched; - $bot->refresh(); $t = time; if ($t > $lasttime) { + my ($min)= (gmtime($t))[1]; + if ($min != $lastmin) { + show_screen(); + $lastmin = $min; + } $lasttime = $t; } + $top->refresh() if $top->is_wintouched; + $bot->refresh(); } exit(0);