X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=9e89d57875268983476d24a4da88ca2f4b7e293e;hb=d169fe2b9f61534051f8c1284d632871b0fb4ab6;hp=c0422004789005c85b57025ba27f0cb6e785abb8;hpb=73419c47f539f4f6d0700fe8ec89bb0f6259c94e;p=xboard.git

diff --git a/xboard.c b/xboard.c
index c042200..9e89d57 100644
--- a/xboard.c
+++ b/xboard.c
@@ -206,6 +206,7 @@ extern char *getenv();
 #include "menus.h"
 #include "board.h"
 #include "dialogs.h"
+#include "engineoutput.h"
 #include "usystem.h"
 #include "gettext.h"
 
@@ -260,10 +261,6 @@ void AnimateUserMove P((Widget w, XEvent * event,
 		     String * params, Cardinal * nParams));
 void HandlePV P((Widget w, XEvent * event,
 		     String * params, Cardinal * nParams));
-void SelectPV P((Widget w, XEvent * event,
-		     String * params, Cardinal * nParams));
-void StopPV P((Widget w, XEvent * event,
-		     String * params, Cardinal * nParams));
 void WhiteClock P((Widget w, XEvent *event,
 		   String *prms, Cardinal *nprms));
 void BlackClock P((Widget w, XEvent *event,
@@ -312,7 +309,7 @@ Widget shellWidget, layoutWidget, formWidget, boardWidget, messageWidget,
   commentShell, whitePieceMenu, blackPieceMenu, dropMenu,
   menuBarWidget, buttonBarWidget, editShell, errorShell, analysisShell,
   ICSInputShell, fileNameShell;
-Widget historyShell, evalGraphShell;
+Widget historyShell;
 XSegment secondSegments[BOARD_RANKS + BOARD_FILES + 2];
 XSegment gridSegments[BOARD_RANKS + BOARD_FILES + 2];
 #if ENABLE_NLS
@@ -522,8 +519,6 @@ XtActionsRec boardActions[] = {
     { "TempBackwardProc", TempBackwardProc },
     { "TempForwardProc", TempForwardProc },
     { "CommentClick", (XtActionProc) CommentClick },
-    { "EngineOutputPopDown", (XtActionProc) EngineOutputPopDown },
-    { "EvalGraphPopDown", (XtActionProc) EvalGraphPopDown },
     { "GenericPopDown", (XtActionProc) GenericPopDown },
     { "ErrorPopDown", (XtActionProc) ErrorPopDown },
     { "CopyMemoProc", (XtActionProc) CopyMemoProc },
@@ -967,7 +962,6 @@ ParseCommPortSettings (char *s)
 { // no such option in XBoard (yet)
 }
 
-extern Widget engineOutputShell;
 int frameX, frameY;
 
 void
@@ -997,9 +991,9 @@ GetWindowCoords ()
 { // wrapper to shield use of window handles from back-end (make addressible by number?)
   // In XBoard this will have to wait until awareness of window parameters is implemented
   GetActualPlacement(shellWidget, &wpMain);
-  if(EngineOutputIsUp()) GetActualPlacement(engineOutputShell, &wpEngineOutput);
-  if(MoveHistoryIsUp()) GetActualPlacement(shells[HistoryDlg], &wpMoveHistory);
-  if(EvalGraphIsUp()) GetActualPlacement(evalGraphShell, &wpEvalGraph);
+  if(shellUp[EngOutDlg]) GetActualPlacement(shells[EngOutDlg], &wpEngineOutput);
+  if(shellUp[HistoryDlg]) GetActualPlacement(shells[HistoryDlg], &wpMoveHistory);
+  if(shellUp[EvalGraphDlg]) GetActualPlacement(shells[EvalGraphDlg], &wpEvalGraph);
   if(shellUp[GameListDlg]) GetActualPlacement(shells[GameListDlg], &wpGameList);
   if(shellUp[CommentDlg]) GetActualPlacement(shells[CommentDlg], &wpComment);
   if(shellUp[TagsDlg]) GetActualPlacement(shells[TagsDlg], &wpTags);
@@ -3386,9 +3380,9 @@ DragProc ()
 	if(wpNew.x == wpMain.x && wpNew.y == wpMain.y && // not moved
 	   wpNew.width == wpMain.width && wpNew.height == wpMain.height) // not sized
 	    return; // false alarm
-	if(EngineOutputIsUp()) CoDrag(engineOutputShell, &wpEngineOutput);
-	if(MoveHistoryIsUp()) CoDrag(shells[HistoryDlg], &wpMoveHistory);
-	if(EvalGraphIsUp()) CoDrag(evalGraphShell, &wpEvalGraph);
+	if(shellUp[EngOutDlg]) CoDrag(shells[EngOutDlg], &wpEngineOutput);
+	if(shellUp[HistoryDlg]) CoDrag(shells[HistoryDlg], &wpMoveHistory);
+	if(shellUp[EvalGraphDlg]) CoDrag(shells[EvalGraphDlg], &wpEvalGraph);
 	if(shellUp[GameListDlg]) CoDrag(shells[GameListDlg], &wpGameList);
 	wpMain = wpNew;
 	DrawPosition(True, NULL);