]> git.sesse.net Git - remoteglot/blobdiff - remoteglot.pl
Only truncate history if needed.
[remoteglot] / remoteglot.pl
index cf9d119b52be7e3160b43d8fb1542ac9dd753377..4459015e7c8510de4bf79044480c5e4b88ad4214 100755 (executable)
@@ -9,30 +9,27 @@
 # Licensed under the GNU General Public License, version 2.
 #
 
+use AnyEvent;
+use AnyEvent::Handle;
+use AnyEvent::HTTP;
+use Chess::PGN::Parse;
+use EV;
 use Net::Telnet;
 use FileHandle;
 use IPC::Open2;
 use Time::HiRes;
+use JSON::XS;
+require 'Position.pm';
+require 'Engine.pm';
+require 'config.pm';
 use strict;
 use warnings;
-
-# Configuration
-my $server = "freechess.org";
-my $target = "GMCarlsen";
-my $engine_cmdline = "'./Deep Rybka 4 SSE42 x64'";
-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 = 0;                    # dangerous :-)
-my @masters = (
-       'Sesse',
-       'Sessse',
-       'Sesssse',
-       'greatestguns',
-       'beuki'
-);
+no warnings qw(once);
 
 # Program starts here
-$SIG{ALRM} = sub { output_screen(); };
+$SIG{ALRM} = sub { output(); };
+my $latest_update = undef;
+my $http_timer = undef;
 
 $| = 1;
 
@@ -50,28 +47,34 @@ $| = 1;
 select(STDOUT);
 
 # open the chess engine
-my $engine = open_engine($engine_cmdline);
-my %uciinfo = ();
-my %uciid = ();
-my ($last_move, $last_tell);
+my $engine = open_engine($remoteglotconf::engine_cmdline, 'E1', sub { handle_uci(@_, 1); });
+my $engine2 = open_engine($remoteglotconf::engine2_cmdline, 'E2', sub { handle_uci(@_, 0); });
+my $last_move;
 my $last_text = '';
-my $last_told_text = '';
-my ($pos_waiting, $pos_calculating);
+my ($pos_waiting, $pos_calculating, $pos_calculating_second_engine);
 
 uciprint($engine, "setoption name UCI_AnalyseMode value true");
-# uciprint($engine, "setoption name NalimovPath value /srv/tablebase");
-uciprint($engine, "setoption name NalimovUsage value Rarely");
-uciprint($engine, "setoption name Hash value 1024");
-# uciprint($engine, "setoption name MultiPV value 2");
+while (my ($key, $value) = each %remoteglotconf::engine_config) {
+       uciprint($engine, "setoption name $key value $value");
+}
 uciprint($engine, "ucinewgame");
 
+if (defined($engine2)) {
+       uciprint($engine2, "setoption name UCI_AnalyseMode value true");
+       while (my ($key, $value) = each %remoteglotconf::engine2_config) {
+               uciprint($engine2, "setoption name $key value $value");
+       }
+       uciprint($engine2, "setoption name MultiPV value 500");
+       uciprint($engine2, "ucinewgame");
+}
+
 print "Chess engine ready.\n";
 
 # now talk to FICS
 my $t = Net::Telnet->new(Timeout => 10, Prompt => '/fics% /');
 $t->input_log(\*FICSLOG);
-$t->open($server);
-$t->print("SesseBOT");
+$t->open($remoteglotconf::server);
+$t->print($remoteglotconf::nick);
 $t->waitfor('/Press return to enter the server/');
 $t->cmd("");
 
@@ -79,167 +82,231 @@ $t->cmd("");
 $t->cmd("set shout 0");
 $t->cmd("set seek 0");
 $t->cmd("set style 12");
-$t->cmd("observe $target");
-
-# main loop
+$t->cmd("observe $remoteglotconf::target");
 print "FICS ready.\n";
