X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=ceac24e278890d1275fa6f904761d1993355061e;hb=a89e605f6679f19b1365061bad1ba93b36293814;hp=02a2e476831ef0567d21dc7c384c8d27a52c84bb;hpb=6e80184b4c2c222a7ab1f7ededb9e9af2be9c236;p=spider.git

diff --git a/perl/console.pl b/perl/console.pl
index 02a2e476..ceac24e2 100755
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -33,6 +33,63 @@ use Curses;
 
 use Carp qw{cluck};
 
+use Console;
+
+#
+# initialisation
+#
+
+$call = "";                     # the 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;
+$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(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);
+	}
+	
+	$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
 {
@@ -42,15 +99,99 @@ sub cease
 	}
 	endwin();
 	dbgclose();
-#	$SIG{__WARN__} = sub {my $a = shift; cluck($a); };
-	sleep(1);
+	print @_ if @_;
 	exit(0);	
 }
 
 # terminate program from signal
 sub sig_term
 {
-	cease(1);
+	cease(1, @_);
+}
+
+# determine the colour of the line
+sub setattr
+{
+	if ($has_colors) {
+		foreach my $ref (@colors) {
+			if ($_[0] =~ m{$$ref[0]}) {
+				$top->attrset($$ref[1]);
+				last;
+			}
+		}
+	}
+}
+
+# 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->attrset(COLOR_PAIR(0)) if $has_colors;
+		$spos = @shistory;
+		
+	} else {
+		
+		# anywhere else
+		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 < $pagel && $p < @shistory; $p++) {
+			my $line = $shistory[$p];
+			my $lines = measure($line);
+			last if $i + $lines > $pagel;
+			setattr($line);
+			$top->addstr($i, 0, $line);
+			$top->attrset(COLOR_PAIR(0)) if $has_colors;
+			$i += $lines;
+		}
+		$spos = $p;
+		$spos = @shistory if $spos > @shistory;
+	}
+    my $shl = @shistory;
+	my $add = "-$spos-$shl";
+    $scr->addstr(LINES()-4, 0, '-' x (COLS() - (length($call) + length($add))));
+	$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;
+	show_screen();
 }
 
 # handle incoming messages
@@ -63,9 +204,9 @@ sub rec_socket
 	if (defined $msg) {
 		my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
 		
-		if ($sort eq 'D') {
-			$top->addstr("\n$line");
-		} 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);
 		}	  
 	}
@@ -85,38 +226,88 @@ 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) {
-				push @history, $inbuf if $inbuf;
-				shift @history if @history > $maxhist;
-				$histpos = @history;
+				# 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;
 				$bot->move(0,0);
+				$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;
 			$conn->send_later("I$call|$inbuf");
 			$inbuf = "";
 			$pos = $lth = 0;
-		} elsif ($r eq KEY_UP || $r eq KEY_PPAGE || $r eq "\020") {
-			if ($histpos > 0) {
-				--$histpos;
-				$inbuf = $history[$histpos];
+		} elsif ($r eq KEY_UP || $r eq "\020") {
+			if ($khistpos > 0) {
+				--$khistpos;
+				$inbuf = $khistory[$khistpos];
 				$pos = $lth = length $inbuf;
 			} else {
 				beep();
 			}
-		} elsif ($r eq KEY_DOWN || $r eq KEY_NPAGE || $r eq "\016") {
-			if ($histpos < @history - 1) {
-				++$histpos;
-				$inbuf = $history[$histpos];
+		} elsif ($r eq KEY_DOWN || $r eq "\016") {
+			if ($khistpos < @khistory - 1) {
+				++$khistpos;
+				$inbuf = $khistory[$khistpos];
 				$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;
+				}
+				$spos = 0 if $spos < 0;
+				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;
+				show_screen();
+			} else {
+				beep();
+			}
 		} elsif ($r eq KEY_LEFT || $r eq "\002") {
 			if ($pos > 0) {
 				--$pos;
@@ -129,8 +320,10 @@ sub rec_stdin
 			} else {
 				beep();
 			}
-		} elsif ($r eq KEY_HOME) {
+		} elsif ($r eq KEY_HOME || $r eq "\001") {
 			$pos = 0;
+		} elsif ($r eq KEY_END || $r eq "\005") {
+			$pos = $lth;
 		} elsif ($r eq KEY_BACKSPACE || $r eq "\010") {
 			if ($pos > 0) {
 				my $a = substr($inbuf, 0, $pos-1);
@@ -155,6 +348,13 @@ sub rec_stdin
 				beep();
 			}
 		} elsif ($r ge ' ' && $r le '~') {
+			# 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);
@@ -165,11 +365,11 @@ sub rec_stdin
 			$pos++;
 			$lth++;
 		} elsif ($r eq "\014" || $r eq "\022") {
-			$scr->touchwin();
-			$scr->refresh();
+			#do_resize();
+			return;
 		} elsif ($r eq "\013") {
-			$inbuf = "";
-			$pos = $lth = 0;
+			$inbuf = substr($inbuf, 0, $pos);
+			$lth = length $inbuf;
 		} else {
 			beep();
 		}
@@ -182,21 +382,6 @@ sub rec_stdin
 }
 
 
-#
-# initialisation
-#
-
-$call = "";                     # the callsign being used
-$conn = 0;                      # the connection object for the cluster
-$lasttime = time;               # lasttime something happened on the interface
-
-$connsort = "local";
-@history = ();
-$histpos = 0;
-$maxhist = 100;
-$pos = $lth = 0;
-$inbuf = "";
-
 #
 # deal with args
 #
@@ -226,35 +411,22 @@ if (! $conn) {
 
 $SIG{'INT'} = \&sig_term;
 $SIG{'TERM'} = \&sig_term;
+#$SIG{'WINCH'} = \&do_resize;
 $SIG{'HUP'} = 'IGNORE';
 
-$scr = new Curses;
-raw();
-noecho();
-$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();
+do_initscr();
 
 $SIG{__DIE__} = \&sig_term;
 
-$pages = LINES()-6;
-
 $conn->send_now("A$call|$connsort");
-$conn->send_now("I$call|set/page $pages");
+$conn->send_now("I$call|set/page $maxshist");
 $conn->send_now("I$call|set/nobeep");
 
 Msg->set_event_handler(\*STDIN, "read" => \&rec_stdin);
 
 for (;;) {
 	my $t;
-	Msg->event_loop(1, 0.010);
+	Msg->event_loop(1, 1);
 	$top->refresh() if $top->is_wintouched;
 	$bot->refresh();
 	$t = time;