Fix crash on OK after Save Changes in Tags and Comment popup.

[xboard.git] / xoptions.c

diff --git a/xoptions.c b/xoptions.c
index 575fc32..437ebae 100644 (file)
--- a/xoptions.c
+++ b/xoptions.c
@@ -365,6 +365,7 @@ int GeneralOptionsOK(int n)
 }
 
 Option generalOptions[] = {
+{ 0,  0, 0, NULL, (void*) &appData.whitePOV, "", NULL, CheckBox, N_("Absolute Analysis Scores") },
 { 0,  0, 0, NULL, (void*) &appData.sweepSelect, "", NULL, CheckBox, N_("Almost Always Queen (Detour Under-Promote)") },
 { 0,  0, 0, NULL, (void*) &appData.animateDragging, "", NULL, CheckBox, N_("Animate Dragging") },
 { 0,  0, 0, NULL, (void*) &appData.animate, "", NULL, CheckBox, N_("Animate Moving") },
@@ -389,6 +390,7 @@ Option generalOptions[] = {
 { 0, 0, 10, NULL, (void*) &appData.flashCount, "", NULL, Spin, N_("Flash Moves (0 = no flashing):") },
 { 0, 1, 10, NULL, (void*) &appData.flashRate, "", NULL, Spin, N_("Flash Rate (high = fast):") },
 { 0, 5, 100,NULL, (void*) &appData.animSpeed, "", NULL, Spin, N_("Animation Speed (high = slow):") },
+{ 0,  1, 5, NULL, (void*) &appData.zoom, "", NULL, Spin, N_("Zoom factor in Evaluation Graph:") },
 { 0,  0, 0, NULL, (void*) &GeneralOptionsOK, "", NULL, EndMark , "" }
 };
 
@@ -452,8 +454,9 @@ Option variantDescriptors[] = {
 { VariantSuicide, 0, 135, NULL, (void*) &Pick, "#FFFFBF", NULL, Button, N_("suicide")},
 { VariantCapaRandom, 1, 135, NULL, (void*) &Pick, "#BFBFFF", NULL, Button, N_("CRC (10x8)")},
 { VariantGiveaway, 0, 135, NULL, (void*) &Pick, "#FFFFBF", NULL, Button, N_("give-away")},
-{ VariantSpartan, 1, 135, NULL, (void*) &Pick, "#FF0000", NULL, Button, N_("Spartan")},
+{ VariantGrand, 1, 135, NULL, (void*) &Pick, "#5070FF", NULL, Button, N_("grand (10x10)")},
 { VariantLosers, 0, 135, NULL, (void*) &Pick, "#FFFFBF", NULL, Button, N_("losers")},
+{ VariantSpartan, 1, 135, NULL, (void*) &Pick, "#FF0000", NULL, Button, N_("Spartan")},
 { 0, 0, 0, NULL, NULL, NULL, NULL, Label, N_("Board size ( -1 = default for selected variant):")},
 { 0, -1, BOARD_RANKS-1, NULL, (void*) &appData.NrRanks, "", NULL, Spin, N_("Number of Board Ranks:") },
 { 0, -1, BOARD_FILES, NULL, (void*) &appData.NrFiles, "", NULL, Spin, N_("Number of Board Files:") },
@@ -670,7 +673,6 @@ void RefreshColor(int source, int n)
 {
     int col, j, r, g, b, step = 10;
     char *s, buf[MSG_SIZ]; // color string
-    Arg args[5];
     GetWidgetText(&currentOption[source], &s);
     if(sscanf(s, "#%x", &col) != 1) return;   // malformed
     b = col & 0xFF; g = col & 0xFF00; r = col & 0xFF0000;
@@ -1393,7 +1395,7 @@ int NewComCallback(int n)
 
 void SaveChanges(int n)
 {
-    GetWidgetText(&currentOption[0], &commentText);
+    GenericReadout(0);
     ReplaceComment(commentIndex, commentText);
 }
 
@@ -1420,7 +1422,6 @@ void ClearComment(int n)
 
 void NewCommentPopup(char *title, char *text, int index)
 {
-    Widget edit;
     Arg args[16];
 
     if(shells[1]) { // if already exists, alter title and content
@@ -1435,7 +1436,7 @@ void NewCommentPopup(char *title, char *text, int index)
        XtOverrideTranslations(commentOptions[0].handle, XtParseTranslationTable(commentTranslations));
 }
 
-static char *tagsText, *msgText;
+static char *tagsText;
 
 int NewTagsCallback(int n)
 {
@@ -1445,7 +1446,7 @@ int NewTagsCallback(int n)
 
 void changeTags(int n)
 {
-    GetWidgetText(&currentOption[1], &tagsText);
+    GenericReadout(1);
     if(bookUp) SaveToBook(tagsText); else
     ReplaceTags(tagsText, &gameInfo);
 }
@@ -1459,7 +1460,6 @@ Option tagsOptions[] = {
 
 void NewTagsPopup(char *text, char *msg)
 {
-    Widget edit;
     Arg args[16];
     char *title = bookUp ? _("Edit book") : _("Tags");
 
@@ -1511,12 +1511,11 @@ void TypeInProc(w, event, prms, nprms)
      String *prms;
      Cardinal *nprms;
 {
-    Arg args[2];
-    String val;
+    char *val;
 
     if(prms[0][0] == '1') {
        GetWidgetText(&boxOptions[0], &val);
-       TypeInDoneEvent((char*)val);
+       TypeInDoneEvent(val);
     }
     PopDown(0);
 }
@@ -1642,7 +1641,6 @@ void SetRandom(int n)
 {
     int r = n==2 ? -1 : rand() & (1<<30)-1;
     char buf[MSG_SIZ];
-    Arg args[2];
     snprintf(buf, MSG_SIZ,  "%d", r);
     SetWidgetText(&shuffleOptions[1], buf, 0);
     SetWidgetState(&shuffleOptions[0], True);
@@ -1678,6 +1676,7 @@ int TcOK(int n)
     if(tcType == 0 && tmpMoves <= 0) return 0;
     if(tcType == 2 && tmpInc <= 0) return 0;
     GetWidgetText(&currentOption[4], &tc); // get original text, in case it is min:sec
+    searchTime = 0;
     switch(tcType) {
       case 0:
        if(!ParseTimeControl(tc, -1, tmpMoves)) return 0;