X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=35e5da7e9bf339aebf3f26e209e6f9e9b262850e;hb=88665a2bed3b9ec9e97237938a95a045b2a21bb4;hp=ceac24e278890d1275fa6f904761d1993355061e;hpb=de6161942af879983173417d630b6327b50a423a;p=spider.git

diff --git a/perl/console.pl b/perl/console.pl
index ceac24e2..35e5da7e 100755
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -28,11 +28,10 @@ BEGIN {
 use Msg;
 use DXVars;
 use DXDebug;
+use DXUtil;
 use IO::File;
 use Curses;
 
-use Carp qw{cluck};
-
 use Console;
 
 #
@@ -67,6 +66,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);
@@ -95,7 +102,7 @@ sub cease
 {
 	my $sendz = shift;
 	if ($conn && $sendz) {
-		$conn->send_now("Z$call|bye...\n");
+		$conn->send_now("Z$call|bye...");
 	}
 	endwin();
 	dbgclose();
@@ -176,7 +183,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 +198,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();
 }
 
@@ -202,13 +214,18 @@ 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.
+		# ******************************************************
+		# ******************************************************
 	}
 	$top->refresh();
 	$lasttime = time; 
@@ -388,6 +405,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";
@@ -412,27 +435,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, 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);