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 594bc67eea73c0c8762b1c6598a455616b50ba52..d5224cf9900c8db9d1d6e75dc6a103ad08fac545 100755 (executable)
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -68,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);
@@ -96,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();
@@ -394,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";
@@ -418,24 +432,29 @@ 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, 1);
        $t = time;
        if ($t > $lasttime) {
-               show_screen();
+               my ($min)= (gmtime($t))[1];
+               if ($min != $lastmin) {
+                       show_screen();
+                       $lastmin = $min;
+               }
                $lasttime = $t;
        }
        $top->refresh() if $top->is_wintouched;