X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard2uci.c;h=2097de919bfeda018126fd614feba00940286dae;hb=ac968003c13bde5c86ffa19f8819e436b5bc03e6;hp=529f041ffec618a1c70958a0952c3b8e39a5a36d;hpb=acb140befabd8b0f1a8606470013b420d05b4fb7;p=polyglot.git

diff --git a/xboard2uci.c b/xboard2uci.c
index 529f041..2097de9 100644
--- a/xboard2uci.c
+++ b/xboard2uci.c
@@ -27,6 +27,7 @@
 #include "uci.h"
 #include "uci2uci.h"
 #include "util.h"
+#include "xboard2uci.h"
 
 // defines
 
@@ -454,20 +455,31 @@ void xboard2uci_gui_step(char string[]) {
                 char *pg_name=Star[0];
                 polyglot_set_option(pg_name,value);
             }else{
-                start_protected_command();
-                if(!uci_send_option(Uci, name, "%s", value)){
+                option_t *opt=option_find(Uci->option,name);
+                if(opt){
+                    if(my_string_case_equal(opt->type,"check")){
+                       value=my_string_equal(value,"1")?"true":"false";
+                    }
+                    start_protected_command();
+                    uci_send_option(Uci, name, "%s", value);
+                    end_protected_command();
+                }else{
                     gui_send(GUI,"Error (unknown option): %s",name); 
                 }
-                end_protected_command();
             }
         } else if (match(string,"option *")){
             char *name=Star[0];
-            start_protected_command();
+             if(match(name, "Polyglot *")){
+                char *pg_name=Star[0];
+                polyglot_set_option(pg_name,"<empty>");
+	     }else{           
+	       start_protected_command();
                 // value is ignored
-            if(!uci_send_option(Uci, name, "%s", "<empty>")){
-               gui_send(GUI,"Error (unknown option): %s",name); 
-            }; 
-            end_protected_command();
+	       if(!uci_send_option(Uci, name, "%s", "<empty>")){
+		 gui_send(GUI,"Error (unknown option): %s",name); 
+	       }; 
+	       end_protected_command();
+	     }
         } else if (XB->has_feature_smp && match(string,"cores *")){
                 int cores=atoi(Star[0]);
                 if(cores>=1){
@@ -740,6 +752,7 @@ void xboard2uci_engine_step(char string[]) {
                 gui_send(GUI,"1-0 {polyglot: resign"
                          " (illegal engine move black)}");
             }
+            board_disp(board);
             XB->result = TRUE;
             mess();
         }
@@ -761,25 +774,27 @@ void format_xboard_option_line(char * option_line, option_t *opt){
     strcat(option_line,option_string);
     sprintf(option_string," -%s",opt->type);
     strcat(option_line,option_string);
-    if(strcmp(opt->type,"button") && strcmp(opt->type,"combo")){
+    if(!IS_BUTTON(opt) && strcmp(opt->type,"combo")){
         if(strcmp(opt->type,"check")){
-            sprintf(option_string," %s",opt->default_);
+            sprintf(option_string," %s",opt->value);
         }else{
             sprintf(option_string," %d",
-                    my_string_case_equal(opt->default_,"true")?1:0);
+                    my_string_case_equal(opt->value,"true")||
+                    my_string_equal(opt->value,"1")
+                    ?1:0);
         }
         strcat(option_line,option_string);
     }
-    if(!strcmp(opt->type,"spin")){
+    if(IS_SPIN(opt)){
         sprintf(option_string," %s",opt->min);
             strcat(option_line,option_string);
     }
-    if(!strcmp(opt->type,"spin")){
+    if(IS_SPIN(opt)){
         sprintf(option_string," %s",opt->max);
         strcat(option_line,option_string);
     }
     for(j=0;j<opt->var_nb;j++){
-        if(!strcmp(opt->var[j],opt->default_)){
+        if(!strcmp(opt->var[j],opt->value)){
             sprintf(option_string," *%s",opt->var[j]);
         }else{
             sprintf(option_string," %s",opt->var[j]);
@@ -802,10 +817,7 @@ void format_xboard_option_line(char * option_line, option_t *opt){
 
 static void send_xboard_options(){
 
-    char option_line[StringSize]="";
-    const char * name;
-    option_t *opt;
-    
+   
     gui_send(GUI,"feature done=0");
     
     gui_send(GUI,"feature analyze=1");
@@ -848,30 +860,44 @@ static void send_xboard_options(){
         gui_send(GUI,"feature variants=\"normal\"");
     }
 
-    option_start_iter(Uci->option);
-    while((opt=option_next(Uci->option))){
-        if(my_string_case_equal(opt->name,"UCI_AnalyseMode")) continue;
-        if(my_string_case_equal(opt->name,"Ponder")) continue;
-        if(my_string_case_equal(opt->name,"Hash")) continue;
-        if(my_string_case_equal(opt->name,"NalimovPath")) continue;
-        if((name=uci_thread_option(Uci))!=NULL &&
-           my_string_case_equal(opt->name,name)) continue;
-        
-        format_xboard_option_line(option_line,opt);
-        
-        gui_send(GUI,"%s",option_line);
-    }
-
+    xboard2uci_send_options();
+}
 
-    option_start_iter(Option);
-    while((opt=option_next(Option))){
-        if(opt->mode &XBOARD){
-            format_xboard_option_line(option_line,opt);
-            gui_send(GUI,"%s",option_line);
-        }
-    }       
-    gui_send(GUI,"feature done=1"); 
+void xboard2uci_send_options(){
+  char option_line[StringSize]="";
+  const char * name;
+  option_t *opt;
+  
+  option_start_iter(Uci->option);
+  while((opt=option_next(Uci->option))){
+    if(my_string_case_equal(opt->name,"UCI_AnalyseMode")) continue;
+    if(my_string_case_equal(opt->name,"UCI_Opponent")) continue;
+    if(my_string_case_equal(opt->name,"UCI_Chess960")) continue;
+    if(my_string_case_equal(opt->name,"UCI_ShowCurrLine")) continue;
+    if(my_string_case_equal(opt->name,"UCI_ShowRefutations")) continue;
+    if(my_string_case_equal(opt->name,"UCI_ShredderbasesPath")) continue;
+    if(my_string_case_equal(opt->name,"UCI_SetPositionValue")) continue;
+    if(my_string_case_equal(opt->name,"UCI_DrawOffers")) continue;
+    if(my_string_case_equal(opt->name,"Ponder")) continue;
+    if(my_string_case_equal(opt->name,"Hash")) continue;
+    if(my_string_case_equal(opt->name,"NalimovPath")) continue;
+    if((name=uci_thread_option(Uci))!=NULL &&
+       my_string_case_equal(opt->name,name)) continue;
+    format_xboard_option_line(option_line,opt);
     
+    gui_send(GUI,"%s",option_line);
+  }
+  
+  
+  option_start_iter(Option);
+  while((opt=option_next(Option))){
+    if(opt->mode &XBOARD){
+      format_xboard_option_line(option_line,opt);
+      gui_send(GUI,"%s",option_line);
+    }
+  }       
+  gui_send(GUI,"feature done=1"); 
+  
 }
 
 // report_best_score()
@@ -1190,11 +1216,17 @@ static void search_update() {
 
    if (State->state == THINK || State->state == PONDER || State->state == ANALYSE) {
 
+      // [VdB] moved up as we need the move number
+
+       game_get_board(Game,Uci->board);
+
       // opening book
 
-       if (State->state == THINK && option_get_bool(Option,"Book")) {
+       if (State->state == THINK &&
+           option_get_bool(Option,"Book") &&
+           Uci->board->move_nb<option_get_int(Option,"BookDepth")
+           ) {
 
-         game_get_board(Game,Uci->board);
 
          move = book_move(Uci->board,option_get_bool(Option,"BookRandom"));
 
@@ -1463,7 +1495,7 @@ static void send_board(int extra_move) {
 
 static void send_info() {
     int min_depth;
-    if(option_get_bool(Option,"WbWorkArounds")){
+    if(option_get_bool(Option,"WbWorkArounds2")){
             // Silly bug in some versions of WinBoard.
             // depth <=1 clears the engine output window.
             // Why shouldn't an engine be allowed to send info at depth 1?