}
use Msg;
+use IntMsg;
use DXVars;
use DXDebug;
use DXUtil;
use IO::File;
-use Curses;
-
-use Carp qw{cluck};
+use Curses 1.05;
use Console;
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);
+ $scr->attrset(COLOR_PAIR(0));
}
$top = $scr->subwin(LINES()-4, COLS, 0, 0);
sub cease
{
my $sendz = shift;
- if ($conn && $sendz) {
- $conn->send_now("Z$call|bye...\n");
- }
+ $conn->disconnect if $conn;
endwin();
dbgclose();
print @_ if @_;
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;
} else {
beep();
}
- } elsif ($r ge ' ' && $r le '~') {
+ } elsif (is_pctext($r)) {
# move the top screen back to the bottom if you type something
if ($spos < @shistory) {
$spos = @shistory;
$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);
+$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();
$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);
my $lastmin = 0;
for (;;) {
my $t;
- Msg->event_loop(1, 1);
+ Msg->event_loop(10, 0.01);
$t = time;
if ($t > $lasttime) {
my ($min)= (gmtime($t))[1];