X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=remoteglot.pl;h=b36487d2987cad84a4654741e8eb594c95fe5ec9;hb=260c0217da4894edb753c7171d9aa2a3c65816df;hp=9d88db75727817d0324f7c315e301e2f5b95fa22;hpb=195648946e62e7841af4af86601bde2ab281c5df;p=remoteglot

diff --git a/remoteglot.pl b/remoteglot.pl
index 9d88db7..b36487d 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,6 +374,8 @@ sub style12_to_fen {
 	$fen .= $x[26];
 
 	$pos{'fen'} = $fen;
+	$pos{'move_num'} = $x[26];
+	$pos{'last_move'} = $x[29];
 
 	return \%pos;
 }
@@ -517,12 +568,22 @@ sub output_screen {
 		return;
 	}
 
-	my $text = '';
+	my $text = 'Analysis';
+	if ($pos_calculating->{'last_move'} ne 'none') {
+		if ($pos_calculating->{'toplay'} eq 'W') {
+			$text .= sprintf ' after %u. ... %s', ($pos_calculating->{'move_num'}-1), $pos_calculating->{'last_move'};
+		} else {
+			$text .= sprintf ' after %u. %s', $pos_calculating->{'move_num'}, $pos_calculating->{'last_move'};
+		}
+		if (exists($uciid{'name'})) {
+			$text .= ',';
+		}
+	}
 
 	if (exists($uciid{'name'})) {
-		$text .= "Analysis by $uciid{'name'}:\n\n";
+		$text .= " by $uciid{'name'}:\n\n";
 	} else {
-		$text .= "Analysis:\n\n";
+		$text .= ":\n\n";
 	}
 
 	return unless (exists($pos_calculating->{'board'}));
@@ -838,7 +899,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 {