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 0996dc7a8285e9c3564139aed3e3fd6234fb6aad..f4c4a85fa37731c163379cdf3b21b9b84d609b35 100755
(executable)
--- a/
perl/console.pl
+++ b/
perl/console.pl
@@
-30,8
+30,10
@@
use IntMsg;
use DXVars;
use DXDebug;
use DXUtil;
use DXVars;
use DXDebug;
use DXUtil;
+use DXDebug;
use IO::File;
use IO::File;
-use Curses 1.05;
+use Time::HiRes qw(gettimeofday tv_interval);
+use Curses 1.06;
use Console;
use Console;
@@
-49,15
+51,20
@@
$connsort = "local";
$khistpos = 0;
$spos = $pos = $lth = 0;
$inbuf = "";
$khistpos = 0;
$spos = $pos = $lth = 0;
$inbuf = "";
+@time = ();
+
+$SIG{WINCH} = sub {@time = gettimeofday};
+
+sub mydbg
+{
+ local *STDOUT = undef;
+ dbg(@_);
+}
# do the screen initialisation
sub do_initscr
{
$scr = new Curses;
# do the screen initialisation
sub do_initscr
{
$scr = new Curses;
- raw();
- noecho();
- $has_colors = has_colors();
-
if ($has_colors) {
start_color();
init_pair("0", $foreground, $background);
if ($has_colors) {
start_color();
init_pair("0", $foreground, $background);
@@
-76,28
+83,42
@@
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);
-
$scr->attrset(COLOR_PAIR(0))
;
+
eval { assume_default_colors($foreground, $background) }
;
}
}
- $top = $scr->subwin(
LINES()-4, COLS
, 0, 0);
+ $top = $scr->subwin(
$lines-4, $cols
, 0, 0);
$top->intrflush(0);
$top->scrollok(1);
$top->intrflush(0);
$top->scrollok(1);
- $scr->addstr(LINES()-4, 0, '-' x COLS);
- $bot = $scr->subwin(3, COLS, LINES()-3, 0);
+ $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);
$bot->intrflush(0);
$bot->scrollok(1);
+ $top->idlok(1);
$bot->keypad(1);
$bot->move(1,0);
$bot->keypad(1);
$bot->move(1,0);
+ $bot->meta(1);
+ $bot->nodelay(1);
$scr->refresh();
$scr->refresh();
- $pagel =
LINES()
-4;
+ $pagel =
$lines
-4;
$mycallcolor = COLOR_PAIR(1) unless $mycallcolor;
}
sub do_resize
{
$mycallcolor = COLOR_PAIR(1) unless $mycallcolor;
}
sub do_resize
{
- undef $scr;
+ endwin() if $scr;
+ initscr();
+ raw();
+ noecho();
+ nonl();
+ $lines = LINES;
+ $cols = COLS;
+ $has_colors = has_colors();
do_initscr();
do_initscr();
+
+ show_screen();
}
# cease communications
}
# cease communications
@@
-137,8
+158,8
@@
sub measure
return 0 unless $line;
my $l = length $line;
return 0 unless $line;
my $l = length $line;
- my $lines = int ($l /
COLS()
);
- $lines++ if $l /
COLS()
> $lines;
+ my $lines = int ($l /
$cols
);
+ $lines++ if $l /
$cols
> $lines;
return $lines;
}
return $lines;
}
@@
-152,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;
@@
-174,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;
}
@@
-183,13
+206,15
@@
sub show_screen
$spos = @shistory if $spos > @shistory;
}
my $shl = @shistory;
$spos = @shistory if $spos > @shistory;
}
my $shl = @shistory;
+ my $size = $lines . 'x' . $cols . '-';
my $add = "-$spos-$shl";
my $time = ztime(time);
my $add = "-$spos-$shl";
my $time = ztime(time);
- my $str = "-" . $time . '-' x (
COLS() - (
length($call) + length($add) + length($time) + 1));
- $scr->addstr(
LINES()
-4, 0, $str);
+ my $str = "-" . $time . '-' x (
$cols - (length($size) +
length($call) + length($add) + length($time) + 1));
+ $scr->addstr(
$lines
-4, 0, $str);
+ $scr->addstr($size);
$scr->attrset($mycallcolor) if $has_colors;
$scr->attrset($mycallcolor) if $has_colors;
- $scr->addstr(
"$call"
);
+ $scr->addstr(
$call
);
$scr->attrset(COLOR_PAIR(0)) if $has_colors;
$scr->addstr($add);
$scr->refresh();
$scr->attrset(COLOR_PAIR(0)) if $has_colors;
$scr->addstr($add);
$scr->refresh();
@@
-201,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;
}
@@
-217,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);
@@
-236,9
+266,7
@@
sub rec_socket
sub rec_stdin
{
sub rec_stdin
{
- my ($fh) = @_;
-
- $r = $bot->getch();
+ my $r = shift;;
# my $prbuf;
# $prbuf = $buf;
# my $prbuf;
# $prbuf = $buf;
@@
-246,43
+274,44
@@
sub rec_stdin
# $prbuf =~ s/\n/\\n/;
# print "sys: $r ($prbuf)\n";
if (defined $r) {
# $prbuf =~ s/\n/\\n/;
# 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;
@@
-344,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;
@@
-367,13
+396,18
@@
sub rec_stdin
} else {
beep();
}
} else {
beep();
}
- } elsif (is_pctext($r)) {
+ } elsif ($r eq KEY_RESIZE || $r eq "\0632") {
+ do_resize();
+ return;
+ } elsif (defined $r && is_pctext($r)) {
# move the top screen back to the bottom if you type something
if ($spos < @shistory) {
$spos = @shistory;
show_screen();
}
# move the top screen back to the bottom if you type something
if ($spos < @shistory) {
$spos = @shistory;
show_screen();
}
-
+
+ # $r = ($r lt ' ' || $r gt "\x7e") ? sprintf("'%x", ord $r) : $r;
+
# insert the character into the keyboard buffer
if ($pos < $lth) {
my $a = substr($inbuf, 0, $pos);
# insert the character into the keyboard buffer
if ($pos < $lth) {
my $a = substr($inbuf, 0, $pos);
@@
-385,8
+419,8
@@
sub rec_stdin
$pos++;
$lth++;
} elsif ($r eq "\014" || $r eq "\022") {
$pos++;
$lth++;
} elsif ($r eq "\014" || $r eq "\022") {
- touchwin(
$
curscr, 1);
- refresh(
$
curscr);
+ touchwin(curscr, 1);
+ refresh(curscr);
return;
} elsif ($r eq "\013") {
$inbuf = substr($inbuf, 0, $pos);
return;
} elsif ($r eq "\013") {
$inbuf = substr($inbuf, 0, $pos);
@@
-421,6
+455,8
@@
if ($call eq $mycall) {
exit(0);
}
exit(0);
}
+dbginit();
+
$conn = IntMsg->connect("$clusteraddr", $clusterport, \&rec_socket);
if (! $conn) {
if (-r "$data/offline") {
$conn = IntMsg->connect("$clusteraddr", $clusterport, \&rec_socket);
if (! $conn) {
if (-r "$data/offline") {
@@
-443,23
+479,23
@@
unless ($DB::VERSION) {
$SIG{'TERM'} = \&sig_term;
}
$SIG{'TERM'} = \&sig_term;
}
-#$SIG{'WINCH'} = \&do_resize;
$SIG{'HUP'} = \&sig_term;
$SIG{'HUP'} = \&sig_term;
-do_initscr();
+# start up
+do_resize();
$SIG{__DIE__} = \&sig_term;
$SIG{__DIE__} = \&sig_term;
-$conn->send_later("A$call|$connsort width=$
COLS
");
+$conn->send_later("A$call|$connsort width=$
cols
");
$conn->send_later("I$call|set/page $maxshist");
$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);
my $lastmin = 0;
for (;;) {
my $t;
my $lastmin = 0;
for (;;) {
my $t;
- Msg->event_loop(1
0
, 0.01);
+ Msg->event_loop(1, 0.01);
$t = time;
if ($t > $lasttime) {
my ($min)= (gmtime($t))[1];
$t = time;
if ($t > $lasttime) {
my ($min)= (gmtime($t))[1];
@@
-469,6
+505,17
@@
for (;;) {
}
$lasttime = $t;
}
}
$lasttime = $t;
}
+ my $ch = $bot->getch();
+ if (@time && tv_interval(\@time, [gettimeofday]) >= 1) {
+# mydbg("Got Resize");
+# do_resize();
+ next;
+ }
+ if (defined $ch) {
+ if ($ch ne '-1') {
+ rec_stdin($ch);
+ }
+ }
$top->refresh() if $top->is_wintouched;
$bot->refresh();
}
$top->refresh() if $top->is_wintouched;
$bot->refresh();
}