]> git.sesse.net Git - remoteglot/blobdiff - remoteglot.pl
Print number annotations in the PVs. Not happy, will revert.
[remoteglot] / remoteglot.pl
old mode 100644 (file)
new mode 100755 (executable)
index a2a5e5e..1b2e49a
@@ -16,14 +16,30 @@ use Time::HiRes;
 use strict;
 use warnings;
 
+# Configuration
+my $server = "freechess.org";
+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(); };
 
 $| = 1;
 
-my $server = "freechess.org";
-my $target = "Sesse";
-# my $engine = "/usr/games/toga2";
-my $engine = "wine Rybkav2.3.2a.mp.w32.exe";
+open(FICSLOG, ">ficslog.txt")
+       or die "ficslog.txt: $!";
+print FICSLOG "Log starting.\n";
+select(FICSLOG);
+$| = 1;
 
 open(UCILOG, ">ucilog.txt")
        or die "ucilog.txt: $!";
@@ -35,18 +51,26 @@ select(STDOUT);
 # open the chess engine
 my $pid = IPC::Open2::open2(*UCIREAD, *UCIWRITE, $engine);
 my %uciinfo = ();
-my %ficsinfo = ();
+my %uciid = ();
+my ($last_move, $last_tell);
+my $last_text = '';
+my $last_told_text = '';
+my ($pos_waiting, $pos_calculating);
 
 uciprint("uci");
 
 # gobble the options
 while (<UCIREAD>) {
        /uciok/ && last;
+       handle_uci($_);
 }
 
 uciprint("setoption name UCI_AnalyseMode value true");
+# uciprint("setoption name Preserve Analysis value true");
 uciprint("setoption name NalimovPath value c:\\nalimov");
-uciprint("setoption name NalimovUsage value Normally");
+uciprint("setoption name NalimovUsage value Rarely");
+uciprint("setoption name Hash value 1024");
+uciprint("setoption name MultiPV value 3");
 # uciprint("setoption name Contempt value 1000");
 # uciprint("setoption name Outlook value Ultra Optimistic");
 uciprint("ucinewgame");
@@ -55,7 +79,7 @@ print "Chess engine ready.\n";
 
 # now talk to FICS
 my $t = Net::Telnet->new(Timeout => 10, Prompt => '/fics% /');
-#$t->input_log(\*STDOUT);
+$t->input_log(\*FICSLOG);
 $t->open($server);
 $t->print("guest");
 $t->waitfor('/Press return to enter the server/');
