X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=691e29b2d6b3fa928933a878ec07221b579957da;hb=refs%2Fheads%2Fnewpc92timings;hp=528067061a52332a7c9c7b4a5659a9407e05a055;hpb=ae313f260d904cd45b58e4d1e620a49aef1a42c9;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 52806706..691e29b2 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1998 Dirk Koopman G1TLH
 #
-# $Id$
+#
 # 
 
 package DXCommandmode;
@@ -54,12 +54,6 @@ $cmdimportdir = "$main::root/cmd_import"; # the base directory for importing com
                                           # this does not exist as default, you need to create it manually
 					  #
 
-use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 #
 # obtain a new connection this is derived from dxchannel
 #
@@ -71,11 +65,15 @@ sub new
 	# routing, this must go out here to prevent race condx
 	my $pkg = shift;
 	my $call = shift;
-	my @rout = $main::routeroot->add_user($call, Route::here(1));
+#	my @rout = $main::routeroot->add_user($call, Route::here(1));
+	DXProt::_add_thingy($main::routeroot, [$call, 0, 0, 1]);
 
 	# ALWAYS output the user
 	my $ref = Route::User::get($call);
-	$main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref) if $ref;
+	if ($ref) {
+		$main::me->route_pc16($main::mycall, undef, $main::routeroot, $ref);
+		$main::me->route_pc92a($main::mycall, undef, $main::routeroot, $ref) unless $DXProt::pc92_slug_changes;
+	}
 
 	return $self;
 }
@@ -305,10 +303,14 @@ sub normal
 		$self->conn->{echo} = $self->conn->{decho};
 		delete $self->conn->{decho};
 		$self->state('prompt');
-	} elsif ($self->{state} eq 'talk') {
+	} elsif ($self->{state} eq 'talk' || $self->{state} eq 'chat') {
 		if ($cmdline =~ m{^(?:/EX|/ABORT)}i) {
 			for (@{$self->{talklist}}) {
-				$self->send_talks($_,  $self->msg('talkend'));
+				if ($self->{state} eq 'talk') {
+					$self->send_talks($_,  $self->msg('talkend'));
+				} else {
+					$self->local_send('C', $self->msg('chatend', $_));
+				}
 			}
 			$self->state('prompt');
 			delete $self->{talklist};
@@ -325,12 +327,16 @@ sub normal
 						LogDbg('DXCommand', "$self->{call} swore: $l with words:" . join(',', @bad) . ")");
 					} else {
 						for (@{$self->{talklist}}) {
-							$self->send_talks($_, $l);
+							if ($self->{state} eq 'talk') {
+								$self->send_talks($_, $l);
+							} else {
+								send_chats($self, $_, $l)
+							}
 						}
 					}
 				}
 			}
-			$self->send($self->talk_prompt);
+			$self->send($self->{state} eq 'talk' ? $self->talk_prompt : $self->chat_prompt);
 		} elsif ($self->{talklist} && @{$self->{talklist}}) {
 			# send what has been said to whoever is in this person's talk list
 			my @bad;
@@ -339,10 +345,15 @@ sub normal
 				LogDbg('DXCommand', "$self->{call} swore: $cmdline with words:" . join(',', @bad) . ")");
 			} else {
 				for (@{$self->{talklist}}) {
-					$self->send_talks($_, $rawline);
+					if ($self->{state} eq 'talk') {
+						$self->send_talks($_, $rawline);
+					} else {
+						send_chats($self, $_, $rawline);
+					}
 				}
 			}
 			$self->send($self->talk_prompt) if $self->{state} eq 'talk';
+			$self->send($self->chat_prompt) if $self->{state} eq 'chat';
 		} else {
 			# for safety
 			$self->state('prompt');
@@ -384,11 +395,11 @@ sub send_talks
 	
 	my ($to, $via) = $ent =~ /(\S+)>(\S+)/;
 	$to = $ent unless $to;
-	my $call = $via ? $via : $to;
+	my $call = $via && $via ne '*' ? $via : $to;
 	my $clref = Route::get($call);
 	my $dxchan = $clref->dxchan if $clref;
 	if ($dxchan) {
-		$dxchan->talk($self->{call}, $to, $via, $line);
+		$dxchan->talk($self->{call}, $to, undef, $line);
 	} else {
 		$self->send($self->msg('disc2', $via ? $via : $to));
 		my @l = grep { $_ ne $ent } @{$self->{talklist}};
@@ -401,16 +412,40 @@ sub send_talks
 	}
 }
 
