X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xgamelist.c;h=15165f164ff5f58b401d6d4dd02afd36239908f2;hb=ca6061cbffe88ff5eb2332e733e0a534b89cc5e7;hp=3a04f3f83082be7a7efec1bd1853ff47bacdcd01;hpb=369d80a758a3b9f552874f26909d79864a902731;p=xboard.git diff --git a/xgamelist.c b/xgamelist.c index 3a04f3f..15165f1 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 Free Software Foundation, Inc. + * Copyright 1995, 2009, 2010, 2011 Free Software Foundation, Inc. * ------------------------------------------------------------------------ * * GNU XBoard is free software: you can redistribute it and/or modify @@ -93,22 +93,26 @@ 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() \n \ - Return: LoadSelectedProc() \n"; + "(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 \ + Right: LoadSelectedProc(1) \n \ + Return: LoadSelectedProc(0) \n"; char filterTranslations[] = "Return: SetFilterProc() \n"; +char *dummyList[] = { N_("no games matched your request"), NULL }; + typedef struct { Widget shell; Position x, y; @@ -120,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; @@ -174,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, @@ -191,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; @@ -202,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++; @@ -215,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++; @@ -245,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, 173); 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++; @@ -320,44 +321,82 @@ GameListCreate(name, callback, client_data) XtRealizeWidget(shell); CatchDeleteWindow(shell, "GameListPopDown"); + XtSetKeyboardFocus(shell, listwidg); 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; +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; 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 %d 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 @@ -381,6 +420,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) { @@ -391,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; } @@ -403,22 +446,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 @@ -427,9 +475,7 @@ GameListPopUp(fp, filename) char *filename; { Arg args[16]; - int j, nstrings; - Widget listwidg; - ListGame *lg; + int j; char **st; if (glc == NULL) { @@ -437,15 +483,7 @@ GameListPopUp(fp, filename) glc->x = glc->y = -1; } - 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; @@ -454,20 +492,21 @@ GameListPopUp(fp, 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); } @@ -510,8 +549,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 @@ -523,18 +563,42 @@ LoadSelectedProc(w, event, prms, nprms) { Widget listwidg; XawListReturnStruct *rs; - int index; + 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; - index = atoi(glc->strings[index])-1; // [HGM] filter: read true index from sequence nr of line + 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 = listEnd-1; + if(index < 0 || index >= listEnd) return; + XawListHighlight(listwidg, index); + if(!doLoad) return; + } + 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); } } @@ -551,8 +615,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; @@ -583,7 +647,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); } @@ -595,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)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; + +char *strings[20]; +int stringPtr; + +void GLT_ClearList() +{ + strings[0] = NULL; + stringPtr = 0; +} + +void GLT_AddToList(char *name) +{ + strings[stringPtr++] = name; + strings[stringPtr] = NULL; +} + +Boolean GLT_GetFromList(int index, char *name) +{ + safeStrCpy(name, strings[index], MSG_SIZ); + return TRUE; +} + +void GLT_DeSelectList() +{ + XawListChange(listwidg, strings, 0, 0, True); + XawListHighlight(listwidg, 0); +} + +void +GameListOptionsPopDown() +{ + if (gameListOptShell == NULL) return; + + XtPopdown(gameListOptShell); + XtDestroyWidget(gameListOptShell); + gameListOptShell = 0; + XtSetKeyboardFocus(shellWidget, formWidget); +} + +void +GameListOptionsCallback(w, client_data, call_data) + Widget w; + XtPointer client_data, call_data; +{ + String name; + Arg args[16]; + int j; + Widget listwidg; + XawListReturnStruct *rs; + int index; + char *p; + + j = 0; + XtSetArg(args[j], XtNlabel, &name); j++; + XtGetValues(w, args, j); + + if (strcmp(name, _("OK")) == 0) { + GLT_ParseList(); + appData.gameListTags = strdup(lpUserGLT); + GameListOptionsPopDown(); + return; + } else + if (strcmp(name, _("cancel")) == 0) { + GameListOptionsPopDown(); + return; + } + listwidg = XtNameToWidget(gameListOptShell, "*form.list"); + rs = XawListShowCurrent(listwidg); + index = rs->list_index; + if (index < 0) { + DisplayError(_("No tag selected"), 0); + return; + } + p = strings[index]; + if (strcmp(name, _("down")) == 0) { + if(index >= strlen(GLT_ALL_TAGS)) return; + strings[index] = strings[index+1]; + strings[++index] = p; + } else + if (strcmp(name, _("up")) == 0) { + if(index == 0) return; + strings[index] = strings[index-1]; + strings[--index] = p; + } else + if (strcmp(name, _("factory")) == 0) { + safeStrCpy(lpUserGLT, GLT_DEFAULT_TAGS, LPUSERGLT_SIZE); + GLT_TagsToList(lpUserGLT); + index = 0; + } + XawListHighlight(listwidg, index); +} + +Widget +GameListOptionsCreate() +{ + Arg args[16]; + Widget shell, form, viewport, layout; + Widget b_load, b_loadprev, b_loadnext, b_close, b_cancel; + Dimension fw_width; + XtPointer client_data = NULL; + int j; + + j = 0; + XtSetArg(args[j], XtNwidth, &fw_width); j++; + XtGetValues(formWidget, args, j); + + j = 0; + XtSetArg(args[j], XtNresizable, True); j++; + XtSetArg(args[j], XtNallowShellResize, True); j++; + shell = gameListOptShell = + XtCreatePopupShell("Game-list options", transientShellWidgetClass, + shellWidget, args, j); + layout = + XtCreateManagedWidget(layoutName, formWidgetClass, shell, + layoutArgs, XtNumber(layoutArgs)); + j = 0; + XtSetArg(args[j], XtNborderWidth, 0); j++; + form = + XtCreateManagedWidget("form", formWidgetClass, layout, args, j); + + j = 0; + XtSetArg(args[j], XtNdefaultColumns, 1); j++; + XtSetArg(args[j], XtNforceColumns, True); j++; + XtSetArg(args[j], XtNverticalList, True); j++; + listwidg = viewport = + XtCreateManagedWidget("list", listWidgetClass, form, args, j); + XawListHighlight(listwidg, 0); +// XtAugmentTranslations(listwidg, +// XtParseTranslationTable(gameListOptTranslations)); + + j = 0; + XtSetArg(args[j], XtNfromVert, viewport); j++; + XtSetArg(args[j], XtNtop, XtChainBottom); j++; + XtSetArg(args[j], XtNbottom, XtChainBottom); j++; + XtSetArg(args[j], XtNleft, XtChainLeft); j++; + XtSetArg(args[j], XtNright, XtChainLeft); j++; + b_load = + XtCreateManagedWidget(_("factory"), commandWidgetClass, form, args, j); + XtAddCallback(b_load, XtNcallback, GameListOptionsCallback, client_data); + + j = 0; + XtSetArg(args[j], XtNfromVert, viewport); j++; + XtSetArg(args[j], XtNfromHoriz, b_load); j++; + XtSetArg(args[j], XtNtop, XtChainBottom); j++; + XtSetArg(args[j], XtNbottom, XtChainBottom); j++; + XtSetArg(args[j], XtNleft, XtChainLeft); j++; + XtSetArg(args[j], XtNright, XtChainLeft); j++; + b_loadprev = + XtCreateManagedWidget(_("up"), commandWidgetClass, form, args, j); + XtAddCallback(b_loadprev, XtNcallback, GameListOptionsCallback, client_data); + + j = 0; + XtSetArg(args[j], XtNfromVert, viewport); j++; + XtSetArg(args[j], XtNfromHoriz, b_loadprev); j++; + XtSetArg(args[j], XtNtop, XtChainBottom); j++; + XtSetArg(args[j], XtNbottom, XtChainBottom); j++; + XtSetArg(args[j], XtNleft, XtChainLeft); j++; + XtSetArg(args[j], XtNright, XtChainLeft); j++; + b_loadnext = + XtCreateManagedWidget(_("down"), commandWidgetClass, form, args, j); + XtAddCallback(b_loadnext, XtNcallback, GameListOptionsCallback, client_data); + + j = 0; + XtSetArg(args[j], XtNfromVert, viewport); j++; + XtSetArg(args[j], XtNfromHoriz, b_loadnext); j++; + XtSetArg(args[j], XtNtop, XtChainBottom); j++; + XtSetArg(args[j], XtNbottom, XtChainBottom); j++; + XtSetArg(args[j], XtNleft, XtChainLeft); j++; + XtSetArg(args[j], XtNright, XtChainLeft); j++; + b_cancel = + XtCreateManagedWidget(_("cancel"), commandWidgetClass, form, args, j); + XtAddCallback(b_cancel, XtNcallback, GameListOptionsCallback, client_data); + + j = 0; + XtSetArg(args[j], XtNfromVert, viewport); j++; + XtSetArg(args[j], XtNfromHoriz, b_cancel); j++; + XtSetArg(args[j], XtNtop, XtChainBottom); j++; + XtSetArg(args[j], XtNbottom, XtChainBottom); j++; + XtSetArg(args[j], XtNleft, XtChainLeft); j++; + XtSetArg(args[j], XtNright, XtChainLeft); j++; + b_close = + XtCreateManagedWidget(_("OK"), commandWidgetClass, form, args, j); + XtAddCallback(b_close, XtNcallback, GameListOptionsCallback, client_data); + + safeStrCpy(lpUserGLT, appData.gameListTags, LPUSERGLT_SIZE); + GLT_TagsToList(lpUserGLT); + + XtRealizeWidget(shell); + CatchDeleteWindow(shell, "GameListOptionsPopDown"); + + return shell; +} + +void +GameListOptionsPopUp(Widget w, XEvent *event, String *prms, Cardinal *nprms) +{ + if (gameListOptShell == NULL) + gameListOptShell = GameListOptionsCreate(); + + XtPopup(gameListOptShell, XtGrabNone); +} + +