Further copy/paste fixes

[xboard.git] / xengineoutput.c

diff --git a/xengineoutput.c b/xengineoutput.c
index 54c8859..2df13d3 100644 (file)
--- a/xengineoutput.c
+++ b/xengineoutput.c
@@ -132,7 +132,7 @@ Pixmap icons[8]; // [HGM] this front-end array translates back-end icon indicato
 Widget outputField[2][7]; // [HGM] front-end array to translate output field to window handle
 
 void EngineOutputPopDown();
 Widget outputField[2][7]; // [HGM] front-end array to translate output field to window handle
 
 void EngineOutputPopDown();

-void engineOutputPopUp(char *title, char *text);
+void engineOutputPopUp();

 int  EngineOutputIsUp();
 static void SetEngineColorIcon( int which );
 
 int  EngineOutputIsUp();
 static void SetEngineColorIcon( int which );
 


@@ -188,9 +188,9 @@ typedef struct {
     int an_move_count;
 } EngineOutputData;
 
     int an_move_count;
 } EngineOutputData;
 

-static int VerifyDisplayMode();
+static void VerifyDisplayMode();

 static void UpdateControls( EngineOutputData * ed );
 static void UpdateControls( EngineOutputData * ed );

-static SetEngineState( int which, int state, char * state_data );
+static void SetEngineState( int which, int state, char * state_data );

 
 void ReadIcon(char *pixData[], int iconNr)
 {
 
 void ReadIcon(char *pixData[], int iconNr)
 {


@@ -349,13 +349,9 @@ void PositionControlSet(which, form, bw_width)
     XtSetArg(args[j], XtNright, XtChainRight);  j++;
     XtSetArg(args[j], XtNresizable, True);  j++;
     XtSetArg(args[j], XtNwidth, bw_width);  j++; /*force wider than buttons*/
     XtSetArg(args[j], XtNright, XtChainRight);  j++;
     XtSetArg(args[j], XtNresizable, True);  j++;
     XtSetArg(args[j], XtNwidth, bw_width);  j++; /*force wider than buttons*/

-#if 0
-    XtSetArg(args[j], XtNscrollVertical, XawtextScrollWhenNeeded);  j++;
-#else

     /* !!Work around an apparent bug in XFree86 4.0.1 (X11R6.4.3) */
     XtSetArg(args[j], XtNscrollVertical, XawtextScrollAlways);  j++;
     XtSetArg(args[j], XtNscrollHorizontal, XawtextScrollWhenNeeded);  j++;
     /* !!Work around an apparent bug in XFree86 4.0.1 (X11R6.4.3) */
     XtSetArg(args[j], XtNscrollVertical, XawtextScrollAlways);  j++;
     XtSetArg(args[j], XtNscrollHorizontal, XawtextScrollWhenNeeded);  j++;

-#endif

 //    XtSetArg(args[j], XtNautoFill, True);  j++;
 //    XtSetArg(args[j], XtNwrap, XawtextWrapWord); j++;
     outputField[which][nMemo] = edit =
 //    XtSetArg(args[j], XtNautoFill, True);  j++;
 //    XtSetArg(args[j], XtNwrap, XawtextWrapWord); j++;
     outputField[which][nMemo] = edit =


@@ -385,7 +381,11 @@ Widget EngineOutputCreate(name, text)
     j = 0;
     XtSetArg(args[j], XtNresizable, True);  j++;
     shell =
     j = 0;
     XtSetArg(args[j], XtNresizable, True);  j++;
     shell =

+#if TOPLEVEL 
+     XtCreatePopupShell(name, topLevelShellWidgetClass,
+#else

       XtCreatePopupShell(name, transientShellWidgetClass,
       XtCreatePopupShell(name, transientShellWidgetClass,

+#endif

                         shellWidget, args, j);
     layout =
       XtCreateManagedWidget(layoutName, formWidgetClass, shell,
                         shellWidget, args, j);
     layout =
       XtCreateManagedWidget(layoutName, formWidgetClass, shell,


@@ -417,20 +417,8 @@ Widget EngineOutputCreate(name, text)
        Window junk;
        Dimension pw_height;
        Dimension ew_height;
        Window junk;
        Dimension pw_height;
        Dimension ew_height;

-#if 0
-       j = 0;
-       XtSetArg(args[j], XtNheight, &ew_height);  j++;
-       XtGetValues(edit, args, j);
-
-       j = 0;
-       XtSetArg(args[j], XtNheight, &pw_height);  j++;
-       XtGetValues(shell, args, j);
-       engineOutputH = pw_height + (lines - 1) * ew_height;
-       engineOutputW = bw_width - 16;
-#else

        engineOutputH = bw_height/2;
        engineOutputW = bw_width-16;
        engineOutputH = bw_height/2;
        engineOutputW = bw_width-16;

-#endif

 
        XSync(xDisplay, False);
 #ifdef NOTDEF
 
        XSync(xDisplay, False);
 #ifdef NOTDEF


@@ -499,12 +487,13 @@ void ResizeWindowControls(shell, mode)
     }
 }
 
     }
 }
 

-void EngineOutputPopUp(title, text)
-     char *title, *text;
+void 
+EngineOutputPopUp()

 {
     Arg args[16];
     int j;
     Widget edit;
 {
     Arg args[16];
     int j;
     Widget edit;

+    static char *title = _("Engine output"), *text = _("This feature is experimental");

 
     if (engineOutputShell == NULL) {
        engineOutputShell =
 
     if (engineOutputShell == NULL) {
        engineOutputShell =


@@ -570,7 +559,7 @@ void EngineOutputPopDown()
 
 
 // back end, due to front-end wrapper for SetWindowText, and new SetIcon arguments
 
 
 // back end, due to front-end wrapper for SetWindowText, and new SetIcon arguments

-static SetEngineState( int which, int state, char * state_data )
+static void SetEngineState( int which, int state, char * state_data )

 {
     int x_which = 1 - which;
 
 {
     int x_which = 1 - which;
 


@@ -756,7 +745,7 @@ static void SetDisplayMode( int mode )
 }
 
 // pure back end
 }
 
 // pure back end

-int VerifyDisplayMode()
+void VerifyDisplayMode()

 {
     int mode;
 
 {
     int mode;
 


@@ -862,7 +851,8 @@ static void UpdateControls( EngineOutputData * ed )
             strncpy( mov, ed->hint, sizeof(mov) );
             mov[ sizeof(mov)-1 ] = '\0';
 
             strncpy( mov, ed->hint, sizeof(mov) );
             mov[ sizeof(mov)-1 ] = '\0';
 

-            sprintf( buf, "%d/%d: %s [%02d:%02d:%02d]", ed->an_move_index, ed->an_move_count, mov, time_mins / 60, time_mins % 60, time_secs % 60 );
+           sprintf( buf, "[%d] %d/%d: %s [%02d:%02d:%02d]", ed->depth, ed->an_move_index,
+                       ed->an_move_count, mov, time_mins / 60, time_mins % 60, time_secs % 60 );

         }
 
         SetEngineState( ed->which, STATE_ANALYZING, buf );
         }
 
         SetEngineState( ed->which, STATE_ANALYZING, buf );


@@ -953,7 +943,7 @@ EngineOutputProc(w, event, prms, nprms)
   if (engineOutputDialogUp) {
     EngineOutputPopDown();
   } else {
   if (engineOutputDialogUp) {
     EngineOutputPopDown();
   } else {

-    EngineOutputPopUp(_("engine output"),_("This feature is experimental"));
+    EngineOutputPopUp();

   }
 //  ToNrEvent(currentMove);
 }
   }
 //  ToNrEvent(currentMove);
 }