fixed crash in history window

someone discovered that opening the move-history window in XBoard leads to
an immediate crash. Turns out that renaming the menu item broke it! (The
name of the item was apprently used elsewhere in the code to access it,
for putting a check mark there.)

diff --git a/xhistory.c b/xhistory.c
index 5e8ba35..c247acb 100644 (file)
--- a/xhistory.c
+++ b/xhistory.c
@@ -87,7 +87,7 @@ extern char *layoutName;
 \r
 struct History{\r
   String *Nr,*white,*black;\r
-  int     aNr;  /* space actually alocated */  \r
+  int     aNr;  /* space actually alocated */\r
   Widget mvn,mvw,mvb,vbox,viewport,sh;\r
   char Up;\r
 };\r
@@ -115,7 +115,7 @@ HistoryPopDown(w, client_data, call_data)
   }\r
   j=0;\r
   XtSetArg(args[j], XtNleftBitmap, None); j++;\r
-  XtSetValues(XtNameToWidget(menuBarWidget, "menuMode.Show Move List"),\r
+  XtSetValues(XtNameToWidget(menuBarWidget, "menuMode.Show Move History"),\r
                args, j);\r
 }\r
 \r
@@ -140,13 +140,13 @@ void HistoryAlloc(int len){
     free(hist->Nr);free(hist->white);free(hist->black);\r
   }\r
   else{\r
-    hist=(struct History*)malloc(sizeof(struct History)); \r
+    hist=(struct History*)malloc(sizeof(struct History));\r
   }\r
     hist->aNr=len;\r
     hist->Nr=(String*)malloc(hist->aNr*sizeof(String*));\r
     hist->white=(String*)malloc(hist->aNr*sizeof(String*));\r
     hist->black=(String*)malloc(hist->aNr*sizeof(String*));\r
-    \r
+\r
     hist->Nr[0]=(String)malloc(hist->aNr*6);\r
     hist->white[0]=(String)malloc(hist->aNr*MOVE_LEN);\r
     hist->black[0]=(String)malloc(hist->aNr*MOVE_LEN);\r
@@ -197,7 +197,7 @@ HistoryFill()
   } else {\r
     extra = extra/2;\r
   }\r
- \r
+\r
   j = 0;\r
   XtSetArg(args[j], XtNwidth, &w);  j++;\r
   XtGetValues(hist->mvw, args, j);\r
