X-Git-Url: http://www.dxcluster.org/gitweb/gitweb.cgi?p=spider.git;a=blobdiff_plain;f=perl%2Fconsole.pl;h=13f2bfa1873ae9522068d427e217cc5e936c2a24;hp=eae1c0ff4451a477af22765c3d36cfd3f00bc538;hb=d8d7d25e92a56847754a237166ca926adc2199ca;hpb=d4af9b75c46cddd2cc830961eb615975ed260a9e

diff --git a/perl/console.pl b/perl/console.pl
index eae1c0ff..13f2bfa1 100755
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
 #
 # this is the operators console.
 #
@@ -10,10 +10,16 @@
 #
 # Copyright (c) 1999 Dirk Koopman G1TLH
 #
-# $Id$
+#
 # 
 
-require 5.004;
+require 5.8.1;
+use warnings;
+
+use vars qw($data $clusteraddr $clusterport);
+
+$clusteraddr = '127.0.0.1';     # cluster tcp host address - used for things like console.pl
+$clusterport = 27754;           # cluster tcp port
 
 # search local then perl directories
 BEGIN {
@@ -23,6 +29,8 @@ BEGIN {
 	
 	unshift @INC, "$root/perl";	# this IS the right way round!
 	unshift @INC, "$root/local";
+	$is_win = ($^O =~ /^MS/ || $^O =~ /^OS-2/) ? 1 : 0; # is it Windows?
+	$data = "$root/data";
 }
 
 use Msg;
@@ -32,7 +40,9 @@ use DXDebug;
 use DXUtil;
 use DXDebug;
 use IO::File;
+use Time::HiRes qw(gettimeofday tv_interval);
 use Curses 1.06;
+use Text::Wrap qw(wrap);
 
 use Console;
 
@@ -40,22 +50,24 @@ use Console;
 # initialisation
 #
 
+$clusteraddr //= '127.0.0.1';
+$clusterport //= 27754;
+
 $call = "";                     # the callsign being used
+$node = "";                     # the node callsign being used
 $conn = 0;                      # the connection object for the cluster
 $lasttime = time;               # lasttime something happened on the interface
 
 $connsort = "local";
-@khistory = ();
-@shistory = ();
-$khistpos = 0;
+@kh = ();
+@sh = ();
+$kpos = 0;
 $spos = $pos = $lth = 0;
 $inbuf = "";
+$inscroll = 0;
 
-sub mydbg
-{
-	local *STDOUT = undef;
-	dbg(@_);
-}
+
+#$SIG{WINCH} = sub {@time = gettimeofday};
 
 # do the screen initialisation
 sub do_initscr
@@ -79,30 +91,32 @@ sub do_initscr
 		init_pair(12, COLOR_MAGENTA, COLOR_BLUE);
 		init_pair(13, COLOR_YELLOW, COLOR_GREEN);
 		init_pair(14, COLOR_RED, COLOR_GREEN);
-		eval { assume_default_colors($foreground, $background) };
+		eval { assume_default_colors($foreground, $background) } unless $is_win;
 	}
-	
+
 	$top = $scr->subwin($lines-4, $cols, 0, 0);
 	$top->intrflush(0);
-	$top->scrollok(1);
+	$top->scrollok(0);
 	$top->idlok(1);
 	$top->meta(1);
-#	$scr->addstr($lines-4, 0, '-' x $cols);
+	$top->leaveok(1);
+	$top->clrtobot();
 	$bot = $scr->subwin(3, $cols, $lines-3, 0);
 	$bot->intrflush(0);
 	$bot->scrollok(1);
-	$top->idlok(1);
 	$bot->keypad(1);
 	$bot->move(1,0);
 	$bot->meta(1);
 	$bot->nodelay(1);
+	$bot->clrtobot();
 	$scr->refresh();
+
 	
 	$pagel = $lines-4;
 	$mycallcolor = COLOR_PAIR(1) unless $mycallcolor;
 }
 
-sub do_resize
+sub doresize
 {
 	endwin() if $scr;
 	initscr();
@@ -114,9 +128,10 @@ sub do_resize
 	$has_colors = has_colors();
 	do_initscr();
 
-	$winch = 0;
-	$SIG{'WINCH'} = sub {$winch = 1};
+	$inscroll = 0;
+	$spos = @sh < $pagel ? 0 :  @sh - $pagel;
 	show_screen();
+	$conn->send_later("C$call|$cols") if $conn;
 }
 
 # cease communications
