X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xoptions.c;h=2f0ea155389d034976b9952cc1d0c84eee9cd36f;hb=e3d541f391d70849cdb46eeafe3928ed6085d492;hp=25d3fe7eef16f82b265d0ccccc09a97cfe4fb390;hpb=7fb56edee87ea24c7b2b6b0065e73e5053650383;p=xboard.git

diff --git a/xoptions.c b/xoptions.c
index 25d3fe7..2f0ea15 100644
--- a/xoptions.c
+++ b/xoptions.c
@@ -45,6 +45,7 @@ extern char *getenv();
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+#include <stdint.h>
 
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
@@ -602,8 +603,8 @@ void EngineCallback(w, client_data, call_data)
 	// read all switches
 	appData.periodicUpdates = ReadToggle(w1);
 //	appData.hideThinkingFromHuman = ReadToggle(w2);
-	appData.firstScoreIsAbsolute  = ReadToggle(w3);
-	appData.secondScoreIsAbsolute = ReadToggle(w4);
+	first.scoreIsAbsolute  = appData.firstScoreIsAbsolute  = ReadToggle(w3);
+	second.scoreIsAbsolute = appData.secondScoreIsAbsolute = ReadToggle(w4);
 	appData.testClaims    = ReadToggle(w5);
 	appData.checkMates    = ReadToggle(w6);
 	appData.materialDraws = ReadToggle(w7);
@@ -958,7 +959,7 @@ void NewVariantCallback(w, client_data, call_data)
     XtGetValues(w, args, 1);
     
     if (strcmp(name, _("  OK  ")) == 0) {
-	int nr = (int) XawToggleGetCurrent(buttonDesc[0].handle) - 1;
+	int nr = (intptr_t) XawToggleGetCurrent(buttonDesc[0].handle) - 1;
 	if(nr < 0) return;
 	v = buttonDesc[nr].variant;
 	if(!appData.noChessProgram) { 
@@ -1338,23 +1339,24 @@ void SpinCallback(w, client_data, call_data)
     Arg args[16];
     char buf[MSG_SIZ];
     int i, j;
+    int data = (intptr_t) client_data;
     
     XtSetArg(args[0], XtNlabel, &name);
     XtGetValues(w, args, 1);
     
     j = 0;
     XtSetArg(args[0], XtNstring, &val);
-    XtGetValues(currentCps->option[(int)client_data].handle, args, 1);
+    XtGetValues(currentCps->option[data].handle, args, 1);
     sscanf(val, "%d", &j);
     if (strcmp(name, "+") == 0) {
-	if(++j > currentCps->option[(int)client_data].max) return;
+	if(++j > currentCps->option[data].max) return;
     } else
     if (strcmp(name, "-") == 0) {
-	if(--j < currentCps->option[(int)client_data].min) return;
+	if(--j < currentCps->option[data].min) return;
     } else return;
     sprintf(buf, "%d", j);
     XtSetArg(args[0], XtNstring, buf);
-    XtSetValues(currentCps->option[(int)client_data].handle, args, 1);
+    XtSetValues(currentCps->option[data].handle, args, 1);
 }
 
 void SettingsCallback(w, client_data, call_data)
@@ -1366,6 +1368,7 @@ void SettingsCallback(w, client_data, call_data)
     Arg args[16];
     char buf[MSG_SIZ];
     int i, j;
+    int data = (intptr_t) client_data;
     
     XtSetArg(args[0], XtNlabel, &name);
     XtGetValues(w, args, 1);
@@ -1374,7 +1377,7 @@ void SettingsCallback(w, client_data, call_data)
         SettingsPopDown();
         return;
     }
-    if (strcmp(name, _("OK")) == 0 || (int)client_data) { // save buttons imply OK
+    if (strcmp(name, _("OK")) == 0 || data) { // save buttons imply OK
 	int nr;
 
 	for(i=0; i<currentCps->nrOptions; i++) { // send all options that had to be OK-ed to engine
@@ -1420,7 +1423,7 @@ void SettingsCallback(w, client_data, call_data)
 		    break;
 	    }
 	}
-	if((int)client_data) { // send save-button command to engine
+	if(data) { // send save-button command to engine
 	    sprintf(buf, "option %s\n", name);
 	    SendToProgram(buf, currentCps);
 	}
@@ -1437,8 +1440,8 @@ void ComboSelect(w, addr, index) // callback for all combo items
      caddr_t index;
 {
     Arg args[16];
-    int i = ((int)addr)>>8;
-    int j = 255 & (int) addr;
+    int i = ((intptr_t)addr)>>8;
+    int j = 255 & (intptr_t) addr;
 
     values[i] = j; // store in temporary, for transfer at OK
     XtSetArg(args[0], XtNlabel, ((char**)currentCps->option[i].textValue)[j]);
@@ -1465,7 +1468,7 @@ void CreateComboPopup(parent, name, n, mb)
 					  menu, args, j);
 	    XtAddCallback(entry, XtNcallback,
 			  (XtCallbackProc) ComboSelect,
-			  (caddr_t) (256*n+i));
+			  (caddr_t)(intptr_t) (256*n+i));
 	i++;
     }
 }	
@@ -1543,7 +1546,8 @@ void SettingsPopUp(ChessProgramState *cps)
 	    XtSetArg(args[j], XtNheight, 10);  j++;
 	    XtSetArg(args[j], XtNwidth, 20);  j++;
 	    edit = XtCreateManagedWidget("+", commandWidgetClass, form, args, j);
-	    XtAddCallback(edit, XtNcallback, SpinCallback, (XtPointer) i);
+	    XtAddCallback(edit, XtNcallback, SpinCallback,
+			  (XtPointer)(intptr_t) i);
 
 	    j=0;
 	    XtSetArg(args[j], XtNfromVert, edit);  j++;
@@ -1551,7 +1555,8 @@ void SettingsPopUp(ChessProgramState *cps)
 	    XtSetArg(args[j], XtNheight, 10);  j++;
 	    XtSetArg(args[j], XtNwidth, 20);  j++;
 	    last = XtCreateManagedWidget("-", commandWidgetClass, form, args, j);
-	    XtAddCallback(last, XtNcallback, SpinCallback, (XtPointer) i);
+	    XtAddCallback(last, XtNcallback, SpinCallback,
+			  (XtPointer)(intptr_t) i);
 	    break;
 	  case CheckBox:
 	    j=0;
@@ -1575,7 +1580,8 @@ void SettingsPopUp(ChessProgramState *cps)
 	    XtSetArg(args[j], XtNstate, cps->option[i].value);  j++;
 	    cps->option[i].handle = (void*) 
 		(last = XtCreateManagedWidget(cps->option[i].name, commandWidgetClass, form, args, j));   
-	    XtAddCallback(last, XtNcallback, SettingsCallback, (XtPointer) (cps->option[i].type == SaveButton));
+	    XtAddCallback(last, XtNcallback, SettingsCallback,
+			  (XtPointer)(intptr_t) (cps->option[i].type == SaveButton));
 	    break;
 	  case ComboBox:
 	    j=0;