X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xgamelist.c;h=ecdc9151f8611dd3a021a26b907fd19f58db0c3c;hb=e70077aab0199817f37aef9ed0bdba1bbca93b45;hp=aa7c6a2d4bd0df656d53ce8d3eeb592ce326f73f;hpb=5cd55bddca592918f38deff675d05b650a71412e;p=xboard.git diff --git a/xgamelist.c b/xgamelist.c index aa7c6a2..ecdc915 100644 --- a/xgamelist.c +++ b/xgamelist.c @@ -1,7 +1,7 @@ /* * xgamelist.c -- Game list window, part of X front end for XBoard * - * Copyright 1995, 2009, 2010 Free Software Foundation, Inc. + * Copyright 1995, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. * ------------------------------------------------------------------------ * * GNU XBoard is free software: you can redistribute it and/or modify @@ -93,20 +93,16 @@ extern char *getenv(); void SetFocus P((Widget w, XtPointer data, XEvent *event, Boolean *b)); -extern Widget formWidget, shellWidget, boardWidget, menuBarWidget, gameListShell; -extern Display *xDisplay; -extern int squareSize; -extern Pixmap xMarkPixmap; -extern char *layoutName; - 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 \ @@ -115,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; @@ -126,11 +124,6 @@ typedef struct { } GameListClosure; static GameListClosure *glc = NULL; -static Arg layoutArgs[] = { - { XtNborderWidth, 0 }, - { XtNdefaultDistance, 0 } -}; - Widget GameListCreate(name, callback, client_data) char *name; @@ -180,11 +173,11 @@ 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++; - listwidg = + listwidg = XtCreateManagedWidget("list", listWidgetClass, viewport, args, j); XawListHighlight(listwidg, 0); XtAugmentTranslations(listwidg, @@ -197,7 +190,7 @@ GameListCreate(name, callback, client_data) XtSetArg(args[j], XtNleft, XtChainLeft); j++; XtSetArg(args[j], XtNright, XtChainLeft); j++; b_load = - XtCreateManagedWidget(_("load"), commandWidgetClass, form, args, j); + XtCreateManagedWidget(_("thresholds"), commandWidgetClass, form, args, j); XtAddCallback(b_load, XtNcallback, callback, client_data); j = 0; @@ -208,9 +201,9 @@ GameListCreate(name, callback, client_data) XtSetArg(args[j], XtNleft, XtChainLeft); j++; XtSetArg(args[j], XtNright, XtChainLeft); j++; b_loadprev = - XtCreateManagedWidget(_("prev"), commandWidgetClass, form, args, j); + XtCreateManagedWidget(_("find position"), commandWidgetClass, form, args, j); XtAddCallback(b_loadprev, XtNcallback, callback, client_data); - +#if 1 j = 0; XtSetArg(args[j], XtNfromVert, viewport); j++; XtSetArg(args[j], XtNfromHoriz, b_loadprev); j++; @@ -221,7 +214,9 @@ GameListCreate(name, callback, client_data) b_loadnext = XtCreateManagedWidget(_("next"), commandWidgetClass, form, args, j); XtAddCallback(b_loadnext, XtNcallback, callback, client_data); - +#else + b_loadnext = b_loadprev; +#endif j = 0; XtSetArg(args[j], XtNfromVert, viewport); j++; XtSetArg(args[j], XtNfromHoriz, b_loadnext); j++; @@ -251,7 +246,7 @@ GameListCreate(name, callback, client_data) XtSetArg(args[j], XtNbottom, XtChainBottom); j++; XtSetArg(args[j], XtNleft, XtChainLeft); j++; XtSetArg(args[j], XtNright, XtChainRight); j++; - XtSetArg(args[j], XtNwidth, fw_width - 225 - squareSize); j++; + XtSetArg(args[j], XtNwidth, fw_width - 275 - squareSize); j++; XtSetArg(args[j], XtNstring, filterString); j++; XtSetArg(args[j], XtNdisplayCaret, False); j++; XtSetArg(args[j], XtNresizable, True); j++; @@ -331,40 +326,75 @@ GameListCreate(name, callback, client_data) return shell; } +extern int soughtCounts[]; +extern Board soughtBoard; + static int -GameListPrepare() +GameListPrepare(int byPos) { // [HGM] filter: put in separate routine, to make callable from call-back int nstrings; ListGame *lg; char **st, *line; + TimeMark t, t2; + GetTimeMark(&t); + 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; + if(byPos) InitSearch(); while (nstrings--) { + int pos = -1; line = GameListLine(lg->number, &lg->gameInfo); - if(filterString[0] == NULLCHAR || SearchPattern( line, filterString ) ) { - *st++ = line; // [HGM] filter: make adding line conditional + if((filterString[0] == NULLCHAR || SearchPattern( line, filterString )) && (!byPos || (pos=GameContainsPosition(glc->fp, lg)) >= 0) ) { + *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; } +GetTimeMark(&t2);printf("GameListPrepare %ld msec\n", SubtractTimeMarks(&t2,&t)); + DisplayTitle("XBoard"); *st = NULL; return listLength; } -static void -GameListReplace() -{ // [HGM] filter: put in separate routine, to make callable from call-back - Arg args[16]; - int j; - Widget listwidg; +static char *list[1003]; +int listEnd; - listwidg = XtNameToWidget(glc->shell, "*form.viewport.list"); - XawListChange(listwidg, glc->strings, 0, 0, True); - XawListHighlight(listwidg, 0); +static void +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"); + 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 @@ -388,6 +418,10 @@ GameListCallback(w, client_data, call_data) GameListPopDown(); return; } + if (strcmp(name, _("thresholds")) == 0) { + LoadOptionsProc(); + return; + } listwidg = XtNameToWidget(glc->shell, "*form.viewport.list"); rs = XawListShowCurrent(listwidg); if (strcmp(name, _("load")) == 0) { @@ -398,7 +432,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,22 +444,27 @@ 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); - strcpy(filterString, name); + safeStrCpy(filterString, text, sizeof(filterString)/sizeof(filterString[0])); XawListHighlight(listwidg, 0); - if(GameListPrepare()) GameListReplace(); // crashes on empty list... + GameListPrepare(strcmp(name, _("find position")) == 0); GameListReplace(0); return; } - index = atoi(glc->strings[index])-1; // [HGM] filter: read true index from sequence nr of line +#if 1 + 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); } +#else + printf("This code should have been unreachable. Please report bug!\n"); +#endif } void @@ -434,47 +473,39 @@ GameListPopUp(fp, filename) char *filename; { Arg args[16]; - int j, nstrings; - Widget listwidg; - ListGame *lg; + int j; char **st; if (glc == NULL) { glc = (GameListClosure *) calloc(1, sizeof(GameListClosure)); glc->x = glc->y = -1; + glc->filename = NULL; + glc->shell = NULL; } - if (glc->strings != NULL) { - st = glc->strings; - while (*st) { - free(*st++); - } - free(glc->strings); - } - - GameListPrepare(); // [HGM] filter: code put in separate routine + GameListPrepare(False); // [HGM] filter: code put in separate routine glc->fp = fp; if (glc->filename != NULL) free(glc->filename); glc->filename = StrSave(filename); - if (glc->shell == NULL) { - glc->shell = GameListCreate(filename, GameListCallback, glc); + 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; j = 0; XtSetArg(args[j], XtNleftBitmap, xMarkPixmap); j++; - XtSetValues(XtNameToWidget(menuBarWidget, "menuMode.Show Game List"), + XtSetValues(XtNameToWidget(menuBarWidget, "menuView.Show Game List"), args, j); } @@ -517,8 +548,9 @@ ShowGameListProc(w, event, prms, nprms) glc->up = True; j = 0; XtSetArg(args[j], XtNleftBitmap, xMarkPixmap); j++; - XtSetValues(XtNameToWidget(menuBarWidget, "menuMode.Show Game List"), + XtSetValues(XtNameToWidget(menuBarWidget, "menuView.Show Game List"), args, j); + GameListHighlight(lastLoadGameNumber); } void @@ -532,24 +564,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) { - index += direction; + 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); } } @@ -566,8 +614,8 @@ SetFilterProc(w, event, prms, nprms) int j = 0; XtSetArg(args[j], XtNstring, &name); j++; XtGetValues(filterText, args, j); - strcpy(filterString, name); - if(GameListPrepare()) GameListReplace(); // crashes on empty list... + safeStrCpy(filterString, name, sizeof(filterString)/sizeof(filterString[0])); + GameListPrepare(False); GameListReplace(0); list = XtNameToWidget(glc->shell, "*form.viewport.list"); XawListHighlight(list, 0); j = 0; @@ -598,7 +646,7 @@ GameListPopDown() glc->up = False; j = 0; XtSetArg(args[j], XtNleftBitmap, None); j++; - XtSetValues(XtNameToWidget(menuBarWidget, "menuMode.Show Game List"), + XtSetValues(XtNameToWidget(menuBarWidget, "menuView.Show Game List"), args, j); } @@ -610,7 +658,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)up; } +int SaveGameListAsText(FILE *f) +{ + ListGame * lg = (ListGame *) gameList.head; + int nItem; + + if( !glc || ((ListGame *) gameList.tailPred)->number <= 0 ) { + DisplayError(_("Game list not loaded or empty"), 0); + return False; + } + + /* Copy the list into the global memory block */ + if( f != NULL ) { + + lg = (ListGame *) gameList.head; + + for (nItem = 0; nItem < ((ListGame *) gameList.tailPred)->number; nItem++){ + char * st = GameListLineFull(lg->number, &lg->gameInfo); + char *line = GameListLine(lg->number, &lg->gameInfo); + if(filterString[0] == NULLCHAR || SearchPattern( line, filterString ) ) + fprintf( f, "%s\n", st ); + free(st); free(line); + lg = (ListGame *) lg->node.succ; + } + + fclose(f); + return True; + } + return False; +} //--------------------------------- Game-List options dialog ------------------------------------------ Widget gameListOptShell, listwidg; @@ -642,7 +719,8 @@ void GLT_AddToList(char *name) Boolean GLT_GetFromList(int index, char *name) { - strcpy(name, strings[index]); + safeStrCpy(name, strings[index], MSG_SIZ); + return TRUE; } void GLT_DeSelectList() @@ -654,14 +732,12 @@ void GLT_DeSelectList() void GameListOptionsPopDown() { - Arg args[16]; - int j; + if (gameListOptShell == NULL) return; - if (gameListOptShell == NULL) return; - XtPopdown(gameListOptShell); - XtDestroyWidget(gameListOptShell); - gameListOptShell = 0; - XtSetKeyboardFocus(shellWidget, formWidget); + XtPopdown(gameListOptShell); + XtDestroyWidget(gameListOptShell); + gameListOptShell = 0; + XtSetKeyboardFocus(shellWidget, formWidget); } void @@ -710,9 +786,9 @@ GameListOptionsCallback(w, client_data, call_data) strings[--index] = p; } else if (strcmp(name, _("factory")) == 0) { - strcpy(lpUserGLT, GLT_DEFAULT_TAGS); - GLT_TagsToList(lpUserGLT); - index = 0; + safeStrCpy(lpUserGLT, GLT_DEFAULT_TAGS, LPUSERGLT_SIZE); + GLT_TagsToList(lpUserGLT); + index = 0; } XawListHighlight(listwidg, index); } @@ -735,7 +811,7 @@ GameListOptionsCreate() XtSetArg(args[j], XtNresizable, True); j++; XtSetArg(args[j], XtNallowShellResize, True); j++; shell = gameListOptShell = - XtCreatePopupShell("Game-list options", transientShellWidgetClass, + XtCreatePopupShell(_("Game-list options"), transientShellWidgetClass, shellWidget, args, j); layout = XtCreateManagedWidget(layoutName, formWidgetClass, shell, @@ -809,7 +885,7 @@ GameListOptionsCreate() XtCreateManagedWidget(_("OK"), commandWidgetClass, form, args, j); XtAddCallback(b_close, XtNcallback, GameListOptionsCallback, client_data); - strcpy(lpUserGLT, appData.gameListTags); + safeStrCpy(lpUserGLT, appData.gameListTags, LPUSERGLT_SIZE); GLT_TagsToList(lpUserGLT); XtRealizeWidget(shell); @@ -821,15 +897,10 @@ GameListOptionsCreate() void GameListOptionsPopUp(Widget w, XEvent *event, String *prms, Cardinal *nprms) { - Arg args[16]; - int j, nstrings; - Widget listwidg; - - if (gameListOptShell == NULL) { - gameListOptShell = GameListOptionsCreate(); - } + if (gameListOptShell == NULL) + gameListOptShell = GameListOptionsCreate(); - XtPopup(gameListOptShell, XtGrabNone); + XtPopup(gameListOptShell, XtGrabNone); }