X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xgamelist.c;h=d68c00b2765ccd1cad2776e71304a292b5f50ceb;hb=d9f4b584106f4d7477158476ff792f6fa0b2630a;hp=35194ac5639504c463c30c0eea981209fd244669;hpb=d954a9a2cfff2fe954f09abb3392a26a20d1952e;p=xboard.git

diff --git a/xgamelist.c b/xgamelist.c
index 35194ac..d68c00b 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,12 +93,6 @@ 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;
@@ -126,11 +120,6 @@ typedef struct {
 } GameListClosure;
 static GameListClosure *glc = NULL;
 
-static Arg layoutArgs[] = {
-    { XtNborderWidth, 0 },
-    { XtNdefaultDistance, 0 }
-};
-
 Widget
 GameListCreate(name, callback, client_data)
      char *name;
@@ -184,7 +173,7 @@ GameListCreate(name, callback, client_data)
     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,
@@ -197,7 +186,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;
@@ -208,9 +197,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++;
@@ -221,7 +210,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++;
@@ -251,7 +242,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++;
@@ -332,7 +323,7 @@ GameListCreate(name, callback, client_data)
 }
 
 static int
-GameListPrepare()
+GameListPrepare(int byPos)
 {   // [HGM] filter: put in separate routine, to make callable from call-back
     int nstrings;
     ListGame *lg;
@@ -344,11 +335,13 @@ GameListPrepare()
     lg = (ListGame *) gameList.head;
     listLength = 0;
     while (nstrings--) {
+	int pos = -1;
 	line = GameListLine(lg->number, &lg->gameInfo);
-	if(filterString[0] == NULLCHAR || SearchPattern( line, filterString ) ) {
+	if((filterString[0] == NULLCHAR || SearchPattern( line, filterString )) && (!byPos || (pos=GameContainsPosition(glc->fp, lg)) >= 0) ) {
 	    *st++ = line; // [HGM] filter: make adding line conditional
 	    listLength++;
 	}
+	lg->position = pos;
 	lg = (ListGame *) lg->node.succ;
      }
     *st = NULL;
@@ -357,14 +350,13 @@ GameListPrepare()
 
 static void
 GameListReplace()
-{   // [HGM] filter: put in separate routine, to make callable from call-back
-    Arg args[16];
-    int j;
-    Widget listwidg;
+{
+  // filter: put in separate routine, to make callable from call-back
+  Widget listwidg;
 
-	listwidg = XtNameToWidget(glc->shell, "*form.viewport.list");
-	XawListChange(listwidg, glc->strings, 0, 0, True);
-	XawListHighlight(listwidg, 0);
+  listwidg = XtNameToWidget(glc->shell, "*form.viewport.list");
+  XawListChange(listwidg, glc->strings, 0, 0, True);
+  XawListHighlight(listwidg, 0);
 }
 
 void
@@ -388,6 +380,14 @@ GameListCallback(w, client_data, call_data)
 	GameListPopDown();
 	return;
     }
+    if (strcmp(name, _("thresholds")) == 0) {
+	LoadOptionsProc();
+	return;
+    }
+    if (strcmp(name, _("find position")) == 0) {
+        if(GameListPrepare(True)) GameListReplace(); // crashes on empty list...
+	return;
+    }
     listwidg = XtNameToWidget(glc->shell, "*form.viewport.list");
     rs = XawListShowCurrent(listwidg);
     if (strcmp(name, _("load")) == 0) {
@@ -415,17 +415,21 @@ GameListCallback(w, client_data, call_data)
         j = 0;
         XtSetArg(args[j], XtNstring, &name);  j++;
 	XtGetValues(filterText, args, j);
-        strcpy(filterString, name);
+        safeStrCpy(filterString, name, sizeof(filterString)/sizeof(filterString[0]));
 	XawListHighlight(listwidg, 0);
-        if(GameListPrepare()) GameListReplace(); // crashes on empty list...
+        if(GameListPrepare(False)) GameListReplace(); // crashes on empty list...
         return;
     }
+#if 1
     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 {
 	LoadGame(glc->fp, index + 1, glc->filename, True);
     }
+#else
+    printf("This code should have been unreachable. Please report bug!\n");
+#endif
 }
 
 void
@@ -434,9 +438,7 @@ GameListPopUp(fp, filename)
      char *filename;
 {
     Arg args[16];
-    int j, nstrings;
-    Widget listwidg;
-    ListGame *lg;
+    int j;
     char **st;
 
     if (glc == NULL) {
@@ -452,7 +454,7 @@ GameListPopUp(fp, filename)
 	free(glc->strings);
     }
 
-    GameListPrepare(); // [HGM] filter: code put in separate routine
+    GameListPrepare(False); // [HGM] filter: code put in separate routine
 
     glc->fp = fp;
 
@@ -461,7 +463,7 @@ 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;
@@ -474,7 +476,7 @@ GameListPopUp(fp, filename)
     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);
 }
 
@@ -517,8 +519,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
@@ -538,7 +541,7 @@ LoadSelectedProc(w, event, prms, nprms)
     index = rs->list_index;
     if (index < 0) return;
     if(direction != 0) {
-	index += direction; 
+	index += direction;
 	if(direction == -2) index = 0;
 	if(direction == 2) index = listLength-1;
 	if(index < 0 || index >= listLength) return;
@@ -566,8 +569,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]));
+        if(GameListPrepare(False)) GameListReplace(); // crashes on empty list...
 	list = XtNameToWidget(glc->shell, "*form.viewport.list");
 	XawListHighlight(list, 0);
         j = 0;
@@ -598,7 +601,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);
 }
 
@@ -620,3 +623,239 @@ GameListIsUp()
 {
     return glc && glc->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);
+}
+
+