-sub talk_prompt
+sub send_chats
+{
+	my $self = shift;
+	my $target = shift;
+	my $text = shift;
+
+	my $msgid = DXProt::nextchatmsgid();
+	$text = "#$msgid $text";
+	$main::me->normal(DXProt::pc93($target, $self->{call}, undef, $text));
+}
+
+sub special_prompt
 {
 	my $self = shift;
+	my $prompt = shift;
 	my @call;
 	for (@{$self->{talklist}}) {
 		my ($to, $via) = /(\S+)>(\S+)/;
 		$to = $_ unless $to;
 		push @call, $to;
 	}
-	return $self->msg('talkprompt', join(',', @call));
+	return $self->msg($prompt, join(',', @call));
+}
+
+sub talk_prompt
+{
+	my $self = shift;
+	return $self->special_prompt('talkprompt');
+}
+
+sub chat_prompt
+{
+	my $self = shift;
+	return $self->special_prompt('chatprompt');
 }
 
 #
@@ -572,11 +607,14 @@ sub disconnect
 	my $uref = Route::User::get($call);
 	my @rout;
 	if ($uref) {
-		@rout = $main::routeroot->del_user($uref);
+#		@rout = $main::routeroot->del_user($uref);
+		@rout = DXProt::_del_thingy($main::routeroot, [$call, 0]);
+
 		dbg("B/C PC17 on $main::mycall for: $call") if isdbg('route');
 
 		# issue a pc17 to everybody interested
 		$main::me->route_pc17($main::mycall, undef, $main::routeroot, $uref);
+		$main::me->route_pc92d($main::mycall, undef, $main::routeroot, $uref) unless $DXProt::pc92_slug_changes;
 	} else {
 		confess "trying to disconnect a non existant user $call";
 	}
@@ -815,7 +853,7 @@ sub send
 sub local_send
 {
 	my ($self, $let, $buf) = @_;
-	if ($self->{state} eq 'prompt' || $self->{state} eq 'talk') {
+	if ($self->{state} eq 'prompt' || $self->{state} eq 'talk' || $self->{state} eq 'chat') {
 		if ($self->{enhanced}) {
 			$self->send_later($let, $buf);
 		} else {
@@ -829,16 +867,16 @@ sub local_send
 # send a talk message here
 sub talk
 {
-	my ($self, $from, $to, $via, $line) = @_;
+	my ($self, $from, $to, $via, $line, $onode) = @_;
 	$line =~ s/\\5E/\^/g;
 	if ($self->{talk}) {
 		if ($self->{gtk}) {
-			$self->local_send('T', dd(['talk',$to,$from,$via,$line,@_]));
+			$self->local_send('T', dd(['talk',$to,$from,$via,$line]));
 		} else {
 			$self->local_send('T', "$to de $from: $line");
 		}
 	}
-	Log('talk', $to, $from, $via?$via:$main::mycall, $line);
+	Log('talk', $to, $from, '<' . ($onode || '*'), $line);
 	# send a 'not here' message if required
 	unless ($self->{here} && $from ne $to) {
 		my $key = "$to$from";
@@ -922,9 +960,9 @@ sub format_dx_spot
 	my $t = ztime($_[2]);
 	my $loc = '';
 	my $clth = $self->{consort} eq 'local' ? 29 : 30;
-	my $comment = substr $_[3], 0, $clth; 
+	my $comment = substr (($_[3] || ''), 0, $clth);
 	$comment .= ' ' x ($clth - length($comment));
-	if ($self->{user}->wantgrid) { 
+	if ($self->{user}->wantgrid) {
 		my $ref = DXUser->get_current($_[4]);
 		if ($ref) {
 			$loc = $ref->qra || '';
@@ -1050,9 +1088,9 @@ sub broadcast_debug
 	foreach my $dxchan (DXChannel::get_all) {
 		next unless $dxchan->{enhanced} && $dxchan->{senddbg};
 		if ($dxchan->{gtk}) {
-			$dxchan->local_send('L', dd(['db', $s]));
+			$dxchan->send_later('L', dd(['db', $s]));
 		} else {
-			$dxchan->local_send('L', $s);
+			$dxchan->send_later('L', $s);
 		}
 	}
 }
@@ -1173,5 +1211,12 @@ sub import_cmd
 		}
 	}
 }
+
+sub print_find_reply
+{
+	my ($self, $node, $target, $flag, $ms) = @_;
+	my $sort = $flag == 2 ? "External" : "Local";
+	$self->send("$sort $target found at $node in $ms ms" );
+}
 1;
 __END__