X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xgamelist.c;h=4eb1d38b5e33e60f92e502a0f0f313ebf13a7100;hb=bb1c0f39816daca49f22a751768be6cf9f4fc9a2;hp=c0a19ff2fd4b0b4ef08222401660c1182682e938;hpb=91d8e5853ca580769cc130aa6ea004869118d171;p=xboard.git diff --git a/xgamelist.c b/xgamelist.c index c0a19ff..4eb1d38 100644 --- a/xgamelist.c +++ b/xgamelist.c @@ -1,8 +1,7 @@ /* * xgamelist.c -- Game list window, part of X front end for XBoard - * $Id$ * - * Copyright 1995,2009 Free Software Foundation, Inc. + * Copyright 1995, 2009, 2010 Free Software Foundation, Inc. * ------------------------------------------------------------------------ * * GNU XBoard is free software: you can redistribute it and/or modify @@ -92,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; @@ -111,6 +124,7 @@ typedef struct { char *filename; char **strings; } GameListClosure; +static GameListClosure *glc = NULL; static Arg layoutArgs[] = { { XtNborderWidth, 0 }, @@ -124,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; @@ -138,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 @@ -219,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, fw_width - 225 - 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; @@ -261,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; @@ -296,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; } @@ -308,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 { @@ -316,8 +428,6 @@ GameListCallback(w, client_data, call_data) } } -static GameListClosure *glc = NULL; - void GameListPopUp(fp, filename) FILE *fp; @@ -342,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++; @@ -429,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 { @@ -444,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]; @@ -456,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; @@ -470,7 +607,230 @@ 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; +} + +//--------------------------------- 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) +{ + strcpy(name, strings[index]); + return TRUE; +} + +void GLT_DeSelectList() +{ + XawListChange(listwidg, strings, 0, 0, True); + XawListHighlight(listwidg, 0); +} + +void +GameListOptionsPopDown() +{ + Arg args[16]; + int j; + + 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) { + strcpy(lpUserGLT, GLT_DEFAULT_TAGS); + 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); + + strcpy(lpUserGLT, appData.gameListTags); + GLT_TagsToList(lpUserGLT); + + XtRealizeWidget(shell); + CatchDeleteWindow(shell, "GameListOptionsPopDown"); + + return shell; +} + +void +GameListOptionsPopUp(Widget w, XEvent *event, String *prms, Cardinal *nprms) +{ + Arg args[16]; + int j, nstrings; + Widget listwidg; + + if (gameListOptShell == NULL) { + gameListOptShell = GameListOptionsCreate(); + } + + XtPopup(gameListOptShell, XtGrabNone); +} + +