From 73419c47f539f4f6d0700fe8ec89bb0f6259c94e Mon Sep 17 00:00:00 2001 From: H.G. Muller Date: Wed, 21 Mar 2012 23:00:05 +0100 Subject: [PATCH] Redo Game List with generic popup Check in ngamelist.c Redo Game List with generic popup The X-independent code (i.e. almost all) is moved to a new file ngamelist.c. Make button in Game List to pop up Game List Options Fix scrolling game list Fix popup of existing Game List after loading file Wheel-scroll game list Symbolic reference game list TopLevel game list Put format flags with listbox options --- Makefile.am | 2 +- dialogs.c | 22 ++- dialogs.h | 8 + frontend.h | 1 - menus.c | 5 +- menus.h | 4 +- ngamelist.c | 373 +++++++++++++++++++++++++++++++++++++ xboard.c | 10 +- xboard.h | 2 +- xgamelist.c | 586 +---------------------------------------------------------- xgamelist.h | 3 - 11 files changed, 418 insertions(+), 598 deletions(-) create mode 100644 ngamelist.c diff --git a/Makefile.am b/Makefile.am index 1935579..548a6da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ xboard_SOURCES = backend.c backend.h backendz.h \ childio.c childio.h \ common.h \ frontend.h \ - gamelist.c \ + gamelist.c ngamelist.c \ gettext.h \ lists.c lists.h \ moves.c moves.h \ diff --git a/dialogs.c b/dialogs.c index 10de8cf..8de450d 100644 --- a/dialogs.c +++ b/dialogs.c @@ -611,10 +611,16 @@ static Option loadOptions[] = { }; void -LoadOptionsProc () +LoadOptionsPopUp (DialogClass parent) { ASSIGN(searchMode, modeValues[appData.searchMode-1]); - GenericPopUp(loadOptions, _("Load Game Options"), TransientDlg, BoardWindow, MODAL, 0); + GenericPopUp(loadOptions, _("Load Game Options"), TransientDlg, parent, MODAL, 0); +} + +void +LoadOptionsProc () +{ // called from menu + LoadOptionsPopUp(BoardWindow); } //------------------------------------------- Save Game Options -------------------------------------------- @@ -1546,18 +1552,24 @@ GLT_Button (int n) safeStrCpy(lpUserGLT, GLT_DEFAULT_TAGS, LPUSERGLT_SIZE); GLT_TagsToList(lpUserGLT); index = 0; - LoadListBox(&listOptions[0]); // Note: the others don't need this, as the highligh + LoadListBox(&listOptions[0], "?"); // Note: the others don't need this, as the highlight switching redraws the change items } HighlightListBoxItem(&listOptions[0], index); } void -GameListOptionsPopUp () +GameListOptionsPopUp (DialogClass parent) { safeStrCpy(lpUserGLT, appData.gameListTags, LPUSERGLT_SIZE); GLT_TagsToList(lpUserGLT); - GenericPopUp(listOptions, _("Game-list options"), TransientDlg); + GenericPopUp(listOptions, _("Game-list options"), TransientDlg, parent, MODAL, 0); +} + +void +GameListOptionsProc () +{ + GameListOptionsPopUp(BoardWindow); } //----------------------------- Error popup in various uses ----------------------------- diff --git a/dialogs.h b/dialogs.h index 856598e..417bd1c 100644 --- a/dialogs.h +++ b/dialogs.h @@ -82,6 +82,7 @@ typedef enum { // identifier of dialogs done by GenericPopup TransientDlg=0, // transient: grabs mouse events and is destroyed at pop-down (so other dialog can use this ID next time) CommentDlg, TagsDlg, TextMenuDlg, InputBoxDlg, NoDlg, BrowserDlg, HistoryDlg, // persistent: no grab and reused +GameListDlg, PromoDlg, // this and beyond are destroyed at pop-down ErrorDlg, AskDlg, // this and beyond do grab mouse events (and are destroyed) @@ -143,5 +144,12 @@ int SetCurrentComboSelection P((Option *opt)); void BoxAutoPopUp P((char *buf)); void IcsKey P((int n)); void ICSInputBoxPopUp P((void)); +void LoadOptionsPopUp P((DialogClass parent)); +void GameListOptionsPopUp P((DialogClass parent)); + +// in ngamelist.c +int GameListClicks P((int direction)); +void SetFilter P((void)); +int SaveGameListAsText P((FILE *f)); diff --git a/frontend.h b/frontend.h index 7dce83f..358726a 100644 --- a/frontend.h +++ b/frontend.h @@ -183,7 +183,6 @@ extern char *homeDir; /* these are in wgamelist.c */ void GameListPopUp P((FILE *fp, char *filename)); -void GameListPopDown P((void)); void GameListHighlight P((int index)); void GameListDestroy P((void)); diff --git a/menus.c b/menus.c index c222249..1b60482 100644 --- a/menus.c +++ b/menus.c @@ -89,7 +89,6 @@ extern char *getenv(); #include "backend.h" #include "backendz.h" #include "moves.h" -#include "xgamelist.h" #include "xhistory.h" #include "xedittags.h" #include "menus.h" @@ -685,7 +684,7 @@ MenuItem viewMenu[] = { {N_("ICS Input Box"), "ICS Input Box", IcsInputBoxProc}, {"----", NULL, NothingProc}, {N_("Board..."), "Board Options", BoardOptionsProc}, - {N_("Game List Tags..."), "Game List", GameListOptionsPopUp}, + {N_("Game List Tags..."), "Game List", GameListOptionsProc}, {NULL, NULL, NULL} }; @@ -752,7 +751,7 @@ MenuItem optionsMenu[] = { {N_("Load Game ..."), "Load Game", LoadOptionsProc}, {N_("Save Game ..."), "Save Game", SaveOptionsProc}, // {N_(" ..."), "", OptionsProc}, - {N_("Game List ..."), "Game List", GameListOptionsPopUp}, + {N_("Game List ..."), "Game List", GameListOptionsProc}, {N_("Sounds ..."), "Sounds", SoundOptionsProc}, {"----", NULL, NothingProc}, #ifndef OPTIONSDIALOG diff --git a/menus.h b/menus.h index 37195bd..9ed3fc9 100644 --- a/menus.h +++ b/menus.h @@ -154,7 +154,7 @@ void IcsTextProc P((void)); void LoadEngineProc P((void)); void FirstSettingsProc P((void)); void SecondSettingsProc P((void)); -void GameListOptionsPopUp P((void)); +void GameListOptionsProc P((void)); void IcsOptionsProc P((void)); void SoundOptionsProc P((void)); void BoardOptionsProc P((void)); @@ -162,6 +162,8 @@ void LoadOptionsProc P((void)); void SaveOptionsProc P((void)); void EditBookProc P((void)); void InitMenuMarkers P((void)); +void ShowGameListProc P((void)); // in ngamelist.c + // must be moved to xengineoutput.h diff --git a/ngamelist.c b/ngamelist.c new file mode 100644 index 0000000..365ed8c --- /dev/null +++ b/ngamelist.c @@ -0,0 +1,373 @@ +/* + * ngamelist.c -- Game list window, Xt-independent front-end code for XBoard + * + * Copyright 1995, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + * ------------------------------------------------------------------------ + * + * GNU XBoard is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or (at + * your option) any later version. + * + * GNU XBoard is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. * + * + *------------------------------------------------------------------------ + ** See the file ChangeLog for a revision history. */ + +#include "config.h" + +#include +#include +#include +#include + +#if STDC_HEADERS +# include +# include +#else /* not STDC_HEADERS */ +extern char *getenv(); +# if HAVE_STRING_H +# include +# else /* not HAVE_STRING_H */ +# include +# endif /* not HAVE_STRING_H */ +#endif /* not STDC_HEADERS */ + +#if HAVE_UNISTD_H +# include +#endif + +#include "common.h" +#include "frontend.h" +#include "backend.h" +#include "dialogs.h" +#include "menus.h" +#include "gettext.h" + +#ifdef ENABLE_NLS +# define _(s) gettext (s) +# define N_(s) gettext_noop (s) +#else +# define _(s) (s) +# define N_(s) s +#endif + + +static char filterString[MSG_SIZ]; +static int listLength, wins, losses, draws, page; + + +typedef struct { + short int x, y; + short int w, h; + FILE *fp; + char *filename; + char **strings; +} GameListClosure; +static GameListClosure *glc = NULL; + +static char *filterPtr; +static char *list[1003]; +static int listEnd; + +static int GameListPrepare P((int byPos)); +static void GameListReplace P((int page)); +static void GL_Button P((int n)); + +static Option gamesOptions[] = { +{ 200, LR|TB, 400, NULL, (void*) list, "", NULL, ListBox, "" }, +{ 0, 0, 100, NULL, (void*) &filterPtr, "", NULL, TextBox, "" }, +{ 2, SAME_ROW, 0, NULL, (void*) &GL_Button, NULL, NULL, Button, N_("(filter)") }, // buttons referred to by ID in value (=first) field! +{ 3, SAME_ROW, 0, NULL, (void*) &GL_Button, NULL, NULL, Button, N_("thresholds") }, +{ 9, SAME_ROW, 0, NULL, (void*) &GL_Button, NULL, NULL, Button, N_("tags") }, +{ 4, SAME_ROW, 0, NULL, (void*) &GL_Button, NULL, NULL, Button, N_("find position") }, +{ 5, SAME_ROW, 0, NULL, (void*) &GL_Button, NULL, NULL, Button, N_("next") }, +{ 6, SAME_ROW, 0, NULL, (void*) &GL_Button, NULL, NULL, Button, N_("close") }, +{ 0, SAME_ROW | NO_OK, 0, NULL, NULL, "", NULL, EndMark , "" } +}; + +static void +GL_Button (int n) +{ + int index, j; + n = gamesOptions[n].value; // use marker in option rather than n itself, for more easy adding/deletng of buttons + if (n == 6) { // close + PopDown(GameListDlg); + return; + } + if (n == 3) { // thresholds + LoadOptionsPopUp(GameListDlg); + return; + } + if (n == 9) { // tags + GameListOptionsPopUp(GameListDlg); + return; + } + index = SelectedListBoxItem(&gamesOptions[0]); + if (n == 7) { // load + if (index < 0) { + DisplayError(_("No game selected"), 0); + return; + } + } else if (n == 5) { // next + index++; + if (index >= listLength || !list[index]) { + DisplayError(_("Can't go forward any further"), 0); + return; + } + HighlightWithScroll(&gamesOptions[0], index, listEnd); + } else if (n == 8) { // prev + index--; + if (index < 0) { + DisplayError(_("Can't back up any further"), 0); + return; + } + HighlightWithScroll(&gamesOptions[0], index, listEnd); + } else if (n == 2 || // filter + n == 4) { // find position + char *text; + GetWidgetText(&gamesOptions[1], &text); + safeStrCpy(filterString, text, sizeof(filterString)/sizeof(filterString[0])); + GameListPrepare(n == 4); GameListReplace(0); + 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); + } +} + +static int +GameListCreate (char *name) +{ + int new; + if(new = GenericPopUp(gamesOptions, name, GameListDlg, BoardWindow, NONMODAL, 1)) + AddHandler(&gamesOptions[1], 4), + AddHandler(&gamesOptions[0], 5); + FocusOnWidget(&gamesOptions[0], GameListDlg); + return new; +} + +static int +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 = 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) ) { + *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 (int page) +{ + // filter: put in separate routine, to make callable from call-back + 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; + + LoadListBox(&gamesOptions[0], _("no games matched your request")); + HighlightWithScroll(&gamesOptions[0], listEnd > 1000, listEnd); + snprintf(buf, MSG_SIZ, _("%s - %d/%d games (%d-%d-%d)"), glc->filename, listLength, ((ListGame *) gameList.tailPred)->number, wins, losses, draws); + SetDialogTitle(GameListDlg, buf); +} + +void +GameListPopUp (FILE *fp, char *filename) +{ + char **st; + + if (glc == NULL) { + glc = (GameListClosure *) calloc(1, sizeof(GameListClosure)); + glc->x = glc->y = -1; + glc->filename = NULL; + } + + GameListPrepare(False); // [HGM] filter: code put in separate routine + + glc->fp = fp; + + if (glc->filename != NULL) free(glc->filename); + glc->filename = StrSave(filename); + + if (!GameListCreate(filename)) + SetIconName(GameListDlg, filename); + + page = 0; + GameListReplace(0); // [HGM] filter: code put in separate routine, and also called to set title + MarkMenu("Show Game List", GameListDlg); +} + +void +GameListDestroy () +{ + if (glc == NULL) return; + PopDown(GameListDlg); + if (glc->strings != NULL) { + char **st; + st = glc->strings; + while (*st) { + free(*st++); + } + free(glc->strings); + } + free(glc); + glc = NULL; +} + +void +ShowGameListProc () +{ + Arg args[16]; + int j; + + if (glc == NULL) { + DisplayError(_("There is no game list"), 0); + return; + } + if (shellUp[GameListDlg]) { + PopDown(GameListDlg); + return; + } + GenericPopUp(NULL, NULL, GameListDlg, BoardWindow, NONMODAL, 1); // first two args ignored when shell exists! + MarkMenu("Show Game List", GameListDlg); + GameListHighlight(lastLoadGameNumber); +} + +int +GameListClicks (int direction) +{ + int index; + + if (glc == NULL || listLength == 0) return 0; + if(direction == 100) { FocusOnWidget(&gamesOptions[0], GameListDlg); return 1; } + index = SelectedListBoxItem(&gamesOptions[0]); + + if (index < 0) return; + if(page && (index == 0 && direction < 1 || direction == -4)) { + page -= 1000; + if(page < 0) page = 0; // safety + GameListReplace(page); + return 1; + } + if(index == 1001 && direction >= 0 || listEnd == 1001 && direction == 4) { + page += 1000; + GameListReplace(page); + return 1; + } + + if(direction != 0) { + int doLoad = abs(direction) == 3; + if(doLoad) direction /= 3; + index += direction; + if(direction < -1) index = 0; + if(direction > 1) index = listEnd-1; + if(index < 0 || index >= listEnd) return; + HighlightWithScroll(&gamesOptions[0], index, listEnd); + if(!doLoad) return 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); + } + return 0; +} + +void +SetFilter () +{ + char *name; + GetWidgetText(&gamesOptions[1], &name); + safeStrCpy(filterString, name, sizeof(filterString)/sizeof(filterString[0])); + GameListPrepare(False); GameListReplace(0); + UnCaret(); // filter text-edit + FocusOnWidget(&gamesOptions[0], GameListDlg); // listbox +} + +void +GameListHighlight (int index) +{ + int i=0; char **st; + if (!shellUp[GameListDlg]) return; + st = list; + while(*st && atoi(*st)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; +} + diff --git a/xboard.c b/xboard.c index 4ee3c19..c042200 100644 --- a/xboard.c +++ b/xboard.c @@ -312,7 +312,7 @@ Widget shellWidget, layoutWidget, formWidget, boardWidget, messageWidget, commentShell, whitePieceMenu, blackPieceMenu, dropMenu, menuBarWidget, buttonBarWidget, editShell, errorShell, analysisShell, ICSInputShell, fileNameShell; -Widget historyShell, evalGraphShell, gameListShell; +Widget historyShell, evalGraphShell; XSegment secondSegments[BOARD_RANKS + BOARD_FILES + 2]; XSegment gridSegments[BOARD_RANKS + BOARD_FILES + 2]; #if ENABLE_NLS @@ -522,7 +522,6 @@ XtActionsRec boardActions[] = { { "TempBackwardProc", TempBackwardProc }, { "TempForwardProc", TempForwardProc }, { "CommentClick", (XtActionProc) CommentClick }, - { "GameListPopDown", (XtActionProc) GameListPopDown }, { "EngineOutputPopDown", (XtActionProc) EngineOutputPopDown }, { "EvalGraphPopDown", (XtActionProc) EvalGraphPopDown }, { "GenericPopDown", (XtActionProc) GenericPopDown }, @@ -807,9 +806,6 @@ BoardToTop () #define OPTCHAR "-" #define SEPCHAR " " -// these two must some day move to frontend.h, when they are implemented -Boolean GameListIsUp(); - // The option definition and parsing code common to XBoard and WinBoard is collected in this file #include "args.h" @@ -1004,7 +1000,7 @@ GetWindowCoords () if(EngineOutputIsUp()) GetActualPlacement(engineOutputShell, &wpEngineOutput); if(MoveHistoryIsUp()) GetActualPlacement(shells[HistoryDlg], &wpMoveHistory); if(EvalGraphIsUp()) GetActualPlacement(evalGraphShell, &wpEvalGraph); - if(GameListIsUp()) GetActualPlacement(gameListShell, &wpGameList); + if(shellUp[GameListDlg]) GetActualPlacement(shells[GameListDlg], &wpGameList); if(shellUp[CommentDlg]) GetActualPlacement(shells[CommentDlg], &wpComment); if(shellUp[TagsDlg]) GetActualPlacement(shells[TagsDlg], &wpTags); } @@ -3393,7 +3389,7 @@ DragProc () if(EngineOutputIsUp()) CoDrag(engineOutputShell, &wpEngineOutput); if(MoveHistoryIsUp()) CoDrag(shells[HistoryDlg], &wpMoveHistory); if(EvalGraphIsUp()) CoDrag(evalGraphShell, &wpEvalGraph); - if(GameListIsUp()) CoDrag(gameListShell, &wpGameList); + if(shellUp[GameListDlg]) CoDrag(shells[GameListDlg], &wpGameList); wpMain = wpNew; DrawPosition(True, NULL); delayedDragID = 0; // now drag executed, make sure next DelayedDrag will not cancel timer event (which could now be used by other) diff --git a/xboard.h b/xboard.h index 188e507..bc709a7 100644 --- a/xboard.h +++ b/xboard.h @@ -152,7 +152,7 @@ FILE * XsraSelFile P((Widget w, char *prompt, char *ok, char *cancel, char *fail extern Widget shells[]; extern int dialogError; -extern Widget formWidget, shellWidget, boardWidget, menuBarWidget, gameListShell, historyShell; +extern Widget formWidget, shellWidget, boardWidget, menuBarWidget, historyShell; extern Display *xDisplay; extern Window xBoardWindow; extern int squareSize; diff --git a/xgamelist.c b/xgamelist.c index 0f0b53e..50367b1 100644 --- a/xgamelist.c +++ b/xgamelist.c @@ -76,29 +76,16 @@ extern char *getenv(); #endif #include "common.h" -#include "frontend.h" #include "backend.h" #include "xboard.h" #include "xgamelist.h" -#include "gettext.h" - -#ifdef ENABLE_NLS -# define _(s) gettext (s) -# define N_(s) gettext_noop (s) -#else -# define _(s) (s) -# define N_(s) s -#endif +#include "dialogs.h" -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, page; - char gameListTranslations[] = - ": LoadSelectedProc(100) Set() \n \ + ": WheelProc(-3) \n \ + : WheelProc(3) \n \ + : LoadSelectedProc(100) Set() \n \ (2): LoadSelectedProc(0) \n \ Home: LoadSelectedProc(-2) \n \ End: LoadSelectedProc(2) \n \ @@ -108,577 +95,24 @@ char gameListTranslations[] = Down: LoadSelectedProc(1) \n \ Left: LoadSelectedProc(-1) \n \ Right: LoadSelectedProc(1) \n \ + Prior: LoadSelectedProc(-4) \n \ + Next: LoadSelectedProc(4) \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; - Dimension w, h; - Boolean up; - FILE *fp; - char *filename; - char **strings; -} GameListClosure; -static GameListClosure *glc = NULL; - -Widget -GameListCreate (char *name, XtCallbackProc callback, XtPointer client_data) -{ - Arg args[16]; - Widget shell, form, viewport, listwidg, layout, label; - Widget b_load, b_loadprev, b_loadnext, b_close, b_filter; - Dimension fw_width; - int j; - GameListClosure *glc = (GameListClosure *) client_data; - - 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++; -#if TOPLEVEL - shell = gameListShell = - XtCreatePopupShell(name, topLevelShellWidgetClass, - shellWidget, args, j); -#else - shell = gameListShell = - XtCreatePopupShell(name, transientShellWidgetClass, - shellWidget, args, j); -#endif - 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], XtNtop, XtChainTop); j++; - XtSetArg(args[j], XtNbottom, XtChainBottom); j++; - XtSetArg(args[j], XtNleft, XtChainLeft); j++; - XtSetArg(args[j], XtNright, XtChainRight); j++; - XtSetArg(args[j], XtNresizable, False); j++; - XtSetArg(args[j], XtNwidth, fw_width); j++; - XtSetArg(args[j], XtNallowVert, True); j++; - viewport = - XtCreateManagedWidget("viewport", viewportWidgetClass, form, args, j); - - j = 0; -// 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 = - XtCreateManagedWidget("list", listWidgetClass, viewport, args, j); - XawListHighlight(listwidg, 0); - XtOverrideTranslations(listwidg, - XtParseTranslationTable(gameListTranslations)); - - 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(_("thresholds"), commandWidgetClass, form, args, j); - XtAddCallback(b_load, XtNcallback, callback, 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(_("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++; - 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(_("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++; - 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(_("close"), commandWidgetClass, form, args, j); - XtAddCallback(b_close, XtNcallback, callback, client_data); - - j = 0; - XtSetArg(args[j], XtNfromVert, viewport); j++; - XtSetArg(args[j], XtNfromHoriz, b_close); 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++; - XtSetArg(args[j], XtNborderWidth, 0); j++; - label = - XtCreateManagedWidget(_("Filter:"), labelWidgetClass, form, args, j); - - j = 0; - XtSetArg(args[j], XtNfromVert, viewport); j++; - XtSetArg(args[j], XtNfromHoriz, label); j++; - XtSetArg(args[j], XtNtop, XtChainBottom); j++; - XtSetArg(args[j], XtNbottom, XtChainBottom); j++; - XtSetArg(args[j], XtNleft, XtChainLeft); j++; - XtSetArg(args[j], XtNright, XtChainRight); 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++; -// XtSetArg(args[j], XtNwidth, bw_width); j++; /*force wider than buttons*/ - /* !!Work around an apparent bug in XFree86 4.0.1 (X11R6.4.3) */ - XtSetArg(args[j], XtNeditType, XawtextEdit); j++; - XtSetArg(args[j], XtNuseStringInPlace, False); j++; - filterText = - XtCreateManagedWidget(_("filtertext"), asciiTextWidgetClass, form, args, j); - XtAddEventHandler(filterText, ButtonPressMask, False, SetFocus, (XtPointer) shell); - XtOverrideTranslations(filterText, - XtParseTranslationTable(filterTranslations)); - - j = 0; - XtSetArg(args[j], XtNfromVert, viewport); j++; - XtSetArg(args[j], XtNfromHoriz, filterText); j++; - XtSetArg(args[j], XtNtop, XtChainBottom); j++; - XtSetArg(args[j], XtNbottom, XtChainBottom); j++; - XtSetArg(args[j], XtNleft, XtChainRight); j++; - XtSetArg(args[j], XtNright, XtChainRight); j++; - b_filter = - XtCreateManagedWidget(_("apply"), commandWidgetClass, form, args, j); - XtAddCallback(b_filter, XtNcallback, callback, client_data); - - - if(wpGameList.width > 0) { - glc->x = wpGameList.x; - glc->y = wpGameList.y; - glc->w = wpGameList.width; - glc->h = wpGameList.height; - } - - if (glc->x == -1) { - Position y1; - Dimension h1; - int xx, yy; - Window junk; - - j = 0; - XtSetArg(args[j], XtNheight, &h1); j++; - XtSetArg(args[j], XtNy, &y1); j++; - XtGetValues(boardWidget, args, j); - glc->w = fw_width * 3/4; - glc->h = squareSize * 3; - - XSync(xDisplay, False); -#ifdef NOTDEF - /* This code seems to tickle an X bug if it is executed too soon - after xboard starts up. The coordinates get transformed as if - the main window was positioned at (0, 0). - */ - XtTranslateCoords(shellWidget, (fw_width - glc->w) / 2, - y1 + (h1 - glc->h + appData.borderYoffset) / 2, - &glc->x, &glc->y); -#else /*!NOTDEF*/ - XTranslateCoordinates(xDisplay, XtWindow(shellWidget), - RootWindowOfScreen(XtScreen(shellWidget)), - (fw_width - glc->w) / 2, - y1 + (h1 - glc->h + appData.borderYoffset) / 2, - &xx, &yy, &junk); - glc->x = xx; - glc->y = yy; -#endif /*!NOTDEF*/ - if (glc->y < 0) glc->y = 0; /*avoid positioning top offscreen*/ - } - j = 0; - XtSetArg(args[j], XtNheight, glc->h); j++; - XtSetArg(args[j], XtNwidth, glc->w); j++; - XtSetArg(args[j], XtNx, glc->x - appData.borderXoffset); j++; - XtSetArg(args[j], XtNy, glc->y - appData.borderYoffset); j++; - XtSetValues(shell, args, j); - - XtRealizeWidget(shell); - CatchDeleteWindow(shell, "GameListPopDown"); - XtSetKeyboardFocus(shell, listwidg); - - 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; - 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 = 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) ) { - *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 char *list[1003]; -int listEnd; - -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 -GameListCallback (Widget w, XtPointer client_data, XtPointer call_data) -{ - String name; - Arg args[16]; - int j; - Widget listwidg; - GameListClosure *glc = (GameListClosure *) client_data; - XawListReturnStruct *rs; - int index; - - j = 0; - XtSetArg(args[j], XtNlabel, &name); j++; - XtGetValues(w, args, j); - - if (strcmp(name, _("close")) == 0) { - GameListPopDown(); - return; - } - if (strcmp(name, _("thresholds")) == 0) { - LoadOptionsProc(); - return; - } - listwidg = XtNameToWidget(glc->shell, "*form.viewport.list"); - rs = XawListShowCurrent(listwidg); - if (strcmp(name, _("load")) == 0) { - index = rs->list_index; - if (index < 0) { - DisplayError(_("No game selected"), 0); - return; - } - } else if (strcmp(name, _("next")) == 0) { - index = rs->list_index + 1; - if (index >= listLength || !list[index]) { - DisplayError(_("Can't go forward any further"), 0); - return; - } - XawListHighlight(listwidg, index); - } else if (strcmp(name, _("prev")) == 0) { - index = rs->list_index - 1; - if (index < 0) { - DisplayError(_("Can't back up any further"), 0); - return; - } - XawListHighlight(listwidg, index); - } else if (strcmp(name, _("apply")) == 0 || - strcmp(name, _("find position")) == 0) { - String text; - j = 0; - XtSetArg(args[j], XtNstring, &text); j++; - XtGetValues(filterText, args, j); - safeStrCpy(filterString, text, sizeof(filterString)/sizeof(filterString[0])); - XawListHighlight(listwidg, 0); - GameListPrepare(strcmp(name, _("find position")) == 0); GameListReplace(0); - return; - } -#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 -GameListPopUp (FILE *fp, char *filename) -{ - Arg args[16]; - int j; - char **st; - - if (glc == NULL) { - glc = (GameListClosure *) calloc(1, sizeof(GameListClosure)); - glc->x = glc->y = -1; - glc->filename = NULL; - glc->shell = NULL; - } - - 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); - } else { - j = 0; - XtSetArg(args[j], XtNiconName, (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, "menuView.Show Game List"), - args, j); -} - -void -GameListDestroy () -{ - if (glc == NULL) return; - GameListPopDown(); - if (glc->strings != NULL) { - char **st; - st = glc->strings; - while (*st) { - free(*st++); - } - free(glc->strings); - } - free(glc); - glc = NULL; -} - -void -ShowGameListProc () -{ - Arg args[16]; - int j; - - if (glc == NULL) { - DisplayError(_("There is no game list"), 0); - return; - } - if (glc->up) { - GameListPopDown(); - return; - } - XtPopup(glc->shell, XtGrabNone); - glc->up = True; - j = 0; - XtSetArg(args[j], XtNleftBitmap, xMarkPixmap); j++; - XtSetValues(XtNameToWidget(menuBarWidget, "menuView.Show Game List"), - args, j); - GameListHighlight(lastLoadGameNumber); -} void LoadSelectedProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { - Widget listwidg; - XawListReturnStruct *rs; - int index, direction = atoi(prms[0]); -printf("action(%d)\n",direction); - if (glc == NULL || listLength == 0) return; - listwidg = XtNameToWidget(glc->shell, "*form.viewport.list"); - if(direction == 100) { XtSetKeyboardFocus(glc->shell, listwidg); return; } - 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 = 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); - } + if(GameListClicks(atoi(prms[0]))) return; // if no game loaded, no focus transfer + XSync(xDisplay, False); + XSetInputFocus(xDisplay, XtWindow(boardWidget), RevertToPointerRoot, CurrentTime); } void SetFilterProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { - Arg args[16]; - String name; - Widget list; - int j = 0; - XtSetArg(args[j], XtNstring, &name); j++; - XtGetValues(filterText, args, j); - safeStrCpy(filterString, name, sizeof(filterString)/sizeof(filterString[0])); - GameListPrepare(False); GameListReplace(0); - list = XtNameToWidget(glc->shell, "*form.viewport.list"); - XawListHighlight(list, 0); - j = 0; - XtSetArg(args[j], XtNdisplayCaret, False); j++; - XtSetValues(filterText, args, j); - XtSetKeyboardFocus(glc->shell, list); -} - -void -GameListPopDown () -{ - Arg args[16]; - int j; - - if (glc == NULL) return; - j = 0; - XtSetArg(args[j], XtNx, &glc->x); j++; - XtSetArg(args[j], XtNy, &glc->y); j++; - XtSetArg(args[j], XtNheight, &glc->h); j++; - XtSetArg(args[j], XtNwidth, &glc->w); j++; - XtGetValues(glc->shell, args, j); - wpGameList.x = glc->x - 4; - wpGameList.y = glc->y - 23; - wpGameList.width = glc->w; - wpGameList.height = glc->h; - XtPopdown(glc->shell); - XtSetKeyboardFocus(shellWidget, formWidget); - glc->up = False; - j = 0; - XtSetArg(args[j], XtNleftBitmap, None); j++; - XtSetValues(XtNameToWidget(menuBarWidget, "menuView.Show Game List"), - args, j); -} - -void -GameListHighlight (int index) -{ - Widget listwidg; - int i=0; char **st; - if (glc == NULL || !glc->up) return; - listwidg = XtNameToWidget(glc->shell, "*form.viewport.list"); - 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; + SetFilter(); } diff --git a/xgamelist.h b/xgamelist.h index 17dec72..9cacc61 100644 --- a/xgamelist.h +++ b/xgamelist.h @@ -23,12 +23,9 @@ #ifndef _XGAMEL_H #define _XGAMEL_H 1 -void ShowGameListProc P((void)); void LoadSelectedProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void SetFilterProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); -int SaveGameListAsText P((FILE *f)); -extern Widget gameListShell; #endif /* _XGAMEL_H */ -- 1.7.0.4