X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xevalgraph.c;h=cb7dbe35f938eb3a9c7310cd62c05cabe2b699bc;hb=08a38fdd71f1fae28fb213d4c5f6fb0834967412;hp=3556473633f943351dd6e325053b4133e8a999c5;hpb=5353e7326ef32081eea7669e885ae3f906ca677d;p=xboard.git

diff --git a/xevalgraph.c b/xevalgraph.c
index 3556473..cb7dbe3 100644
--- a/xevalgraph.c
+++ b/xevalgraph.c
@@ -6,7 +6,7 @@
  *
  * Copyright 2005 Alessandro Scotti
  *
- * Enhancements Copyright 2009 Free Software Foundation, Inc.
+ * Enhancements Copyright 2009, 2010, 2011 Free Software Foundation, Inc.
  *
  * ------------------------------------------------------------------------
  *
@@ -84,37 +84,15 @@ extern char *getenv();
 
 #include <X11/xpm.h>
 
-// [HGM] pixmaps of some ICONS used in the engine-outut window
-#include "pixmaps/WHITE_14.xpm"
-#include "pixmaps/BLACK_14.xpm"
-#include "pixmaps/CLEAR_14.xpm"
-#include "pixmaps/UNKNOWN_14.xpm"
-#include "pixmaps/THINKING_14.xpm"
-#include "pixmaps/PONDER_14.xpm"
-#include "pixmaps/ANALYZING_14.xpm"
-
 #ifdef SNAP
 #include "wsnap.h"
 #endif
 
 #define _LL_ 100
 
-// imports from xboard.c
-extern Widget formWidget, shellWidget, boardWidget, menuBarWidget;
-extern Display *xDisplay;
-extern Window xBoardWindow;
-extern int squareSize;
-extern Pixmap xMarkPixmap, wIconPixmap, bIconPixmap;
-extern char *layoutName;
-
 Pixmap icons[8]; // [HGM] this front-end array translates back-end icon indicator to handle
 Widget outputField[2][7]; // [HGM] front-end array to translate output field to window handle
-
-/* Imports from backend.c */
-
-/* Imports from xboard.c */
-extern Arg layoutArgs[2], formArgs[2], messageArgs[4];
-extern GC coordGC;
+static char *title = N_("Evaluation graph");
 
 //extern WindowPlacement wpEvalGraph;
 
@@ -138,14 +116,15 @@ static HDC hdcPB = NULL;
 static HBITMAP hbmPB = NULL;
 #endif
 
-// [HGM] front-end, added as wrapper to avoid use of LineTo and MoveToEx in other routines (so they can be back-end) 
+// [HGM] front-end, added as wrapper to avoid use of LineTo and MoveToEx in other routines (so they can be back-end)
 void DrawSegment( int x, int y, int *lastX, int *lastY, int penType )
 {
-static curX, curY;
-    if(penType != PEN_NONE)
-      XDrawLine(yDisplay, eGraphWindow, pens[penType], curX, curY, x, y);
-    if(lastX != NULL) { *lastX = curX; *lastY = curY; }
-    curX = x; curY = y;
+  static int curX, curY;
+
+  if(penType != PEN_NONE)
+    XDrawLine(yDisplay, eGraphWindow, pens[penType], curX, curY, x, y);
+  if(lastX != NULL) { *lastX = curX; *lastY = curY; }
+  curX = x; curY = y;
 }
 
 // front-end wrapper for drawing functions to do rectangles
@@ -220,24 +199,22 @@ static void DisplayEvalGraph()
 
     // back-end painting; calls back front-end primitives for lines, rectangles and text
     PaintEvalGraph();
+    XtSetArg(args[0], XtNtitle, MakeEvalTitle(_(title))); j++;
+    XtSetValues(evalGraphShell, args, 1);
 
     XSync(yDisplay, False);
 }
 
 static void InitializeEvalGraph()
