X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=0996dc7a8285e9c3564139aed3e3fd6234fb6aad;hb=412fb1b9e4070d7791f4e986b55bbc0c06f612ea;hp=75632aa8d35726fbf44094b3f526733926ae98fb;hpb=c961a6af6d9aec8eba4d58803f890fc514a109cc;p=spider.git diff --git a/perl/console.pl b/perl/console.pl index 75632aa8..0996dc7a 100755 --- a/perl/console.pl +++ b/perl/console.pl @@ -26,12 +26,12 @@ BEGIN { } use Msg; +use IntMsg; use DXVars; use DXDebug; +use DXUtil; use IO::File; -use Curses; - -use Carp qw{cluck}; +use Curses 1.05; use Console; @@ -60,13 +60,23 @@ sub do_initscr if ($has_colors) { start_color(); - init_pair(0, $foreground, $background); + init_pair("0", $foreground, $background); +# init_pair(0, $background, $foreground); init_pair(1, COLOR_RED, $background); init_pair(2, COLOR_YELLOW, $background); init_pair(3, COLOR_GREEN, $background); 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); + $scr->attrset(COLOR_PAIR(0)); } $top = $scr->subwin(LINES()-4, COLS, 0, 0); @@ -81,6 +91,7 @@ sub do_initscr $scr->refresh(); $pagel = LINES()-4; + $mycallcolor = COLOR_PAIR(1) unless $mycallcolor; } sub do_resize @@ -93,9 +104,7 @@ sub do_resize sub cease { my $sendz = shift; - if ($conn && $sendz) { - $conn->send_now("Z$call|bye...\n"); - } + $conn->disconnect if $conn; endwin(); dbgclose(); print @_ if @_; @@ -139,7 +148,7 @@ sub show_screen if ($spos == @shistory - 1) { # if we really are scrolling thru at the end of the history - my $line = $shistory[-1]; + my $line = $shistory[$spos]; $top->addstr("\n") if $spos > 0; setattr($line); $top->addstr($line); @@ -151,7 +160,7 @@ sub show_screen # anywhere else my ($i, $l); my $p = $spos-1; - for ($i = 0; $i <= $pagel && $p >= 0; ) { + for ($i = 0; $i < $pagel && $p >= 0; ) { $l = measure($shistory[$p]); $i += $l; $p-- if $i < $pagel; @@ -161,27 +170,40 @@ sub show_screen $top->move(0, 0); $top->attrset(COLOR_PAIR(0)) if $has_colors; $top->clrtobot(); - for ($i = 0; $i <= $pagel && $p < @shistory; $p++) { + for ($i = 0; $i < $pagel && $p < @shistory; $p++) { my $line = $shistory[$p]; my $lines = measure($line); last if $i + $lines > $pagel; - $top->move($i, 0); setattr($line); - $top->addstr($line); + $top->addstr($i, 0, $line); $top->attrset(COLOR_PAIR(0)) if $has_colors; $i += $lines; } $spos = $p; + $spos = @shistory if $spos > @shistory; } - $top->refresh(); + my $shl = @shistory; + my $add = "-$spos-$shl"; + 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; + $scr->addstr($add); + $scr->refresh(); +# $top->refresh(); } # 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(); } @@ -193,13 +215,20 @@ sub rec_socket cease(1); } if (defined $msg) { - my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/; + my ($sort, $call, $line) = $msg =~ /^(\w)([^\|]+)\|(.*)$/; if ($sort && $sort eq 'D') { addtotop($line); } elsif ($sort && $sort eq 'Z') { # end, disconnect, go, away ..... cease(0); } + # ****************************************************** + # ****************************************************** + # any other sorts that might happen are silently ignored. + # ****************************************************** + # ****************************************************** + } else { + cease(0); } $top->refresh(); $lasttime = time; @@ -246,6 +275,10 @@ sub rec_stdin } # add it to the monitor window + unless ($spos == @shistory) { + $spos = @shistory; + show_screen(); + }; addtotop($inbuf) if $inbuf; # send it to the cluster @@ -290,7 +323,7 @@ sub rec_stdin $i += $l; $spos++ if $i <= $pagel; } - $spos = @shistory if $spos > @shistory; + $spos = @shistory if $spos >= @shistory - 1; show_screen(); } else { beep(); @@ -334,9 +367,9 @@ sub rec_stdin } else { beep(); } - } elsif ($r ge ' ' && $r le '~') { + } elsif (is_pctext($r)) { # move the top screen back to the bottom if you type something - if ($spos < @shistory - 1) { + if ($spos < @shistory) { $spos = @shistory; show_screen(); } @@ -352,7 +385,8 @@ sub rec_stdin $pos++; $lth++; } elsif ($r eq "\014" || $r eq "\022") { - #do_resize(); + touchwin($curscr, 1); + refresh($curscr); return; } elsif ($r eq "\013") { $inbuf = substr($inbuf, 0, $pos); @@ -375,13 +409,19 @@ sub rec_stdin $call = uc shift @ARGV if @ARGV; $call = uc $myalias if !$call; +my ($scall, $ssid) = split /-/, $call; +$ssid = undef unless $ssid && $ssid =~ /^\d+$/; +if ($ssid) { + $ssid = 15 if $ssid > 15; + $call = "$scall-$ssid"; +} if ($call eq $mycall) { print "You cannot connect as your cluster callsign ($mycall)\n"; exit(0); } -$conn = Msg->connect("$clusteraddr", $clusterport, \&rec_socket); +$conn = IntMsg->connect("$clusteraddr", $clusterport, \&rec_socket); if (! $conn) { if (-r "$data/offline") { open IN, "$data/offline" or die; @@ -395,31 +435,42 @@ if (! $conn) { exit(0); } +$conn->set_error(sub{cease(0)}); + + +unless ($DB::VERSION) { + $SIG{'INT'} = \&sig_term; + $SIG{'TERM'} = \&sig_term; +} -$SIG{'INT'} = \&sig_term; -$SIG{'TERM'} = \&sig_term; #$SIG{'WINCH'} = \&do_resize; -$SIG{'HUP'} = 'IGNORE'; +$SIG{'HUP'} = \&sig_term; do_initscr(); $SIG{__DIE__} = \&sig_term; -$conn->send_now("A$call|$connsort"); -$conn->send_now("I$call|set/page $maxshist"); -$conn->send_now("I$call|set/nobeep"); +$conn->send_later("A$call|$connsort width=$COLS"); +$conn->send_later("I$call|set/page $maxshist"); +$conn->send_later("I$call|set/nobeep"); Msg->set_event_handler(\*STDIN, "read" => \&rec_stdin); +my $lastmin = 0; for (;;) { my $t; - Msg->event_loop(1, 0.010); - $top->refresh() if $top->is_wintouched; - $bot->refresh(); + Msg->event_loop(10, 0.01); $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);