X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fconsole.pl;h=50196907829e16608af9cfc0a4f95f0132efdbcb;hb=e0278322b79d09a997ed7df948c57b58f02b139c;hp=977285dad1e1db43d60f215a7ee7d67c38c3c906;hpb=2f4355fb63f336cce61887b189d5556faf1734d7;p=spider.git diff --git a/perl/console.pl b/perl/console.pl index 977285da..50196907 100755 --- a/perl/console.pl +++ b/perl/console.pl @@ -118,6 +118,15 @@ sub show_screen $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 sub rec_socket { @@ -129,10 +138,7 @@ sub rec_socket my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/; if ($sort eq 'D') { - push @shistory, $line; - shift @shistory if @shistory > $maxshist; -# $spos = @shistory if $spos >= @shistory - 1; - show_screen(); + addtotop($line); } elsif ($sort eq 'Z') { # end, disconnect, go, away ..... cease(0); } @@ -153,10 +159,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 +186,9 @@ sub rec_stdin $bot->clrtoeol(); $bot->addstr(substr($inbuf, 0, COLS)); } + + # add it to the monitor window + addtotop($inbuf) if $inbuf; # send it to the cluster $inbuf = " " unless $inbuf; @@ -242,6 +267,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 - 1) { + $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,8 +284,8 @@ sub rec_stdin $pos++; $lth++; } elsif ($r eq "\014" || $r eq "\022") { - $scr->touchwin(); - $scr->refresh(); +# curscr()->refresh(); + return; } elsif ($r eq "\013") { $inbuf = substr($inbuf, 0, $pos); $lth = length $inbuf;