X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=0996dc7a8285e9c3564139aed3e3fd6234fb6aad;hb=412fb1b9e4070d7791f4e986b55bbc0c06f612ea;hp=14c945a58987edabecd084078caf58eedca9ed38;hpb=30788e921ae7fb6ca54f043d21f154bfd884dcc6;p=spider.git

diff --git a/perl/console.pl b/perl/console.pl
index 14c945a5..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;
 
@@ -50,13 +50,61 @@ $khistpos = 0;
 $spos = $pos = $lth = 0;
 $inbuf = "";
 
+# do the screen initialisation
+sub do_initscr
+{
+	$scr = new Curses;
+	raw();
+	noecho();
+	$has_colors = has_colors();
+	
+	if ($has_colors) {
+		start_color();
+		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);
+	$top->intrflush(0);
+	$top->scrollok(1);
+	$scr->addstr(LINES()-4, 0, '-' x COLS);
+	$bot = $scr->subwin(3, COLS, LINES()-3, 0);
+	$bot->intrflush(0);
+	$bot->scrollok(1);
+	$bot->keypad(1);
+	$bot->move(1,0);
+	$scr->refresh();
+	
+	$pagel = LINES()-4;
+	$mycallcolor = COLOR_PAIR(1) unless $mycallcolor;
+}
+
+sub do_resize
+{
+	undef $scr;
+	do_initscr();
+}
+
 # cease communications
 sub cease
 {
 	my $sendz = shift;
-	if ($conn && $sendz) {
-		$conn->send_now("Z$call|bye...\n");
-	}
+	$conn->disconnect if $conn;
 	endwin();
 	dbgclose();
 	print @_ if @_;
@@ -82,13 +130,25 @@ sub setattr
 	}
 }
 
+# measure the no of screen lines a line will take
+sub measure
+{
+	my $line = shift;
+	return 0 unless $line;
+
+	my $l = length $line;
+	my $lines = int ($l / COLS());
+	$lines++ if $l / COLS() > $lines;
+	return $lines;
+}
+
 # display the top screen
 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);
