projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prat!
[spider.git]
/
perl
/
DXCommandmode.pm
diff --git
a/perl/DXCommandmode.pm
b/perl/DXCommandmode.pm
index bef5626d9e30a998aabbb6ccf70115a77362bdc2..cd37c5e93c5833638491871427f7f92bba832941 100644
(file)
--- a/
perl/DXCommandmode.pm
+++ b/
perl/DXCommandmode.pm
@@
-959,7
+959,7
@@
sub announce
$buf = dd(['ann', $to, $target, $text, @_])
} else {
$buf = "$to$target de $_[0]: $text";
$buf = dd(['ann', $to, $target, $text, @_])
} else {
$buf = "$to$target de $_[0]: $text";
- $buf =~ s/\%5E/^/g;
+
#
$buf =~ s/\%5E/^/g;
$buf .= "\a\a" if $self->{beep};
}
$self->local_send($target eq 'WX' ? 'W' : 'N', $buf);
$buf .= "\a\a" if $self->{beep};
}
$self->local_send($target eq 'WX' ? 'W' : 'N', $buf);
@@
-984,7
+984,7
@@
sub chat
$buf = dd(['chat', $to, $target, $text, @_])
} else {
$buf = "$target de $_[0]: $text";
$buf = dd(['chat', $to, $target, $text, @_])
} else {
$buf = "$target de $_[0]: $text";
- $buf =~ s/\%5E/^/g;
+
#
$buf =~ s/\%5E/^/g;
$buf .= "\a\a" if $self->{beep};
}
$self->local_send('C', $buf);
$buf .= "\a\a" if $self->{beep};
}
$self->local_send('C', $buf);
@@
-996,7
+996,7
@@
sub format_dx_spot
my $t = ztime($_[2]);
my $loc = '';
my $t = ztime($_[2]);
my $loc = '';
- my $clth = 30
;
+ my $clth = 30
+ $self->{width} - 80; # allow comment to grow according the screen width
# --$clth if $self->{consort} eq 'local';
my $comment = substr (($_[3] || ''), 0, $clth);
# --$clth if $self->{consort} eq 'local';
my $comment = substr (($_[3] || ''), 0, $clth);
@@
-1070,7
+1070,7
@@
sub dx_spot
} else {
$buf = $self->format_dx_spot(@_);
$buf .= "\a\a" if $self->{beep};
} else {
$buf = $self->format_dx_spot(@_);
$buf .= "\a\a" if $self->{beep};
- $buf =~ s/\%5E/^/g;
+
#
$buf =~ s/\%5E/^/g;
}
$self->local_send('X', $buf);
}
$self->local_send('X', $buf);
@@
-1335,11
+1335,16
@@
sub spawn_cmd
sub {
my $subpro = shift;
if (isdbg('progress')) {
sub {
my $subpro = shift;
if (isdbg('progress')) {
- my $s = qq{line: "$line"};
+ my $s = qq{
$call
line: "$line"};
$s .= ", args: " . join(', ', map { defined $_ ? qq{'$_'} : q{'undef'} } @$args) if $args && @$args;
dbg($s);
}
$s .= ", args: " . join(', ', map { defined $_ ? qq{'$_'} : q{'undef'} } @$args) if $args && @$args;
dbg($s);
}
- eval { @out = $cmdref->(@$args); };
+ eval {
+ ++$self->{_in_sub_process};
+ dbg "\$self->{_in_sub_process} = $self->{_in_sub_process}";
+ @out = $cmdref->(@$args);
+ --$self->{_in_sub_process} if $self->{_in_sub_process} > 0;
+ };
if ($@) {
DXDebug::dbgprintring(25);
push @out, DXDebug::shortmess($@);
if ($@) {
DXDebug::dbgprintring(25);
push @out, DXDebug::shortmess($@);