use DXUtil;
use DXDebug;
use IO::File;
+use Time::HiRes qw(gettimeofday tv_interval);
use Curses 1.06;
+use Text::Wrap;
use Console;
$khistpos = 0;
$spos = $pos = $lth = 0;
$inbuf = "";
+@time = ();
+
+$SIG{WINCH} = sub {@time = gettimeofday};
sub mydbg
{
$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);
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();
}
$top->addstr("\n") if $spos > 0;
setattr($line);
$top->addstr($line);
+# $top->addstr("\n");
$top->attrset(COLOR_PAIR(0)) if $has_colors;
$spos = @shistory;
{
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();
}
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 $line;
+ $line = " " unless length($line);
addtotop($line);
} elsif ($sort && $sort eq 'Z') { # end, disconnect, go, away .....
cease(0);
# 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
- $inbuf = " " unless $inbuf;
+ $inbuf = " " unless length $inbuf;
# check for a pling and do a search back for a command
if ($inbuf =~ /^!/o) {
return;
}
}
- push @khistory, $inbuf if $inbuf;
+ push @khistory, $inbuf if length $inbuf;
shift @khistory if @khistory > $maxkhist;
$khistpos = @khistory;
$bot->move(0,0);
} 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;
$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;
} 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;
$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;
$lasttime = $t;
}
my $ch = $bot->getch();
- if ($winch) {
+ if (@time && tv_interval(\@time, [gettimeofday]) >= 1) {
# mydbg("Got Resize");
# do_resize();
next;