X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=nengineoutput.c;h=088cc1c78052e75e8f7b66c9c69111f81f94ea03;hb=1c03d229073e56dda9e5856db5adaae51576a3bb;hp=dc84aa4ddb2856fd6e2ff38edc428ddf67a75922;hpb=b602e7faa8f3973c5b3c4ae00108eaea982ea196;p=xboard.git

diff --git a/nengineoutput.c b/nengineoutput.c
index dc84aa4..088cc1c 100644
--- a/nengineoutput.c
+++ b/nengineoutput.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2005 Alessandro Scotti
  *
- * Enhancements Copyright 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ * Enhancements Copyright 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
  *
  * ------------------------------------------------------------------------
  *
@@ -69,21 +69,21 @@ extern char *getenv();
 int  windowMode = 1;
 
 char *mem1, *mem2; // dummies, as this dialog can never be OK'ed
-static int currentPV, highTextStart[2], highTextEnd[2];
+int highTextStart[2], highTextEnd[2];
 
 int MemoProc P((Option *opt, int n, int x, int y, char *text, int index));
 
 Option engoutOptions[] = {
-{  0,  LL|T2T,           17, NULL, NULL, NULL, NULL, Label, " " },
+{  0,  LL|T2T,           17, NULL, NULL, NULL, NULL, Icon, " " },
 {  0, L2L|T2T|SAME_ROW, 163, NULL, NULL, NULL, NULL, Label, N_("engine name") },
-{  0,     T2T|SAME_ROW,  30, NULL, NULL, NULL, NULL, Label, " " },
+{  0,     T2T|SAME_ROW,  30, NULL, NULL, NULL, NULL, Icon, " " },
 {  0, R2R|T2T|SAME_ROW, 188, NULL, NULL, NULL, NULL, Label, N_("move") },
 {  0,  RR|T2T|SAME_ROW,  80, NULL, NULL, NULL, NULL, Label, N_("NPS") },
 {200, T_VSCRL | T_TOP,  500, NULL, (void*) &mem1, "", (char**) MemoProc, TextBox, "" },
 {  0,         0,         0, NULL, NULL, "", NULL, Break , "" },
-{  0,  LL|T2T,           17, NULL, NULL, NULL, NULL, Label, " " },
+{  0,  LL|T2T,           17, NULL, NULL, NULL, NULL, Icon, " " },
 {  0, L2L|T2T|SAME_ROW, 163, NULL, NULL, NULL, NULL, Label, N_("engine name") },
-{  0,     T2T|SAME_ROW,  30, NULL, NULL, NULL, NULL, Label, " " },
+{  0,     T2T|SAME_ROW,  30, NULL, NULL, NULL, NULL, Icon, " " },
 {  0, R2R|T2T|SAME_ROW, 188, NULL, NULL, NULL, NULL, Label, N_("move") },
 {  0,  RR|T2T|SAME_ROW,  80, NULL, NULL, NULL, NULL, Label, N_("NPS") },
 {200, T_VSCRL | T_TOP,  500, NULL, (void*) &mem2, "", (char**) MemoProc, TextBox, "" },
@@ -104,14 +104,14 @@ MemoProc (Option *opt, int n, int x, int y, char *text, int index)
       case 3: // press button 3
 	pressed = 1;
 	if(LoadMultiPV(x, y, text, index, &start, &end, currentPV)) {
-#ifdef TODO_GTK
-	    XawTextSetSelection( w, start, end );
-#endif
 	    highTextStart[currentPV] = start; highTextEnd[currentPV] = end;
+	    HighlightText(&engoutOptions[currentPV ? 12 : 5], start, end, TRUE);
 	}
 	break;
       case -3: // release button 3
 	pressed = 0;
+        if(highTextStart[currentPV] != highTextEnd[currentPV])
+            HighlightText(&engoutOptions[currentPV ? 12 : 5], highTextStart[currentPV], highTextEnd[currentPV], FALSE);
         highTextStart[currentPV] = highTextEnd[currentPV] = 0;
         UnLoadPV();
 	break;
@@ -155,8 +155,8 @@ EngineOutputPopUp ()
     if (GenericPopUp(engoutOptions, _(title), EngOutDlg, BoardWindow, NONMODAL, 1)) {
 	if(engoutOptions[STRIDE-1].type != Break)
 	    DisplayFatalError(_("Mismatch of STRIDE in nengineoutput.c\nChange and recompile!"), 0, 2);
-	AddHandler(&engoutOptions[MEMO], 6);
-	AddHandler(&engoutOptions[MEMO+STRIDE], 6);
+	AddHandler(&engoutOptions[MEMO], EngOutDlg, 6);
+	AddHandler(&engoutOptions[MEMO+STRIDE], EngOutDlg, 6);
 	if( needInit ) {
 	    InitEngineOutput(&engoutOptions[0], &engoutOptions[MEMO]); // make icon bitmaps
 	    needInit = FALSE;
@@ -192,4 +192,3 @@ EngineOutputProc ()
 {
   if (!PopDown(EngOutDlg)) EngineOutputPopUp();
 }
-