projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
again?
[spider.git]
/
perl
/
console.pl
diff --git
a/perl/console.pl
b/perl/console.pl
index bfd7700da0a011442e2822b97433533d27f45c0c..e247d3c96791ebde87b35945124e89455f6fb9d2 100755
(executable)
--- a/
perl/console.pl
+++ b/
perl/console.pl
@@
-26,13
+26,12
@@
BEGIN {
}
use Msg;
}
use Msg;
+use IntMsg;
use DXVars;
use DXDebug;
use DXUtil;
use IO::File;
use DXVars;
use DXDebug;
use DXUtil;
use IO::File;
-use Curses;
-
-use Carp qw{cluck};
+use Curses 1.05;
use Console;
use Console;
@@
-61,7
+60,8
@@
sub do_initscr
if ($has_colors) {
start_color();
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(1, COLOR_RED, $background);
init_pair(2, COLOR_YELLOW, $background);
init_pair(3, COLOR_GREEN, $background);
@@
-76,6
+76,7
@@
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));
}
$top = $scr->subwin(LINES()-4, COLS, 0, 0);
}
$top = $scr->subwin(LINES()-4, COLS, 0, 0);
@@
-103,9
+104,7
@@
sub do_resize
sub cease
{
my $sendz = shift;
sub cease
{
my $sendz = shift;
- if ($conn && $sendz) {
- $conn->send_now("Z$call|bye...\n");
- }
+ $conn->disconnect if $conn;
endwin();
dbgclose();
print @_ if @_;
endwin();
dbgclose();
print @_ if @_;
@@
-216,13
+215,20
@@
sub rec_socket
cease(1);
}
if (defined $msg) {
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);
}
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;
}
$top->refresh();
$lasttime = time;
@@
-361,7
+367,7
@@
sub rec_stdin
} else {
beep();
}
} 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;
# move the top screen back to the bottom if you type something
if ($spos < @shistory) {
$spos = @shistory;
@@
-379,7
+385,8
@@
sub rec_stdin
$pos++;
$lth++;
} elsif ($r eq "\014" || $r eq "\022") {
$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);
return;
} elsif ($r eq "\013") {
$inbuf = substr($inbuf, 0, $pos);
@@
-402,13
+409,19
@@
sub rec_stdin
$call = uc shift @ARGV if @ARGV;
$call = uc $myalias if !$call;
$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);
}
if ($call eq $mycall) {
print "You cannot connect as your cluster callsign ($mycall)\n";
exit(0);
}
-$conn = Msg->connect("$clusteraddr", $clusterport, \&rec_socket);
+$conn =
Int
Msg->connect("$clusteraddr", $clusterport, \&rec_socket);
if (! $conn) {
if (-r "$data/offline") {
open IN, "$data/offline" or die;
if (! $conn) {
if (-r "$data/offline") {
open IN, "$data/offline" or die;
@@
-422,9
+435,14
@@
if (! $conn) {
exit(0);
}
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'} = \&sig_term;
#$SIG{'WINCH'} = \&do_resize;
$SIG{'HUP'} = \&sig_term;
@@
-432,16
+450,16
@@
do_initscr();
$SIG{__DIE__} = \&sig_term;
$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");
+$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->set_event_handler(\*STDIN, "read" => \&rec_stdin);
my $lastmin = 0;
for (;;) {
my $t;
- Msg->event_loop(1
,
1);
+ Msg->event_loop(1
0, 0.0
1);
$t = time;
if ($t > $lasttime) {
my ($min)= (gmtime($t))[1];
$t = time;
if ($t > $lasttime) {
my ($min)= (gmtime($t))[1];