Update Changelog, spec file

[polyglot.git] / xboard2uci.c

diff --git a/xboard2uci.c b/xboard2uci.c
index fcc1812..dfae34c 100644 (file)
--- a/xboard2uci.c
+++ b/xboard2uci.c
@@ -21,6 +21,7 @@
 #include "move.h"
 #include "move_do.h"
 #include "move_legal.h"
+#include "move_gen.h"
 #include "option.h"
 #include "parse.h"
 #include "san.h"
@@ -177,6 +178,9 @@ void xboard2uci_init() {
    XB->node_rate = -1;
 }
 
+
+static list_t move_list[1];
+
 // xboard2uci_gui_step()
 
 void xboard2uci_gui_step(char string[]) {
@@ -208,8 +212,50 @@ void xboard2uci_gui_step(char string[]) {
                        if (option_get_bool(Option,"Book")) {
                                game_get_board(Game,board);
                                book_disp(board);
+                       } else { // [HGM] without book, print all legal moves
+                               int i, gen=!list_size(move_list);
+                               game_get_board(Game,board);
+                               if(gen) gen_legal_moves(move_list,board);
+                               for(i=0; i<list_size(move_list); i++){
+                                       if(gen) move_list->value[i] = 0;
+                                       move_to_san(move_list->move[i],board,move_string,256);
+                                       printf(" %s%6s\n", move_list->value[i]? "* " : "", move_string);
+                               }
+                               // this is necessary by the xboard protocol
+                               printf("\n");
                        }
 
+               } else if (match(string,"exclude *") || match(string,"option Polyglot exclude move=*")) { // [HGM] 
+
+                               int i, all = !strcmp(Star[0], "all"), change=FALSE, cnt=0;
+                               game_get_board(Game,board);
+                               if(!list_size(move_list)) {
+                                       gen_legal_moves(move_list,board);
+                                       for(i=0; i<list_size(move_list); i++){
+                                               move_list->value[i] = 0;
+                                       }
+                               }
+                               move = move_from_san(Star[0],board);
+
+                               for(i=0; i<list_size(move_list); i++){
+                                       if(all || move_list->move[i] == move)
+                                               change |= !move_list->value[i], move_list->value[i] = 1;
+                                       cnt += !move_list->value[i];
+                               }
+                               if(change && cnt) mess(); // do not relay to engine if no change or no moves left
+
+               } else if (match(string,"include *")) { // [HGM] 
+
+                       int i, all = !strcmp(Star[0], "all"), change = FALSE;
+                       game_get_board(Game,board);
+                       move = move_from_san(Star[0],board);
+
+                       for(i=0; i<list_size(move_list); i++){
+                               if(all || move_list->move[i] == move)
+                                       change |= move_list->value[i], move_list->value[i] = 0;
+                       }
+                       if(change) mess();
+
                } else if (match(string,"black")) {
 
                        if (colour_is_black(game_turn(Game))) {
@@ -231,6 +277,10 @@ void xboard2uci_gui_step(char string[]) {
                        if(option_find(Uci->option,"UCI_DrawOffers")){
                            my_log("POLYGLOT draw from XB received");
                                uci_send_option(Uci,"DrawOffer","%s","draw");}
+                       else if (option_get_bool(Option,"HandleDraws") && Uci->root_move_nb > 20) { // [HGM] PG draw handling
+                           my_log("POLYGLOT draw from XB received");
+                           if (Uci->best_score <= -option_get_int(Option,"ContemptScore")) 
+                               gui_send(GUI,"offer draw");}
                } else if (match(string,"easy")) {
 
                        XB->ponder = FALSE;
@@ -322,6 +372,8 @@ void xboard2uci_gui_step(char string[]) {
 
                        game_clear(Game);
 
+                       move_list->size = 0; // [HGM] clear all exclude moves
+
                        if (XB->analyse) {
                                State->computer[White] = FALSE;
                                State->computer[Black] = FALSE;
@@ -575,6 +627,8 @@ void xboard2uci_gui_step(char string[]) {
 
                        if (!game_init(Game,Star[0])) my_fatal("xboard_step(): bad FEN \"%s\"\n",Star[0]);
 
+                       move_list->size = 0; // [HGM] clear all exclude moves
+
                        State->computer[White] = FALSE;
                        State->computer[Black] = FALSE;
 
@@ -596,6 +650,8 @@ void xboard2uci_gui_step(char string[]) {
 
                } else if (match(string,"undo")) {
 
+                       move_list->size = 0; // [HGM] clear all exclude moves
+
                        if (game_pos(Game) >= 1) {
 
                                game_goto(Game,game_pos(Game)-1);
@@ -610,6 +666,8 @@ void xboard2uci_gui_step(char string[]) {
 
                } else if (match(string,"usermove *")) {
 
+                       move_list->size = 0; // [HGM] clear all exclude moves
+
                        game_get_board(Game,board);
                        move = move_from_san(Star[0],board);
 
@@ -875,6 +933,7 @@ static void send_xboard_options(){
     gui_send(GUI,"feature done=0");
     
     gui_send(GUI,"feature analyze=1");
+    gui_send(GUI,"feature exclude=1");
     gui_send(GUI,"feature colors=0");
     gui_send(GUI,"feature draw=1");
     gui_send(GUI,"feature ics=1");
@@ -955,6 +1014,8 @@ void xboard2uci_send_options(){
   }
   
   
+  gui_send(GUI,"feature option=\"Polyglot exclude move -string \"");
+
   option_start_iter(Option);
   while((opt=option_next(Option))){
     if(opt->mode &XBOARD){
@@ -1014,8 +1075,10 @@ static void comp_move(int move) {
          my_log("POLYGLOT %d move%s with resign score\n",State->resign_nb,(State->resign_nb>1)?"s":"");
 
          if (State->resign_nb >= option_get_int(Option,"ResignMoves")) {
-            my_log("POLYGLOT *** RESIGN ***\n");
-            gui_send(GUI,"resign");
+           if (!option_get_bool(Option,"QueenNeverResigns") || !board_has_queen(board, board->turn)) { // [HGM] suppress resignig with Queen
+                my_log("POLYGLOT *** RESIGN ***\n");
+                gui_send(GUI,"resign");
+           }
          }
 
       } else {
@@ -1419,8 +1482,23 @@ static void search_update() {
          engine_send(Engine,""); // newline
 
       } else if (State->state == ANALYSE) {
-
-         engine_send(Engine,"go infinite");
+         int i;
+         char move_string[256];
+
+         engine_send_queue(Engine,"go infinite");
+
+         if(list_size(move_list)) {
+               board_t board[1];
+               game_get_board(Game,board);
+            engine_send_queue(Engine," searchmoves");
+            for(i=0; i<list_size(move_list); i++) {
+               if(!move_list->value[i]) {
+                  move_to_can(move_list->move[i],board,move_string,256);
+                  engine_send_queue(Engine," %s",move_string);
+               }
+            }
+         }
+         engine_send(Engine,""); // newline
 
       } else {