X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=1b2e49a8d89057d6cbe0fc3edaadf21ee8582747;hp=9d88db75727817d0324f7c315e301e2f5b95fa22;hb=6851dc53ed0d8873ee2c7cbbc1422eea752f4a32;hpb=195648946e62e7841af4af86601bde2ab281c5df

diff --git a/remoteglot.pl b/remoteglot.pl
index 9d88db7..1b2e49a 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -18,11 +18,17 @@ use warnings;
 
 # Configuration
 my $server = "freechess.org";
-my $target = "22";
+my $target = "224";
 # my $engine = "/usr/games/toga2";
 my $engine = "wine Rybkav2.3.2a.mp.w32.exe";
 my $telltarget = undef;   # undef to be silent
 my @tell_intervals = (5, 20, 60, 120, 240, 480, 960);  # after each move
+my $uci_assume_full_compliance = 1;                    # dangerous :-)
+my @masters = (
+	'Sesse',
+	'Sessse',
+	'Sesssse'
+);
 
 # Program starts here
 $SIG{ALRM} = sub { output_screen(); };
@@ -60,7 +66,7 @@ while (<UCIREAD>) {
 }
 
 uciprint("setoption name UCI_AnalyseMode value true");
-uciprint("setoption name Preserve Analysis value true");
+# uciprint("setoption name Preserve Analysis value true");
 uciprint("setoption name NalimovPath value c:\\nalimov");
 uciprint("setoption name NalimovUsage value Rarely");
 uciprint("setoption name Hash value 1024");
