X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=5fd965ee8f1da9f0d3a950daed7036531d214495;hb=0bd9d2811cc42417676a1b11b121681c2377d70a;hp=bf747b8631b5de32424eebd7dc3b39ef0abd5b8f;hpb=ab8aa7901d27e89362945baefae347a8680ca250;p=spider.git

diff --git a/perl/console.pl b/perl/console.pl
index bf747b86..5fd965ee 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);
@@ -81,6 +88,7 @@ sub do_initscr
 	$scr->refresh();
 	
 	$pagel = LINES()-4;
+	$mycallcolor = COLOR_PAIR(1) unless $mycallcolor;
 }
 
 sub do_resize
@@ -94,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();
@@ -139,7 +147,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 +159,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 +169,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();
 }
 
@@ -195,9 +216,9 @@ sub rec_socket
 	if (defined $msg) {
 		my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
 		
-		if ($sort eq 'D') {
+		if ($sort && $sort eq 'D') {
 			addtotop($line);
-		} elsif ($sort eq 'Z') { # end, disconnect, go, away .....
+		} elsif ($sort && $sort eq 'Z') { # end, disconnect, go, away .....
 			cease(0);
 		}	  
 	}
@@ -246,6 +267,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 +315,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();
@@ -336,7 +361,7 @@ sub rec_stdin
 			}
 		} elsif ($r ge ' ' && $r le '~') {
 			# move the top screen back to the bottom if you type something
-			if ($spos < @shistory - 1) {
+			if ($spos < @shistory) {
 				$spos = @shistory;
 				show_screen();
 			}
@@ -375,6 +400,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";
@@ -399,27 +430,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);