Fix recognition of title in small layout

[xboard.git] / ngamelist.c

diff --git a/ngamelist.c b/ngamelist.c
index 32fdf33..1004a92 100644 (file)
--- a/ngamelist.c
+++ b/ngamelist.c
@@ -1,7 +1,7 @@
 /*
  * ngamelist.c -- Game list window, Xt-independent front-end code for XBoard
  *
 /*
  * ngamelist.c -- Game list window, Xt-independent front-end code for XBoard
  *

- * Copyright 1995, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ * Copyright 1995, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free Software Foundation, Inc.

  * ------------------------------------------------------------------------
  *
  * GNU XBoard is free software: you can redistribute it and/or modify
  * ------------------------------------------------------------------------
  *
  * GNU XBoard is free software: you can redistribute it and/or modify


@@ -82,7 +82,7 @@ static void GameListReplace P((int page));
 static void GL_Button P((int n));
 
 static Option gamesOptions[] = {
 static void GL_Button P((int n));
 
 static Option gamesOptions[] = {

-{ 200,  LR|TB,     400, NULL, (void*) list,       "", NULL, ListBox, "" },
+{ 200,  LR|TB,     400, NULL, (void*) list,       NULL, NULL, ListBox, "", &appData.gameListFont },

 {   0,  0,         100, NULL, (void*) &filterPtr, "", NULL, TextBox, "" },
 {   4,  SAME_ROW,    0, NULL, (void*) &GL_Button, NULL, NULL, Button, N_("find position") },
 {   2,  SAME_ROW,    0, NULL, (void*) &GL_Button, NULL, NULL, Button, N_("narrow") }, // buttons referred to by ID in value (=first) field!
 {   0,  0,         100, NULL, (void*) &filterPtr, "", NULL, TextBox, "" },
 {   4,  SAME_ROW,    0, NULL, (void*) &GL_Button, NULL, NULL, Button, N_("find position") },
 {   2,  SAME_ROW,    0, NULL, (void*) &GL_Button, NULL, NULL, Button, N_("narrow") }, // buttons referred to by ID in value (=first) field!


@@ -151,9 +151,9 @@ static int
 GameListCreate (char *name)
 {
     int new;
 GameListCreate (char *name)
 {
     int new;

-    if(new = GenericPopUp(gamesOptions, name, GameListDlg, BoardWindow, NONMODAL, 1))
-       AddHandler(&gamesOptions[1], 4),
-       AddHandler(&gamesOptions[0], 5);
+    if(new = GenericPopUp(gamesOptions, name, GameListDlg, BoardWindow, NONMODAL, appData.topLevel))
+       AddHandler(&gamesOptions[1], GameListDlg, 4),
+       AddHandler(&gamesOptions[0], GameListDlg, 5);

     FocusOnWidget(&gamesOptions[0], GameListDlg);
     return new;
 }
     FocusOnWidget(&gamesOptions[0], GameListDlg);
     return new;
 }


@@ -190,12 +190,12 @@ GameListPrepare (int byPos, int narrow)
        if(lg->number % 2000 == 0) {
            char buf[MSG_SIZ];
            snprintf(buf, MSG_SIZ, _("Scanning through games (%d)"), lg->number);
        if(lg->number % 2000 == 0) {
            char buf[MSG_SIZ];
            snprintf(buf, MSG_SIZ, _("Scanning through games (%d)"), lg->number);

-           DisplayTitle(buf);
+           DisplayTitle(buf); DoEvents();

        }
        lg->position = pos;
        lg = (ListGame *) lg->node.succ;
     }
        }
        lg->position = pos;
        lg = (ListGame *) lg->node.succ;
     }

-GetTimeMark(&t2);printf("GameListPrepare %ld msec\n", SubtractTimeMarks(&t2,&t));
+    if(appData.debugMode) { GetTimeMark(&t2);printf("GameListPrepare %ld msec\n", SubtractTimeMarks(&t2,&t)); }

     DisplayTitle("XBoard");
     *st = NULL;
     return listLength;
     DisplayTitle("XBoard");
     *st = NULL;
     return listLength;


@@ -220,6 +220,14 @@ GameListReplace (int page)
   SetDialogTitle(GameListDlg, buf);
 }
 
   SetDialogTitle(GameListDlg, buf);
 }
 

+void
+GameListUpdate ()
+{
+    if(!DialogExists(GameListDlg)) return;
+    GameListPrepare(False, False);
+    GameListReplace(0);
+}
+

 void
 GameListPopUp (FILE *fp, char *filename)
 {
 void
 GameListPopUp (FILE *fp, char *filename)
 {


@@ -242,12 +250,20 @@ GameListPopUp (FILE *fp, char *filename)
     page = 0;
     GameListReplace(0); // [HGM] filter: code put in separate routine, and also called to set title
     MarkMenu("View.GameList", GameListDlg);
     page = 0;
     GameListReplace(0); // [HGM] filter: code put in separate routine, and also called to set title
     MarkMenu("View.GameList", GameListDlg);

+    EnableNamedMenuItem("File.SaveSelected", TRUE);
+}
+
+FILE *
+GameFile ()
+{
+  return glc ? glc->fp : NULL;

 }
 
 void
 GameListDestroy ()
 {
     if (glc == NULL) return;
 }
 
 void
 GameListDestroy ()
 {
     if (glc == NULL) return;

+    EnableNamedMenuItem("File.SaveSelected", FALSE);

     PopDown(GameListDlg);
     if (glc->strings != NULL) {
        char **st;
     PopDown(GameListDlg);
     if (glc->strings != NULL) {
        char **st;


@@ -272,7 +288,7 @@ ShowGameListProc ()
        PopDown(GameListDlg);
        return;
     }
        PopDown(GameListDlg);
        return;
     }

-    GenericPopUp(NULL, NULL, GameListDlg, BoardWindow, NONMODAL, 1); // first two args ignored when shell exists!
+    GenericPopUp(NULL, NULL, GameListDlg, BoardWindow, NONMODAL, appData.topLevel); // first two args ignored when shell exists!

     MarkMenu("View.GameList", GameListDlg);
     GameListHighlight(lastLoadGameNumber);
 }
     MarkMenu("View.GameList", GameListDlg);
     GameListHighlight(lastLoadGameNumber);
 }


@@ -352,7 +368,7 @@ SaveGameListAsText (FILE *f)
 
     /* Copy the list into the global memory block */
     if( f != NULL ) {
 
     /* Copy the list into the global memory block */
     if( f != NULL ) {

- 
+

         lg = (ListGame *) gameList.head;
 
         for (nItem = 0; nItem < ((ListGame *) gameList.tailPred)->number; nItem++){
         lg = (ListGame *) gameList.head;
 
         for (nItem = 0; nItem < ((ListGame *) gameList.tailPred)->number; nItem++){


@@ -369,4 +385,3 @@ SaveGameListAsText (FILE *f)
     }
     return False;
 }
     }
     return False;
 }

-