X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xgamelist.c;h=06ebf4a210c94156485bd1c27c1785dbdb2c7924;hb=3d0e4f38019f924c773592842adad7922531e421;hp=d68c00b2765ccd1cad2776e71304a292b5f50ceb;hpb=d9f4b584106f4d7477158476ff792f6fa0b2630a;p=xboard.git

diff --git a/xgamelist.c b/xgamelist.c
index d68c00b..06ebf4a 100644
--- a/xgamelist.c
+++ b/xgamelist.c
@@ -95,7 +95,7 @@ void SetFocus P((Widget w, XtPointer data, XEvent *event, Boolean *b));
 
 static Widget filterText;
 static char filterString[MSG_SIZ];
-static int listLength;
+static int listLength, wins, losses, draws;
 
 char gameListTranslations[] =
   "<Btn1Up>(2): LoadSelectedProc(0) \n \
@@ -109,6 +109,8 @@ char gameListTranslations[] =
 char filterTranslations[] =
   "<Key>Return: SetFilterProc() \n";
 
+char *dummyList[] = { N_("no games matched your request"), NULL };
+
 typedef struct {
     Widget shell;
     Position x, y;
@@ -169,7 +171,7 @@ GameListCreate(name, callback, client_data)
       XtCreateManagedWidget("viewport", viewportWidgetClass, form, args, j);
 
     j = 0;
-    XtSetArg(args[j], XtNlist, glc->strings);  j++;
+//    XtSetArg(args[j], XtNlist, glc->strings);  j++;
     XtSetArg(args[j], XtNdefaultColumns, 1);  j++;
     XtSetArg(args[j], XtNforceColumns, True);  j++;
     XtSetArg(args[j], XtNverticalList, True);  j++;
@@ -329,21 +331,31 @@ GameListPrepare(int byPos)
     ListGame *lg;
     char **st, *line;
 
+    if(st = glc->strings) while(*st) free(*st++);
     nstrings = ((ListGame *) gameList.tailPred)->number;
     glc->strings = (char **) malloc((nstrings + 1) * sizeof(char *));
     st = glc->strings;
     lg = (ListGame *) gameList.head;
-    listLength = 0;
+    listLength = wins = losses = draws = 0;
     while (nstrings--) {
 	int pos = -1;
 	line = GameListLine(lg->number, &lg->gameInfo);
 	if((filterString[0] == NULLCHAR || SearchPattern( line, filterString )) && (!byPos || (pos=GameContainsPosition(glc->fp, lg)) >= 0) ) {
-	    *st++ = line; // [HGM] filter: make adding line conditional
+	    if(listLength < 1500) *st++ = line; // [HGM] filter: make adding line conditional. *** X listboxes have severe size limit ***
 	    listLength++;
+            if( lg->gameInfo.result == WhiteWins ) wins++; else
+            if( lg->gameInfo.result == BlackWins ) losses++; else
+            if( lg->gameInfo.result == GameIsDrawn ) draws++;
+	}
+	if(lg->number % 2000 == 0) {
+	    char buf[MSG_SIZ];
+	    snprintf(buf, MSG_SIZ, _("Scanning through games (%d)"), lg->number);
+	    DisplayTitle(buf);
 	}
 	lg->position = pos;
 	lg = (ListGame *) lg->node.succ;
      }
+     DisplayTitle("XBoard");
     *st = NULL;
     return listLength;
 }
@@ -353,10 +365,17 @@ GameListReplace()
 {
   // filter: put in separate routine, to make callable from call-back
   Widget listwidg;
+  Arg arg;
+  char buf[MSG_SIZ],*p;
 
   listwidg = XtNameToWidget(glc->shell, "*form.viewport.list");
+  XtSetArg(arg, XtNlist, listLength ? glc->strings : dummyList); // empty list displays message
   XawListChange(listwidg, glc->strings, 0, 0, True);
+  XtSetValues(listwidg, &arg, 1);
   XawListHighlight(listwidg, 0);
+  snprintf(buf, MSG_SIZ, "%s- %d/%d games (%d-%d-%d)", glc->filename, listLength, ((ListGame *) gameList.tailPred)->number, wins, losses, draws);
+  XtSetArg(arg, XtNtitle, buf);
+  XtSetValues(glc->shell, &arg, 1);
 }
 
 void
