use DXVars;
use DXDebug;
use DXUtil;
+use DXDebug;
use IO::File;
-use Curses 1.05;
+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
+{
+ local *STDOUT = undef;
+ dbg(@_);
+}
# 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);
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);
- $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);
+ $top->idlok(1);
$bot->keypad(1);
$bot->move(1,0);
+ $bot->meta(1);
+ $bot->nodelay(1);
$scr->refresh();
- $pagel = LINES()-4;
+ $pagel = $lines-4;
$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();
+
+ show_screen();
}
# cease communications
sub cease
{
my $sendz = shift;
-# if ($conn && $sendz) {
-# $conn->send_now("Z$call|bye...");
-# }
+ $conn->disconnect if $conn;
endwin();
dbgclose();
print @_ if @_;
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;
}
$top->addstr("\n") if $spos > 0;
setattr($line);
$top->addstr($line);
+# $top->addstr("\n");
$top->attrset(COLOR_PAIR(0)) if $has_colors;
$spos = @shistory;
my $line = $shistory[$p];
my $lines = measure($line);
last if $i + $lines > $pagel;
+ $top->addstr("\n") if $i;
setattr($line);
- $top->addstr($i, 0, $line);
+ $top->addstr($line);
$top->attrset(COLOR_PAIR(0)) if $has_colors;
$i += $lines;
}
$spos = @shistory if $spos > @shistory;
}
my $shl = @shistory;
+ my $size = $lines . 'x' . $cols . '-';
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->addstr("$call");
+ $scr->addstr($call);
$scr->attrset(COLOR_PAIR(0)) if $has_colors;
$scr->addstr($add);
$scr->refresh();
{
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 length($line);
addtotop($line);
} elsif ($sort && $sort eq 'Z') { # end, disconnect, go, away .....
cease(0);
sub rec_stdin
{
- my ($fh) = @_;
-
- $r = $bot->getch();
+ my $r = shift;;
# my $prbuf;
# $prbuf = $buf;
# $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 ($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();
};
- addtotop($inbuf) if $inbuf;
+ addtotop($inbuf);
# send it to the cluster
- $inbuf = " " unless $inbuf;
$conn->send_later("I$call|$inbuf");
$inbuf = "";
$pos = $lth = 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") {
+ } 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;
} 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();
}
-
+
+ # $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);
$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);
exit(0);
}
+dbginit();
+
$conn = IntMsg->connect("$clusteraddr", $clusterport, \&rec_socket);
if (! $conn) {
if (-r "$data/offline") {
exit(0);
}
+$conn->set_error(sub{cease(0)});
+
unless ($DB::VERSION) {
$SIG{'INT'} = \&sig_term;
$SIG{'TERM'} = \&sig_term;
}
-#$SIG{'WINCH'} = \&do_resize;
$SIG{'HUP'} = \&sig_term;
-do_initscr();
+# start up
+do_resize();
$SIG{__DIE__} = \&sig_term;
-$conn->send_later("A$call|$connsort");
+$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);
+
+$Text::Wrap::Columns = $cols;
my $lastmin = 0;
for (;;) {
my $t;
- Msg->event_loop(1, 0.1);
+ Msg->event_loop(1, 0.01);
$t = time;
if ($t > $lasttime) {
my ($min)= (gmtime($t))[1];
}
$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();
}
projects / spider.git / blobdiff