Fix gamelist highlight

[xboard.git] / xgamelist.c

diff --git a/xgamelist.c b/xgamelist.c
index c2065e0..41a43ce 100644 (file)
--- 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 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
@@ -184,7 +184,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,
@@ -357,14 +357,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
@@ -434,9 +433,7 @@ GameListPopUp(fp, filename)
      char *filename;
 {
     Arg args[16];
-    int j, nstrings;
-    Widget listwidg;
-    ListGame *lg;
+    int j;
     char **st;
 
     if (glc == NULL) {
@@ -461,7 +458,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 +471,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 +514,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 +536,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;
@@ -598,7 +596,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);
 }
 
@@ -621,6 +619,35 @@ GameListIsUp()
     return glc && glc->up;
 }
 
+int SaveGameListAsText(FILE *f)\r
+{\r
+    ListGame * lg = (ListGame *) gameList.head;\r
+    int nItem;\r
+\r
+    if( !glc || ((ListGame *) gameList.tailPred)->number <= 0 ) {\r
+        DisplayError("Game list not loaded or empty", 0);\r
+        return False;\r
+    }\r
+\r
+    /* Copy the list into the global memory block */\r
+    if( f != NULL ) {\r
+ 
+        lg = (ListGame *) gameList.head;\r
+\r
+        for (nItem = 0; nItem < ((ListGame *) gameList.tailPred)->number; nItem++){\r
+            char * st = GameListLineFull(lg->number, &lg->gameInfo);\r
+           char *line = GameListLine(lg->number, &lg->gameInfo);
+           if(filterString[0] == NULLCHAR || SearchPattern( line, filterString ) )
+                   fprintf( f, "%s\n", st );
+           free(st); free(line);\r
+            lg = (ListGame *) lg->node.succ;\r
+        }\r
+\r
+        fclose(f);
+       return True;\r
+    }
+    return False;\r
+}\r
 //--------------------------------- Game-List options dialog ------------------------------------------
 
 Widget gameListOptShell, listwidg;
@@ -655,14 +682,12 @@ void GLT_DeSelectList()
 void
 GameListOptionsPopDown()
 {
-    Arg args[16];
-    int j;
+  if (gameListOptShell == NULL) return;
 
-    if (gameListOptShell == NULL) return;
-    XtPopdown(gameListOptShell);
-    XtDestroyWidget(gameListOptShell);
-    gameListOptShell = 0;
-    XtSetKeyboardFocus(shellWidget, formWidget);
+  XtPopdown(gameListOptShell);
+  XtDestroyWidget(gameListOptShell);
+  gameListOptShell = 0;
+  XtSetKeyboardFocus(shellWidget, formWidget);
 }
 
 void
@@ -822,15 +847,10 @@ GameListOptionsCreate()
 void
 GameListOptionsPopUp(Widget w, XEvent *event, String *prms, Cardinal *nprms)
 {
-    Arg args[16];
-    int j, nstrings;
-    Widget listwidg;
-
-    if (gameListOptShell == NULL) {
-       gameListOptShell = GameListOptionsCreate(); 
-    }
+  if (gameListOptShell == NULL)
+    gameListOptShell = GameListOptionsCreate();
 
-    XtPopup(gameListOptShell, XtGrabNone);
+  XtPopup(gameListOptShell, XtGrabNone);
 }