@@ -384,10 +403,6 @@ GameListCallback(w, client_data, call_data)
 	LoadOptionsProc();
 	return;
     }
-    if (strcmp(name, _("find position")) == 0) {
-        if(GameListPrepare(True)) GameListReplace(); // crashes on empty list...
-	return;
-    }
     listwidg = XtNameToWidget(glc->shell, "*form.viewport.list");
     rs = XawListShowCurrent(listwidg);
     if (strcmp(name, _("load")) == 0) {
@@ -410,14 +425,15 @@ GameListCallback(w, client_data, call_data)
 	    return;
 	}
 	XawListHighlight(listwidg, index);
-    } else if (strcmp(name, _("apply")) == 0) {
-        String name;
+    } else if (strcmp(name, _("apply")) == 0 ||
+               strcmp(name, _("find position")) == 0) {
+        String text;
         j = 0;
-        XtSetArg(args[j], XtNstring, &name);  j++;
+        XtSetArg(args[j], XtNstring, &text);  j++;
 	XtGetValues(filterText, args, j);
-        safeStrCpy(filterString, name, sizeof(filterString)/sizeof(filterString[0]));
+        safeStrCpy(filterString, text, sizeof(filterString)/sizeof(filterString[0]));
 	XawListHighlight(listwidg, 0);
-        if(GameListPrepare(False)) GameListReplace(); // crashes on empty list...
+        GameListPrepare(strcmp(name, _("find position")) == 0); GameListReplace();
         return;
     }
 #if 1
@@ -446,14 +462,6 @@ GameListPopUp(fp, filename)
 	glc->x = glc->y = -1;
     }
 
-    if (glc->strings != NULL) {
-	st = glc->strings;
-	while (*st) {
-	    free(*st++);
-	}
-	free(glc->strings);
-    }
-
     GameListPrepare(False); // [HGM] filter: code put in separate routine
 
     glc->fp = fp;
@@ -465,12 +473,12 @@ GameListPopUp(fp, filename)
     if (glc->shell == NULL) {
 	glc->shell = GameListCreate(filename, GameListCallback, glc);
     } else {
-        GameListReplace(); // [HGM] filter: code put in separate routine
 	j = 0;
 	XtSetArg(args[j], XtNiconName, (XtArgVal) filename);  j++;
-	XtSetArg(args[j], XtNtitle, (XtArgVal) filename);  j++;
+//	XtSetArg(args[j], XtNtitle, (XtArgVal) filename);  j++;
 	XtSetValues(glc->shell, args, j);
     }
+    GameListReplace(); // [HGM] filter: code put in separate routine, and also called to set title
 
     XtPopup(glc->shell, XtGrabNone);
     glc->up = True;
@@ -535,7 +543,7 @@ LoadSelectedProc(w, event, prms, nprms)
     XawListReturnStruct *rs;
     int index, direction = atoi(prms[0]);
 
-    if (glc == NULL) return;
+    if (glc == NULL || listLength == 0) return;
     listwidg = XtNameToWidget(glc->shell, "*form.viewport.list");
     rs = XawListShowCurrent(listwidg);
     index = rs->list_index;
@@ -570,7 +578,7 @@ SetFilterProc(w, event, prms, nprms)
         XtSetArg(args[j], XtNstring, &name);  j++;
 	XtGetValues(filterText, args, j);
         safeStrCpy(filterString, name, sizeof(filterString)/sizeof(filterString[0]));
-        if(GameListPrepare(False)) GameListReplace(); // crashes on empty list...
+        GameListPrepare(False); GameListReplace();
 	list = XtNameToWidget(glc->shell, "*form.viewport.list");
 	XawListHighlight(list, 0);
         j = 0;