}
use Msg;
+use IntMsg;
use DXVars;
use DXDebug;
+use DXUtil;
+use DXDebug;
use IO::File;
-use Curses;
-
-use Carp qw{cluck};
+use Curses 1.06;
use Console;
$spos = $pos = $lth = 0;
$inbuf = "";
+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("0", $foreground, $background);
+# init_pair(0, $background, $foreground);
init_pair(1, COLOR_RED, $background);
init_pair(2, COLOR_YELLOW, $background);
init_pair(3, COLOR_GREEN, $background);
init_pair(4, COLOR_CYAN, $background);
init_pair(5, COLOR_BLUE, $background);
init_pair(6, COLOR_MAGENTA, $background);
+ init_pair(7, COLOR_RED, COLOR_BLUE);
+ init_pair(8, COLOR_YELLOW, COLOR_BLUE);
+ init_pair(9, COLOR_GREEN, COLOR_BLUE);
+ init_pair(10, COLOR_CYAN, COLOR_BLUE);
+ init_pair(11, COLOR_BLUE, COLOR_RED);
+ init_pair(12, COLOR_MAGENTA, COLOR_BLUE);
+ init_pair(13, COLOR_YELLOW, COLOR_GREEN);
+ init_pair(14, COLOR_RED, COLOR_GREEN);
+ 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->meta(1);
+# $scr->addstr($lines-4, 0, '-' x $cols);
+ $bot = $scr->subwin(3, $cols, $lines-3, 0);
$bot->intrflush(0);
$bot->scrollok(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();
+ $lines = LINES;
+ $cols = COLS;
+ $has_colors = has_colors();
do_initscr();
+
+ $winch = 0;
+ $SIG{'WINCH'} = sub {$winch = 1};
+ show_screen();
}
# cease communications
sub cease
{
my $sendz = shift;
- if ($conn && $sendz) {
- $conn->send_now("Z$call|bye...\n");
- }
+ $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;
}
$spos = @shistory if $spos > @shistory;
}
my $shl = @shistory;
+ my $size = $lines . 'x' . $cols . '-';
my $add = "-$spos-$shl";
- $scr->addstr(LINES()-4, 0, '-' x (COLS() - (length($call) + length($add))));
+ my $time = ztime(time);
+ 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();
# add a line to the end of the top screen
sub addtotop
{
- my $inbuf = shift;
- push @shistory, $inbuf;
- shift @shistory if @shistory > $maxshist;
+ while (@_) {
+ my $inbuf = shift;
+ push @shistory, $inbuf;
+ shift @shistory if @shistory > $maxshist;
+ }
show_screen();
}
cease(1);
}
if (defined $msg) {
- my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
+ my ($sort, $call, $line) = $msg =~ /^(\w)([^\|]+)\|(.*)$/;
if ($sort && $sort eq 'D') {
addtotop($line);
} elsif ($sort && $sort eq 'Z') { # end, disconnect, go, away .....
cease(0);
}
+ # ******************************************************
+ # ******************************************************
+ # any other sorts that might happen are silently ignored.
+ # ******************************************************
+ # ******************************************************
+ } else {
+ cease(0);
}
$top->refresh();
$lasttime = time;
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) {
+
if ($r eq KEY_ENTER || $r eq "\n" || $r eq "\r") {
$khistpos = @khistory;
$bot->move(0,0);
$bot->clrtoeol();
- $bot->addstr(substr($inbuf, 0, COLS));
+ $bot->addstr(substr($inbuf, 0, $cols));
}
# add it to the monitor window
$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 "\0177") {
if ($pos > 0) {
my $a = substr($inbuf, 0, $pos-1);
my $b = substr($inbuf, $pos) if $pos < $lth;
} else {
beep();
}
- } elsif ($r ge ' ' && $r le '~') {
+ } elsif ($r eq KEY_RESIZE || $r eq "\0632") {
+ do_resize();
+ return;
+ } elsif (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") {
- #do_resize();
+ touchwin(curscr, 1);
+ refresh(curscr);
return;
} elsif ($r eq "\013") {
$inbuf = substr($inbuf, 0, $pos);
$call = uc shift @ARGV if @ARGV;
$call = uc $myalias if !$call;
+my ($scall, $ssid) = split /-/, $call;
+$ssid = undef unless $ssid && $ssid =~ /^\d+$/;
+if ($ssid) {
+ $ssid = 15 if $ssid > 15;
+ $call = "$scall-$ssid";
+}
if ($call eq $mycall) {
print "You cannot connect as your cluster callsign ($mycall)\n";
exit(0);
}
-$conn = Msg->connect("$clusteraddr", $clusterport, \&rec_socket);
+dbginit();
+
+$conn = IntMsg->connect("$clusteraddr", $clusterport, \&rec_socket);
if (! $conn) {
if (-r "$data/offline") {
open IN, "$data/offline" or die;
exit(0);
}
+$conn->set_error(sub{cease(0)});
+
+
+unless ($DB::VERSION) {
+ $SIG{'INT'} = \&sig_term;
+ $SIG{'TERM'} = \&sig_term;
+}
-$SIG{'INT'} = \&sig_term;
-$SIG{'TERM'} = \&sig_term;
-#$SIG{'WINCH'} = \&do_resize;
-$SIG{'HUP'} = 'IGNORE';
+$SIG{'HUP'} = \&sig_term;
-do_initscr();
+# start up
+do_resize();
$SIG{__DIE__} = \&sig_term;
-$conn->send_now("A$call|$connsort");
-$conn->send_now("I$call|set/page $maxshist");
-$conn->send_now("I$call|set/nobeep");
+$conn->send_later("A$call|$connsort width=$cols");
+$conn->send_later("I$call|set/page $maxshist");
+$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;
- Msg->event_loop(1, 0.010);
- $top->refresh() if $top->is_wintouched;
- $bot->refresh();
+ Msg->event_loop(1, 0.01);
$t = time;
if ($t > $lasttime) {
+ my ($min)= (gmtime($t))[1];
+ if ($min != $lastmin) {
+ show_screen();
+ $lastmin = $min;
+ }
$lasttime = $t;
}
+ my $ch = $bot->getch();
+ if ($winch) {
+# mydbg("Got Resize");
+# do_resize();
+ next;
+ }
+ if (defined $ch) {
+ if ($ch ne '-1') {
+ rec_stdin($ch);
+ }
+ }
+ $top->refresh() if $top->is_wintouched;
+ $bot->refresh();
}
exit(0);
projects / spider.git / blobdiff