X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xoptions.c;h=114215bb41a8c0ebfab3b46d5029b47b267629e5;hb=5dbd6684586ced536fedf1e2beb05897a629ba2e;hp=6742e3f39a5b97e08dadbff25af6993a489735e3;hpb=4e062d14429ed3a3a251c971690bade4c8cba946;p=xboard.git

diff --git a/xoptions.c b/xoptions.c
index 6742e3f..114215b 100644
--- a/xoptions.c
+++ b/xoptions.c
@@ -130,7 +130,7 @@ SetWidgetText (Option *opt, char *buf, int n)
     Arg arg;
     XtSetArg(arg, XtNstring, buf);
     XtSetValues(opt->handle, &arg, 1);
-    SetFocus(opt->handle, shells[n], NULL, False);
+    if(n >= 0) SetFocus(opt->handle, shells[n], NULL, False);
 }
 
 void
@@ -404,7 +404,6 @@ Option generalOptions[] = {
 { 0,  0, 0, NULL, (void*) &appData.blindfold, "", NULL, CheckBox, N_("Blindfold") },
 { 0,  0, 0, NULL, (void*) &appData.dropMenu, "", NULL, CheckBox, N_("Drop Menu") },
 { 0,  0, 0, NULL, (void*) &appData.hideThinkingFromHuman, "", NULL, CheckBox, N_("Hide Thinking from Human") },
-{ 0,  0, 0, NULL, (void*) &appData.highlightDragging, "", NULL, CheckBox, N_("Highlight Dragging (Show Move Targets)") },
 { 0,  0, 0, NULL, (void*) &appData.highlightLastMove, "", NULL, CheckBox, N_("Highlight Last Move") },
 { 0,  0, 0, NULL, (void*) &appData.highlightMoveWithArrow, "", NULL, CheckBox, N_("Highlight with Arrow") },
 { 0,  0, 0, NULL, (void*) &appData.ringBellAfterMoves, "", NULL, CheckBox, N_("Move Sound") },
@@ -827,6 +826,50 @@ Option boardOptions[] = {
 { 0, 0, 0, NULL, (void*) &BoardOptionsOK, "", NULL, EndMark , "" }
 };
 
+void
+GenericUpdate (int selected)
+{
+    int i, j;
+    char buf[MSG_SIZ];
+    float x;
+	for(i=0; ; i++) {
+	    if(selected >= 0) { if(i < selected) continue; else if(i > selected) break; }
+	    switch(currentOption[i].type) {
+		case TextBox:
+		case FileName:
+		case PathName:
+		    SetWidgetText(&currentOption[i],  *(char**) currentOption[i].target, -1);
+		    break;
+		case Spin:
+		    sprintf(buf, "%d", *(int*) currentOption[i].target);
+		    SetWidgetText(&currentOption[i], buf, -1);
+		    break;
+		case Fractional:
+		    sprintf(buf, "%4.2f", *(float*) currentOption[i].target);
+		    SetWidgetText(&currentOption[i], buf, -1);
+		    break;
+		case CheckBox:
+		    SetWidgetState(&currentOption[i],  *(Boolean*) currentOption[i].target);
+		    break;
+		case ComboBox:
+		    for(j=0; currentOption[i].choice[j]; j++)
+			if(*(char**)currentOption[i].target && !strcmp(*(char**)currentOption[i].target, currentOption[i].choice[j])) break;
+		    values[i] = currentOption[i].value = j + (currentOption[i].choice[j] == NULL);
+		    // TODO: actually display this
+		    break;
+		case EndMark:
+		    return;
+	    default:
+		printf("GenericUpdate: unexpected case in switch.\n");
+		case Button:
+		case SaveButton:
+		case Label:
+		case Break:
+	      break;
+	    }
+	}
+}
+
 int
 GenericReadout (int selected)
 {