@@ -116,8 +122,16 @@ while (1) {
 			# if we're already thinking on something, stop and wait for the engine
 			# to approve
 			if (defined($pos_calculating)) {
-				uciprint("stop");
-				$pos_waiting = $pos;
+				if (!defined($pos_waiting)) {
+					uciprint("stop");
+				}
+				if ($uci_assume_full_compliance) {
+					$pos_waiting = $pos;
+				} else {
+					uciprint("position fen " . $pos->{'fen'});
+					uciprint("go infinite");
+					$pos_calculating = $pos;
+				}
 			} else {
 				# it's wrong just to give the FEN (the move history is useful,
 				# and per the UCI spec, we should really have sent "ucinewgame"),
@@ -139,13 +153,48 @@ while (1) {
 			#
 			$t->cmd("date");
 		}
+		if ($line =~ /^([A-Za-z]+)(?:\([A-Z]+\))* tells you: (.*)$/) {
+			my ($who, $msg) = ($1, $2);
+
+			next if (grep { $_ eq $who } (@masters) == 0);
+	
+			if ($msg =~ /^fics (.*?)$/) {
+				$t->cmd("tell $who Executing '$1' on FICS.");
+				$t->cmd($1);
+			} elsif ($msg =~ /^uci (.*?)$/) {
+				$t->cmd("tell $who Sending '$1' to the engine.");
+				print UCIWRITE "$1\n";
+			} else {
+				$t->cmd("tell $who Couldn't understand '$msg', sorry.");
+			}
+		}
 		#print "FICS: [$line]\n";
 		$sleep = 0;
 	}
 	
 	# any fun on the UCI channel?
 	if ($nfound > 0 && vec($rout, fileno(UCIREAD), 1) == 1) {
-		my $line = <UCIREAD>;
+		# 
+		# Read until we've got a full line -- if the engine sends part of
+		# a line and then stops we're pretty much hosed, but that should
+		# never happen.
+		#
+		my $line = '';
+		while ($line !~ /\n/) {
+			my $tmp;
+			my $ret = sysread UCIREAD, $tmp, 1;
+
+			if (!defined($ret)) {
+				next if ($!{EINTR});
+				die "error in reading from the UCI engine: $!";
+			} elsif ($ret == 0) {
+				die "EOF from UCI engine";
+			}
+
+			$line .= $tmp;
+		}
+
+		$line =~ tr/\r\n//d;
 		handle_uci($line);
 		$sleep = 0;
 
@@ -161,7 +210,7 @@ sub handle_uci {
 
 	chomp $line;
 	$line =~ tr/\r//d;
-	print UCILOG "<= $line\n";
+	print UCILOG localtime() . " <= $line\n";
 	if ($line =~ /^info/) {
 		my (@infos) = split / /, $line;
 		shift @infos;
@@ -174,7 +223,7 @@ sub handle_uci {
 
 		parse_ids(@ids);
 	}
-	if ($line =~ /^bestmove/) {
+	if ($line =~ /^bestmove/ && $uci_assume_full_compliance) {
 		if (defined($pos_waiting)) {
 			uciprint("position fen " . $pos_waiting->{'fen'});
 			uciprint("go infinite");
@@ -325,17 +374,42 @@ sub style12_to_fen {
 	$fen .= $x[26];
 
 	$pos{'fen'} = $fen;
+	$pos{'move_num'} = $x[26];
 
 	return \%pos;
 }
 
+sub prefix_pv {
+	my ($move_num, $toplay) = @_;
+
+	if ($toplay eq 'B') {
+		return "$move_num. ..";
+	} else {
+		return "";
+	}
+}
+
 sub prettyprint_pv {
-	my ($board, @pvs) = @_;
-	
+	my ($board, $move_num, $toplay, @pvs) = @_;
+
+	if (!defined($board) || !defined($move_num) || !defined($toplay)) {
+		die "Missing data";
+	}
 	if (scalar @pvs == 0 || !defined($pvs[0])) {
 		return ();
 	}
-	
+
+	my ($prefix, $next_move, $next_toplay);
+	if ($toplay eq 'W') {
+		$prefix = "$move_num.";
+		$next_move = $move_num;
+		$next_toplay = 'B';
+	} else {
+		$prefix = "";
+		$next_move = $move_num + 1;
+		$next_toplay = 'W';
+	}
+
 	my @nb = @$board;
 
 	my $pv = shift @pvs;
@@ -350,6 +424,12 @@ sub prettyprint_pv {
 	if ($piece eq '-') {
 		die "Invalid move";
 	}
+	if ($piece eq uc($piece) && $toplay eq 'B') {
+		die "Black tried to move a white piece";
+	}
+	if ($piece eq lc($piece) && $toplay eq 'W') {
+		die "White tried to move a black piece";
+	}
 
 	# white short castling
 	if ($pv eq 'e1g1' && $piece eq 'K') {
@@ -361,7 +441,7 @@ sub prettyprint_pv {
 		substr($nb[7], 7, 1, '-');
 		substr($nb[7], 5, 1, 'R');
 				
-		return ('0-0', prettyprint_pv(\@nb, @pvs));
+		return ($prefix . '0-0', prettyprint_pv(\@nb, $next_move, $next_toplay, @pvs));
 	}
 
 	# white long castling
@@ -374,7 +454,7 @@ sub prettyprint_pv {
 		substr($nb[7], 0, 1, '-');
 		substr($nb[7], 3, 1, 'R');
 				
-		return ('0-0-0', prettyprint_pv(\@nb, @pvs));
+		return ($prefix . '0-0-0', prettyprint_pv(\@nb, $next_move, $next_toplay, @pvs));
 	}
 
 	# black short castling
@@ -387,7 +467,7 @@ sub prettyprint_pv {
 		substr($nb[0], 7, 1, '-');
 		substr($nb[0], 5, 1, 'r');
 				
-		return ('0-0', prettyprint_pv(\@nb, @pvs));
+		return ($prefix . '0-0', prettyprint_pv(\@nb, $next_move, $next_toplay, @pvs));
 	}
 
 	# black long castling
@@ -400,7 +480,7 @@ sub prettyprint_pv {
 		substr($nb[0], 0, 1, '-');
 		substr($nb[0], 3, 1, 'r');
 				
-		return ('0-0-0', prettyprint_pv(\@nb, @pvs));
+		return ($prefix . '0-0-0', prettyprint_pv(\@nb, $next_move, $next_toplay, @pvs));
 	}
 
 	# check if the from-piece is a pawn
@@ -487,7 +567,7 @@ sub prettyprint_pv {
 		$pretty .= '+';
 	}
 
-	return ($pretty, prettyprint_pv(\@nb, @pvs));
+	return ($prefix . $pretty, prettyprint_pv(\@nb, $next_move, $next_toplay, @pvs));
 }
 
 sub output_screen {
@@ -503,12 +583,18 @@ sub output_screen {
 	eval {
 		my $dummy;
 		if (exists($uciinfo{'pv'})) {
-			$dummy = prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}});
+			$dummy = prettyprint_pv($pos_calculating->{'board'},
+				$pos_calculating->{'move_num'},
+				$pos_calculating->{'toplay'},
+				@{$uciinfo{'pv'}});
 		}
 	
 		my $mpv = 1;
 		while (exists($uciinfo{'pv' . $mpv})) {
-			$dummy = prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}});
+			$dummy = prettyprint_pv($pos_calculating->{'board'},
+				$pos_calculating->{'move_num'},
+				$pos_calculating->{'toplay'},
+				@{$uciinfo{'pv' . $mpv}});
 			++$mpv;
 		}
 	};
@@ -539,6 +625,27 @@ sub output_screen {
 			}
 		}
 	}
+			
+	my @text_pvs = ();
+	if (exists($uciinfo{'pv1'}) && exists($uciinfo{'pv2'})) {
+		# multi-PV
+		my $mpv = 1;
+		while (exists($uciinfo{'pv' . $mpv})) {
+			$text_pvs[$mpv] = prefix_pv($pos_calculating->{'move_num'}, $pos_calculating->{'toplay'}) .
+				join(' ', prettyprint_pv($pos_calculating->{'board'},
+					$pos_calculating->{'move_num'},
+					$pos_calculating->{'toplay'},
+					@{$uciinfo{'pv' . $mpv}}));
+			++$mpv;
+		}
+	} else {
+		# single-PV
+		$text_pvs[0] = prefix_pv($pos_calculating->{'move_num'}, $pos_calculating->{'toplay'}) .
+			join(' ', prettyprint_pv($pos_calculating->{'board'},
+				$pos_calculating->{'move_num'},
+				$pos_calculating->{'toplay'},
+				@{$uciinfo{'pv'}}));
+	}
 
 	if (exists($uciinfo{'pv1'}) && exists($uciinfo{'pv2'})) {
 		# multi-PV
@@ -559,16 +666,14 @@ sub output_screen {
 			}
 
 			$text .= ":\n";
-			$text .= "  " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}})) . "\n";
-			$text .= "\n";
+			$text .= "  $text_pvs[$mpv]\n\n";
 			++$mpv;
 		}
 	} else {
 		# single-PV
 		my $score = long_score(\%uciinfo, $pos_calculating, '');
 		$text .= "  $score\n" if defined($score);
-		$text .=  "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}}));
-		$text .=  "\n";
+		$text .= "  PV: $text_pvs[0]\n";
 
 		if (exists($uciinfo{'nodes'}) && exists($uciinfo{'nps'}) && exists($uciinfo{'depth'})) {
 			$text .= sprintf "  %u nodes, %7u nodes/sec, depth %u ply",
@@ -612,16 +717,14 @@ sub output_screen {
 				$tell_text .= sprintf " (%2u ply)", $uciinfo{'depth' . $mpv};
 			}
 
-			$tell_text .= ": ";
-			$tell_text .= join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}}));
-			$tell_text .= "\n";
+			$tell_text .= ": $text_pvs[$mpv]\n";
 			++$mpv;
 		}
 	} else {
 		# single-PV
 		my $score = long_score(\%uciinfo, $pos_calculating, '');
 		$tell_text .= "  $score\n" if defined($score);
-		$tell_text .= "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}}));
+		$tell_text .= "  PV: $text_pvs[0]";
 		if (exists($uciinfo{'depth'})) {
 			$tell_text .= sprintf " (depth %u ply)", $uciinfo{'depth'};
 		}
@@ -838,7 +941,7 @@ sub can_reach {
 sub uciprint {
 	my $msg = shift;
 	print UCIWRITE "$msg\n";
-	print UCILOG "=> $msg\n";
+	print UCILOG localtime() . " => $msg\n";
 }
 
 sub short_score {