-{ int i;    XtGCMask value_mask = GCLineWidth | GCLineStyle | GCForeground
-      | GCBackground | GCFunction | GCPlaneMask;
-    XGCValues gc_values;
-//    GC copyInvertedGC;
-
-    pens[PEN_BLACK]     = CreateGC(1, "black", "black", LineSolid);
-    pens[PEN_DOTTED]    = CreateGC(1, "#A0A0A0", "#A0A0A0", LineOnOffDash);
-    pens[PEN_BLUEDOTTED] = CreateGC(1, "#0000FF", "#0000FF", LineOnOffDash);
-    pens[PEN_BOLD]      = CreateGC(3, crWhite, crWhite, LineSolid);
-    pens[PEN_BOLD+1]    = CreateGC(3, crBlack, crBlack, LineSolid);
-    hbrHist[0] = CreateGC(3, crWhite, crWhite, LineSolid);
-    hbrHist[1] = CreateGC(3, crBlack, crBlack, LineSolid);
-    hbrHist[2] = CreateGC(3, "#E0E0F0", "#E0E0F0", LineSolid);; // background (a bit blueish, for contrst with yellow curve)
+{
+  pens[PEN_BLACK]      = CreateGC(1, "black", "black", LineSolid);
+  pens[PEN_DOTTED]     = CreateGC(1, "#A0A0A0", "#A0A0A0", LineOnOffDash);
+  pens[PEN_BLUEDOTTED] = CreateGC(1, "#0000FF", "#0000FF", LineOnOffDash);
+  pens[PEN_BOLD]       = CreateGC(3, crWhite, crWhite, LineSolid);
+  pens[PEN_BOLD+1]     = CreateGC(3, crBlack, crBlack, LineSolid);
+  hbrHist[0] = CreateGC(3, crWhite, crWhite, LineSolid);
+  hbrHist[1] = CreateGC(3, crBlack, crBlack, LineSolid);
+  hbrHist[2] = CreateGC(3, "#E0E0F0", "#E0E0F0", LineSolid);; // background (a bit blueish, for contrst with yellow curve)
 }
 
 void EvalClick(widget, unused, event)
@@ -279,7 +256,7 @@ Widget EvalGraphCreate(name)
      char *name;
 {
     Arg args[16];
-    Widget shell, layout, form, form2, edit;
+    Widget shell, layout, form;
     Dimension bw_width, bw_height;
     int j;
 
@@ -293,7 +270,7 @@ Widget EvalGraphCreate(name)
     j = 0;
     XtSetArg(args[j], XtNresizable, True);  j++;
     shell =
-#if TOPLEVEL 
+#if TOPLEVEL
      XtCreatePopupShell(name, topLevelShellWidgetClass,
 #else
       XtCreatePopupShell(name, transientShellWidgetClass,
@@ -324,8 +301,6 @@ Widget EvalGraphCreate(name)
     if (evalGraphX == -1) {
 	int xx, yy;
 	Window junk;
-	Dimension pw_height;
-	Dimension ew_height;
 	evalGraphH = bw_height/4;
 	evalGraphW = bw_width-16;
 
@@ -354,7 +329,6 @@ Widget EvalGraphCreate(name)
     XtSetArg(args[j], XtNx, evalGraphX);  j++;
     XtSetArg(args[j], XtNy, evalGraphY);  j++;
     XtSetValues(shell, args, j);
-//    XtSetKeyboardFocus(shell, edit);
 
     yDisplay = XtDisplay(shell);
     eGraphWindow = XtWindow(form);
@@ -366,19 +340,17 @@ Widget EvalGraphCreate(name)
     return shell;
 }
 
-void 
+void
 EvalGraphPopUp()
 {
     Arg args[16];
     int j;
-    Widget edit;
     static int  needInit = TRUE;
-    static char *title = _("Evaluation graph");
 
     if (evalGraphShell == NULL) {
 
 	evalGraphShell =
-	  EvalGraphCreate(title);
+	  EvalGraphCreate(_(title));
 	XtRealizeWidget(evalGraphShell);
 	CatchDeleteWindow(evalGraphShell, "EvalGraphPopDown");
 	if( needInit ) {
@@ -387,8 +359,8 @@ EvalGraphPopUp()
 	}
     } else {
 	j = 0;
-	XtSetArg(args[j], XtNiconName, (XtArgVal) title);   j++;
-	XtSetArg(args[j], XtNtitle, (XtArgVal) title);      j++;
+	XtSetArg(args[j], XtNiconName, (XtArgVal) _(title));   j++;
+	XtSetArg(args[j], XtNtitle, (XtArgVal) _(title));      j++;
 	XtSetValues(evalGraphShell, args, j);
     }
 
@@ -397,7 +369,7 @@ EvalGraphPopUp()
 
     j=0;
     XtSetArg(args[j], XtNleftBitmap, xMarkPixmap); j++;
-    XtSetValues(XtNameToWidget(menuBarWidget, "menuMode.Show Evaluation Graph"),
+    XtSetValues(XtNameToWidget(menuBarWidget, "menuView.Show Evaluation Graph"),
 		args, j);
 
     evalGraphDialogUp = True;
@@ -424,7 +396,7 @@ void EvalGraphPopDown()
     XSync(xDisplay, False);
     j=0;
     XtSetArg(args[j], XtNleftBitmap, None); j++;
-    XtSetValues(XtNameToWidget(menuBarWidget, "menuMode.Show Evaluation Graph"),
+    XtSetValues(XtNameToWidget(menuBarWidget, "menuView.Show Evaluation Graph"),
 		args, j);
 
     evalGraphDialogUp = False;