projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add it to the main line
[spider.git]
/
perl
/
console.pl
diff --git
a/perl/console.pl
b/perl/console.pl
index eae1c0ff4451a477af22765c3d36cfd3f00bc538..f4c4a85fa37731c163379cdf3b21b9b84d609b35 100755
(executable)
--- a/
perl/console.pl
+++ b/
perl/console.pl
@@
-32,6
+32,7
@@
use DXDebug;
use DXUtil;
use DXDebug;
use IO::File;
use DXUtil;
use DXDebug;
use IO::File;
+use Time::HiRes qw(gettimeofday tv_interval);
use Curses 1.06;
use Console;
use Curses 1.06;
use Console;
@@
-50,6
+51,9
@@
$connsort = "local";
$khistpos = 0;
$spos = $pos = $lth = 0;
$inbuf = "";
$khistpos = 0;
$spos = $pos = $lth = 0;
$inbuf = "";
+@time = ();
+
+$SIG{WINCH} = sub {@time = gettimeofday};
sub mydbg
{
sub mydbg
{
@@
-114,8
+118,6
@@
sub do_resize
$has_colors = has_colors();
do_initscr();
$has_colors = has_colors();
do_initscr();
- $winch = 0;
- $SIG{'WINCH'} = sub {$winch = 1};
show_screen();
}
show_screen();
}
@@
-224,6
+226,9
@@
sub addtotop
{
while (@_) {
my $inbuf = shift;
{
while (@_) {
my $inbuf = shift;
+ if ($inbuf =~ s/\x07+$//) {
+ beep();
+ }
push @shistory, $inbuf;
shift @shistory if @shistory > $maxshist;
}
push @shistory, $inbuf;
shift @shistory if @shistory > $maxshist;
}
@@
-240,6
+245,7
@@
sub rec_socket
if (defined $msg) {
my ($sort, $call, $line) = $msg =~ /^(\w)([^\|]+)\|(.*)$/;
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);
if ($sort && $sort eq 'D') {
$line = " " unless length($line);
addtotop($line);
@@
-274,7
+280,7
@@
sub rec_stdin
if ($r eq KEY_ENTER || $r eq "\n" || $r eq "\r") {
# save the lines
if ($r eq KEY_ENTER || $r eq "\n" || $r eq "\r") {
# save the lines
- $inbuf = " " unless length
($inbuf)
;
+ $inbuf = " " unless length
$inbuf
;
# check for a pling and do a search back for a command
if ($inbuf =~ /^!/o) {
# check for a pling and do a search back for a command
if ($inbuf =~ /^!/o) {
@@
-291,7
+297,7
@@
sub rec_stdin
return;
}
}
return;
}
}
- push @khistory, $inbuf if $inbuf;
+ push @khistory, $inbuf if
length
$inbuf;
shift @khistory if @khistory > $maxkhist;
$khistpos = @khistory;
$bot->move(0,0);
shift @khistory if @khistory > $maxkhist;
$khistpos = @khistory;
$bot->move(0,0);
@@
-367,7
+373,7
@@
sub rec_stdin
$pos = 0;
} elsif ($r eq KEY_END || $r eq "\005") {
$pos = $lth;
$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;
if ($pos > 0) {
my $a = substr($inbuf, 0, $pos-1);
my $b = substr($inbuf, $pos) if $pos < $lth;
@@
-393,7
+399,7
@@
sub rec_stdin
} elsif ($r eq KEY_RESIZE || $r eq "\0632") {
do_resize();
return;
} elsif ($r eq KEY_RESIZE || $r eq "\0632") {
do_resize();
return;
- } elsif (defined 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;
# move the top screen back to the bottom if you type something
if ($spos < @shistory) {
$spos = @shistory;
@@
-482,7
+488,7
@@
$SIG{__DIE__} = \&sig_term;
$conn->send_later("A$call|$connsort width=$cols");
$conn->send_later("I$call|set/page $maxshist");
$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);
#Msg->set_event_handler(\*STDIN, "read" => \&rec_stdin);
@@
-500,7
+506,7
@@
for (;;) {
$lasttime = $t;
}
my $ch = $bot->getch();
$lasttime = $t;
}
my $ch = $bot->getch();
- if (
$winch
) {
+ if (
@time && tv_interval(\@time, [gettimeofday]) >= 1
) {
# mydbg("Got Resize");
# do_resize();
next;
# mydbg("Got Resize");
# do_resize();
next;