@@ -272,7 +272,7 @@ void HistorySet(char movelist[][2*MOVE_LEN],int first,int last,int current){
   if(hist){\r
     if(last >= hist->aNr) HistoryAlloc(last+_LL_);\r
     for(i=0;i<last;i++) {\r
-      if((i%2)==0) { \r
+      if((i%2)==0) {\r
        if(movelist[i][0]) {\r
          char* p = strchr(movelist[i], ' ');\r
          if (p) {\r
@@ -280,7 +280,7 @@ void HistorySet(char movelist[][2*MOVE_LEN],int first,int last,int current){
            hist->white[i/2+1][p-movelist[i]] = NULLCHAR;\r
          } else {\r
            strcpy(hist->white[i/2+1],movelist[i]);\r
-         }         \r
+         }\r
        } else {\r
          strcpy(hist->white[i/2+1],dots);\r
        }\r
@@ -292,7 +292,7 @@ void HistorySet(char movelist[][2*MOVE_LEN],int first,int last,int current){
            hist->black[i/2+1][p-movelist[i]] = NULLCHAR;\r
          } else {\r
            strcpy(hist->black[i/2+1],movelist[i]);\r
-         }         \r
+         }\r
        } else {\r
          strcpy(hist->black[i/2+1],"");\r
        }\r
@@ -336,11 +336,11 @@ Widget HistoryCreate()
              <Key>Right: ForwardProc() \n";\r
     /*--- allocate memory for move-strings ---*/\r
     HistoryAlloc(_LL_);\r
-   \r
+\r
     /*-------- create the widgets ---------------*/\r
     j = 0;\r
     XtSetArg(args[j], XtNresizable, True);  j++;\r
-    XtSetArg(args[j], XtNallowShellResize, True);  j++;   \r
+    XtSetArg(args[j], XtNallowShellResize, True);  j++;\r
 #if TOPLEVEL\r
     hist->sh =\r
       XtCreatePopupShell(_("Move list"), topLevelShellWidgetClass,\r
@@ -349,18 +349,18 @@ Widget HistoryCreate()
     hist->sh =\r
       XtCreatePopupShell(_("Move list"), transientShellWidgetClass,\r
                         shellWidget, args, j);\r
-#endif        \r
+#endif\r
     j = 0;\r
     XtSetArg(args[j], XtNborderWidth, 0); j++;\r
     XtSetArg(args[j], XtNdefaultDistance, 0);  j++;\r
       layout =\r
       XtCreateManagedWidget(layoutName, formWidgetClass, hist->sh,\r
                            args, j);\r
-    \r
+\r
     j = 0;\r
     XtSetArg(args[j], XtNborderWidth, 0); j++;\r
     XtSetArg(args[j], XtNresizable, True);  j++;\r
-  \r
+\r
     form =\r
       XtCreateManagedWidget("form", formWidgetClass, layout, args, j);\r
      j=0;\r
@@ -386,13 +386,13 @@ Widget HistoryCreate()
     XtSetArg(args[j], XtNorientation,XtorientHorizontal);j++;\r
     hist->vbox =\r
       XtCreateManagedWidget("vbox", formWidgetClass, hist->viewport, args, j);\r
-    \r
+\r
     j=0;\r
     XtSetArg(args[j], XtNtop, XtChainTop);  j++;\r
     XtSetArg(args[j], XtNbottom, XtChainTop);  j++;\r
     XtSetArg(args[j], XtNleft, XtChainLeft);  j++;\r
-    XtSetArg(args[j], XtNright, XtChainLeft);  j++;    \r
-     \r
+    XtSetArg(args[j], XtNright, XtChainLeft);  j++;\r
+\r
     XtSetArg(args[j], XtNdefaultColumns, 1);  j++;\r
     XtSetArg(args[j], XtNforceColumns, True);  j++;\r
     XtSetArg(args[j], XtNverticalList, True);  j++;\r
@@ -407,8 +407,8 @@ Widget HistoryCreate()
     XtSetArg(args[j], XtNtop, XtChainTop);  j++;\r
     XtSetArg(args[j], XtNbottom, XtChainTop);  j++;\r
     XtSetArg(args[j], XtNleft, XtChainLeft);  j++;\r
-    XtSetArg(args[j], XtNright, XtRubber);  j++;    \r
-    \r
+    XtSetArg(args[j], XtNright, XtRubber);  j++;\r
+\r
     XtSetArg(args[j], XtNdefaultColumns, 1);  j++;\r
     XtSetArg(args[j], XtNforceColumns, True);  j++;\r
     XtSetArg(args[j], XtNverticalList, True);  j++;\r
@@ -424,7 +424,7 @@ Widget HistoryCreate()
     XtSetArg(args[j], XtNbottom, XtChainTop);  j++;\r
     XtSetArg(args[j], XtNleft, XtRubber);  j++;\r
     XtSetArg(args[j], XtNright,  XtRubber);  j++;\r
-    \r
+\r
     XtSetArg(args[j], XtNdefaultColumns, 1);  j++;\r
     XtSetArg(args[j], XtNforceColumns, True);  j++;\r
     XtSetArg(args[j], XtNverticalList, True);  j++;\r
@@ -442,10 +442,10 @@ Widget HistoryCreate()
     XtSetArg(args[j], XtNright, XtChainLeft);  j++;\r
     XtSetArg(args[j], XtNfromVert, hist->viewport);  j++;\r
     b_close= XtCreateManagedWidget(_("Close"), commandWidgetClass,\r
-                                  form, args, j);   \r
+                                  form, args, j);\r
     XtAddCallback(b_close, XtNcallback, HistoryPopDown, (XtPointer) 0);\r
 \r
-    XtAugmentTranslations(hist->sh,XtParseTranslationTable (trstr)); \r
+    XtAugmentTranslations(hist->sh,XtParseTranslationTable (trstr));\r
 \r
     XtRealizeWidget(hist->sh);\r
     CatchDeleteWindow(hist->sh, "HistoryPopDown");\r
@@ -454,7 +454,7 @@ Widget HistoryCreate()
       strcpy(hist->white[i],dots);\r
       strcpy(hist->black[i],"");\r
      }\r
-   \r
+\r
     return hist->sh;\r
 }\r
 \r
@@ -465,6 +465,7 @@ HistoryPopUp()
   int j;\r
 \r
   if(!hist) HistoryCreate();\r
+\r
   XtPopup(hist->sh, XtGrabNone);\r
 \r
   // [HGM] restore old position\r
@@ -475,12 +476,12 @@ HistoryPopUp()
 \r
   j=0;\r
   XtSetArg(args[j], XtNleftBitmap, xMarkPixmap); j++;\r
-  XtSetValues(XtNameToWidget(menuBarWidget, "menuMode.Show Move List"),\r
+  XtSetValues(XtNameToWidget(menuBarWidget, "menuMode.Show Move History"),\r
                args, j);\r
   hist->Up=True;\r
 }\r
 \r
- \r
+\r
 void\r
 HistoryShowProc(w, event, prms, nprms)\r
      Widget w;\r
@@ -498,4 +499,4 @@ HistoryShowProc(w, event, prms, nprms)
   }\r
   ToNrEvent(currentMove);\r
 }\r
- \r
+\r