@@ -85,10 +109,64 @@ while (1) {
                chomp $line;
                $line =~ tr/\r//d;
                if ($line =~ /^<12> /) {
-                       my $fen = style12_to_fen($line);
-                       uciprint("stop");
-                       uciprint("position fen $fen");
-                       uciprint("go infinite");
+                       my $pos = style12_to_fen($line);
+                       
+                       # if this is already in the queue, ignore it
+                       next if (defined($pos_waiting) && $pos->{'fen'} eq $pos_waiting->{'fen'});
+
+                       # if we're already chewing on this and there's nothing else in the queue,
+                       # also ignore it
+                       next if (!defined($pos_waiting) && defined($pos_calculating) &&
+                                $pos->{'fen'} eq $pos_calculating->{'fen'});
+
+                       # if we're already thinking on something, stop and wait for the engine
+                       # to approve
+                       if (defined($pos_calculating)) {
+                               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"),
+                               # but it's easier
+                               uciprint("position fen " . $pos->{'fen'});
+                               uciprint("go infinite");
+                               $pos_calculating = $pos;
+                       }
+
+                       %uciinfo = ();
+                       $last_move = time;
+
+                       # 
+                       # Output a command every move to note that we're
+                       # still paying attention -- this is a good tradeoff,
+                       # since if no move has happened in the last half
+                       # hour, the analysis/relay has most likely stopped
+                       # and we should stop hogging server resources.
+                       #
+                       $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;
@@ -96,16 +174,28 @@ while (1) {
        
        # any fun on the UCI channel?
        if ($nfound > 0 && vec($rout, fileno(UCIREAD), 1) == 1) {
-               my $line = <UCIREAD>;
-               chomp $line;
-               $line =~ tr/\r//d;
-               print UCILOG "<= $line\n";
-               if ($line =~ /^info/) {
-                       my (@infos) = split / /, $line;
-                       shift @infos;
+               # 
+               # 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";
+                       }
 
-                       parse_infos(@infos);
+                       $line .= $tmp;
                }
+
+               $line =~ tr/\r\n//d;
+               handle_uci($line);
                $sleep = 0;
 
                # don't update too often
@@ -115,29 +205,70 @@ while (1) {
        sleep $sleep;
 }
 
+sub handle_uci {
+       my ($line) = @_;
+
+       chomp $line;
+       $line =~ tr/\r//d;
+       print UCILOG localtime() . " <= $line\n";
+       if ($line =~ /^info/) {
+               my (@infos) = split / /, $line;
+               shift @infos;
+
+               parse_infos(@infos);
+       }
+       if ($line =~ /^id/) {
+               my (@ids) = split / /, $line;
+               shift @ids;
+
+               parse_ids(@ids);
+       }
+       if ($line =~ /^bestmove/ && $uci_assume_full_compliance) {
+               if (defined($pos_waiting)) {
+                       uciprint("position fen " . $pos_waiting->{'fen'});
+                       uciprint("go infinite");
+
+                       $pos_calculating = $pos_waiting;
+                       $pos_waiting = undef;
+               }
+       }
+}
+
 sub parse_infos {
        my (@x) = @_;
+       my $mpv = '';
 
        while (scalar @x > 0) {
-               if ($x[0] =~ /^(currmove|currmovenumber|time|nodes|nps|cpuload|hashfull|depth|seldepth|multipv|time|tbhits)$/) {
+               if ($x[0] =~ 'multipv') {
+                       shift @x;
+                       $mpv = shift @x;
+                       next;
+               }
+               if ($x[0] =~ /^(currmove|currmovenumber|cpuload)$/) {
                        my $key = shift @x;
                        my $value = shift @x;
                        $uciinfo{$key} = $value;
                        next;
                }
+               if ($x[0] =~ /^(depth|seldepth|hashfull|time|nodes|nps|tbhits)$/) {
+                       my $key = shift @x;
+                       my $value = shift @x;
+                       $uciinfo{$key . $mpv} = $value;
+                       next;
+               }
                if ($x[0] eq 'score') {
                        shift @x;
 
-                       delete $uciinfo{'score_cp'};
-                       delete $uciinfo{'score_mate'};
+                       delete $uciinfo{'score_cp' . $mpv};
+                       delete $uciinfo{'score_mate' . $mpv};
 
                        while ($x[0] =~ /^(cp|mate|lowerbound|upperbound)$/) {
                                if ($x[0] eq 'cp') {
                                        shift @x;
-                                       $uciinfo{'score_cp'} = shift @x;
+                                       $uciinfo{'score_cp' . $mpv} = shift @x;
                                } elsif ($x[0] eq 'mate') {
                                        shift @x;
-                                       $uciinfo{'score_mate'} = shift @x;
+                                       $uciinfo{'score_mate' . $mpv} = shift @x;
                                } else {
                                        shift @x;
                                }
@@ -145,7 +276,7 @@ sub parse_infos {
                        next;
                }
                if ($x[0] eq 'pv') {
-                       $uciinfo{'pv'} = [ @x[1..$#x] ];
+                       $uciinfo{'pv' . $mpv} = [ @x[1..$#x] ];
                        last;
                }
                if ($x[0] eq 'string' || $x[0] eq 'UCI_AnalyseMode' || $x[0] eq 'setting' || $x[0] eq 'contempt') {
@@ -159,12 +290,29 @@ sub parse_infos {
        }
 }
 
+sub parse_ids {
+       my (@x) = @_;
+
+       while (scalar @x > 0) {
+               if ($x[0] =~ /^(name|author)$/) {
+                       my $key = shift @x;
+                       my $value = join(' ', @x);
+                       $uciid{$key} = $value;
+                       last;
+               }
+
+               # unknown
+               shift @x;
+       }
+}
+
 sub style12_to_fen {
-       my $str = shift; 
+       my $str = shift;
+       my %pos = ();
        my (@x) = split / /, $str;
        
-       $ficsinfo{'board'} = [ @x[1..8] ];
-       $ficsinfo{'toplay'} = $x[9];
+       $pos{'board'} = [ @x[1..8] ];
+       $pos{'toplay'} = $x[9];
        
        # the board itself
        my (@board) = @x[1..8];
@@ -198,7 +346,7 @@ sub style12_to_fen {
                } else {
                        $nep .= "6";
                }
-               
+
                #
                # Showing the en passant square when actually no capture can be made
                # seems to confuse at least Rybka. Thus, check if there's actually
@@ -207,11 +355,11 @@ sub style12_to_fen {
                # "right" thing as per the standard, though.
                #
                if ($x[9] eq 'B') {
-                       $ep = $nep if ($col > 0 && substr($board[4], $col-1, 1) eq 'p');
-                       $ep = $nep if ($col < 7 && substr($board[4], $col+1, 1) eq 'p');
+                       $ep = $nep if ($col > 0 && substr($pos{'board'}[4], $col-1, 1) eq 'p');
+                       $ep = $nep if ($col < 7 && substr($pos{'board'}[4], $col+1, 1) eq 'p');
                } else {
-                       $ep = $nep if ($col > 0 && substr($board[3], $col-1, 1) eq 'P');
-                       $ep = $nep if ($col < 7 && substr($board[3], $col+1, 1) eq 'P');
+                       $ep = $nep if ($col > 0 && substr($pos{'board'}[3], $col-1, 1) eq 'P');
+                       $ep = $nep if ($col < 7 && substr($pos{'board'}[3], $col+1, 1) eq 'P');
                }
        }
        $fen .= " ";
@@ -225,16 +373,45 @@ sub style12_to_fen {
        $fen .= " ";
        $fen .= $x[26];
 
-       return $fen;
+       $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;
        my $from_col = ord(substr($pv, 0, 1)) - ord('a');
        my $from_row = 7 - (ord(substr($pv, 1, 1)) - ord('1'));
@@ -244,10 +421,18 @@ sub prettyprint_pv {
        my $pretty;
        my $piece = substr($board->[$from_row], $from_col, 1);
 
+       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') {
-               my @nb = @$board;
-
                # king
                substr($nb[7], 4, 1, '-');
                substr($nb[7], 6, 1, $piece);
@@ -256,59 +441,62 @@ 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
-       if ($pv eq 'e1b1' && $piece eq 'K') {
-               my @nb = @$board;
-
+       if ($pv eq 'e1c1' && $piece eq 'K') {
                # king
                substr($nb[7], 4, 1, '-');
                substr($nb[7], 2, 1, $piece);
                
                # rook
                substr($nb[7], 0, 1, '-');
-               substr($nb[7], 2, 1, 'R');
+               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
        if ($pv eq 'e8g8' && $piece eq 'k') {
-               my @nb = @$board;
-
                # king
                substr($nb[0], 4, 1, '-');
                substr($nb[0], 6, 1, $piece);
                
                # rook
                substr($nb[0], 7, 1, '-');
-               substr($nb[0], 5, 1, 'R');
+               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
-       if ($pv eq 'e8b8' && $piece eq 'k') {
-               my @nb = @$board;
-
+       if ($pv eq 'e8c8' && $piece eq 'k') {
                # king
                substr($nb[0], 4, 1, '-');
                substr($nb[0], 2, 1, $piece);
                
                # rook
                substr($nb[0], 0, 1, '-');
-               substr($nb[0], 2, 1, 'R');
+               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
        if (lc($piece) eq 'p') {
                # attack?
-               if (substr($board->[$to_row], $to_col, 1) ne '-') {
+               if ($from_col != $to_col) {
                        $pretty = substr($pv, 0, 1) . 'x' . substr($pv, 2, 2);
+
+                       # en passant?
+                       if (substr($board->[$to_row], $to_col, 1) eq '-') {
+                               if ($piece eq 'p') {
+                                       substr($nb[$to_row + 1], $to_col, 1, '-');
+                               } else {
+                                       substr($nb[$to_row - 1], $to_col, 1, '-');
+                               }
+                       }
                } else {
                        $pretty = substr($pv, 2, 2);
 
@@ -370,7 +558,6 @@ sub prettyprint_pv {
        }
 
        # update the board
-       my @nb = @$board;
        substr($nb[$from_row], $from_col, 1, '-');
        substr($nb[$to_row], $to_col, 1, $piece);
 
@@ -380,33 +567,188 @@ sub prettyprint_pv {
                $pretty .= '+';
        }
 
-       return ($pretty, prettyprint_pv(\@nb, @pvs));
+       return ($prefix . $pretty, prettyprint_pv(\@nb, $next_move, $next_toplay, @pvs));
 }
 
 sub output_screen {
        #return;
+       
+       return if (!defined($pos_calculating));
+
+       #
+       # Check the PVs first. if they're invalid, just wait, as our data
+       # is most likely out of sync. This isn't a very good solution, as
+       # it can frequently miss stuff, but it's good enough for most users.
+       #
+       eval {
+               my $dummy;
+               if (exists($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'},
+                               $pos_calculating->{'move_num'},
+                               $pos_calculating->{'toplay'},
+                               @{$uciinfo{'pv' . $mpv}});
+                       ++$mpv;
+               }
+       };
+       if ($@) {
+               %uciinfo = ();
+               return;
+       }
+
+       my $text = '';
 
-       print  "\ecAnalysis:\n";
-       if (defined($uciinfo{'score_mate'})) {
-               printf "  Mate in %d\n", $uciinfo{'score_mate'};
+       if (exists($uciid{'name'})) {
+               $text .= "Analysis by $uciid{'name'}:\n\n";
        } else {
-               my $score = $uciinfo{'score_cp'} * 0.01;
-               if ($ficsinfo{'toplay'} eq 'B') {
-                       $score = -$score;
+               $text .= "Analysis:\n\n";
+       }
+
+       return unless (exists($pos_calculating->{'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'};
+                       }
                }
-               printf "  Score: %+5.2f\n", $score;
        }
-       print  "  PV: ", join(', ', prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv'}}));
-       print  "\n";
-       printf "  %u nodes, %7u nodes/sec, depth %u ply",
-               $uciinfo{'nodes'}, $uciinfo{'nps'}, $uciinfo{'depth'};
-       if (exists($uciinfo{'tbhits'})) {
-               printf ", %u Nalimov hits", $uciinfo{'tbhits'};
+                       
+       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{'seldepth'})) {
-               printf " (%u selective)", $uciinfo{'seldepth'};
+
+       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, $pos_calculating, $mpv);
+                       $text .= "  ($score)" if (defined($score));
+
+                       my $tbhits = '';
+                       if (exists($uciinfo{'tbhits' . $mpv})) {
+                               $tbhits = sprintf ", %u tbhits", $uciinfo{'tbhits' . $mpv};
+                       }
+
+                       if (exists($uciinfo{'nodes' . $mpv}) && exists($uciinfo{'nps' . $mpv}) && exists($uciinfo{'depth' . $mpv})) {
+                               $text .= sprintf " (%5u kn, %3u kn/s, %2u ply$tbhits)",
+                                       $uciinfo{'nodes' . $mpv} / 1000, $uciinfo{'nps' . $mpv} / 1000, $uciinfo{'depth' . $mpv};
+                       }
+
+                       $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: $text_pvs[0]\n";
+
+               if (exists($uciinfo{'nodes'}) && exists($uciinfo{'nps'}) && exists($uciinfo{'depth'})) {
+                       $text .= sprintf "  %u nodes, %7u nodes/sec, depth %u ply",
+                               $uciinfo{'nodes'}, $uciinfo{'nps'}, $uciinfo{'depth'};
+               }
+               if (exists($uciinfo{'tbhits'})) {
+                       $text .= sprintf ", %u Nalimov hits", $uciinfo{'tbhits'};
+               }
+               if (exists($uciinfo{'seldepth'})) {
+                       $text .= sprintf " (%u selective)", $uciinfo{'seldepth'};
+               }
+               $text .=  "\n\n";
+       }
+
+       if ($last_text ne $text) {
+               print "\e[H\e[2J"; # clear the screen
+               print $text;
+               $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, $pos_calculating, $mpv);
+                       $tell_text .= "  ($score)" if (defined($score));
+
+                       if (exists($uciinfo{'depth' . $mpv})) {
+                               $tell_text .= sprintf " (%2u ply)", $uciinfo{'depth' . $mpv};
+                       }
+
+                       $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: $text_pvs[0]";
+               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 $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/, $tell_text) {
+                               $t->print("tell $telltarget [$target] $line");
+                       }
+
+                       $last_told_text = $text;
+                       $last_tell = $now;
+
+                       last;
+               }
        }
-       print  "\n\n";
 }
 
 sub find_kings {
@@ -474,7 +816,7 @@ sub in_check {
        for my $row (0..7) {
                for my $col (0..7) {
                        my $piece = substr($board->[$row], $col, 1);
-                       next if ($piece eq '-' || lc($piece) eq 'k');
+                       next if ($piece eq '-');
                
                        if (uc($piece) eq $piece) {
                                # white piece
@@ -599,5 +941,49 @@ sub can_reach {
 sub uciprint {
        my $msg = shift;
        print UCIWRITE "$msg\n";
-       print UCILOG "=> $msg\n";
+       print UCILOG localtime() . " => $msg\n";
+}
+
+sub short_score {
+       my ($uciinfo, $pos, $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 ($pos->{'toplay'} eq 'B') {
+                               $score = -$score;
+                       }
+                       return sprintf "%+5.2f", $score;
+               }
+       }
+
+       return undef;
+}
+
+sub long_score {
+       my ($uciinfo, $pos, $mpv) = @_;
+
+       if (defined($uciinfo{'score_mate' . $mpv})) {
+               my $mate = $uciinfo{'score_mate' . $mpv};
+               if ($pos->{'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 ($pos->{'toplay'} eq 'B') {
+                               $score = -$score;
+                       }
+                       return sprintf "Score: %+5.2f", $score;
+               }
+       }
+
+       return undef;
 }