X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xgamelist.c;h=35194ac5639504c463c30c0eea981209fd244669;hb=18ccb0da4151e649009780bd4db7ecbdea7a93c8;hp=9ce424bd94fed2e2b88ecdffa2c0f593767a467f;hpb=fb8fa22c61533dc438d2e3152305d3f1253fb24a;p=xboard.git diff --git a/xgamelist.c b/xgamelist.c index 9ce424b..35194ac 100644 --- a/xgamelist.c +++ b/xgamelist.c @@ -1,29 +1,24 @@ /* * xgamelist.c -- Game list window, part of X front end for XBoard - * $Id$ * - * Copyright 1995 Free Software Foundation, Inc. - * - * The following terms apply to the enhanced version of XBoard distributed - * by the Free Software Foundation: + * Copyright 1995,2009 Free Software Foundation, Inc. * ------------------------------------------------------------------------ - * This program is free software; you can redistribute it and/or modify + * + * 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 2 of the License, or - * (at your option) any later version. + * the Free Software Foundation, either version 3 of the License, or (at + * your option) any later version. * - * This program 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. + * 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, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * ------------------------------------------------------------------------ + * along with this program. If not, see http://www.gnu.org/licenses/. * * - * See the file ChangeLog for a revision history. - */ + *------------------------------------------------------------------------ + ** See the file ChangeLog for a revision history. */ #include "config.h" @@ -96,15 +91,29 @@ extern char *getenv(); #endif -extern Widget formWidget, shellWidget, boardWidget, menuBarWidget; +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; + char gameListTranslations[] = - "(2): LoadSelectedProc() \n \ - Return: LoadSelectedProc() \n"; + "(2): LoadSelectedProc(0) \n \ + Home: LoadSelectedProc(-2) \n \ + End: LoadSelectedProc(2) \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"; typedef struct { Widget shell; @@ -115,6 +124,7 @@ typedef struct { char *filename; char **strings; } GameListClosure; +static GameListClosure *glc = NULL; static Arg layoutArgs[] = { { XtNborderWidth, 0 }, @@ -128,8 +138,8 @@ GameListCreate(name, callback, client_data) XtPointer client_data; { Arg args[16]; - Widget shell, form, viewport, listwidg, layout; - Widget b_load, b_loadprev, b_loadnext, b_close; + 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; @@ -142,11 +152,11 @@ GameListCreate(name, callback, client_data) XtSetArg(args[j], XtNresizable, True); j++; XtSetArg(args[j], XtNallowShellResize, True); j++; #if TOPLEVEL - shell = + shell = gameListShell = XtCreatePopupShell(name, topLevelShellWidgetClass, shellWidget, args, j); #else - shell = + shell = gameListShell = XtCreatePopupShell(name, transientShellWidgetClass, shellWidget, args, j); #endif @@ -223,6 +233,57 @@ GameListCreate(name, callback, client_data) 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, 173); 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; @@ -265,10 +326,47 @@ GameListCreate(name, callback, client_data) XtRealizeWidget(shell); CatchDeleteWindow(shell, "GameListPopDown"); + XtSetKeyboardFocus(shell, listwidg); return shell; } +static int +GameListPrepare() +{ // [HGM] filter: put in separate routine, to make callable from call-back + int nstrings; + ListGame *lg; + char **st, *line; + + nstrings = ((ListGame *) gameList.tailPred)->number; + glc->strings = (char **) malloc((nstrings + 1) * sizeof(char *)); + st = glc->strings; + lg = (ListGame *) gameList.head; + listLength = 0; + while (nstrings--) { + line = GameListLine(lg->number, &lg->gameInfo); + if(filterString[0] == NULLCHAR || SearchPattern( line, filterString ) ) { + *st++ = line; // [HGM] filter: make adding line conditional + listLength++; + } + lg = (ListGame *) lg->node.succ; + } + *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; + + listwidg = XtNameToWidget(glc->shell, "*form.viewport.list"); + XawListChange(listwidg, glc->strings, 0, 0, True); + XawListHighlight(listwidg, 0); +} + void GameListCallback(w, client_data, call_data) Widget w; @@ -300,7 +398,7 @@ GameListCallback(w, client_data, call_data) } } else if (strcmp(name, _("next")) == 0) { index = rs->list_index + 1; - if (index >= ((ListGame *) gameList.tailPred)->number) { + if (index >= listLength) { DisplayError(_("Can't go forward any further"), 0); return; } @@ -312,7 +410,17 @@ GameListCallback(w, client_data, call_data) return; } XawListHighlight(listwidg, index); + } else if (strcmp(name, _("apply")) == 0) { + String name; + j = 0; + XtSetArg(args[j], XtNstring, &name); j++; + XtGetValues(filterText, args, j); + strcpy(filterString, name); + XawListHighlight(listwidg, 0); + if(GameListPrepare()) GameListReplace(); // crashes on empty list... + return; } + index = atoi(glc->strings[index])-1; // [HGM] filter: read true index from sequence nr of line if (cmailMsgLoaded) { CmailLoadGame(glc->fp, index + 1, glc->filename, True); } else { @@ -320,8 +428,6 @@ GameListCallback(w, client_data, call_data) } } -static GameListClosure *glc = NULL; - void GameListPopUp(fp, filename) FILE *fp; @@ -346,27 +452,18 @@ GameListPopUp(fp, filename) free(glc->strings); } - nstrings = ((ListGame *) gameList.tailPred)->number; - glc->strings = (char **) malloc((nstrings + 1) * sizeof(char *)); - st = glc->strings; - lg = (ListGame *) gameList.head; - while (nstrings--) { - *st++ = GameListLine(lg->number, &lg->gameInfo); - lg = (ListGame *) lg->node.succ; - } - *st = NULL; + GameListPrepare(); // [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 { - listwidg = XtNameToWidget(glc->shell, "*form.viewport.list"); - XawListChange(listwidg, glc->strings, 0, 0, True); - XawListHighlight(listwidg, 0); + GameListReplace(); // [HGM] filter: code put in separate routine j = 0; XtSetArg(args[j], XtNiconName, (XtArgVal) filename); j++; XtSetArg(args[j], XtNtitle, (XtArgVal) filename); j++; @@ -433,13 +530,22 @@ LoadSelectedProc(w, event, prms, nprms) { Widget listwidg; XawListReturnStruct *rs; - int index; + int index, direction = atoi(prms[0]); if (glc == NULL) return; listwidg = XtNameToWidget(glc->shell, "*form.viewport.list"); rs = XawListShowCurrent(listwidg); index = rs->list_index; if (index < 0) return; + if(direction != 0) { + index += direction; + if(direction == -2) index = 0; + if(direction == 2) index = listLength-1; + if(index < 0 || index >= listLength) return; + XawListHighlight(listwidg, index); + return; + } + index = atoi(glc->strings[index])-1; // [HGM] filter: read true index from sequence nr of line if (cmailMsgLoaded) { CmailLoadGame(glc->fp, index + 1, glc->filename, True); } else { @@ -448,6 +554,29 @@ LoadSelectedProc(w, event, prms, nprms) } void +SetFilterProc(w, event, prms, nprms) + 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); + strcpy(filterString, name); + if(GameListPrepare()) GameListReplace(); // crashes on empty list... + 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]; @@ -460,6 +589,10 @@ GameListPopDown() 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; @@ -474,7 +607,16 @@ GameListHighlight(index) int index; { Widget listwidg; + int i=0; char **st; if (glc == NULL || !glc->up) return; listwidg = XtNameToWidget(glc->shell, "*form.viewport.list"); - XawListHighlight(listwidg, index - 1); + st = glc->strings; + while(*st && atoi(*st)up; }