X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=4601ec21df0ca34d01ca99b7beb64f9f9996bdd8;hb=55f3823f3ad86d76e1e995b0f255f1804684de18;hp=58b4296934c5a5ae0c6d44d81a5394ea01d9401c;hpb=b672afe940f843351af2bc4a87b4c4239f3a5140;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 58b42969..4601ec21 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -63,7 +63,10 @@ sub new
 	my $pkg = shift;
 	my $call = shift;
 	my @rout = $main::routeroot->add_user($call, Route::here(1));
-	DXProt::route_pc16($main::me, $main::routeroot, @rout) if @rout;
+
+	# ALWAYS output the user
+	my $ref = Route::User::get($call);
+	DXProt::route_pc16($main::me, $main::routeroot, $ref) if $ref;
 
 	return $self;
 }
@@ -104,6 +107,7 @@ sub start
 	$self->{logininfo} = $user->wantlogininfo;
 	$self->{ann_talk} = $user->wantann_talk;
 	$self->{here} = 1;
+	$self->{prompt} = $user->prompt if $user->prompt;
 
 	# sort out registration
 	if ($main::reqreg == 1) {
@@ -182,6 +186,9 @@ sub normal
 	my $self = shift;
 	my $cmdline = shift;
 	my @ans;
+
+	# save this for them's that need it
+	my $rawline = $cmdline;
 	
 	# remove leading and trailing spaces
 	$cmdline =~ s/^\s*(.*)\s*$/$1/;
@@ -270,7 +277,7 @@ sub normal
 				Log('DXCommand', "$self->{call} swore: $cmdline");
 			} else {
 				for (@{$self->{talklist}}) {
-					$self->send_talks($_, $cmdline);
+					$self->send_talks($_, $rawline);
 				}
 			}
 			$self->send($self->talk_prompt) if $self->{state} eq 'talk';
@@ -282,12 +289,13 @@ sub normal
 		no strict 'refs';
 		my @ans;
 		if (ref $self->{edit}) {
-			eval { @ans = $self->{edit}->$func($self, $cmdline)};
+			eval { @ans = $self->{edit}->$func($self, $rawline)};
 		} else {
-			eval {	@ans = &{$self->{func}}($self, $cmdline) };
+			eval {	@ans = &{$self->{func}}($self, $rawline) };
 		}
 		if ($@) {
 			$self->send_ans("Syserr: on stored func $self->{func}", $@);
+			delete $self->{func};
 			$self->state('prompt');
 			undef $@;
 		}
@@ -494,13 +502,13 @@ sub disconnect
 	if ($uref) {
 		@rout = $main::routeroot->del_user($uref);
 		dbg("B/C PC17 on $main::mycall for: $call") if isdbg('route');
+
+		# issue a pc17 to everybody interested
+		DXProt::route_pc17($main::me, $main::routeroot, $uref);
 	} else {
 		confess "trying to disconnect a non existant user $call";
 	}
 
-	# issue a pc17 to everybody interested
-	DXProt::route_pc17($main::me, $main::routeroot, @rout) if @rout;
-
 	# I was the last node visited
     $self->user->node($main::mycall);
 		
@@ -519,7 +527,11 @@ sub disconnect
 sub prompt
 {
 	my $self = shift;
-	$self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call, cldate($main::systime), ztime($main::systime)));
+	if ($self->{prompt}) {
+		$self->send($self->{prompt});
+	} else {
+		$self->send($self->msg($self->here ? 'pr' : 'pr2', $self->call, cldate($main::systime), ztime($main::systime)));
+	}
 }
 
 # broadcast a message to all users [except those mentioned after buffer]
@@ -785,7 +797,13 @@ sub dx_spot
 		return unless $filter;
 	}
 
-	my $buf = Spot::formatb($self->{user}->wantgrid, $_[0], $_[1], $_[2], $_[3], $_[4]);
+
+	my $t = ztime($_[2]);
+	my $ref = DXUser->get_current($_[4]);
+	my $loc = $ref->qra if $ref && $ref->qra && $self->{user}->wantgrid;
+	$loc = ' ' . substr($loc, 0, 4) if $loc;
+	$loc = "" unless $loc;
+	my $buf = sprintf "DX de %-7.7s%11.1f  %-12.12s %-*s $t$loc", "$_[4]:", $_[0], $_[1], $self->{consort} eq 'local' ? 29 : 30, $_[3];
 	$buf .= "\a\a" if $self->{beep};
 	$buf =~ s/\%5E/^/g;
 	$self->local_send('X', $buf);