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

diff --git a/winboard/wgamelist.c b/winboard/wgamelist.c
index e582a46..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 Free Software Foundation, Inc.
+ * Copyright 1995, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -57,16 +57,17 @@ 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;
 
     /* Initialize stats (use a dummy variable if caller not interested in them) */
-    if( stats == NULL ) { 
+    if( stats == NULL ) {
         stats = &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;
 }
@@ -124,7 +143,7 @@ static int GameListUpdateTitle( HWND hDlg, char * pszTitle, int item_count, int
 {
     char buf[256];
 
-    sprintf( buf, _("%s - %d/%d games"), pszTitle, item_count, item_total );
+    snprintf( buf, sizeof(buf)/sizeof(buf[0]),_("%s - %d/%d games"), pszTitle, item_count, item_total );
 
     if( stats != 0 ) {
         sprintf( buf+strlen(buf), " (%d-%d-%d)", stats->white_wins, stats->black_wins, stats->drawn );
@@ -153,7 +172,7 @@ GameListDialog(HWND hDlg, UINT message,	WPARAM wParam, LPARAM lParam)
   static SnapData sd;
 
   switch (message) {
-  case WM_INITDIALOG: 
+  case WM_INITDIALOG:
     Translate(hDlg, DLG_GameList);
     GetWindowText( hDlg, szDlgTitle, sizeof(szDlgTitle) );
     szDlgTitle[ sizeof(szDlgTitle)-1 ] = '\0';
@@ -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 );
@@ -203,13 +222,14 @@ GameListDialog(HWND hDlg, UINT message,	WPARAM wParam, LPARAM lParam)
 			      newSizeX, newSizeY);
 	sizeX = newSizeX;
 	sizeY = newSizeY;
-      } else 
+      } else
         GetActualPlacement( gameListDialog, &wpGameList );
 
     }
       GameListUpdateTitle( hDlg, _("Game List"), count, ((ListGame *) gameList.tailPred)->number, &stats ); // [HGM] always update title
+    GameListHighlight(lastLoadGameNumber);
     return FALSE;
-    
+
   case WM_SIZE:
     newSizeX = LOWORD(lParam);
     newSizeY = HIWORD(lParam);
@@ -230,7 +250,7 @@ GameListDialog(HWND hDlg, UINT message,	WPARAM wParam, LPARAM lParam)
 
   case WM_EXITSIZEMOVE:
     return OnExitSizeMove( &sd, hDlg, wParam, lParam );
-  
+
   case WM_GETMINMAXINFO:
     /* Prevent resizing window too small */
     mmi = (MINMAXINFO *) lParam;
@@ -239,7 +259,7 @@ GameListDialog(HWND hDlg, UINT message,	WPARAM wParam, LPARAM lParam)
     break;
 
   case WM_COMMAND:
-      /* 
+      /*
         [AS]
         If <Enter> is pressed while editing the filter, it's better to apply
         the filter rather than selecting the current game.
@@ -261,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? */
@@ -270,7 +292,7 @@ GameListDialog(HWND hDlg, UINT message,	WPARAM wParam, LPARAM lParam)
 	return TRUE;
       }
       break; /* load the game*/
-      
+
     case OPT_GameListNext:
       nItem = SendDlgItemMessage(hDlg, OPT_GameListText, LB_GETCURSEL, 0, 0);
       nItem++;
@@ -281,8 +303,9 @@ GameListDialog(HWND hDlg, UINT message,	WPARAM wParam, LPARAM lParam)
       }
       SendDlgItemMessage(hDlg, OPT_GameListText, LB_SETCURSEL, nItem, 0);
       break; /* load the game*/
-      
+
     case OPT_GameListPrev:
+#if 0
       nItem = SendDlgItemMessage(hDlg, OPT_GameListText, LB_GETCURSEL, 0, 0);
       nItem--;
       if (nItem < 0) {
@@ -292,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 );
             }
         }
@@ -311,13 +335,13 @@ GameListDialog(HWND hDlg, UINT message,	WPARAM wParam, LPARAM lParam)
     case OPT_GameListClose:
       GameListPopDown();
       return TRUE;
-      
+
     case OPT_GameListText:
       switch (HIWORD(wParam)) {
       case LBN_DBLCLK:
 	nItem = SendMessage((HWND) lParam, LB_GETCURSEL, 0, 0);
 	break; /* load the game*/
-	
+
       default:
 	return FALSE;
       }
@@ -359,8 +383,8 @@ GameListDialog(HWND hDlg, UINT message,	WPARAM wParam, LPARAM lParam)
             CmailLoadGame(gameFile, nItem + 1, gameFileName, TRUE);
         }
         else {
-	    SetFocus(hwndMain); // [HGM] automatic focus switch
             LoadGame(gameFile, nItem + 1, gameFileName, TRUE);
+	    SetFocus(hwndMain); // [HGM] automatic focus switch
         }
     }
 
@@ -376,7 +400,7 @@ GameListDialog(HWND hDlg, UINT message,	WPARAM wParam, LPARAM lParam)
 VOID GameListPopUp(FILE *fp, char *filename)
 {
   FARPROC lpProc;
-  
+
   gameFile = fp;
   if (gameFileName != filename) {
     if (gameFileName) free(gameFileName);
@@ -396,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);
@@ -406,9 +435,15 @@ VOID GameListPopDown(void)
 
 VOID GameListHighlight(int index)
 {
+  char buf[MSG_SIZ];
+  int i, res = 0;
   if (gameListDialog == NULL) return;
-  SendDlgItemMessage(gameListDialog, OPT_GameListText, 
-    LB_SETCURSEL, index - 1, 0);
+  for(i=0; res != LB_ERR; i++) {
+        res = SendDlgItemMessage( gameListDialog, OPT_GameListText, LB_GETTEXT, i, (LPARAM)buf );
+        if(index <= atoi( buf )) break;
+  }
+  SendDlgItemMessage(gameListDialog, OPT_GameListText,
+    LB_SETCURSEL, i, 0);
 }