rewrote parts of Msg.pm and client.c so that the messages no longer use

[spider.git] / perl / console.pl

diff --git a/perl/console.pl b/perl/console.pl
index 97c0864c3e89e49b23b4627c4a31724618cfdcd8..d5224cf9900c8db9d1d6e75dc6a103ad08fac545 100755 (executable)
--- 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);
@@ -81,6 +90,7 @@ sub do_initscr
        $scr->refresh();
        
        $pagel = LINES()-4;
+       $mycallcolor = COLOR_PAIR(1) unless $mycallcolor;
 }
 
 sub do_resize
@@ -94,7 +104,7 @@ sub cease
 {
        my $sendz = shift;
        if ($conn && $sendz) {
-               $conn->send_now("Z$call|bye...\n");
+               $conn->send_now("Z$call|bye...");
        }
        endwin();
        dbgclose();
@@ -174,8 +184,14 @@ sub show_screen
                $spos = @shistory if $spos > @shistory;
        }
     my $shl = @shistory;
-       my $add = "$call-$spos-$shl";
-    $scr->addstr(LINES()-4, 0, '-' x (COLS() - length $add));
+       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();
@@ -184,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();
 }
 
@@ -384,6 +402,12 @@ 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";
@@ -408,27 +432,33 @@ if (! $conn) {
 $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");
+$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(1, 1);
        $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);