allow amsat keps to work again.

[spider.git] / perl / console.pl

diff --git a/perl/console.pl b/perl/console.pl
index 597c5eff0ee2010764a9e533732c14b8cd23a38b..d04a7279bd585f9450a7e2fb1094c94018823461 100755 (executable)
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -23,14 +23,6 @@ BEGIN {
        
        unshift @INC, "$root/perl";     # this IS the right way round!
        unshift @INC, "$root/local";
-
-       sub main::mkver
-       {
-               my $s = shift;
-               my ($v, $b) = $s =~ /(\d+\.\d+)(?:\.(\d+\.\d+))?/;
-               $main::build += sprintf "%.3f", $v;
-               $main::branch += sprintf("%.3f", $b) if $b;
-       }
 }
 
 use Msg;
@@ -42,6 +34,7 @@ use DXDebug;
 use IO::File;
 use Time::HiRes qw(gettimeofday tv_interval);
 use Curses 1.06;
+use Text::Wrap;
 
 use Console;
 
@@ -237,8 +230,13 @@ sub addtotop
                if ($inbuf =~ s/\x07+$//) {
                        beep();
                }
-               push @shistory, $inbuf;
-               shift @shistory if @shistory > $maxshist;
+               if (length $inbuf > $cols) {
+                       $Text::Wrap::Columns = $cols;
+                       push @shistory, wrap('',"\t", $inbuf);
+               } else {
+                       push @shistory, $inbuf;
+               }
+               shift @shistory while @shistory > $maxshist;
        }
        show_screen();
 }
@@ -342,7 +340,7 @@ sub rec_stdin
                } elsif ($r eq KEY_PPAGE || $r eq "\032") {
                        if ($spos > 0) {
                                my ($i, $l);
-                               for ($i = 0; $i <= $pagel-1 && $spos >= 0; ) {
+                               for ($i = 0; $i < $pagel-1 && $spos >= 0; ) {
                                        $l = measure($shistory[$spos]);
                                        $i += $l;
                                        $spos-- if $i <= $pagel;
@@ -500,6 +498,8 @@ $conn->send_later("I$call|set/page $maxshist");
 
 #Msg->set_event_handler(\*STDIN, "read" => \&rec_stdin);
 
+$Text::Wrap::Columns = $cols;
+
 my $lastmin = 0;
 for (;;) {
        my $t;