X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xgamelist.c;h=15165f164ff5f58b401d6d4dd02afd36239908f2;hb=ca6061cbffe88ff5eb2332e733e0a534b89cc5e7;hp=e1781dc7a81a389b4c634cb495d5adc091eeea62;hpb=217502f8f21abe39a2747605f7fcbb96239aeb37;p=xboard.git diff --git a/xgamelist.c b/xgamelist.c index e1781dc..15165f1 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, wins, losses, draws; +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; @@ -322,12 +326,19 @@ GameListCreate(name, callback, client_data) return shell; } +extern int soughtCounts[]; +extern Board soughtBoard; + static int GameListPrepare(int byPos) { // [HGM] filter: put in separate routine, to make callable from call-back int nstrings; ListGame *lg; char **st, *line; +struct { + long sec; /* Assuming this is >= 32 bits */ + int ms; /* Assuming this is >= 16 bits */ +} t,t2; GetTimeMark(&t); if(st = glc->strings) while(*st) free(*st++); nstrings = ((ListGame *) gameList.tailPred)->number; @@ -335,11 +346,12 @@ GameListPrepare(int byPos) st = glc->strings; lg = (ListGame *) gameList.head; listLength = wins = losses = draws = 0; + if(byPos) InitSearch(); 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) ) { - if(listLength < 1500) *st++ = line; // [HGM] filter: make adding line conditional. *** X listboxes have severe size limit *** + *st++ = line; // [HGM] filter: make adding line conditional. listLength++; if( lg->gameInfo.result == WhiteWins ) wins++; else if( lg->gameInfo.result == BlackWins ) losses++; else @@ -353,22 +365,33 @@ GameListPrepare(int byPos) lg->position = pos; lg = (ListGame *) lg->node.succ; } +GetTimeMark(&t2);printf("GameListPrepare %d msec\n", SubtractTimeMarks(&t2,&t)); 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; + 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"); - XtSetArg(arg, XtNlist, glc->strings); - 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); @@ -411,7 +434,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; } @@ -431,11 +454,11 @@ GameListCallback(w, client_data, call_data) XtGetValues(filterText, args, j); safeStrCpy(filterString, text, sizeof(filterString)/sizeof(filterString[0])); XawListHighlight(listwidg, 0); - if(GameListPrepare(strcmp(name, _("find position")) == 0)) 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 { @@ -476,7 +499,8 @@ GameListPopUp(fp, filename) // 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 + page = 0; + GameListReplace(0); // [HGM] filter: code put in separate routine, and also called to set title XtPopup(glc->shell, XtGrabNone); glc->up = True; @@ -546,19 +570,35 @@ LoadSelectedProc(w, event, prms, nprms) 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); } } @@ -576,7 +616,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; @@ -619,7 +659,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)