X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=1561ac338d0a615eef815bc0e324ea6e3b736ef2;hp=36af4ed093e7af20f95bb83b7d17b878ca092498;hb=89ed095b76d91d5bccfcec86fa3962d48c6f8b56;hpb=738f28c8ecc383040f5adf71f30e2ab0e51e3047

diff --git a/remoteglot.pl b/remoteglot.pl
index 36af4ed..1561ac3 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -490,25 +490,28 @@ sub output_screen {
 	}
 
 	return unless (exists($ficsinfo{'board'}));
+		
+	#
+	# Some programs _always_ report MultiPV, even with only one PV.
+	# In this case, we simply use that data as if MultiPV was never
+	# specified.
+	#
+	if (exists($uciinfo{'pv1'}) && !exists($uciinfo{'pv2'})) {
+		for my $key qw(pv score_cp score_mate nodes nps depth seldepth tbhits) {
+			if (exists($uciinfo{$key . '1'}) && !exists($uciinfo{$key})) {
+				$uciinfo{$key} = $uciinfo{$key . '1'};
+			}
+		}
+	}
 
 	if (exists($uciinfo{'pv1'}) && exists($uciinfo{'pv2'})) {
 		# multi-PV
 		my $mpv = 1;
 		while (exists($uciinfo{'pv' . $mpv})) {
 			$text .= sprintf "  PV%2u", $mpv;
+			my $score = short_score(\%uciinfo, \%ficsinfo, $mpv);
+			$text .= "  ($score)" if (defined($score));
 
-			if (defined($uciinfo{'score_mate' . $mpv})) {
-				$text .= sprintf " (M%3d)", $uciinfo{'score_mate' . $mpv};
-			} else {
-				if (exists($uciinfo{'score_cp' . $mpv})) {
-					my $score = $uciinfo{'score_cp' . $mpv} * 0.01;
-					if ($ficsinfo{'toplay'} eq 'B') {
-						$score = -$score;
-					}
-					$text .= sprintf " (%+5.2f)", $score;
-				}
-			}
-			
 			if (exists($uciinfo{'nodes' . $mpv}) && exists($uciinfo{'nps' . $mpv}) && exists($uciinfo{'depth' . $mpv})) {
 				$text .= sprintf " (%5u kn, %3u kn/s, %2u ply)",
 					$uciinfo{'nodes' . $mpv} / 1000, $uciinfo{'nps' . $mpv} / 1000, $uciinfo{'depth' . $mpv};
@@ -520,40 +523,9 @@ sub output_screen {
 			++$mpv;
 		}
 	} else {
-		#
-		# Some programs _always_ report MultiPV, even with only one PV.
-		# In this case, we simply use that data as if MultiPV was never
-		# specified.
-		#
-		if (exists($uciinfo{'pv1'})) {
-			for my $key qw(pv score_cp score_mate nodes nps depth seldepth tbhits) {
-				if (exists($uciinfo{$key . '1'}) && !exists($uciinfo{$key})) {
-					$uciinfo{$key} = $uciinfo{$key . '1'};
-				}
-			}
-		}
-
 		# single-PV
-		if (defined($uciinfo{'score_mate'})) {
-			my $mate = $uciinfo{'score_mate'};
-			if ($ficsinfo{'toplay'} eq 'B') {
-				$mate = -$mate;
-			}
-			if ($mate > 0) {
-				$text .= sprintf "  White mates in %u\n", $mate;
-			} else {
-				$text .= sprintf "  Black mates in %u\n", -$mate;
-			}
-		} else {
-			if (exists($uciinfo{'score_cp'})) {
-				my $score = $uciinfo{'score_cp'} * 0.01;
-				if ($ficsinfo{'toplay'} eq 'B') {
-					$score = -$score;
-				}
-				$text .= sprintf "  Score: %+5.2f\n", $score;
-			}
-		}
-
+		my $score = long_score(\%uciinfo, \%ficsinfo, '');
+		$text .= "  $score\n" if defined($score);
 		$text .=  "  PV: " . join(', ', prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv'}}));
 		$text .=  "\n";
 
@@ -576,15 +548,54 @@ sub output_screen {
 		$last_text = $text;
 	}
 
+	# Now construct the tell text, if any
+	return if (!defined($telltarget));
+
+	my $tell_text = '';
+
+	if (exists($uciid{'name'})) {
+		$tell_text .= "Analysis by $uciid{'name'} -- see http://analysis.sesse.net/ for more information\n";
+	} else {
+		$tell_text .= "Computer analysis -- http://analysis.sesse.net/ for more information\n";
+	}
+
+	if (exists($uciinfo{'pv1'}) && exists($uciinfo{'pv2'})) {
+		# multi-PV
+		my $mpv = 1;
+		while (exists($uciinfo{'pv' . $mpv})) {
+			$tell_text .= sprintf "  PV%2u", $mpv;
+			my $score = short_score(\%uciinfo, \%ficsinfo, $mpv);
+			$tell_text .= "  ($score)" if (defined($score));
+
+			if (exists($uciinfo{'depth' . $mpv})) {
+				$tell_text .= sprintf " (%2u ply)", $uciinfo{'depth' . $mpv};
+			}
+
+			$tell_text .= ": ";
+			$tell_text .= join(', ', prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv' . $mpv}}));
+			$tell_text .= "\n";
+			++$mpv;
+		}
+	} else {
+		# single-PV
+		my $score = long_score(\%uciinfo, \%ficsinfo, '');
+		$tell_text .= "  $score\n" if defined($score);
+		$tell_text .= "  PV: " . join(', ', prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv'}}));
+		if (exists($uciinfo{'depth'})) {
+			$tell_text .= sprintf " (depth %u ply)", $uciinfo{'depth'};
+		}
+		$tell_text .=  "\n";
+	}
+
 	# see if a new tell is called for -- it is if the delay has expired _and_
 	# this is not simply a repetition of the last one
-	if ($last_told_text ne $text && defined($telltarget)) {
+	if ($last_told_text ne $tell_text) {
 		my $now = time;
 		for my $iv (@tell_intervals) {
 			last if ($now - $last_move < $iv);
 			next if ($last_tell - $last_move >= $iv);
 
-			for my $line (split /\n/, $text) {
+			for my $line (split /\n/, $tell_text) {
 				$t->print("tell $telltarget [$target] $line");
 			}
 
@@ -788,3 +799,47 @@ sub uciprint {
 	print UCIWRITE "$msg\n";
 	print UCILOG "=> $msg\n";
 }
+
+sub short_score {
+	my ($uciinfo, $ficsinfo, $mpv) = @_;
+
+	if (defined($uciinfo{'score_mate' . $mpv})) {
+		return sprintf "M%3d", $uciinfo{'score_mate' . $mpv};
+	} else {
+		if (exists($uciinfo{'score_cp' . $mpv})) {
+			my $score = $uciinfo{'score_cp' . $mpv} * 0.01;
+			if ($ficsinfo{'toplay'} eq 'B') {
+				$score = -$score;
+			}
+			return sprintf "%+5.2f", $score;
+		}
+	}
+
+	return undef;
+}
+
+sub long_score {
+	my ($uciinfo, $ficsinfo, $mpv) = @_;
+
+	if (defined($uciinfo{'score_mate' . $mpv})) {
+		my $mate = $uciinfo{'score_mate' . $mpv};
+		if ($ficsinfo{'toplay'} eq 'B') {
+			$mate = -$mate;
+		}
+		if ($mate > 0) {
+			return sprintf "White mates in %u", $mate;
+		} else {
+			return sprintf "Black mates in %u", -$mate;
+		}
+	} else {
+		if (exists($uciinfo{'score_cp' . $mpv})) {
+			my $score = $uciinfo{'score_cp' . $mpv} * 0.01;
+			if ($ficsinfo{'toplay'} eq 'B') {
+				$score = -$score;
+			}
+			return sprintf "Score: %+5.2f", $score;
+		}
+	}
+
+	return undef;
+}