projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix here
[spider.git]
/
perl
/
console.pl
diff --git
a/perl/console.pl
b/perl/console.pl
index 2be859894ad459b1ffdbf7ae0fc707a442fa7e94..bc3ca0d67bcb41163bd539e953e5f469daef960b 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
{
@@
-79,17
+83,19
@@
sub do_initscr
init_pair(12, COLOR_MAGENTA, COLOR_BLUE);
init_pair(13, COLOR_YELLOW, COLOR_GREEN);
init_pair(14, COLOR_RED, COLOR_GREEN);
init_pair(12, COLOR_MAGENTA, COLOR_BLUE);
init_pair(13, COLOR_YELLOW, COLOR_GREEN);
init_pair(14, COLOR_RED, COLOR_GREEN);
-
assume_default_colors($foreground, $background)
;
+
eval { assume_default_colors($foreground, $background) }
;
}
$top = $scr->subwin($lines-4, $cols, 0, 0);
$top->intrflush(0);
$top->scrollok(1);
}
$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->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);
$bot->keypad(1);
$bot->move(1,0);
$bot->meta(1);
@@
-106,13
+112,12
@@
sub do_resize
initscr();
raw();
noecho();
initscr();
raw();
noecho();
- $lines = LINES;
+ nonl();
+ $lines = LINES;
$cols = COLS;
$has_colors = has_colors();
do_initscr();
$cols = COLS;
$has_colors = has_colors();
do_initscr();
- $winch = 0;
- $SIG{'WINCH'} = sub {$winch = 1};
show_screen();
}
show_screen();
}
@@
-168,6
+173,7
@@
sub show_screen
$top->addstr("\n") if $spos > 0;
setattr($line);
$top->addstr($line);
$top->addstr("\n") if $spos > 0;
setattr($line);
$top->addstr($line);
+# $top->addstr("\n");
$top->attrset(COLOR_PAIR(0)) if $has_colors;
$spos = @shistory;
$top->attrset(COLOR_PAIR(0)) if $has_colors;
$spos = @shistory;
@@
-190,8
+196,9
@@
sub show_screen
my $line = $shistory[$p];
my $lines = measure($line);
last if $i + $lines > $pagel;
my $line = $shistory[$p];
my $lines = measure($line);
last if $i + $lines > $pagel;
+ $top->addstr("\n") if $i;
setattr($line);
setattr($line);
- $top->addstr($
i, 0, $
line);
+ $top->addstr($line);
$top->attrset(COLOR_PAIR(0)) if $has_colors;
$i += $lines;
}
$top->attrset(COLOR_PAIR(0)) if $has_colors;
$i += $lines;
}
@@
-219,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;
}
@@
-235,7
+245,9
@@
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') {
if ($sort && $sort eq 'D') {
+ $line = " " unless length($line);
addtotop($line);
} elsif ($sort && $sort eq 'Z') { # end, disconnect, go, away .....
cease(0);
addtotop($line);
} elsif ($sort && $sort eq 'Z') { # end, disconnect, go, away .....
cease(0);
@@
-263,43
+275,43
@@
sub rec_stdin
# print "sys: $r ($prbuf)\n";
if (defined $r) {
# 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 ($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();
};
# add it to the monitor window
unless ($spos == @shistory) {
$spos = @shistory;
show_screen();
};
- addtotop($inbuf)
if $inbuf
;
+ addtotop($inbuf);
# send it to the cluster
# send it to the cluster
- $inbuf = " " unless $inbuf;
$conn->send_later("I$call|$inbuf");
$inbuf = "";
$pos = $lth = 0;
$conn->send_later("I$call|$inbuf");
$inbuf = "";
$pos = $lth = 0;
@@
-322,7
+334,7
@@
sub rec_stdin
} elsif ($r eq KEY_PPAGE || $r eq "\032") {
if ($spos > 0) {
my ($i, $l);
} 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;
$l = measure($shistory[$spos]);
$i += $l;
$spos-- if $i <= $pagel;
@@
-361,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") {
+ } 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;
@@
-387,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 (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;
@@
-476,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);
@@
-494,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;