X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwgamelist.c;h=4fa60251a32223551c3630b93a069d24fe7b7045;hb=c37d45adc7d98a702a7459ccdc0ac23df01a476e;hp=a496359176d9fd70deb7cc16da59668343c919f0;hpb=1c36ced6dd39e157e3e94e24c253a93be9f8f4ed;p=xboard.git

diff --git a/winboard/wgamelist.c b/winboard/wgamelist.c
index a496359..4fa6025 100644
--- a/winboard/wgamelist.c
+++ b/winboard/wgamelist.c
@@ -1,7 +1,7 @@
 /*
  * wgamelist.c -- Game list window for WinBoard
  *
- * Copyright 1995, 2009, 2010, 2011 Free Software Foundation, Inc.
+ * Copyright 1995, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -57,10 +57,11 @@ struct GameListStats
 };
 
 /* [AS] Setup the game list according to the specified filter */
-static int GameListToListBox( HWND hDlg, BOOL boReset, char * pszFilter, struct GameListStats * stats )
+static int GameListToListBox( HWND hDlg, BOOL boReset, char * pszFilter, struct GameListStats * stats, BOOL byPos, BOOL narrow )
 {
     ListGame * lg = (ListGame *) gameList.head;
     int nItem;
+    char buf[MSG_SIZ];
     BOOL hasFilter = FALSE;
     int count = 0;
     struct GameListStats dummy;
@@ -85,17 +86,30 @@ static int GameListToListBox( HWND hDlg, BOOL boReset, char * pszFilter, struct
         }
     }
 
+    if(byPos) InitSearch();
+
     for (nItem = 0; nItem < ((ListGame *) gameList.tailPred)->number; nItem++){
-        char * st = GameListLine(lg->number, &lg->gameInfo);
+        char * st = NULL;
         BOOL skip = FALSE;
+	int pos = -1;
+
+        if(nItem % 2000 == 0) {
+          snprintf(buf, MSG_SIZ, _("Scanning through games (%d)"), nItem);
+          SetWindowText(hwndMain, buf);
+        }
 
+      if(!narrow || lg->position >= 0) {
         if( hasFilter ) {
-            if( ! SearchPattern( st, pszFilter ) ) {
-                skip = TRUE;
-            }
+            st = GameListLine(lg->number, &lg->gameInfo);
+	    if( !SearchPattern( st, pszFilter) ) skip = TRUE;
+        }
+
+        if( !skip && byPos) {
+            if( (pos = GameContainsPosition(gameFile, lg)) < 0) skip = TRUE;
         }
 
         if( ! skip ) {
+            if(!st) st = GameListLine(lg->number, &lg->gameInfo);
             SendDlgItemMessage(hDlg, OPT_GameListText, LB_ADDSTRING, 0, (LPARAM) st);
             count++;
 
@@ -108,13 +122,18 @@ static int GameListToListBox( HWND hDlg, BOOL boReset, char * pszFilter, struct
                 stats->drawn++;
             else
                 stats->unfinished++;
+	    if(!byPos) pos = 0;
         }
+      }
 
-        free(st);
+	lg->position = pos;
+
+        if(st) free(st);
         lg = (ListGame *) lg->node.succ;
     }
 
     SendDlgItemMessage(hDlg, OPT_GameListText, LB_SETCURSEL, 0, 0);
+    SetWindowText(hwndMain, "WinBoard");
 
     return count;
 }
@@ -166,9 +185,9 @@ GameListDialog(HWND hDlg, UINT message,	WPARAM wParam, LPARAM lParam)
     hwndText = GetDlgItem(hDlg, OPT_TagsText);
 
     /* Set font */
-    SendDlgItemMessage( hDlg, OPT_GameListText, WM_SETFONT, (WPARAM)font[boardSize][MOVEHISTORY_FONT]->hf, MAKELPARAM(TRUE, 0 ));
+    SendDlgItemMessage( hDlg, OPT_GameListText, WM_SETFONT, (WPARAM)font[boardSize][GAMELIST_FONT]->hf, MAKELPARAM(TRUE, 0 ));
 
-    count = GameListToListBox( hDlg, gameListDialog ? TRUE : FALSE, NULL, &stats );
+    count = GameListToListBox( hDlg, gameListDialog ? TRUE : FALSE, NULL, &stats, FALSE, FALSE );
 
     SendDlgItemMessage( hDlg, IDC_GameListFilter, WM_SETTEXT, 0, (LPARAM) "" );
     SendDlgItemMessage( hDlg, IDC_GameListFilter, EM_SETLIMITTEXT, MAX_FILTER_LENGTH, 0 );
@@ -262,8 +281,10 @@ GameListDialog(HWND hDlg, UINT message,	WPARAM wParam, LPARAM lParam)
       /* [AS] End command replacement */
 
     switch (LOWORD(wParam)) {
-    case IDOK:
     case OPT_GameListLoad:
+      LoadOptionsPopup(hDlg);
+      return TRUE;
+    case IDOK:
       nItem = SendDlgItemMessage(hDlg, OPT_GameListText, LB_GETCURSEL, 0, 0);
       if (nItem < 0) {
 	/* is this possible? */
@@ -284,6 +305,7 @@ GameListDialog(HWND hDlg, UINT message,	WPARAM wParam, LPARAM lParam)
       break; /* load the game*/
 
     case OPT_GameListPrev:
+#if 0
       nItem = SendDlgItemMessage(hDlg, OPT_GameListText, LB_GETCURSEL, 0, 0);
       nItem--;
       if (nItem < 0) {
@@ -293,15 +315,16 @@ GameListDialog(HWND hDlg, UINT message,	WPARAM wParam, LPARAM lParam)
       }
       SendDlgItemMessage(hDlg, OPT_GameListText, LB_SETCURSEL, nItem, 0);
       break; /* load the game*/
-
+#endif
     /* [AS] */
+    case OPT_GameListFind:
     case IDC_GameListDoFilter:
         {
             char filter[MAX_FILTER_LENGTH+1];
 
             if( GetDlgItemText( hDlg, IDC_GameListFilter, filter, sizeof(filter) ) >= 0 ) {
                 filter[ sizeof(filter)-1 ] = '\0';
-                count = GameListToListBox( hDlg, TRUE, filter, &stats );
+                count = GameListToListBox( hDlg, TRUE, filter, &stats, LOWORD(wParam)!=IDC_GameListDoFilter, LOWORD(wParam)==OPT_GameListNarrow );
                 GameListUpdateTitle( hDlg, _("Game List"), count, ((ListGame *) gameList.tailPred)->number, &stats );
             }
         }
@@ -397,6 +420,11 @@ VOID GameListPopUp(FILE *fp, char *filename)
   gameListUp = TRUE;
 }
 
+FILE *GameFile()
+{
+  return gameFile;
+}
+
 VOID GameListPopDown(void)
 {
   CheckMenuItem(GetMenu(hwndMain), IDM_ShowGameList, MF_UNCHECKED);