X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xgamelist.c;h=5aa9201b7cd3c10d1cd68156f529982b9cb27c5f;hb=f5883cc4e2222df9c0a504a0c50da4acd6b77fb0;hp=5767b9810951b20d1e9e087291128fcd4a723a54;hpb=92c925816e3a150b69d80d42d3d15198602d460f;p=xboard.git diff --git a/xgamelist.c b/xgamelist.c index 5767b98..5aa9201 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, 2011 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 @@ -98,7 +98,8 @@ static char filterString[MSG_SIZ]; static int listLength, wins, losses, draws, page; char gameListTranslations[] = - "(2): LoadSelectedProc(0) \n \ + ": LoadSelectedProc(100) Set() \n \ + (2): LoadSelectedProc(0) \n \ Home: LoadSelectedProc(-2) \n \ End: LoadSelectedProc(2) \n \ CtrlUp: LoadSelectedProc(-3) \n \ @@ -125,10 +126,7 @@ typedef struct { static GameListClosure *glc = NULL; Widget -GameListCreate(name, callback, client_data) - char *name; - XtCallbackProc callback; - XtPointer client_data; +GameListCreate (char *name, XtCallbackProc callback, XtPointer client_data) { Arg args[16]; Widget shell, form, viewport, listwidg, layout, label; @@ -180,7 +178,7 @@ GameListCreate(name, callback, client_data) listwidg = XtCreateManagedWidget("list", listWidgetClass, viewport, args, j); XawListHighlight(listwidg, 0); - XtAugmentTranslations(listwidg, + XtOverrideTranslations(listwidg, XtParseTranslationTable(gameListTranslations)); j = 0; @@ -326,19 +324,25 @@ GameListCreate(name, callback, client_data) return shell; } +extern int soughtCounts[]; +extern Board soughtBoard; + static int -GameListPrepare(int byPos) +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); @@ -357,6 +361,7 @@ GameListPrepare(int byPos) lg->position = pos; lg = (ListGame *) lg->node.succ; } +GetTimeMark(&t2);printf("GameListPrepare %ld msec\n", SubtractTimeMarks(&t2,&t)); DisplayTitle("XBoard"); *st = NULL; return listLength; @@ -366,7 +371,7 @@ static char *list[1003]; int listEnd; static void -GameListReplace(int page) +GameListReplace (int page) { // filter: put in separate routine, to make callable from call-back Widget listwidg; @@ -385,15 +390,13 @@ GameListReplace(int page) 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); + 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(w, client_data, call_data) - Widget w; - XtPointer client_data, call_data; +GameListCallback (Widget w, XtPointer client_data, XtPointer call_data) { String name; Arg args[16]; @@ -461,9 +464,7 @@ GameListCallback(w, client_data, call_data) } void -GameListPopUp(fp, filename) - FILE *fp; - char *filename; +GameListPopUp (FILE *fp, char *filename) { Arg args[16]; int j; @@ -472,6 +473,8 @@ GameListPopUp(fp, filename) 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 @@ -481,7 +484,6 @@ GameListPopUp(fp, filename) if (glc->filename != NULL) free(glc->filename); glc->filename = StrSave(filename); - if (glc->shell == NULL) { glc->shell = GameListCreate(filename, GameListCallback, glc); } else { @@ -502,7 +504,7 @@ GameListPopUp(fp, filename) } void -GameListDestroy() +GameListDestroy () { if (glc == NULL) return; GameListPopDown(); @@ -519,11 +521,7 @@ GameListDestroy() } void -ShowGameListProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +ShowGameListProc () { Arg args[16]; int j; @@ -546,18 +544,15 @@ ShowGameListProc(w, event, prms, nprms) } void -LoadSelectedProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +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; @@ -594,11 +589,7 @@ LoadSelectedProc(w, event, prms, nprms) } void -SetFilterProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +SetFilterProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { Arg args[16]; String name; @@ -617,7 +608,7 @@ SetFilterProc(w, event, prms, nprms) } void -GameListPopDown() +GameListPopDown () { Arg args[16]; int j; @@ -643,8 +634,7 @@ GameListPopDown() } void -GameListHighlight(index) - int index; +GameListHighlight (int index) { Widget listwidg; int i=0; char **st; @@ -656,18 +646,19 @@ GameListHighlight(index) } Boolean -GameListIsUp() +GameListIsUp () { return glc && glc->up; } -int SaveGameListAsText(FILE *f) +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); + DisplayError(_("Game list not loaded or empty"), 0); return False; } @@ -697,32 +688,36 @@ Widget gameListOptShell, listwidg; char *strings[20]; int stringPtr; -void GLT_ClearList() +void +GLT_ClearList () { strings[0] = NULL; stringPtr = 0; } -void GLT_AddToList(char *name) +void +GLT_AddToList (char *name) { strings[stringPtr++] = name; strings[stringPtr] = NULL; } -Boolean GLT_GetFromList(int index, char *name) +Boolean +GLT_GetFromList (int index, char *name) { safeStrCpy(name, strings[index], MSG_SIZ); return TRUE; } -void GLT_DeSelectList() +void +GLT_DeSelectList () { XawListChange(listwidg, strings, 0, 0, True); XawListHighlight(listwidg, 0); } void -GameListOptionsPopDown() +GameListOptionsPopDown () { if (gameListOptShell == NULL) return; @@ -733,9 +728,7 @@ GameListOptionsPopDown() } void -GameListOptionsCallback(w, client_data, call_data) - Widget w; - XtPointer client_data, call_data; +GameListOptionsCallback (Widget w, XtPointer client_data, XtPointer call_data) { String name; Arg args[16]; @@ -786,7 +779,7 @@ GameListOptionsCallback(w, client_data, call_data) } Widget -GameListOptionsCreate() +GameListOptionsCreate () { Arg args[16]; Widget shell, form, viewport, layout; @@ -803,7 +796,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, @@ -887,7 +880,7 @@ GameListOptionsCreate() } void -GameListOptionsPopUp(Widget w, XEvent *event, String *prms, Cardinal *nprms) +GameListOptionsPopUp (Widget w, XEvent *event, String *prms, Cardinal *nprms) { if (gameListOptShell == NULL) gameListOptShell = GameListOptionsCreate();