X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xengineoutput.c;h=ddd93df4fa6934b7acfdee12ed078ab52f856d16;hb=fa8cdd39eca80f4bdbf6e8e8a290fa1b8979224e;hp=e7d8b6b3b0af168891592f35072b8ddf335aa898;hpb=292d1fc96afcdd5aececf3ec0da28c56bfb1a5a6;p=xboard.git diff --git a/xengineoutput.c b/xengineoutput.c index e7d8b6b..ddd93df 100644 --- a/xengineoutput.c +++ b/xengineoutput.c @@ -5,7 +5,7 @@ * * Copyright 2005 Alessandro Scotti * - * Enhancements Copyright 2009 Free Software Foundation, Inc. + * Enhancements Copyright 2009, 2010, 2011, 2012 Free Software Foundation, Inc. * * ------------------------------------------------------------------------ * @@ -100,14 +100,6 @@ extern char *getenv(); #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 @@ -116,12 +108,6 @@ void engineOutputPopUp(); int EngineOutputIsUp(); void SetEngineColorIcon( int which ); -/* Imports from backend.c */ -extern int opponentKibitzes; - -/* Imports from xboard.c */ -extern Arg layoutArgs[2], formArgs[2], messageArgs[4]; - //extern WindowPlacement wpEngineOutput; Position engineOutputX = -1, engineOutputY = -1; @@ -131,6 +117,7 @@ static int engineOutputDialogUp; /* Module variables */ int windowMode = 1; +static int currentPV, highTextStart[2], highTextEnd[2]; typedef struct { char * name; @@ -147,7 +134,8 @@ typedef struct { //static void UpdateControls( EngineOutputData * ed ); -void ReadIcon(char *pixData[], int iconNr) +void +ReadIcon (char *pixData[], int iconNr) { int r; @@ -156,13 +144,13 @@ void ReadIcon(char *pixData[], int iconNr) &(icons[iconNr]), NULL, NULL /*&attr*/)) != 0) { fprintf(stderr, _("Error %d loading icon image\n"), r); - exit(1); - } + exit(1); + } } -static void InitializeEngineOutput() -{ int i; - +static void +InitializeEngineOutput () +{ ReadIcon(WHITE_14, nColorWhite); ReadIcon(BLACK_14, nColorBlack); ReadIcon(UNKNOWN_14, nColorUnknown); @@ -173,30 +161,45 @@ static void InitializeEngineOutput() ReadIcon(ANALYZE_14, nAnalyzing); } -void DoSetWindowText(int which, int field, char *s_label) -{ +void +DoSetWindowText (int which, int field, char *s_label) +{ Arg arg; XtSetArg(arg, XtNlabel, (XtArgVal) s_label); XtSetValues(outputField[which][field], &arg, 1); } -void InsertIntoMemo( int which, char * text, int where ) +void +SetEngineOutputTitle (char *title) { - Arg arg; XawTextBlock t; Widget edit; + Arg arg; + XtSetArg(arg, XtNtitle, (XtArgVal) title); + XtSetValues(engineOutputShell, &arg, 1); +} + +void +InsertIntoMemo (int which, char * text, int where) +{ + XawTextBlock t; + Widget edit; - /* the backend adds \r\n, which is needed for winboard, + /* the backend adds \r\n, which is needed for winboard, * for xboard we delete them again over here */ if(t.ptr = strchr(text, '\r')) *t.ptr = ' '; t.ptr = text; t.firstPos = 0; t.length = strlen(text); t.format = XawFmt8Bit; edit = XtNameToWidget(engineOutputShell, which ? "*form2.text" : "*form.text"); XawTextReplace(edit, where, where, &t); -// XtSetArg(arg, XtNstring, (XtArgVal) text); -// XtSetValues(outputField[which][nMemo], &arg, 1); + if(where < highTextStart[which]) { // [HGM] multiPVdisplay: move highlighting + int len = strlen(text); + highTextStart[which] += len; highTextEnd[which] += len; + XawTextSetSelection( outputField[which][nMemo], highTextStart[which], highTextEnd[which] ); + } } -void SetIcon( int which, int field, int nIcon ) +void +SetIcon (int which, int field, int nIcon) { Arg arg; @@ -206,32 +209,63 @@ void SetIcon( int which, int field, int nIcon ) } } -void DoClearMemo(int which) -{ - Arg args[16]; - int j; - Widget edit; - - edit = XtNameToWidget(engineOutputShell, which ? "*form2.text" : "*form.text"); - XtCallActionProc(edit, "select-all", NULL, NULL, 0); - XtCallActionProc(edit, "kill-selection", NULL, NULL, 0); +void +DoClearMemo (int which) +{ + Widget edit = XtNameToWidget(engineOutputShell, which ? "*form2.text" : "*form.text"); + Arg arg; +// XtCallActionProc(edit, "select-all", NULL, NULL, 0); +// XtCallActionProc(edit, "kill-selection", NULL, NULL, 0); + XtSetArg(arg, XtNstring, ""); // clear without disturbing selection! + XtSetValues(edit, &arg, 1); } // cloned from CopyPositionProc. Abuse selected_fen_position to hold selection -extern char *selected_fen_position; - Boolean SendPositionSelection(Widget w, Atom *selection, Atom *target, Atom *type_return, XtPointer *value_return, unsigned long *length_return, int *format_return); // from xboard.c void SetFocus(Widget w, XtPointer data, XEvent *event, Boolean *b); // from xoptions.c char memoTranslations[] = -":Ctrlc: CopyMemoProc() \n"; +":Ctrlc: CopyMemoProc() \n \ +: HandlePV() \n \ +Shift: select-start() SelectPV(1) \n \ +Any: select-start() SelectPV(0) \n \ +: extend-end() StopPV() \n"; + +void +SelectPV (Widget w, XEvent * event, String * params, Cardinal * nParams) +{ // [HGM] pv: translate click to PV line, and load it for display + String val; + int start, end; + XawTextPosition index, dummy; + int x, y; + Arg arg; + + x = event->xmotion.x; y = event->xmotion.y; + currentPV = (w == outputField[1][nMemo]); + XawTextGetSelectionPos(w, &index, &dummy); + XtSetArg(arg, XtNstring, &val); + XtGetValues(w, &arg, 1); + shiftKey = strcmp(params[0], "0"); + if(LoadMultiPV(x, y, val, index, &start, &end)) { + XawTextSetSelection( outputField[currentPV][nMemo], start, end ); + highTextStart[currentPV] = start; highTextEnd[currentPV] = end; + } +} + +void +StopPV (Widget w, XEvent * event, String * params, Cardinal * nParams) +{ // [HGM] pv: on right-button release, stop displaying PV + XawTextUnsetSelection( w ); + highTextStart[currentPV] = highTextEnd[currentPV] = 0; + UnLoadPV(); +} static void -MemoCB(Widget w, XtPointer client_data, Atom *selection, - Atom *type, XtPointer value, unsigned long *len, int *format) +MemoCB (Widget w, XtPointer client_data, Atom *selection, + Atom *type, XtPointer value, unsigned long *len, int *format) { if (value==NULL || *len==0) return; /* nothing had been selected to copy */ selected_fen_position = value; @@ -243,15 +277,12 @@ MemoCB(Widget w, XtPointer client_data, Atom *selection, NULL/* transfer_done_proc */); } -void CopyMemoProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +CopyMemoProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { if(appData.pasteSelection) return; if (selected_fen_position) free(selected_fen_position); - XtGetSelectionValue(menuBarWidget, + XtGetSelectionValue(menuBarWidget, XA_PRIMARY, XA_STRING, /* (XtSelectionCallbackProc) */ MemoCB, NULL, /* client_data passed to PastePositionCB */ @@ -265,10 +296,8 @@ void CopyMemoProc(w, event, prms, nprms) // The following routines are mutated clones of the commentPopUp routines -void PositionControlSet(which, shell, form, bw_width) - int which; - Widget shell, form; - Dimension bw_width; +void +PositionControlSet (int which, Widget shell, Widget form, Dimension bw_width) { Arg args[16]; Widget edit, NameWidget, ColorWidget, ModeWidget, MoveWidget, NodesWidget; @@ -280,7 +309,6 @@ void PositionControlSet(which, shell, form, bw_width) XtSetArg(args[j], XtNbottom, XtChainTop); j++; XtSetArg(args[j], XtNleft, XtChainLeft); j++; XtSetArg(args[j], XtNright, XtChainLeft); j++; - XtSetArg(args[j], XtNheight, (XtArgVal) 16); j++; XtSetArg(args[j], XtNwidth, (XtArgVal) 17); j++; outputField[which][nColorIcon] = ColorWidget = XtCreateManagedWidget("Color", labelWidgetClass, @@ -293,7 +321,6 @@ void PositionControlSet(which, shell, form, bw_width) XtSetArg(args[j], XtNtop, XtChainTop); j++; XtSetArg(args[j], XtNbottom, XtChainTop); j++; XtSetArg(args[j], XtNleft, XtChainLeft); j++; - XtSetArg(args[j], XtNheight, (XtArgVal) 16); j++; XtSetArg(args[j], XtNwidth, (XtArgVal) bw_width/2 - 57); j++; outputField[which][nLabel] = NameWidget = XtCreateManagedWidget("Engine", labelWidgetClass, @@ -305,7 +332,6 @@ void PositionControlSet(which, shell, form, bw_width) XtSetArg(args[j], XtNfromHoriz, (XtArgVal) NameWidget); j++; XtSetArg(args[j], XtNtop, XtChainTop); j++; XtSetArg(args[j], XtNbottom, XtChainTop); j++; - XtSetArg(args[j], XtNheight, (XtArgVal) 16); j++; XtSetArg(args[j], XtNwidth, (XtArgVal) 20); j++; outputField[which][nStateIcon] = ModeWidget = XtCreateManagedWidget("Mode", labelWidgetClass, @@ -319,7 +345,6 @@ void PositionControlSet(which, shell, form, bw_width) XtSetArg(args[j], XtNtop, XtChainTop); j++; XtSetArg(args[j], XtNbottom, XtChainTop); j++; XtSetArg(args[j], XtNright, XtChainRight); j++; - XtSetArg(args[j], XtNheight, (XtArgVal) 16); j++; XtSetArg(args[j], XtNwidth, (XtArgVal) bw_width/2 - 102); j++; outputField[which][nStateData] = MoveWidget = XtCreateManagedWidget("Move", labelWidgetClass, @@ -334,7 +359,6 @@ void PositionControlSet(which, shell, form, bw_width) XtSetArg(args[j], XtNbottom, XtChainTop); j++; XtSetArg(args[j], XtNleft, XtChainRight); j++; XtSetArg(args[j], XtNright, XtChainRight); j++; - XtSetArg(args[j], XtNheight, (XtArgVal) 16); j++; XtSetArg(args[j], XtNwidth, (XtArgVal) 100); j++; outputField[which][nLabelNPS] = NodesWidget = XtCreateManagedWidget("Nodes", labelWidgetClass, @@ -371,11 +395,11 @@ void PositionControlSet(which, shell, form, bw_width) XtSetValues(edit, args, j); } -Widget EngineOutputCreate(name, text) - char *name, *text; +Widget +EngineOutputCreate (char *name, char *text) { Arg args[16]; - Widget shell, layout, form, form2, edit; + Widget shell, layout, form, form2; Dimension bw_width, bw_height; int j; @@ -389,7 +413,7 @@ Widget EngineOutputCreate(name, text) j = 0; XtSetArg(args[j], XtNresizable, True); j++; shell = -#if TOPLEVEL +#if TOPLEVEL XtCreatePopupShell(name, topLevelShellWidgetClass, #else XtCreatePopupShell(name, transientShellWidgetClass, @@ -430,8 +454,7 @@ Widget EngineOutputCreate(name, text) if (engineOutputX == -1) { int xx, yy; Window junk; - Dimension pw_height; - Dimension ew_height; + engineOutputH = bw_height/2; engineOutputW = bw_width-16; @@ -460,13 +483,12 @@ Widget EngineOutputCreate(name, text) XtSetArg(args[j], XtNx, engineOutputX); j++; XtSetArg(args[j], XtNy, engineOutputY); j++; XtSetValues(shell, args, j); -// XtSetKeyboardFocus(shell, edit); return shell; } -void ResizeWindowControls(mode) - int mode; +void +ResizeWindowControls (int mode) { Widget form1, form2; Arg args[16]; @@ -502,18 +524,18 @@ void ResizeWindowControls(mode) } } -void -EngineOutputPopUp() +void +EngineOutputPopUp () { Arg args[16]; int j; Widget edit; static int needInit = TRUE; - static char *title = _("Engine output"), *text = _("This feature is experimental"); + static char *title = N_("Engine output"), *text = N_("This feature is experimental"); if (engineOutputShell == NULL) { engineOutputShell = - EngineOutputCreate(title, text); + EngineOutputCreate(_(title), _(text)); XtRealizeWidget(engineOutputShell); CatchDeleteWindow(engineOutputShell, "EngineOutputPopDown"); if( needInit ) { @@ -530,8 +552,8 @@ EngineOutputPopUp() XtSetArg(args[j], XtNstring, text); j++; XtSetValues(edit, args, j); 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(engineOutputShell, args, j); } @@ -540,14 +562,15 @@ EngineOutputPopUp() j=0; XtSetArg(args[j], XtNleftBitmap, xMarkPixmap); j++; - XtSetValues(XtNameToWidget(menuBarWidget, "menuMode.Show Engine Output"), + XtSetValues(XtNameToWidget(menuBarWidget, "menuView.Show Engine Output"), args, j); engineOutputDialogUp = True; ShowThinkingEvent(); // [HGM] thinking: might need to prompt engine for thinking output } -void EngineOutputPopDown() +void +EngineOutputPopDown () { Arg args[16]; int j; @@ -568,29 +591,27 @@ void EngineOutputPopDown() XSync(xDisplay, False); j=0; XtSetArg(args[j], XtNleftBitmap, None); j++; - XtSetValues(XtNameToWidget(menuBarWidget, "menuMode.Show Engine Output"), + XtSetValues(XtNameToWidget(menuBarWidget, "menuView.Show Engine Output"), args, j); engineOutputDialogUp = False; ShowThinkingEvent(); // [HGM] thinking: might need to shut off thinking output } -int EngineOutputIsUp() +int +EngineOutputIsUp () { return engineOutputDialogUp; } -int EngineOutputDialogExists() +int +EngineOutputDialogExists () { return engineOutputShell != NULL; } void -EngineOutputProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +EngineOutputProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { if (engineOutputDialogUp) { EngineOutputPopDown();