X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xgamelist.c;h=5767b9810951b20d1e9e087291128fcd4a723a54;hb=f29ff21f23c2a22fc55e14ba48c53d704c22289d;hp=d68c00b2765ccd1cad2776e71304a292b5f50ceb;hpb=d9f4b584106f4d7477158476ff792f6fa0b2630a;p=xboard.git diff --git a/xgamelist.c b/xgamelist.c index d68c00b..5767b98 100644 --- a/xgamelist.c +++ b/xgamelist.c @@ -95,12 +95,14 @@ 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, page; char gameListTranslations[] = "(2): LoadSelectedProc(0) \n \ Home: LoadSelectedProc(-2) \n \ End: LoadSelectedProc(2) \n \ + CtrlUp: LoadSelectedProc(-3) \n \ + CtrlDown: LoadSelectedProc(3) \n \ Up: LoadSelectedProc(-1) \n \ Down: LoadSelectedProc(1) \n \ Left: LoadSelectedProc(-1) \n \ @@ -109,6 +111,8 @@ char gameListTranslations[] = char filterTranslations[] = "Return: SetFilterProc() \n"; +char *dummyList[] = { N_("no games matched your request"), NULL }; + typedef struct { Widget shell; Position x, y; @@ -169,7 +173,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,34 +333,61 @@ 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 + *st++ = line; // [HGM] filter: make adding line conditional. 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; } +static char *list[1003]; +int listEnd; + static void -GameListReplace() +GameListReplace(int page) { // filter: put in separate routine, to make callable from call-back Widget listwidg; + Arg arg; + char buf[MSG_SIZ], *p, **st=list; + int i; + + if(page) *st++ = _("previous page"); else if(listLength > 1000) *st++ = ""; + for(i=0; i<1000; i++) if( !(*st++ = glc->strings[page+i]) ) { st--; break; } + listEnd = st - list; + if(page + 1000 <= listLength) *st++ = _("next page"); + *st = NULL; listwidg = XtNameToWidget(glc->shell, "*form.viewport.list"); - XawListChange(listwidg, glc->strings, 0, 0, True); + XtSetArg(arg, XtNlist, listLength ? list : dummyList); // empty list displays message + XawListChange(listwidg, list, 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 +415,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) { @@ -398,7 +425,7 @@ GameListCallback(w, client_data, call_data) } } else if (strcmp(name, _("next")) == 0) { index = rs->list_index + 1; - if (index >= listLength) { + if (index >= listLength || !list[index]) { DisplayError(_("Can't go forward any further"), 0); return; } @@ -410,18 +437,19 @@ 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(0); return; } #if 1 - index = atoi(glc->strings[index])-1; // [HGM] filter: read true index from sequence nr of line + index = atoi(list[index])-1; // [HGM] filter: read true index from sequence nr of line if (cmailMsgLoaded) { CmailLoadGame(glc->fp, index + 1, glc->filename, True); } else { @@ -446,14 +474,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 +485,13 @@ 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); } + page = 0; + GameListReplace(0); // [HGM] filter: code put in separate routine, and also called to set title XtPopup(glc->shell, XtGrabNone); glc->up = True; @@ -535,24 +556,40 @@ 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; if (index < 0) return; + if(page && index == 0) { + page -= 1000; + if(page < 0) page = 0; // safety + GameListReplace(page); + return; + } + if(index == 1001) { + page += 1000; + GameListReplace(page); + return; + } + if(direction != 0) { + int doLoad = abs(direction) > 2; + if(doLoad) direction /= 3; index += direction; if(direction == -2) index = 0; - if(direction == 2) index = listLength-1; - if(index < 0 || index >= listLength) return; + if(direction == 2) index = listEnd-1; + if(index < 0 || index >= listEnd) return; XawListHighlight(listwidg, index); - return; + if(!doLoad) return; } - index = atoi(glc->strings[index])-1; // [HGM] filter: read true index from sequence nr of line + index = atoi(list[index])-1; // [HGM] filter: read true index from sequence nr of line if (cmailMsgLoaded) { CmailLoadGame(glc->fp, index + 1, glc->filename, True); } else { LoadGame(glc->fp, index + 1, glc->filename, True); + XSync(xDisplay, False); + XSetInputFocus(xDisplay, XtWindow(boardWidget), RevertToPointerRoot, CurrentTime); } } @@ -570,7 +607,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(0); list = XtNameToWidget(glc->shell, "*form.viewport.list"); XawListHighlight(list, 0); j = 0; @@ -613,7 +650,7 @@ GameListHighlight(index) int i=0; char **st; if (glc == NULL || !glc->up) return; listwidg = XtNameToWidget(glc->shell, "*form.viewport.list"); - st = glc->strings; + st = list; while(*st && atoi(*st)