-while (1) {
-       my $rin = '';
-       my $rout;
-       vec($rin, fileno($engine->{'read'}), 1) = 1;
-       vec($rin, fileno($t), 1) = 1;
-
-       my ($nfound, $timeleft) = select($rout=$rin, undef, undef, 5.0);
-       my $sleep = 1.0;
-
-       while (1) {
-               my $line = $t->getline(Timeout => 0, errmode => 'return');
-               last if (!defined($line));
-
-               chomp $line;
-               $line =~ tr/\r//d;
-               if ($line =~ /^<12> /) {
-                       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($engine, "stop");
-                               }
-                               if ($uci_assume_full_compliance) {
-                                       $pos_waiting = $pos;
-                               } else {
-                                       uciprint($engine, "position fen " . $pos->{'fen'});
-                                       uciprint($engine, "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($engine, "position fen " . $pos->{'fen'});
-                               uciprint($engine, "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);
+my $ev1 = AnyEvent->io(
+       fh => fileno($t),
+       poll => 'r',
+       cb => sub {    # what callback to execute
+               while (1) {
+                       my $line = $t->getline(Timeout => 0, errmode => 'return');
+                       return if (!defined($line));
 
-                       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 { $engine->{'write'} } "$1\n";
-                       } else {
-                               $t->cmd("tell $who Couldn't understand '$msg', sorry.");
-                       }
+                       chomp $line;
+                       $line =~ tr/\r//d;
+                       handle_fics($line);
                }
-               #print "FICS: [$line]\n";
-               $sleep = 0;
        }
-       
-       # any fun on the UCI channel?
-       if ($nfound > 0 && vec($rout, fileno($engine->{'read'}), 1) == 1) {
-               my $line = read_line($engine->{'read'});
-               handle_uci($line);
-               $sleep = 0;
-
-               # don't update too often
-               Time::HiRes::alarm(0.2);
-       }
-
-       sleep $sleep;
-}
+);
+# Engine events have already been set up by Engine.pm.
+EV::run;
 
 sub handle_uci {
-       my ($line) = @_;
+       my ($engine, $line, $primary) = @_;
 
-       chomp $line;
-       $line =~ tr/\r//d;
        $line =~ s/  / /g;  # Sometimes needed for Zappa Mexico
-       print UCILOG localtime() . " <= $line\n";
+       print UCILOG localtime() . " $engine->{'tag'} <= $line\n";
        if ($line =~ /^info/) {
                my (@infos) = split / /, $line;
                shift @infos;
 
-               parse_infos(@infos);
+               parse_infos($engine, @infos);
        }
        if ($line =~ /^id/) {
                my (@ids) = split / /, $line;
                shift @ids;
 
-               parse_ids(@ids);
+               parse_ids($engine, @ids);
+       }
+       if ($line =~ /^bestmove/) {
+               if ($primary) {
+                       return if (!$remoteglotconf::uci_assume_full_compliance);
+                       if (defined($pos_waiting)) {
+                               uciprint($engine, "position fen " . $pos_waiting->fen());
+                               uciprint($engine, "go infinite");
+
+                               $pos_calculating = $pos_waiting;
+                               $pos_waiting = undef;
+                       }
+               } else {
+                       $engine2->{'info'} = {};
+                       my $pos = $pos_waiting // $pos_calculating;
+                       uciprint($engine2, "position fen " . $pos->fen());
+                       uciprint($engine2, "go infinite");
+                       $pos_calculating_second_engine = $pos;
+               }
+       }
+       output();
+}
+
+sub handle_fics {
+       my $line = shift;
+       if ($line =~ /^<12> /) {
+               handle_position(Position->new($line));
+       }
+       if ($line =~ /^([A-Za-z]+)(?:\([A-Z]+\))* tells you: (.*)$/) {
+               my ($who, $msg) = ($1, $2);
+
+               next if (grep { $_ eq $who } (@remoteglotconf::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 { $engine->{'write'} } "$1\n";
+               } elsif ($msg =~ /^pgn (.*?)$/) {
+                       my $url = $1;
+                       $t->cmd("tell $who Starting to poll '$url'.");
+                       AnyEvent::HTTP::http_get($url, sub {
+                               handle_pgn(@_, $url);
+                       });
+               } elsif ($msg =~ /^stoppgn$/) {
+                       $t->cmd("tell $who Stopping poll.");
+                       $http_timer = undef;
+               } elsif ($msg =~ /^quit$/) {
+                       $t->cmd("tell $who Bye bye.");
+                       exit;
+               } else {
+                       $t->cmd("tell $who Couldn't understand '$msg', sorry.");
+               }
        }
-       if ($line =~ /^bestmove/ && $uci_assume_full_compliance) {
-               if (defined($pos_waiting)) {
-                       uciprint($engine, "position fen " . $pos_waiting->{'fen'});
+       #print "FICS: [$line]\n";
+}
+
+sub handle_pgn {
+       my ($body, $header, $url) = @_;
+       my $pgn = Chess::PGN::Parse->new(undef, $body);
+       if (!defined($pgn) || !$pgn->read_game()) {
+               warn "Error in parsing PGN from $url\n";
+       } else {
+               $pgn->quick_parse_game;
+               my $pos = Position->start_pos($pgn->white, $pgn->black);
+               my $moves = $pgn->moves;
+               my @uci_moves = ();
+               for my $move (@$moves) {
+                       my ($from_row, $from_col, $to_row, $to_col, $promo) = $pos->parse_pretty_move($move);
+                       push @uci_moves, Board::move_to_uci_notation($from_row, $from_col, $to_row, $to_col, $promo);
+                       $pos = $pos->make_move($from_row, $from_col, $to_row, $to_col, $promo);
+               }
+               $pos->{'history'} = \@uci_moves;
+               $pos->{'pretty_history'} = $moves;
+               handle_position($pos);
+       }
+       
+       $http_timer = AnyEvent->timer(after => 1.0, cb => sub {
+               AnyEvent::HTTP::http_get($url, sub {
+                       handle_pgn(@_, $url);
+               });
+       });
+}
+
+sub handle_position {
+       my ($pos) = @_;
+               
+       # if this is already in the queue, ignore it
+       return 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
+       return 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($engine, "stop");
+               }
+               if ($remoteglotconf::uci_assume_full_compliance) {
+                       $pos_waiting = $pos;
+               } else {
+                       uciprint($engine, "position fen " . $pos->fen());
                        uciprint($engine, "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($engine, "position fen " . $pos->fen());
+               uciprint($engine, "go infinite");
+               $pos_calculating = $pos;
+       }
 
-                       $pos_calculating = $pos_waiting;
-                       $pos_waiting = undef;
+       if (defined($engine2)) {
+               if (defined($pos_calculating_second_engine)) {
+                       uciprint($engine2, "stop");
+               } else {
+                       uciprint($engine2, "position fen " . $pos->fen());
+                       uciprint($engine2, "go infinite");
+                       $pos_calculating_second_engine = $pos;
                }
+               $engine2->{'info'} = {};
        }
+
+       $engine->{'info'} = {};
+       $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");
 }
 
 sub parse_infos {
-       my (@x) = @_;
+       my ($engine, @x) = @_;
        my $mpv = '';
 
+       my $info = $engine->{'info'};
+
+       # Search for "multipv" first of all, since e.g. Stockfish doesn't put it first.
+       for my $i (0..$#x - 1) {
+               if ($x[$i] eq 'multipv') {
+                       $mpv = $x[$i + 1];
+                       next;
+               }
+       }
+
        while (scalar @x > 0) {
-               if ($x[0] =~ 'multipv') {
+               if ($x[0] eq 'multipv') {
+                       # Dealt with above
+                       shift @x;
                        shift @x;
-                       $mpv = shift @x;
                        next;
                }
-               if ($x[0] =~ /^(currmove|currmovenumber|cpuload)$/) {
+               if ($x[0] eq 'currmove' || $x[0] eq 'currmovenumber' || $x[0] eq 'cpuload') {
                        my $key = shift @x;
                        my $value = shift @x;
-                       $uciinfo{$key} = $value;
+                       $info->{$key} = $value;
                        next;
                }
-               if ($x[0] =~ /^(depth|seldepth|hashfull|time|nodes|nps|tbhits)$/) {
+               if ($x[0] eq 'depth' || $x[0] eq 'seldepth' || $x[0] eq 'hashfull' ||
+                   $x[0] eq 'time' || $x[0] eq 'nodes' || $x[0] eq 'nps' ||
+                   $x[0] eq 'tbhits') {
                        my $key = shift @x;
                        my $value = shift @x;
-                       $uciinfo{$key . $mpv} = $value;
+                       $info->{$key . $mpv} = $value;
                        next;
                }
                if ($x[0] eq 'score') {
                        shift @x;
 
-                       delete $uciinfo{'score_cp' . $mpv};
-                       delete $uciinfo{'score_mate' . $mpv};
+                       delete $info->{'score_cp' . $mpv};
+                       delete $info->{'score_mate' . $mpv};
 
-                       while ($x[0] =~ /^(cp|mate|lowerbound|upperbound)$/) {
+                       while ($x[0] eq 'cp' || $x[0] eq 'mate' || $x[0] eq 'lowerbound' || $x[0] eq 'upperbound') {
                                if ($x[0] eq 'cp') {
                                        shift @x;
-                                       $uciinfo{'score_cp' . $mpv} = shift @x;
+                                       $info->{'score_cp' . $mpv} = shift @x;
                                } elsif ($x[0] eq 'mate') {
                                        shift @x;
-                                       $uciinfo{'score_mate' . $mpv} = shift @x;
+                                       $info->{'score_mate' . $mpv} = shift @x;
                                } else {
                                        shift @x;
                                }
@@ -247,7 +314,7 @@ sub parse_infos {
                        next;
                }
                if ($x[0] eq 'pv') {
-                       $uciinfo{'pv' . $mpv} = [ @x[1..$#x] ];
+                       $info->{'pv' . $mpv} = [ @x[1..$#x] ];
                        last;
                }
                if ($x[0] eq 'string' || $x[0] eq 'UCI_AnalyseMode' || $x[0] eq 'setting' || $x[0] eq 'contempt') {
@@ -262,13 +329,13 @@ sub parse_infos {
 }
 
 sub parse_ids {
-       my (@x) = @_;
+       my ($engine, @x) = @_;
 
        while (scalar @x > 0) {
                if ($x[0] =~ /^(name|author)$/) {
                        my $key = shift @x;
                        my $value = join(' ', @x);
-                       $uciid{$key} = $value;
+                       $engine->{'id'}{$key} = $value;
                        last;
                }
 
@@ -277,247 +344,59 @@ sub parse_ids {
        }
 }
 
-sub style12_to_fen {
-       my $str = shift;
-       my %pos = ();
-       my (@x) = split / /, $str;
-       
-       $pos{'board'} = [ @x[1..8] ];
-       $pos{'toplay'} = $x[9];
-       
-       # the board itself
-       my (@board) = @x[1..8];
-       for my $rank (0..7) {
-               $board[$rank] =~ s/(-+)/length($1)/ge;
-       }
-       my $fen = join('/', @board);
-
-       # white/black to move
-       $fen .= " ";
-       $fen .= lc($x[9]);
-
-       # castling
-       my $castling = "";
-       $castling .= "K" if ($x[11] == 1);
-       $castling .= "Q" if ($x[12] == 1);
-       $castling .= "k" if ($x[13] == 1);
-       $castling .= "q" if ($x[14] == 1);
-       $castling = "-" if ($castling eq "");
-       # $castling = "-"; # chess960
-       $fen .= " ";
-       $fen .= $castling;
-
-       # en passant
-       my $ep = "-";
-       if ($x[10] != -1) {
-               my $col = $x[10];
-               my $nep = (qw(a b c d e f g h))[$col];
-
-               if ($x[9] eq 'B') {
-                       $nep .= "3";
-               } 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
-               # a pawn of the opposite side that can do the en passant move, and if
-               # not, just lie -- it doesn't matter anyway. I'm unsure what's the
-               # "right" thing as per the standard, though.
-               #
-               if ($x[9] eq 'B') {
-                       $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($pos{'board'}[3], $col-1, 1) eq 'P');
-                       $ep = $nep if ($col < 7 && substr($pos{'board'}[3], $col+1, 1) eq 'P');
-               }
-       }
-       $fen .= " ";
-       $fen .= $ep;
-
-       # half-move clock
-       $fen .= " ";
-       $fen .= $x[15];
-
-       # full-move clock
-       $fen .= " ";
-       $fen .= $x[26];
-
-       $pos{'fen'} = $fen;
-       $pos{'move_num'} = $x[26];
-       $pos{'last_move'} = $x[29];
-
-       return \%pos;
-}
-
-sub prettyprint_pv {
+sub prettyprint_pv_no_cache {
        my ($board, @pvs) = @_;
 
        if (scalar @pvs == 0 || !defined($pvs[0])) {
                return ();
        }
-       
-       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'));
-       my $to_col   = ord(substr($pv, 2, 1)) - ord('a');
-       my $to_row   = 7 - (ord(substr($pv, 3, 1)) - ord('1'));
-
-       my $pretty;
-       my $piece = substr($board->[$from_row], $from_col, 1);
+       my ($from_col, $from_row, $to_col, $to_row, $promo) = parse_uci_move($pv);
+       my ($pretty, $nb) = $board->prettyprint_move($from_row, $from_col, $to_row, $to_col, $promo);
+       return ( $pretty, prettyprint_pv_no_cache($nb, @pvs) );
+}
 
-       if ($piece eq '-') {
-               die "Invalid move $pv";
-       }
+sub prettyprint_pv {
+       my ($pos, @pvs) = @_;
 
-       # white short castling
-       if ($pv eq 'e1g1' && $piece eq 'K') {
-               # king
-               substr($nb[7], 4, 1, '-');
-               substr($nb[7], 6, 1, $piece);
-               
-               # rook
-               substr($nb[7], 7, 1, '-');
-               substr($nb[7], 5, 1, 'R');
-                               
-               return ('0-0', prettyprint_pv(\@nb, @pvs));
+       my $cachekey = join('', @pvs);
+       if (exists($pos->{'prettyprint_cache'}{$cachekey})) {
+               return @{$pos->{'prettyprint_cache'}{$cachekey}};
+       } else {
+               my @res = prettyprint_pv_no_cache($pos->{'board'}, @pvs);
+               $pos->{'prettyprint_cache'}{$cachekey} = \@res;
+               return @res;
        }
+}
 
-       # white long castling
-       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], 3, 1, 'R');
-                               
-               return ('0-0-0', prettyprint_pv(\@nb, @pvs));
-       }
+sub output {
+       #return;
 
-       # black short castling
-       if ($pv eq 'e8g8' && $piece eq 'k') {
-               # king
-               substr($nb[0], 4, 1, '-');
-               substr($nb[0], 6, 1, $piece);
-               
-               # rook
-               substr($nb[0], 7, 1, '-');
-               substr($nb[0], 5, 1, 'r');
-                               
-               return ('0-0', prettyprint_pv(\@nb, @pvs));
-       }
+       return if (!defined($pos_calculating));
 
-       # black long castling
-       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], 3, 1, 'r');
-                               
-               return ('0-0-0', prettyprint_pv(\@nb, @pvs));
+       # Don't update too often.
+       my $age = Time::HiRes::tv_interval($latest_update);
+       if ($age < $remoteglotconf::update_max_interval) {
+               Time::HiRes::alarm($remoteglotconf::update_max_interval + 0.01 - $age);
+               return;
        }
-
-       # check if the from-piece is a pawn
-       if (lc($piece) eq 'p') {
-               # attack?
-               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);
-
-                       if (length($pv) == 5) {
-                               # promotion
-                               $pretty .= "=";
-                               $pretty .= uc(substr($pv, 4, 1));
-
-                               if ($piece eq 'p') {
-                                       $piece = substr($pv, 4, 1);
-                               } else {
-                                       $piece = uc(substr($pv, 4, 1));
-                               }
-                       }
-               }
-       } else {
-               $pretty = uc($piece);
-
-               # see how many of these pieces could go here, in all
-               my $num_total = 0;
-               for my $col (0..7) {
-                       for my $row (0..7) {
-                               next unless (substr($board->[$row], $col, 1) eq $piece);
-                               ++$num_total if (can_reach($board, $piece, $row, $col, $to_row, $to_col));
-                       }
-               }
-
-               # see how many of these pieces from the given row could go here
-               my $num_row = 0;
-               for my $col (0..7) {
-                       next unless (substr($board->[$from_row], $col, 1) eq $piece);
-                       ++$num_row if (can_reach($board, $piece, $from_row, $col, $to_row, $to_col));
-               }
-               
-               # and same for columns
-               my $num_col = 0;
-               for my $row (0..7) {
-                       next unless (substr($board->[$row], $from_col, 1) eq $piece);
-                       ++$num_col if (can_reach($board, $piece, $row, $from_col, $to_row, $to_col));
-               }
-               
-               # see if we need to disambiguate
-               if ($num_total > 1) {
-                       if ($num_col == 1) {
-                               $pretty .= substr($pv, 0, 1);
-                       } elsif ($num_row == 1) {
-                               $pretty .= substr($pv, 1, 1);
-                       } else {
-                               $pretty .= substr($pv, 0, 2);
+       
+       my $info = $engine->{'info'};
+       
+       #
+       # 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($info->{'pv1'}) && !exists($info->{'pv2'})) {
+               for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits)) {
+                       if (exists($info->{$key . '1'})) {
+                               $info->{$key} = $info->{$key . '1'};
                        }
                }
-
-               # attack?
-               if (substr($board->[$to_row], $to_col, 1) ne '-') {
-                       $pretty .= 'x';
-               }
-
-               $pretty .= substr($pv, 2, 2);
-       }
-
-       # update the board
-       substr($nb[$from_row], $from_col, 1, '-');
-       substr($nb[$to_row], $to_col, 1, $piece);
-
-       if (in_mate(\@nb)) {
-               $pretty .= '#';
-       } elsif (in_check(\@nb) ne 'none') {
-               $pretty .= '+';
        }
-
-       return ($pretty, prettyprint_pv(\@nb, @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
@@ -525,21 +404,30 @@ sub output_screen {
        #
        eval {
                my $dummy;
-               if (exists($uciinfo{'pv'})) {
-                       $dummy = prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}});
+               if (exists($info->{'pv'})) {
+                       $dummy = prettyprint_pv($pos_calculating, @{$info->{'pv'}});
                }
        
                my $mpv = 1;
-               while (exists($uciinfo{'pv' . $mpv})) {
-                       $dummy = prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}});
+               while (exists($info->{'pv' . $mpv})) {
+                       $dummy = prettyprint_pv($pos_calculating, @{$info->{'pv' . $mpv}});
                        ++$mpv;
                }
        };
        if ($@) {
-               %uciinfo = ();
+               $engine->{'info'} = {};
                return;
        }
 
+       output_screen();
+       output_json();
+       $latest_update = [Time::HiRes::gettimeofday];
+}
+
+sub output_screen {
+       my $info = $engine->{'info'};
+       my $id = $engine->{'id'};
+
        my $text = 'Analysis';
        if ($pos_calculating->{'last_move'} ne 'none') {
                if ($pos_calculating->{'toplay'} eq 'W') {
@@ -547,365 +435,216 @@ sub output_screen {
                } else {
                        $text .= sprintf ' after %u. %s', $pos_calculating->{'move_num'}, $pos_calculating->{'last_move'};
                }
-               if (exists($uciid{'name'})) {
+               if (exists($id->{'name'})) {
                        $text .= ',';
                }
        }
 
-       if (exists($uciid{'name'})) {
-               $text .= " by $uciid{'name'}:\n\n";
+       if (exists($id->{'name'})) {
+               $text .= " by $id->{'name'}:\n\n";
        } else {
                $text .= ":\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'};
-                       }
-               }
-       }
-
-       if (exists($uciinfo{'pv1'}) && exists($uciinfo{'pv2'})) {
+       if (exists($info->{'pv1'}) && exists($info->{'pv2'})) {
                # multi-PV
                my $mpv = 1;
-               while (exists($uciinfo{'pv' . $mpv})) {
+               while (exists($info->{'pv' . $mpv})) {
                        $text .= sprintf "  PV%2u", $mpv;
-                       my $score = short_score(\%uciinfo, $pos_calculating, $mpv);
+                       my $score = short_score($info, $pos_calculating, $mpv);
                        $text .= "  ($score)" if (defined($score));
 
                        my $tbhits = '';
-                       if (exists($uciinfo{'tbhits' . $mpv}) && $uciinfo{'tbhits' . $mpv} > 0) {
-                               if ($uciinfo{'tbhits' . $mpv} == 1) {
+                       if (exists($info->{'tbhits' . $mpv}) && $info->{'tbhits' . $mpv} > 0) {
+                               if ($info->{'tbhits' . $mpv} == 1) {
                                        $tbhits = ", 1 tbhit";
                                } else {
-                                       $tbhits = sprintf ", %u tbhits", $uciinfo{'tbhits' . $mpv};
+                                       $tbhits = sprintf ", %u tbhits", $info->{'tbhits' . $mpv};
                                }
                        }
 
-                       if (exists($uciinfo{'nodes' . $mpv}) && exists($uciinfo{'nps' . $mpv}) && exists($uciinfo{'depth' . $mpv})) {
+                       if (exists($info->{'nodes' . $mpv}) && exists($info->{'nps' . $mpv}) && exists($info->{'depth' . $mpv})) {
                                $text .= sprintf " (%5u kn, %3u kn/s, %2u ply$tbhits)",
-                                       $uciinfo{'nodes' . $mpv} / 1000, $uciinfo{'nps' . $mpv} / 1000, $uciinfo{'depth' . $mpv};
+                                       $info->{'nodes' . $mpv} / 1000, $info->{'nps' . $mpv} / 1000, $info->{'depth' . $mpv};
                        }
 
                        $text .= ":\n";
-                       $text .= "  " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}})) . "\n";
+                       $text .= "  " . join(', ', prettyprint_pv($pos_calculating, @{$info->{'pv' . $mpv}})) . "\n";
                        $text .= "\n";
                        ++$mpv;
                }
        } else {
                # single-PV
-               my $score = long_score(\%uciinfo, $pos_calculating, '');
+               my $score = long_score($info, $pos_calculating, '');
                $text .= "  $score\n" if defined($score);
-               $text .=  "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}}));
+               $text .=  "  PV: " . join(', ', prettyprint_pv($pos_calculating, @{$info->{'pv'}}));
                $text .=  "\n";
 
-               if (exists($uciinfo{'nodes'}) && exists($uciinfo{'nps'}) && exists($uciinfo{'depth'})) {
+               if (exists($info->{'nodes'}) && exists($info->{'nps'}) && exists($info->{'depth'})) {
                        $text .= sprintf "  %u nodes, %7u nodes/sec, depth %u ply",
-                               $uciinfo{'nodes'}, $uciinfo{'nps'}, $uciinfo{'depth'};
+                               $info->{'nodes'}, $info->{'nps'}, $info->{'depth'};
                }
-               if (exists($uciinfo{'tbhits'}) && $uciinfo{'tbhits'} > 0) {
-                       if ($uciinfo{'tbhits'} == 1) {
-                               $text .= ", one Nalimov hit";
+               if (exists($info->{'seldepth'})) {
+                       $text .= sprintf " (%u selective)", $info->{'seldepth'};
+               }
+               if (exists($info->{'tbhits'}) && $info->{'tbhits'} > 0) {
+                       if ($info->{'tbhits'} == 1) {
+                               $text .= ", one Syzygy hit";
                        } else {
-                               $text .= sprintf ", %u Nalimov hits", $uciinfo{'tbhits'};
+                               $text .= sprintf ", %u Syzygy hits", $info->{'tbhits'};
                        }
                }
-               if (exists($uciinfo{'seldepth'})) {
-                       $text .= sprintf " (%u selective)", $uciinfo{'seldepth'};
-               }
-               $text .=  "\n\n";
+               $text .= "\n\n";
        }
 
-       #$text .= book_info($pos_calculating->{'fen'}, $pos_calculating->{'board'}, $pos_calculating->{'toplay'});
+       #$text .= book_info($pos_calculating->fen(), $pos_calculating->{'board'}, $pos_calculating->{'toplay'});
 
-       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};
-                       }
+       my @refutation_lines = ();
+       if (defined($engine2)) {
+               for (my $mpv = 1; $mpv < 500; ++$mpv) {
+                       my $info = $engine2->{'info'};
+                       last if (!exists($info->{'pv' . $mpv}));
+                       eval {
+                               my $pv = $info->{'pv' . $mpv};
 
-                       $tell_text .= ": ";
-                       $tell_text .= join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}}));
-                       $tell_text .= "\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'}}));
-               if (exists($uciinfo{'depth'})) {
-                       $tell_text .= sprintf " (depth %u ply)", $uciinfo{'depth'};
+                               my $pretty_move = join('', prettyprint_pv($pos_calculating_second_engine, $pv->[0]));
+                               my @pretty_pv = prettyprint_pv($pos_calculating_second_engine, @$pv);
+                               if (scalar @pretty_pv > 5) {
+                                       @pretty_pv = @pretty_pv[0..4];
+                                       push @pretty_pv, "...";
+                               }
+                               my $key = $pretty_move;
+                               my $line = sprintf("  %-6s %6s %3s  %s",
+                                       $pretty_move,
+                                       short_score($info, $pos_calculating_second_engine, $mpv, 0),
+                                       "d" . $info->{'depth' . $mpv},
+                                       join(', ', @pretty_pv));
+                               push @refutation_lines, [ $key, $line ];
+                       };
                }
-               $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;
+       if ($#refutation_lines >= 0) {
+               $text .= "Shallow search of all legal moves:\n\n";
+               for my $line (sort { $a->[0] cmp $b->[0] } @refutation_lines) {
+                       $text .= $line->[1] . "\n";
                }
-       }
-}
+               $text .= "\n\n";        
+       }       
 
-sub find_kings {
-       my $board = shift;
-       my ($wkr, $wkc, $bkr, $bkc);
-
-       for my $row (0..7) {
-               for my $col (0..7) {
-                       my $piece = substr($board->[$row], $col, 1);
-                       if ($piece eq 'K') {
-                               ($wkr, $wkc) = ($row, $col);
-                       } elsif ($piece eq 'k') {
-                               ($bkr, $bkc) = ($row, $col);
-                       }
-               }
+       if ($last_text ne $text) {
+               print "\e[H\e[2J"; # clear the screen
+               print $text;
+               $last_text = $text;
        }
-
-       return ($wkr, $wkc, $bkr, $bkc);
 }
 
-sub in_mate {
-       my $board = shift;
-       my $check = in_check($board);
-       return 0 if ($check eq 'none');
-
-       # try all possible moves for the side in check
-       for my $row (0..7) {
-               for my $col (0..7) {
-                       my $piece = substr($board->[$row], $col, 1);
-                       next if ($piece eq '-');
-
-                       if ($check eq 'white') {
-                               next if ($piece eq lc($piece));
-                       } else {
-                               next if ($piece eq uc($piece));
-                       }
-
-                       for my $dest_row (0..7) {
-                               for my $dest_col (0..7) {
-                                       next if ($row == $dest_row && $col == $dest_col);
-                                       next unless (can_reach($board, $piece, $row, $col, $dest_row, $dest_col));
-
-                                       my @nb = @$board;
-                                       substr($nb[$row], $col, 1, '-');
-                                       substr($nb[$dest_row], $dest_col, 1, $piece);
-
-                                       my $new_check = in_check(\@nb);
-                                       return 0 if ($new_check ne $check && $new_check ne 'both');
-                               }
-                       }
-               }
-       }
-
-       # nothing to do; mate
-       return 1;
+sub output_json {
+       my $info = $engine->{'info'};
+
+       my $json = {};
+       $json->{'position'} = $pos_calculating->to_json_hash();
+       $json->{'id'} = $engine->{'id'};
+       $json->{'score'} = long_score($info, $pos_calculating, '');
+
+       $json->{'nodes'} = $info->{'nodes'};
+       $json->{'nps'} = $info->{'nps'};
+       $json->{'depth'} = $info->{'depth'};
+       $json->{'tbhits'} = $info->{'tbhits'};
+       $json->{'seldepth'} = $info->{'seldepth'};
+
+       # single-PV only for now
+       $json->{'pv_uci'} = $info->{'pv'};
+       $json->{'pv_pretty'} = [ prettyprint_pv($pos_calculating, @{$info->{'pv'}}) ];
+
+       my %refutation_lines = ();
+       my @refutation_lines = ();
+       if (defined($engine2)) {
+               for (my $mpv = 1; $mpv < 500; ++$mpv) {
+                       my $info = $engine2->{'info'};
+                       my $pretty_move = "";
+                       my @pretty_pv = ();
+                       last if (!exists($info->{'pv' . $mpv}));
+
+                       eval {
+                               my $pv = $info->{'pv' . $mpv};
+                               my $pretty_move = join('', prettyprint_pv($pos_calculating, $pv->[0]));
+                               my @pretty_pv = prettyprint_pv($pos_calculating, @$pv);
+                               $refutation_lines{$pv->[0]} = {
+                                       sort_key => $pretty_move,
+                                       depth => $info->{'depth' . $mpv},
+                                       score_sort_key => score_sort_key($info, $pos_calculating, $mpv, 0),
+                                       pretty_score => short_score($info, $pos_calculating, $mpv, 0),
+                                       pretty_move => $pretty_move,
+                                       pv_pretty => \@pretty_pv,
+                               };
+                               $refutation_lines{$pv->[0]}->{'pv_uci'} = $pv;
+                       };
+               }
+       }
+       $json->{'refutation_lines'} = \%refutation_lines;
+
+       open my $fh, ">/srv/analysis.sesse.net/www/analysis.json.tmp"
+               or return;
+       print $fh JSON::XS::encode_json($json);
+       close $fh;
+       rename("/srv/analysis.sesse.net/www/analysis.json.tmp", "/srv/analysis.sesse.net/www/analysis.json");
 }
 
-sub in_check {
-       my $board = shift;
-       my ($black_check, $white_check) = (0, 0);
-
-       my ($wkr, $wkc, $bkr, $bkc) = find_kings($board);
-
-       # check all pieces for the possibility of threatening the two kings
-       for my $row (0..7) {
-               for my $col (0..7) {
-                       my $piece = substr($board->[$row], $col, 1);
-                       next if ($piece eq '-');
-               
-                       if (uc($piece) eq $piece) {
-                               # white piece
-                               $black_check = 1 if (can_reach($board, $piece, $row, $col, $bkr, $bkc));
-                       } else {
-                               # black piece
-                               $white_check = 1 if (can_reach($board, $piece, $row, $col, $wkr, $wkc));
-                       }
-               }
-       }
-
-       if ($black_check && $white_check) {
-               return 'both';
-       } elsif ($black_check) {
-               return 'black';
-       } elsif ($white_check) {
-               return 'white';
-       } else {
-               return 'none';
-       }
+sub uciprint {
+       my ($engine, $msg) = @_;
+       $engine->print($msg);
+       print UCILOG localtime() . " $engine->{'tag'} => $msg\n";
 }
 
-sub can_reach {
-       my ($board, $piece, $from_row, $from_col, $to_row, $to_col) = @_;
-       
-       # can't eat your own piece
-       my $dest_piece = substr($board->[$to_row], $to_col, 1);
-       if ($dest_piece ne '-') {
-               return 0 if (($piece eq lc($piece)) == ($dest_piece eq lc($dest_piece)));
-       }
+sub short_score {
+       my ($info, $pos, $mpv, $invert) = @_;
 
-       if (lc($piece) eq 'k') {
-               return (abs($from_row - $to_row) <= 1 && abs($from_col - $to_col) <= 1);
+       $invert //= 0;
+       if ($pos->{'toplay'} eq 'B') {
+               $invert = !$invert;
        }
-       if (lc($piece) eq 'r') {
-               return 0 unless ($from_row == $to_row || $from_col == $to_col);
-
-               # check that there's a clear passage
-               if ($from_row == $to_row) {
-                       if ($from_col > $to_col) {
-                               ($to_col, $from_col) = ($from_col, $to_col);
-                       }
-
-                       for my $c (($from_col+1)..($to_col-1)) {
-                               my $middle_piece = substr($board->[$to_row], $c, 1);
-                               return 0 if ($middle_piece ne '-');     
-                       }
 
-                       return 1;
+       if (defined($info->{'score_mate' . $mpv})) {
+               if ($invert) {
+                       return sprintf "M%3d", -$info->{'score_mate' . $mpv};
                } else {
-                       if ($from_row > $to_row) {
-                               ($to_row, $from_row) = ($from_row, $to_row);
+                       return sprintf "M%3d", $info->{'score_mate' . $mpv};
+               }
+       } else {
+               if (exists($info->{'score_cp' . $mpv})) {
+                       my $score = $info->{'score_cp' . $mpv} * 0.01;
+                       if ($score == 0) {
+                               return " 0.00";
                        }
-
-                       for my $r (($from_row+1)..($to_row-1)) {
-                               my $middle_piece = substr($board->[$r], $to_col, 1);
-                               return 0 if ($middle_piece ne '-');     
+                       if ($invert) {
+                               $score = -$score;
                        }
-
-                       return 1;
-               }
-       }
-       if (lc($piece) eq 'b') {
-               return 0 unless (abs($from_row - $to_row) == abs($from_col - $to_col));
-
-               my $dr = ($to_row - $from_row) / abs($to_row - $from_row);
-               my $dc = ($to_col - $from_col) / abs($to_col - $from_col);
-
-               my $r = $from_row + $dr;
-               my $c = $from_col + $dc;
-
-               while ($r != $to_row) {
-                       my $middle_piece = substr($board->[$r], $c, 1);
-                       return 0 if ($middle_piece ne '-');
-                       
-                       $r += $dr;
-                       $c += $dc;
-               }
-
-               return 1;
-       }
-       if (lc($piece) eq 'n') {
-               my $diff_r = abs($from_row - $to_row);
-               my $diff_c = abs($from_col - $to_col);
-               return 1 if ($diff_r == 2 && $diff_c == 1);
-               return 1 if ($diff_r == 1 && $diff_c == 2);
-               return 0;
-       }
-       if ($piece eq 'q') {
-               return (can_reach($board, 'r', $from_row, $from_col, $to_row, $to_col) ||
-                       can_reach($board, 'b', $from_row, $from_col, $to_row, $to_col));
-       }
-       if ($piece eq 'Q') {
-               return (can_reach($board, 'R', $from_row, $from_col, $to_row, $to_col) ||
-                       can_reach($board, 'B', $from_row, $from_col, $to_row, $to_col));
-       }
-
-       # TODO: en passant
-       if ($piece eq 'p') {
-               # black pawn
-               if ($to_col == $from_col && $to_row == $from_row + 1) {
-                       return ($dest_piece eq '-');
-               }
-               if ($to_col == $from_col && $from_row == 1 && $to_row == 3) {
-                       my $middle_piece = substr($board->[2], $to_col, 1);
-                       return ($dest_piece eq '-' && $middle_piece eq '-');
-               }
-               if (abs($to_col - $from_col) == 1 && $to_row == $from_row + 1) {
-                       return ($dest_piece ne '-');
-               }
-               return 0;
-       }
-       if ($piece eq 'P') {
-               # white pawn
-               if ($to_col == $from_col && $to_row == $from_row - 1) {
-                       return ($dest_piece eq '-');
-               }
-               if ($to_col == $from_col && $from_row == 6 && $to_row == 4) {
-                       my $middle_piece = substr($board->[5], $to_col, 1);
-                       return ($dest_piece eq '-' && $middle_piece eq '-');
-               }
-               if (abs($to_col - $from_col) == 1 && $to_row == $from_row - 1) {
-                       return ($dest_piece ne '-');
+                       return sprintf "%+5.2f", $score;
                }
-               return 0;
        }
-       
-       # unknown piece
-       return 0;
-}
 
-sub uciprint {
-       my ($engine, $msg) = @_;
-       print { $engine->{'write'} } "$msg\n";
-       print UCILOG localtime() . " => $msg\n";
+       return undef;
 }
 
-sub short_score {
-       my ($uciinfo, $pos, $mpv) = @_;
+sub score_sort_key {
+       my ($info, $pos, $mpv, $invert) = @_;
 
-       if (defined($uciinfo{'score_mate' . $mpv})) {
-               return sprintf "M%3d", $uciinfo{'score_mate' . $mpv};
+       if (defined($info->{'score_mate' . $mpv})) {
+               if ($invert) {
+                       return 99999 - $info->{'score_mate' . $mpv};
+               } else {
+                       return -(99999 - $info->{'score_mate' . $mpv});
+               }
        } else {
-               if (exists($uciinfo{'score_cp' . $mpv})) {
-                       my $score = $uciinfo{'score_cp' . $mpv} * 0.01;
-                       if ($pos->{'toplay'} eq 'B') {
+               if (exists($info->{'score_cp' . $mpv})) {
+                       my $score = $info->{'score_cp' . $mpv};
+                       if ($invert) {
                                $score = -$score;
                        }
-                       return sprintf "%+5.2f", $score;
+                       return $score;
                }
        }
 
@@ -913,10 +652,10 @@ sub short_score {
 }
 
 sub long_score {
-       my ($uciinfo, $pos, $mpv) = @_;
+       my ($info, $pos, $mpv) = @_;
 
-       if (defined($uciinfo{'score_mate' . $mpv})) {
-               my $mate = $uciinfo{'score_mate' . $mpv};
+       if (defined($info->{'score_mate' . $mpv})) {
+               my $mate = $info->{'score_mate' . $mpv};
                if ($pos->{'toplay'} eq 'B') {
                        $mate = -$mate;
                }
@@ -926,8 +665,11 @@ sub long_score {
                        return sprintf "Black mates in %u", -$mate;
                }
        } else {
-               if (exists($uciinfo{'score_cp' . $mpv})) {
-                       my $score = $uciinfo{'score_cp' . $mpv} * 0.01;
+               if (exists($info->{'score_cp' . $mpv})) {
+                       my $score = $info->{'score_cp' . $mpv} * 0.01;
+                       if ($score == 0) {
+                               return "Score:  0.00";
+                       }
                        if ($pos->{'toplay'} eq 'B') {
                                $score = -$score;
                        }
@@ -958,7 +700,7 @@ sub book_info {
                if ($move eq '')  {
                        $pmove = '(current)';
                } else {
-                       ($pmove) = prettyprint_pv($board, $move);
+                       ($pmove) = prettyprint_pv_no_cache($board, $move);
                        $pmove .= $annotation;
                }
 
@@ -991,50 +733,25 @@ sub book_info {
 }
 
 sub open_engine {
-       my $cmdline = shift;
-       my ($uciread, $uciwrite);
-       my $pid = IPC::Open2::open2($uciread, $uciwrite, $cmdline);
-
-       my $engine = {
-               pid => $pid,
-               read => $uciread,
-               write => $uciwrite
-       };
-
-       uciprint($engine, "uci");
-
-       # gobble the options
-       while (<$uciread>) {
-               /uciok/ && last;
-               handle_uci($_);
-       }
-       
-       return $engine;
+       my ($cmdline, $tag, $cb) = @_;
+       return undef if (!defined($cmdline));
+       return Engine->open($cmdline, $tag, $cb);
 }
 
-sub read_line {
-       my $fh = shift;
-
-       # 
-       # 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 $engine->{'read'}, $tmp, 1;
-
-               if (!defined($ret)) {
-                       next if ($!{EINTR});
-                       die "error in reading from the UCI engine: $!";
-               } elsif ($ret == 0) {
-                       die "EOF from UCI engine";
-               }
+sub col_letter_to_num {
+       return ord(shift) - ord('a');
+}
 
-               $line .= $tmp;
-       }
+sub row_letter_to_num {
+       return 7 - (ord(shift) - ord('1'));
+}
 
-       $line =~ tr/\r\n//d;
-       return $line;
+sub parse_uci_move {
+       my $move = shift;
+       my $from_col = col_letter_to_num(substr($move, 0, 1));
+       my $from_row = row_letter_to_num(substr($move, 1, 1));
+       my $to_col   = col_letter_to_num(substr($move, 2, 1));
+       my $to_row   = row_letter_to_num(substr($move, 3, 1));
+       my $promo    = substr($move, 4, 1);
+       return ($from_col, $from_row, $to_col, $to_row, $promo);
 }