@@ -98,24 +158,53 @@ sub show_screen
 	} else {
 		
 		# anywhere else
-		my $p = $spos - $pages;
-		my $i;
+		my ($i, $l);
+		my $p = $spos-1;
+		for ($i = 0; $i < $pagel && $p >= 0; ) {
+			$l = measure($shistory[$p]);
+			$i += $l;
+			$p-- if $i < $pagel;
+		}
 		$p = 0 if $p < 0;
 		
 		$top->move(0, 0);
 		$top->attrset(COLOR_PAIR(0)) if $has_colors;
 		$top->clrtobot();
-		for ($i = 0; $i < $pages && $p < @shistory; $i++, $p++) {
+		for ($i = 0; $i < $pagel && $p < @shistory; $p++) {
 			my $line = $shistory[$p];
-			$line = substr($line, 0, COLS()) if length $line > COLS();
-			$top->move($i, 0);
+			my $lines = measure($line);
+			last if $i + $lines > $pagel;
 			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
+{
+	while (@_) {
+		my $inbuf = shift;
+		push @shistory, $inbuf;
+		shift @shistory if @shistory > $maxshist;
+	}
+	show_screen();
 }
 
 # handle incoming messages
@@ -126,16 +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 eq 'D') {
-			push @shistory, $line;
-			shift @shistory if @shistory > $maxshist;
-#			$spos = @shistory if $spos >= @shistory - 1;
-			show_screen();
-		} elsif ($sort eq 'Z') { # end, disconnect, go, away .....
+		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; 
@@ -153,10 +246,26 @@ sub rec_stdin
 	#  $prbuf =~ s/\n/\\n/;
 	#  print "sys: $r ($prbuf)\n";
 	if (defined $r) {
+		
 		if ($r eq KEY_ENTER || $r eq "\n" || $r eq "\r") {
 			
 			# save the lines
 			if ($inbuf) {
+				# check for a pling and do a search back for a command
+				if ($inbuf =~ /^!/o) {
+					my $i;
+					$inbuf =~ s/^!//o;
+					for ($i = $#khistory; $i >= 0; $i--) {
+						if ($khistory[$i] =~ /^$inbuf/) {
+							$inbuf = $khistory[$i];
+							last;
+						}
+					}
+					if ($i < 0) {
+						beep();
+						return;
+					}
+				}
 				push @khistory, $inbuf if $inbuf;
 				shift @khistory if @khistory > $maxkhist;
 				$khistpos = @khistory;
@@ -164,6 +273,13 @@ sub rec_stdin
 				$bot->clrtoeol();
 				$bot->addstr(substr($inbuf, 0, COLS));
 			}
+
+			# add it to the monitor window
+			unless ($spos == @shistory) {
+				$spos = @shistory;
+				show_screen();
+			};
+			addtotop($inbuf) if $inbuf;
 		
 			# send it to the cluster
 			$inbuf = " " unless $inbuf;
@@ -188,7 +304,12 @@ sub rec_stdin
 			}
 		} elsif ($r eq KEY_PPAGE || $r eq "\032") {
 			if ($spos > 0) {
-				$spos -= $pages;
+				my ($i, $l);
+				for ($i = 0; $i <= $pagel && $spos >= 0; ) {
+					$l = measure($shistory[$spos]);
+					$i += $l;
+					$spos-- if $i <= $pagel;
+				}
 				$spos = 0 if $spos < 0;
 				show_screen();
 			} else {
@@ -196,8 +317,13 @@ sub rec_stdin
 			}
 		} elsif ($r eq KEY_NPAGE || $r eq "\026") {
 			if ($spos < @shistory - 1) {
-				$spos += $pages;
-				$spos = @shistory if $spos > @shistory;
+				my ($i, $l);
+				for ($i = 0; $i <= $pagel && $spos <= @shistory; ) {
+					$l = measure($shistory[$spos]);
+					$i += $l;
+					$spos++ if $i <= $pagel;
+				}
+				$spos = @shistory if $spos >= @shistory - 1;
 				show_screen();
 			} else {
 				beep();
@@ -241,7 +367,14 @@ 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) {
+				$spos = @shistory;
+				show_screen();
+			}
+		
+			# insert the character into the keyboard buffer
 			if ($pos < $lth) {
 				my $a = substr($inbuf, 0, $pos);
 				my $b = substr($inbuf, $pos);
@@ -252,11 +385,9 @@ sub rec_stdin
 			$pos++;
 			$lth++;
 		} elsif ($r eq "\014" || $r eq "\022") {
-			$top->touchwin();
-			$bot->touchwin();
-			$scr->touchwin();
-			$scr->refresh();
-			$top->refresh();
+			touchwin($curscr, 1);
+			refresh($curscr);
+			return;
 		} elsif ($r eq "\013") {
 			$inbuf = substr($inbuf, 0, $pos);
 			$lth = length $inbuf;
@@ -278,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;
@@ -298,57 +435,42 @@ if (! $conn) {
 	exit(0);
 }
 
+$conn->set_error(sub{cease(0)});
+
 
-$SIG{'INT'} = \&sig_term;
-$SIG{'TERM'} = \&sig_term;
-$SIG{'HUP'} = 'IGNORE';
-
-$scr = new Curses;
-raw();
-noecho();
-$has_colors = has_colors();
-
-if ($has_colors) {
-	start_color();
-	init_pair(0, $foreground, $background);
-	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);
+unless ($DB::VERSION) {
+	$SIG{'INT'} = \&sig_term;
+	$SIG{'TERM'} = \&sig_term;
 }
 
-$top = $scr->subwin(LINES()-4, COLS, 0, 0);
-$top->intrflush(0);
-$top->scrollok(1);
-$scr->addstr(LINES()-4, 0, '-' x COLS);
-$bot = $scr->subwin(3, COLS, LINES()-3, 0);
-$bot->intrflush(0);
-$bot->scrollok(1);
-$bot->keypad(1);
-$bot->move(1,0);
-$scr->refresh();
+#$SIG{'WINCH'} = \&do_resize;
+$SIG{'HUP'} = \&sig_term;
 
-$SIG{__DIE__} = \&sig_term;
+do_initscr();
 
-$pages = LINES()-4;
+$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);