@@ -149,119 +164,82 @@ 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[$spos];
-		$top->addstr("\n") if $spos > 0;
-		setattr($line);
-		$top->addstr($line);
-#		$top->addstr("\n");
-		$top->attrset(COLOR_PAIR(0)) if $has_colors;
-		$spos = @shistory;
-		
-	} else {
+	if ($inscroll) {
 		
-		# anywhere else
+		dbg("B: s:$spos h:" . scalar @sh) if isdbg('console');
 		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;
-		
+
+		$spos = 0 if $spos < 0;
+		my $y = $spos;
 		$top->move(0, 0);
 		$top->attrset(COLOR_PAIR(0)) if $has_colors;
 		$top->clrtobot();
-		for ($i = 0; $i < $pagel && $p < @shistory; $p++) {
-			my $line = $shistory[$p];
-			my $lines = measure($line);
-			last if $i + $lines > $pagel;
-			$top->addstr("\n") if $i;
+		for ($i = 0; $i < $pagel && $y < @sh; ++$y) {
+			my $line = $sh[$y];
+			my $lines = 1;
+			$top->move($i, 0);
+			dbg("C: s:$spos y:$i sh:" . scalar @sh . " l:" . length($line) . " '$line'") if isdbg('console');
 			setattr($line);
 			$top->addstr($line);
 			$top->attrset(COLOR_PAIR(0)) if $has_colors;
 			$i += $lines;
 		}
-		$spos = $p;
-		$spos = @shistory if $spos > @shistory;
+		if ($y >= @sh) {
+			$inscroll = 0;
+			$spos = @sh;
+		}
+	}	elsif ($spos < @sh || $spos < $pagel) {
+		# if we really are scrolling thru at the end of the history
+		while ($spos < @sh) {
+			my $line = $sh[$spos];
+			my $y = $spos;
+			if ($y >= $pagel) {
+				$top->scrollok(1);
+				$top->scrl(1);
+				$top->scrollok(0);
+				$y = $pagel-1;
+			}
+			$top->move($y, 0);
+			dbg("A: s:$spos sh:" . scalar @sh . " y:$y l:" . length($line) . " '$line'") if isdbg('console');
+			$top->refresh;
+			setattr($line);
+			$line =~ s/\n//s;
+			$top->addstr($line);
+			$top->attrset(COLOR_PAIR(0)) if $has_colors;
+			++$spos;
+		}
+		shift @sh while @sh > $maxshist;
+		$spos = @sh;
 	}
-    my $shl = @shistory;
+
+	$top->refresh;
+    my $shl = @sh;
 	my $size = $lines . 'x' . $cols . '-'; 
 	my $add = "-$spos-$shl";
     my $time = ztime(time);
-	my $str =  "-" . $time . '-' x ($cols - (length($size) + length($call) + length($add) + length($time) + 1));
+	my $c = "$call\@$node";
+	my $str =  "-" . $time . '-' . ($inscroll ? 'S':'-') . '-' x ($cols - (length($size) + length($c) + length($add) + length($time) + 3));
 	$scr->addstr($lines-4, 0, $str);
 	
 	$scr->addstr($size);
 	$scr->attrset($mycallcolor) if $has_colors;
-	$scr->addstr($call);
+	$scr->addstr($c);
 	$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
-sub rec_socket
-{
-	my ($con, $msg, $err) = @_;
-	if (defined $err && $err) {
-		cease(1);
-	}
-	if (defined $msg) {
-		my ($sort, $call, $line) = $msg =~ /^(\w)([^\|]+)\|(.*)$/;
-		
-		if ($sort && $sort eq 'D') {
-			$line = " " unless length($line);
-			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; 
-}
-
 sub rec_stdin
 {
-	my $r = shift;;
+	my $r = shift;
 	
+	dbg("KEY: " . unpack("H*", $r). " '$r'") if isdbg('console');
+
 	#  my $prbuf;
 	#  $prbuf = $buf;
 	#  $prbuf =~ s/\r/\\r/;
@@ -270,19 +248,19 @@ sub rec_stdin
 	if (defined $r) {
 
 		$r = '0' if !$r;
-		
+
 		if ($r eq KEY_ENTER || $r eq "\n" || $r eq "\r") {
 			
 			# save the lines
-			$inbuf = " " unless length($inbuf);
+			$inbuf = " " unless length $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];
+				for ($i = $#kh; $i >= 0; $i--) {
+					if ($kh[$i] =~ /^$inbuf/) {
+						$inbuf = $kh[$i];
 						last;
 					}
 				}
@@ -291,63 +269,63 @@ sub rec_stdin
 					return;
 				}
 			}
-			push @khistory, $inbuf if $inbuf;
-			shift @khistory if @khistory > $maxkhist;
-			$khistpos = @khistory;
+			push @kh, $inbuf if length $inbuf;
+			shift @kh if @kh > $maxkhist;
+			$kpos = @kh;
 			$bot->move(0,0);
 			$bot->clrtoeol();
 			$bot->addstr(substr($inbuf, 0, $cols));
 
-			# add it to the monitor window
-			unless ($spos == @shistory) {
-				$spos = @shistory;
+			if ($inscroll && $spos < @sh) {
+				$spos = @sh - $pagel;
+				$inscroll = 0;
 				show_screen();
-			};
-			addtotop($inbuf);
+			}
+
+			addtotop(' ', $inbuf);
 		
 			# send it to the cluster
 			$conn->send_later("I$call|$inbuf");
 			$inbuf = "";
 			$pos = $lth = 0;
 		} elsif ($r eq KEY_UP || $r eq "\020") {
-			if ($khistpos > 0) {
-				--$khistpos;
-				$inbuf = $khistory[$khistpos];
+			if ($kpos > 0) {
+				--$kpos;
+				$inbuf = $kh[$kpos];
 				$pos = $lth = length $inbuf;
 			} else {
 				beep();
 			}
 		} elsif ($r eq KEY_DOWN || $r eq "\016") {
-			if ($khistpos < @khistory - 1) {
-				++$khistpos;
-				$inbuf = $khistory[$khistpos];
+			if ($kpos < @kh - 1) {
+				++$kpos;
+				$inbuf = $kh[$kpos];
 				$pos = $lth = length $inbuf;
 			} else {
 				beep();
 			}
 		} elsif ($r eq KEY_PPAGE || $r eq "\032") {
-			if ($spos > 0) {
-				my ($i, $l);
-				for ($i = 0; $i <= $pagel && $spos >= 0; ) {
-					$l = measure($shistory[$spos]);
-					$i += $l;
-					$spos-- if $i <= $pagel;
-				}
+			if ($spos > 0 && @sh > $pagel) {
+				$spos -= $pagel+int($pagel/2); 
 				$spos = 0 if $spos < 0;
+				$inscroll = 1;
 				show_screen();
 			} else {
 				beep();
 			}
 		} elsif ($r eq KEY_NPAGE || $r eq "\026") {
-			if ($spos < @shistory - 1) {
-				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;
+			if ($inscroll && $spos < @sh) {
+
+				dbg("NPAGE sp:$spos $sh:". scalar @sh . " pl: $pagel") if isdbg('console');
+				$spos += int($pagel/2);
+				if ($spos > @sh - $pagel) {
+					$spos = @sh - $pagel;
+				} 
 				show_screen();
+				if ($spos >= @sh) {
+					$spos = @sh;
+					$inscroll = 0;
+				}
 			} else {
 				beep();
 			}
@@ -367,7 +345,7 @@ sub rec_stdin
 			$pos = 0;
 		} elsif ($r eq KEY_END || $r eq "\005") {
 			$pos = $lth;
-		} elsif ($r eq KEY_BACKSPACE || $r eq "\010" || $r eq "\0177") {
+		} elsif ($r eq KEY_BACKSPACE || $r eq "\010" || $r eq "\x7f") {
 			if ($pos > 0) {
 				my $a = substr($inbuf, 0, $pos-1);
 				my $b = substr($inbuf, $pos) if $pos < $lth;
@@ -391,12 +369,21 @@ sub rec_stdin
 				beep();
 			}
 		} elsif ($r eq KEY_RESIZE || $r eq "\0632") {
-			do_resize();
+			doresize();
+			return;
+		} elsif ($r eq "\x12" || $r eq "\x0c") {
+			dbg("REDRAW called") if isdbg('console');
+			doresize();
 			return;
-		} elsif (defined is_pctext($r)) {
+		} elsif ($r eq "\013") {
+			$inbuf = substr($inbuf, 0, $pos);
+			$lth = length $inbuf;
+		} elsif (defined $r && is_pctext($r)) {
 			# move the top screen back to the bottom if you type something
-			if ($spos < @shistory) {
-				$spos = @shistory;
+			
+			if ($inscroll && $spos < @sh) {
+				$spos = @sh - $pagel;
+				$inscroll = 0;
 				show_screen();
 			}
 
@@ -412,16 +399,10 @@ sub rec_stdin
 			}
 			$pos++;
 			$lth++;
-		} elsif ($r eq "\014" || $r eq "\022") {
-			touchwin(curscr, 1);
-			refresh(curscr);
-			return;
-		} elsif ($r eq "\013") {
-			$inbuf = substr($inbuf, 0, $pos);
-			$lth = length $inbuf;
 		} else {
 			beep();
 		}
+
 		$bot->move(1, 0);
 		$bot->clrtobot();
 		$bot->addstr($inbuf);
@@ -431,16 +412,87 @@ sub rec_stdin
 }
 
 
+# add a line to the end of the top screen
+sub addtotop
+{
+	my $sort = shift;
+	while (@_) {
+		my $inbuf = shift;
+		my $l = length $inbuf;
+		if ($l > $cols) {
+			$inbuf =~ s/\s+/ /g;
+			if (length $inbuf > $cols) {
+				$Text::Wrap::columns = $cols;
+				my $token;
+				($token) = $inbuf =~ m!^(.* de [-\w\d/\#]+:?\s+|\w{9}\@\d\d:\d\d:\d\d )!;
+				$token ||= ' ' x 19;
+				push @sh, split /\n/, wrap('', ' ' x length($token), $inbuf);
+			} else {
+				push @sh, $inbuf;
+			}
+		} else {
+			push @sh, $inbuf;
+		}
+	}
+	
+	show_screen() unless $inscroll;
+}
+
+# handle incoming messages
+sub rec_socket
+{
+	my ($con, $msg, $err) = @_;
+	if (defined $err && $err) {
+		cease(1);
+	}
+	if (defined $msg) {
+		my ($sort, $incall, $line) = $msg =~ /^(\w)([^\|]+)\|(.*)$/;
+		dbg("msg: " . length($msg) . " '$msg'") if isdbg('console');
+		if ($line =~ s/\x07+$//) {
+			beep();
+		}
+		$line =~ s/[\r\n]+//s;
+
+		# change my call if my node says "tonight Michael you are Jane" or something like that...
+		$call = $incall if $call ne $incall;
+		
+		$line =~ s/[\x00-\x06\x08\x0a-\x19\x1b-\x1f\x80-\x9f]/./g;         # immutable CSI sequence + control characters
+		if ($sort && $sort eq 'Z') { # end, disconnect, go, away .....
+			cease(0);
+		} else {
+			$line = " " unless length($line);
+			addtotop($sort, $line);
+		}
+
+	} else {
+		cease(0);
+	}
+	$top->refresh();
+	$lasttime = time; 
+}
+
 #
 # deal with args
 #
 
+while (@ARGV && $ARGV[0] =~ /^-/) {
+	my $arg = shift;
+	if ($arg eq '-x') {
+		dbginit('console');
+		dbgadd('console');
+		$maxshist = 200;
+	}
+}
+
 $call = uc shift @ARGV if @ARGV;
-$call = uc $myalias if !$call;
+$call = uc $myalias unless $call;
+$node = uc $mycall unless $node;
+
+$call = normalise_call($call);
 my ($scall, $ssid) = split /-/, $call;
 $ssid = undef unless $ssid && $ssid =~ /^\d+$/;  
 if ($ssid) {
-	$ssid = 15 if $ssid > 15;
+	$ssid = 99 if $ssid > 99;
 	$call = "$scall-$ssid";
 }
 
@@ -449,7 +501,6 @@ if ($call eq $mycall) {
 	exit(0);
 }
 
-dbginit();
 
 $conn = IntMsg->connect("$clusteraddr", $clusterport, \&rec_socket);
 if (! $conn) {
@@ -476,16 +527,19 @@ unless ($DB::VERSION) {
 $SIG{'HUP'} = \&sig_term;
 
 # start up
-do_resize();
+doresize();
 
 $SIG{__DIE__} = \&sig_term;
 
-$conn->send_later("A$call|$connsort width=$cols");
+$Text::Wrap::columns = $cols;
+$conn->send_later("A$call|$connsort width=$cols enhanced");
 $conn->send_later("I$call|set/page $maxshist");
 $conn->send_later("I$call|set/nobeep");
 
 #Msg->set_event_handler(\*STDIN, "read" => \&rec_stdin);
 
+$Text::Wrap::columns = $cols;
+
 my $lastmin = 0;
 for (;;) {
 	my $t;
@@ -500,9 +554,7 @@ for (;;) {
 		$lasttime = $t;
 	}
 	my $ch = $bot->getch();
-	if ($winch) {
-#		mydbg("Got Resize");
-#		do_resize();
+	if (@time && tv_interval(\@time, [gettimeofday]) >= 1) {
 		next;
 	}
 	if (defined $ch) {
@@ -514,4 +566,4 @@ for (;;) {
 	$bot->refresh();
 }
 
-exit(0);
+cease(0);