fixed Makefile.am to handle config file correctly

[xboard.git] / xboard.c

diff --git a/xboard.c b/xboard.c
index 93835c6..a25dcdf 100644 (file)
--- a/xboard.c
+++ b/xboard.c
@@ -359,7 +359,7 @@ Widget  layoutWidget, formWidget, boardWidget, messageWidget,
   menuBarWidget,  editShell, errorShell, analysisShell,
   ICSInputShell, fileNameShell, askQuestionShell;
 
-Widget historyShell, evalGraphShell, gameListShell;
+Widget  evalGraphShell, gameListShell;
 //XSegment gridSegments[BOARD_RANKS + BOARD_FILES + 2];
 //XSegment jailGridSegments[BOARD_RANKS + BOARD_FILES + 6];
 
@@ -1187,6 +1187,7 @@ ParseCommPortSettings(char *s)
 
 extern Widget engineOutputShell;
 extern Widget tagsShell, editTagsShell;
+
 void
 GetActualPlacement(Widget wg, WindowPlacement *wp)
 {
@@ -1216,7 +1217,7 @@ GetWindowCoords()
 
   //  GetActualPlacement(shellWidget, &wpMain);
   if(EngineOutputIsUp()) GetActualPlacement(engineOutputShell, &wpEngineOutput); else
-  if(MoveHistoryIsUp()) GetActualPlacement(historyShell, &wpMoveHistory);
+//  if(MoveHistoryIsUp()) GetActualPlacement(historyShell, &wpMoveHistory);
   if(EvalGraphIsUp()) GetActualPlacement(evalGraphShell, &wpEvalGraph);
   if(GameListIsUp()) GetActualPlacement(gameListShell, &wpGameList);
   if(commentShell) GetActualPlacement(commentShell, &wpComment);
@@ -1452,6 +1453,9 @@ main(argc, argv)
     GUI_History = GTK_WIDGET (gtk_builder_get_object (builder, "MoveHistory"));
     if(!GUI_History) printf("Error: gtk_builder didn't work!\n");
 
+    GUI_GameList = GTK_WIDGET (gtk_builder_get_object (builder, "GameList"));
+    if(!GUI_GameList) printf("Error: gtk_builder didn't work!\n");
+
     GUI_Menubar  = GTK_WIDGET (gtk_builder_get_object (builder, "MenuBar"));
     if(!GUI_Menubar) printf("Error: gtk_builder didn't work!\n");
     GUI_Timer  = GTK_WIDGET (gtk_builder_get_object (builder, "Timer"));
@@ -1470,6 +1474,9 @@ main(argc, argv)
     LIST_MoveHistory = GTK_LIST_STORE (gtk_builder_get_object (builder, "MoveHistoryStore"));
     if(!LIST_MoveHistory) printf("Error: gtk_builder didn't work!\n");
 
+    LIST_GameList = GTK_LIST_STORE (gtk_builder_get_object (builder, "GameListStore"));
+    if(!LIST_GameList) printf("Error: gtk_builder didn't work!\n");
+
     /* EditTags window */
     GUI_EditTags = GTK_WIDGET (gtk_builder_get_object (builder, "EditTags"));
     if(!GUI_EditTags) printf("Error: gtk_builder didn't work!\n");
@@ -3863,9 +3870,10 @@ void ModeHighlight()
       }
     }
 
-    wname = ModeToWidgetName(oldmode);
-    if(wname)
-       gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, wname)),True);
+    // probably not needed anymore
+//    wname = ModeToWidgetName(oldmode);
+//    if(wname)
+//       gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, wname)),True);
 
     oldmode = gameMode;
 
@@ -3897,8 +3905,11 @@ int LoadGamePopUp(f, gameNumber, title)
        else if (!ListEmpty(&gameList) 
                 && ((ListGame *) gameList.tailPred)->number > 1) 
          {
-           // TODO convert to GTK
-           //      GameListPopUp(f, title);
+           /* we need an answer which game to load, so let's make it modal for a while*/
+           gtk_window_set_modal(GTK_WINDOW(GUI_GameList) , TRUE);  
+           GameListPopUp(f, title);
+           gtk_window_set_modal(GTK_WINDOW(GUI_GameList) , FALSE);  
+
            return TRUE;
          };