fix page up off by one bug

[spider.git] / perl / console.pl

diff --git a/perl/console.pl b/perl/console.pl
index 4dba480b03ea56b19d60b8d68a89b382a9d6cabe..d04a7279bd585f9450a7e2fb1094c94018823461 100755 (executable)
--- a/perl/console.pl
+++ b/perl/console.pl
@@ -32,7 +32,9 @@ use DXDebug;
 use DXUtil;
 use DXDebug;
 use IO::File;
+use Time::HiRes qw(gettimeofday tv_interval);
 use Curses 1.06;
+use Text::Wrap;
 
 use Console;
 
@@ -50,6 +52,9 @@ $connsort = "local";
 $khistpos = 0;
 $spos = $pos = $lth = 0;
 $inbuf = "";
+@time = ();
+
+$SIG{WINCH} = sub {@time = gettimeofday};
 
 sub mydbg
 {
@@ -85,11 +90,13 @@ sub do_initscr
        $top = $scr->subwin($lines-4, $cols, 0, 0);
        $top->intrflush(0);
        $top->scrollok(1);
+       $top->idlok(1);
        $top->meta(1);
 #      $scr->addstr($lines-4, 0, '-' x $cols);
        $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);
@@ -106,13 +113,12 @@ sub do_resize
        initscr();
        raw();
        noecho();
-       $lines = LINES;
+       nonl();
+       $lines = LINES;
        $cols = COLS;
        $has_colors = has_colors();
        do_initscr();
 
-       $winch = 0;
-       $SIG{'WINCH'} = sub {$winch = 1};
        show_screen();
 }
 
@@ -168,6 +174,7 @@ sub show_screen
                $top->addstr("\n") if $spos > 0;
                setattr($line);
                $top->addstr($line);
+#              $top->addstr("\n");
                $top->attrset(COLOR_PAIR(0)) if $has_colors;
                $spos = @shistory;
                
@@ -190,8 +197,9 @@ sub show_screen
                        my $line = $shistory[$p];
                        my $lines = measure($line);
                        last if $i + $lines > $pagel;
+                       $top->addstr("\n") if $i;
                        setattr($line);
-                       $top->addstr($i, 0, $line);
+                       $top->addstr($line);
                        $top->attrset(COLOR_PAIR(0)) if $has_colors;
                        $i += $lines;
                }
@@ -219,8 +227,16 @@ sub addtotop
 {
        while (@_) {
                my $inbuf = shift;
-               push @shistory, $inbuf;
-               shift @shistory if @shistory > $maxshist;
+               if ($inbuf =~ s/\x07+$//) {
+                       beep();
+               }
+               if (length $inbuf > $cols) {
+                       $Text::Wrap::Columns = $cols;
+                       push @shistory, wrap('',"\t", $inbuf);
+               } else {
+                       push @shistory, $inbuf;
+               }
+               shift @shistory while @shistory > $maxshist;
        }
        show_screen();
 }
@@ -235,7 +251,9 @@ sub rec_socket
        if (defined $msg) {
                my ($sort, $call, $line) = $msg =~ /^(\w)([^\|]+)\|(.*)$/;
                
+               $line =~ s/[\x00-\x06\x08\x0a-\x19\x1b-\x1f\x80-\x9f]/./g;         # immutable CSI sequence + control characters
                if ($sort && $sort eq 'D') {
+                       $line = " " unless length($line);
                        addtotop($line);
                } elsif ($sort && $sort eq 'Z') { # end, disconnect, go, away .....
                        cease(0);
@@ -263,43 +281,43 @@ sub rec_stdin
        #  print "sys: $r ($prbuf)\n";
        if (defined $r) {
 
+               $r = '0' if !$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;
+                       $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];
+                                               last;
                                        }
                                }
-                               push @khistory, $inbuf if $inbuf;
-                               shift @khistory if @khistory > $maxkhist;
-                               $khistpos = @khistory;
-                               $bot->move(0,0);
-                               $bot->clrtoeol();
-                               $bot->addstr(substr($inbuf, 0, $cols));
+                               if ($i < 0) {
+                                       beep();
+                                       return;
+                               }
                        }
+                       push @khistory, $inbuf if length $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;
+                       addtotop($inbuf);
                
                        # send it to the cluster
-                       $inbuf = " " unless $inbuf;
                        $conn->send_later("I$call|$inbuf");
                        $inbuf = "";
                        $pos = $lth = 0;
@@ -322,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 && $spos >= 0; ) {
+                               for ($i = 0; $i < $pagel-1 && $spos >= 0; ) {
                                        $l = measure($shistory[$spos]);
                                        $i += $l;
                                        $spos-- if $i <= $pagel;
@@ -361,7 +379,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;
@@ -387,7 +405,7 @@ sub rec_stdin
                } elsif ($r eq KEY_RESIZE || $r eq "\0632") {
                        do_resize();
                        return;
-               } elsif (is_pctext($r)) {
+               } elsif (defined $r && is_pctext($r)) {
                        # move the top screen back to the bottom if you type something
                        if ($spos < @shistory) {
                                $spos = @shistory;
@@ -476,10 +494,12 @@ $SIG{__DIE__} = \&sig_term;
 
 $conn->send_later("A$call|$connsort width=$cols");
 $conn->send_later("I$call|set/page $maxshist");
-$conn->send_later("I$call|set/nobeep");
+#$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;
@@ -494,7 +514,7 @@ for (;;) {
                $lasttime = $t;
        }
        my $ch = $bot->getch();
-       if ($winch) {
+       if (@time && tv_interval(\@time, [gettimeofday]) >= 1) {
 #              mydbg("Got Resize");
 #              do_resize();
                next;