X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xoptions.c;h=9a3f4748fccc6d3b2a20dedb8d55b86fabd8950b;hb=b9c6b5e9fcd6321336ec28f25833530db79b928d;hp=955471e5f1e017238f92ea925af499516b8d0f9b;hpb=a3e7cc9b3eb04ffb69fd73b47c06758f73316373;p=xboard.git diff --git a/xoptions.c b/xoptions.c index 955471e..9a3f474 100644 --- a/xoptions.c +++ b/xoptions.c @@ -1,7 +1,7 @@ /* * xoptions.c -- Move list window, part of X front end for XBoard * - * Copyright 2000, 2009, 2010, 2011 Free Software Foundation, Inc. + * Copyright 2000, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. * ------------------------------------------------------------------------ * * GNU XBoard is free software: you can redistribute it and/or modify @@ -83,8 +83,10 @@ extern char *getenv(); // [HGM] the following code for makng menu popups was cloned from the FileNamePopUp routines static Widget previous = NULL; +extern Pixel timerBackgroundPixel; -void SetFocus(Widget w, XtPointer data, XEvent *event, Boolean *b) +void +SetFocus (Widget w, XtPointer data, XEvent *event, Boolean *b) { Arg args[2]; char *s; @@ -111,33 +113,38 @@ typedef int OKCallback(int n); int values[MAX_OPTIONS]; ChessProgramState *currentCps; +int dialogError; static Option *currentOption; static Boolean browserUp; ButtonCallback *comboCallback; -void GetWidgetText(Option *opt, char **buf) +void +GetWidgetText (Option *opt, char **buf) { Arg arg; XtSetArg(arg, XtNstring, buf); XtGetValues(opt->handle, &arg, 1); } -void SetWidgetText(Option *opt, char *buf, int n) +void +SetWidgetText (Option *opt, char *buf, int n) { Arg arg; XtSetArg(arg, XtNstring, buf); XtSetValues(opt->handle, &arg, 1); - SetFocus(opt->handle, shells[n], NULL, False); + if(n >= 0) SetFocus(opt->handle, shells[n], NULL, False); } -void SetWidgetState(Option *opt, int state) +void +SetWidgetState (Option *opt, int state) { Arg arg; XtSetArg(arg, XtNstate, state); XtSetValues(opt->handle, &arg, 1); } -void CheckCallback(Widget ww, XtPointer data, XEvent *event, Boolean *b) +void +CheckCallback (Widget ww, XtPointer data, XEvent *event, Boolean *b) { Widget w = currentOption[(int)(intptr_t)data].handle; Boolean s; @@ -148,9 +155,8 @@ void CheckCallback(Widget ww, XtPointer data, XEvent *event, Boolean *b) SetWidgetState(¤tOption[(int)(intptr_t)data], !s); } -void SpinCallback(w, client_data, call_data) - Widget w; - XtPointer client_data, call_data; +void +SpinCallback (Widget w, XtPointer client_data, XtPointer call_data) { String name, val; Arg args[16]; @@ -190,10 +196,8 @@ void SpinCallback(w, client_data, call_data) SetWidgetText(¤tOption[data], buf, 0); } -void ComboSelect(w, addr, index) // callback for all combo items - Widget w; - caddr_t addr; - caddr_t index; +void +ComboSelect (Widget w, caddr_t addr, caddr_t index) // callback for all combo items { Arg args[16]; int i = ((intptr_t)addr)>>8; @@ -211,21 +215,19 @@ void ComboSelect(w, addr, index) // callback for all combo items if(currentOption[i].min & COMBO_CALLBACK && !currentCps && comboCallback) (comboCallback)(i); } -void CreateComboPopup(parent, option, n) - Widget parent; - Option *option; - int n; +void +CreateComboPopup (Widget parent, Option *option, int n) { int i=0, j; Widget menu, entry; Arg args[16]; + char **mb = (char **) option->textValue; + if(mb[0] == NULL) return; // avoid empty menus, as they cause crash menu = XtCreatePopupShell(option->name, simpleMenuWidgetClass, parent, NULL, 0); j = 0; XtSetArg(args[j], XtNwidth, 100); j++; -// XtSetArg(args[j], XtNright, XtChainRight); j++; - char **mb = (char **) option->textValue; while (mb[i] != NULL) { if (option->min & NO_GETTEXT) @@ -248,25 +250,26 @@ void CreateComboPopup(parent, option, n) extern WindowPlacement wpComment, wpTags, wpMoveHistory; char *trialSound; -static int oldCores, oldPonder; +static int oldCores, oldPonder, oldShow, oldBlind; int MakeColors P((void)); void CreateGCs P((int redo)); void CreateAnyPieces P((void)); int GenericReadout P((int selected)); +void GenericUpdate P((int selected)); Widget shells[10]; -Widget marked[10]; +char *marked[10]; Boolean shellUp[10]; WindowPlacement *wp[10] = { NULL, &wpComment, &wpTags, NULL, NULL, NULL, NULL, &wpMoveHistory }; Option *dialogOptions[10]; -void MarkMenu(char *item, int dlgNr) +void +MarkMenu (char *item, int dlgNr) { - Arg args[2]; - XtSetArg(args[0], XtNleftBitmap, xMarkPixmap); - XtSetValues(marked[dlgNr] = XtNameToWidget(menuBarWidget, item), args, 1); + MarkMenuItem(marked[dlgNr] = item, True); } -int PopDown(int n) +int +PopDown (int n) { int j; Arg args[10]; @@ -289,20 +292,17 @@ int PopDown(int n) if(n == 0) XtDestroyWidget(shells[n]); shellUp[n] = False; if(marked[n]) { - XtSetArg(args[0], XtNleftBitmap, None); - XtSetValues(marked[n], args, 1); + MarkMenuItem(marked[n], False); + marked[n] = NULL; } if(!n) currentCps = NULL; // if an Engine Settings dialog was up, we must be popping it down now return 1; } -void GenericPopDown(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +GenericPopDown (Widget w, XEvent *event, String *prms, Cardinal *nprms) { - if(browserUp) return; // prevent closing dialog when it has an open file-browse daughter + if(browserUp || dialogError) return; // prevent closing dialog when it has an open file-browse daughter PopDown(prms[0][0] - '0'); } @@ -310,9 +310,10 @@ char *engineName, *engineDir, *engineChoice, *engineLine, *nickName, *params, *t Boolean isUCI, hasBook, storeVariant, v1, addToList, useNick; extern Option installOptions[], matchOptions[]; char *engineNr[] = { N_("First Engine"), N_("Second Engine"), NULL }; -char *engineList[100] = {" "}, *engineMnemonic[100] = {""}; +char *engineList[MAXENGINES] = {" "}, *engineMnemonic[MAXENGINES] = {""}; -int AppendText(Option *opt, char *s) +int +AppendText (Option *opt, char *s) { XawTextBlock t; char *v; @@ -324,19 +325,22 @@ int AppendText(Option *opt, char *s) return len; } -void AddLine(Option *opt, char *s) +void +AddLine (Option *opt, char *s) { AppendText(opt, s); AppendText(opt, "\n"); } -void AddToTourney(int n) +void +AddToTourney (int n) { GenericReadout(4); // selected engine AddLine(&matchOptions[3], engineChoice); } -int MatchOK(int n) +int +MatchOK (int n) { ASSIGN(appData.participants, engineName); if(!CreateTourney(tfName) || matchMode) return matchMode || !appData.participants[0]; @@ -345,18 +349,35 @@ int MatchOK(int n) return 1; } -void ReplaceParticipant() +void +ReplaceParticipant () { GenericReadout(3); Substitute(strdup(engineName), True); } -void UpgradeParticipant() +void +UpgradeParticipant () { GenericReadout(3); Substitute(strdup(engineName), False); } +void +CloneTourney () +{ + FILE *f; + char *name; + GetWidgetText(currentOption, &name); + if(name && name[0] && (f = fopen(name, "r")) ) { + char *saveSaveFile; + saveSaveFile = appData.saveGameFile; appData.saveGameFile = NULL; // this is a persistent option, protect from change + ParseArgsFromFile(f); + engineName = appData.participants; GenericUpdate(-1); + FREE(appData.saveGameFile); appData.saveGameFile = saveSaveFile; + } else DisplayError(_("First you must specify an existing tourney file to clone"), 0); +} + Option matchOptions[] = { { 0, 0, 0, NULL, (void*) &tfName, ".trn", NULL, FileName, N_("Tournament file:") }, { 0, 0, 0, NULL, (void*) &appData.roundSync, "", NULL, CheckBox, N_("Sync after round (for concurrent playing of a single") }, @@ -377,14 +398,18 @@ Option matchOptions[] = { { 0, 0, 0, NULL, (void*) &appData.defNoBook, "", NULL, CheckBox, N_("Disable own engine books by default") }, { 0, 0, 0, NULL, (void*) &ReplaceParticipant, NULL, NULL, Button, N_("Replace Engine") }, { 0, 1, 0, NULL, (void*) &UpgradeParticipant, NULL, NULL, Button, N_("Upgrade Engine") }, +{ 0, 1, 0, NULL, (void*) &CloneTourney, NULL, NULL, Button, N_("Clone Tourney") }, { 0, 1, 0, NULL, (void*) &MatchOK, "", NULL, EndMark , "" } }; -int GeneralOptionsOK(int n) +int +GeneralOptionsOK (int n) { int newPonder = appData.ponderNextMove; appData.ponderNextMove = oldPonder; PonderNextMoveEvent(newPonder); + if(!appData.highlightLastMove) ClearHighlights(), ClearPremoveHighlights(); + if(oldShow != appData.showCoords || oldBlind != appData.blindfold) DrawPosition(TRUE, NULL); return 1; } @@ -398,7 +423,6 @@ Option generalOptions[] = { { 0, 0, 0, NULL, (void*) &appData.blindfold, "", NULL, CheckBox, N_("Blindfold") }, { 0, 0, 0, NULL, (void*) &appData.dropMenu, "", NULL, CheckBox, N_("Drop Menu") }, { 0, 0, 0, NULL, (void*) &appData.hideThinkingFromHuman, "", NULL, CheckBox, N_("Hide Thinking from Human") }, -{ 0, 0, 0, NULL, (void*) &appData.highlightDragging, "", NULL, CheckBox, N_("Highlight Dragging (Show Move Targets)") }, { 0, 0, 0, NULL, (void*) &appData.highlightLastMove, "", NULL, CheckBox, N_("Highlight Last Move") }, { 0, 0, 0, NULL, (void*) &appData.highlightMoveWithArrow, "", NULL, CheckBox, N_("Highlight with Arrow") }, { 0, 0, 0, NULL, (void*) &appData.ringBellAfterMoves, "", NULL, CheckBox, N_("Move Sound") }, @@ -410,6 +434,7 @@ Option generalOptions[] = { { 0, 0, 0, NULL, (void*) &appData.showEvalInMoveHistory, "", NULL, CheckBox, N_("Scores in Move List") }, { 0, 0, 0, NULL, (void*) &appData.showCoords, "", NULL, CheckBox, N_("Show Coordinates") }, { 0, 0, 0, NULL, (void*) &appData.markers, "", NULL, CheckBox, N_("Show Target Squares") }, +{ 0, 0, 0, NULL, (void*) &appData.useStickyWindows, "", NULL, CheckBox, N_("Sticky Windows") }, { 0, 0, 0, NULL, (void*) &appData.testLegality, "", NULL, CheckBox, N_("Test Legality") }, { 0, 0, 10, NULL, (void*) &appData.flashCount, "", NULL, Spin, N_("Flash Moves (0 = no flashing):") }, { 0, 1, 10, NULL, (void*) &appData.flashRate, "", NULL, Spin, N_("Flash Rate (high = fast):") }, @@ -418,7 +443,8 @@ Option generalOptions[] = { { 0, 0, 0, NULL, (void*) &GeneralOptionsOK, "", NULL, EndMark , "" } }; -void Pick(int n) +void +Pick (int n) { VariantClass v = currentOption[n].value; if(!appData.noChessProgram) { @@ -495,7 +521,8 @@ Option variantDescriptors[] = { { 0, 2, 0, NULL, NULL, "", NULL, EndMark , "" } }; -int CommonOptionsOK(int n) +int +CommonOptionsOK (int n) { int newPonder = appData.ponderNextMove; // make sure changes are sent to first engine by re-initializing it @@ -540,7 +567,8 @@ Option adjudicationOptions[] = { { 0, 1, 0, NULL, NULL, "", NULL, EndMark , "" } }; -int IcsOptionsOK(int n) +int +IcsOptionsOK (int n) { ParseIcsTextColors(); return 1; @@ -584,7 +612,8 @@ char *modeNames[] = { N_("Exact position match"), N_("Shown position is subset") char *modeValues[] = { "1", "2", "3", "4", "5", "6" }; char *searchMode; -int LoadOptionsOK() +int +LoadOptionsOK () { appData.searchMode = atoi(searchMode); return 1; @@ -602,7 +631,7 @@ Option loadOptions[] = { { 0, 0, 5000, NULL, (void*) &appData.eloThreshold2, "", NULL, Spin, N_("Elo of weakest player at least:") }, { 0, 0, 5000, NULL, (void*) &appData.dateThreshold, "", NULL, Spin, N_("No games before year:") }, { 0, 1, 50, NULL, (void*) &appData.stretch, "", NULL, Spin, N_("Minimum nr consecutive positions:") }, -{ 1, 0, 180, NULL, (void*) &searchMode, (char*) modeNames, modeValues, ComboBox, N_("Seach mode:") }, +{ 1, 0, 180, NULL, (void*) &searchMode, (char*) modeNames, modeValues, ComboBox, N_("Search mode:") }, { 0, 0, 0, NULL, (void*) &appData.ignoreColors, "", NULL, CheckBox, N_("Also match reversed colors") }, { 0, 0, 0, NULL, (void*) &appData.findMirror, "", NULL, CheckBox, N_("Also match left-right flipped position") }, { 0, 0, 0, NULL, (void*) &LoadOptionsOK, "", NULL, EndMark , "" } @@ -614,6 +643,7 @@ Option saveOptions[] = { { 0, 0, 0, NULL, (void*) &appData.savePositionFile, ".fen", NULL, FileName, N_("Save Final Positions on File:") }, { 0, 0, 0, NULL, (void*) &appData.pgnEventHeader, "", NULL, TextBox, N_("PGN Event Header:") }, { 0, 0, 0, NULL, (void*) &appData.oldSaveStyle, "", NULL, CheckBox, N_("Old Save Style (as opposed to PGN)") }, +{ 0, 0, 0, NULL, (void*) &appData.numberTag, "", NULL, CheckBox, N_("Include Number Tag in tourney PGN") }, { 0, 0, 0, NULL, (void*) &appData.saveExtendedInfoInPGN, "", NULL, CheckBox, N_("Save Score/Depth Info in PGN") }, { 0, 0, 0, NULL, (void*) &appData.saveOutOfBookInfo, "", NULL, CheckBox, N_("Save Out-of-Book Info in PGN ") }, { 0, 1, 0, NULL, NULL, "", NULL, EndMark , "" } @@ -655,7 +685,8 @@ char *soundFiles[] = { // sound files corresponding to above names NULL }; -void Test(int n) +void +Test (int n) { GenericReadout(2); if(soundFiles[values[3]]) PlaySound(soundFiles[values[3]]); @@ -685,7 +716,8 @@ Option soundOptions[] = { { 0, 1, 0, NULL, NULL, "", NULL, EndMark , "" } }; -void SetColor(char *colorName, Option *box) +void +SetColor (char *colorName, Option *box) { Arg args[5]; Pixel buttonColor; @@ -699,23 +731,26 @@ void SetColor(char *colorName, Option *box) } else { buttonColor = *(Pixel *) vTo.addr; } - } else buttonColor = (Pixel) 0; + } else buttonColor = timerBackgroundPixel; XtSetArg(args[0], XtNbackground, buttonColor);; XtSetValues(box->handle, args, 1); } -void SetColorText(int n, char *buf) +void +SetColorText (int n, char *buf) { SetWidgetText(¤tOption[n-1], buf, 0); SetColor(buf, ¤tOption[n]); } -void DefColor(int n) +void +DefColor (int n) { SetColorText(n, (char*) currentOption[n].choice); } -void RefreshColor(int source, int n) +void +RefreshColor (int source, int n) { int col, j, r, g, b, step = 10; char *s, buf[MSG_SIZ]; // color string @@ -736,20 +771,23 @@ void RefreshColor(int source, int n) SetColorText(source+1, buf); } -void ColorChanged(Widget w, XtPointer data, XEvent *event, Boolean *b) +void +ColorChanged (Widget w, XtPointer data, XEvent *event, Boolean *b) { char buf[10]; if ( (XLookupString(&(event->xkey), buf, 2, NULL, NULL) == 1) && *buf == '\r' ) RefreshColor((int)(intptr_t) data, 0); } -void AdjustColor(int i) +void +AdjustColor (int i) { int n = currentOption[i].value; RefreshColor(i-n-1, n); } -int BoardOptionsOK(int n) +int +BoardOptionsOK (int n) { if(appData.overrideLineGap >= 0) lineGap = appData.overrideLineGap; else lineGap = defaultLineGap; useImages = useImageSqs = 0; @@ -763,9 +801,13 @@ int BoardOptionsOK(int n) Option boardOptions[] = { { 0, 0, 70, NULL, (void*) &appData.whitePieceColor, "", NULL, TextBox, N_("White Piece Color:") }, { 1000, 1, 0, NULL, (void*) &DefColor, NULL, (char**) "#FFFFCC", Button, " " }, +/* TRANSLATORS: R = single letter for the color red */ { 1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("R") }, +/* TRANSLATORS: G = single letter for the color green */ { 2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("G") }, +/* TRANSLATORS: B = single letter for the color blue */ { 3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("B") }, +/* TRANSLATORS: D = single letter to make a color darker */ { 4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, N_("D") }, { 0, 0, 70, NULL, (void*) &appData.blackPieceColor, "", NULL, TextBox, N_("Black Piece Color:") }, { 1000, 1, 0, NULL, (void*) &DefColor, NULL, (char**) "#202020", Button, " " }, @@ -809,7 +851,52 @@ Option boardOptions[] = { { 0, 0, 0, NULL, (void*) &BoardOptionsOK, "", NULL, EndMark , "" } }; -int GenericReadout(int selected) +void +GenericUpdate (int selected) +{ + int i, j; + char buf[MSG_SIZ]; + float x; + for(i=0; ; i++) { + if(selected >= 0) { if(i < selected) continue; else if(i > selected) break; } + switch(currentOption[i].type) { + case TextBox: + case FileName: + case PathName: + SetWidgetText(¤tOption[i], *(char**) currentOption[i].target, -1); + break; + case Spin: + sprintf(buf, "%d", *(int*) currentOption[i].target); + SetWidgetText(¤tOption[i], buf, -1); + break; + case Fractional: + sprintf(buf, "%4.2f", *(float*) currentOption[i].target); + SetWidgetText(¤tOption[i], buf, -1); + break; + case CheckBox: + SetWidgetState(¤tOption[i], *(Boolean*) currentOption[i].target); + break; + case ComboBox: + for(j=0; currentOption[i].choice[j]; j++) + if(*(char**)currentOption[i].target && !strcmp(*(char**)currentOption[i].target, currentOption[i].choice[j])) break; + values[i] = currentOption[i].value = j + (currentOption[i].choice[j] == NULL); + // TODO: actually display this + break; + case EndMark: + return; + default: + printf("GenericUpdate: unexpected case in switch.\n"); + case Button: + case SaveButton: + case Label: + case Break: + break; + } + } +} + +int +GenericReadout (int selected) { int i, j, res=1; String val; @@ -896,9 +983,8 @@ int GenericReadout(int selected) return res; } -void GenericCallback(w, client_data, call_data) - Widget w; - XtPointer client_data, call_data; +void +GenericCallback (Widget w, XtPointer client_data, XtPointer call_data) { String name; Arg args[16]; @@ -928,12 +1014,12 @@ void GenericCallback(w, client_data, call_data) static char *oneLiner = "Return: redraw-display()\n"; int -GenericPopUp(Option *option, char *title, int dlgNr) +GenericPopUp (Option *option, char *title, int dlgNr) { Arg args[16]; Widget popup, layout, dialog=NULL, edit=NULL, form, last, b_ok, b_cancel, leftMargin = NULL, textField = NULL; Window root, child; - int x, y, i, j, height=999, width=1, h, c, w; + int x, y, i, j, height=999, width=1, h, c, w, shrink=FALSE; int win_x, win_y, maxWidth, maxTextWidth; unsigned int mask; char def[MSG_SIZ], *msg; @@ -1003,6 +1089,7 @@ GenericPopUp(Option *option, char *title, int dlgNr) XtSetArg(args[j], XtNfromVert, last); j++; XtSetArg(args[j], XtNleft, XtChainLeft); j++; XtSetArg(args[j], XtNright, XtChainLeft); j++; + XtSetArg(args[j], XtNheight, textHeight), j++; XtSetArg(args[j], XtNborderWidth, 0); j++; XtSetArg(args[j], XtNjustify, XtJustifyLeft); j++; XtSetArg(args[j], XtNlabel, _(option[i].name)); j++; @@ -1022,7 +1109,7 @@ GenericPopUp(Option *option, char *title, int dlgNr) if(option[i].value & 2) { XtSetArg(args[j], XtNscrollHorizontal, XawtextScrollAlways); j++; } if(option[i].value & 4) { XtSetArg(args[j], XtNautoFill, True); j++; } if(option[i].value & 8) { XtSetArg(args[j], XtNwrap, XawtextWrapWord); j++; } - } + } else shrink = TRUE; XtSetArg(args[j], XtNleft, XtChainLeft); j++; XtSetArg(args[j], XtNeditType, XawtextEdit); j++; XtSetArg(args[j], XtNuseStringInPlace, False); j++; @@ -1051,9 +1138,10 @@ GenericPopUp(Option *option, char *title, int dlgNr) msg = _("browse"); w = 0; /* automatically scale to width of text */ XtSetArg(args[j], XtNwidth, (XtArgVal) NULL ); j++; + if(textHeight) XtSetArg(args[j], XtNheight, textHeight), j++; } else { w = 20; msg = "+"; - XtSetArg(args[j], XtNheight, 10); j++; + XtSetArg(args[j], XtNheight, textHeight/2); j++; XtSetArg(args[j], XtNwidth, w); j++; } edit = XtCreateManagedWidget(msg, commandWidgetClass, form, args, j); @@ -1065,7 +1153,8 @@ GenericPopUp(Option *option, char *title, int dlgNr) j=0; XtSetArg(args[j], XtNfromVert, edit); j++; XtSetArg(args[j], XtNfromHoriz, last); j++; - XtSetArg(args[j], XtNheight, 10); j++; + XtSetArg(args[j], XtNvertDistance, -1); j++; + XtSetArg(args[j], XtNheight, textHeight/2); j++; XtSetArg(args[j], XtNwidth, 20); j++; XtSetArg(args[j], XtNleft, XtChainRight); j++; XtSetArg(args[j], XtNright, XtChainRight); j++; @@ -1076,8 +1165,9 @@ GenericPopUp(Option *option, char *title, int dlgNr) if(!currentCps) option[i].value = *(Boolean*)option[i].target; j=0; XtSetArg(args[j], XtNfromVert, last); j++; - XtSetArg(args[j], XtNwidth, 10); j++; - XtSetArg(args[j], XtNheight, 10); j++; + XtSetArg(args[j], XtNvertDistance, (textHeight+2)/4 + 3); j++; + XtSetArg(args[j], XtNwidth, textHeight/2); j++; + XtSetArg(args[j], XtNheight, textHeight/2); j++; XtSetArg(args[j], XtNleft, XtChainLeft); j++; XtSetArg(args[j], XtNright, XtChainLeft); j++; XtSetArg(args[j], XtNstate, option[i].value); j++; @@ -1090,6 +1180,7 @@ GenericPopUp(Option *option, char *title, int dlgNr) j=0; XtSetArg(args[j], XtNfromVert, last); j++; XtSetArg(args[j], XtNfromHoriz, option[i].type != Label ? dialog : NULL); j++; + if(option[i].type != Label) XtSetArg(args[j], XtNheight, textHeight), j++, shrink = TRUE; XtSetArg(args[j], XtNleft, XtChainLeft); j++; XtSetArg(args[j], XtNborderWidth, 0); j++; XtSetArg(args[j], XtNjustify, XtJustifyLeft); j++; @@ -1104,9 +1195,13 @@ GenericPopUp(Option *option, char *title, int dlgNr) if(option[i].min & SAME_ROW) { XtSetArg(args[j], XtNfromVert, lastrow); j++; XtSetArg(args[j], XtNfromHoriz, last); j++; + XtSetArg(args[j], XtNleft, XtChainRight); j++; + XtSetArg(args[j], XtNright, XtChainRight); j++; + if(shrink) XtSetArg(args[j], XtNheight, textHeight), j++; } else { XtSetArg(args[j], XtNfromVert, last); j++; XtSetArg(args[j], XtNfromHoriz, NULL); j++; lastrow = forelast; + shrink = FALSE; } XtSetArg(args[j], XtNlabel, _(option[i].name)); j++; if(option[i].max) { XtSetArg(args[j], XtNwidth, option[i].max); j++; } @@ -1131,6 +1226,7 @@ GenericPopUp(Option *option, char *title, int dlgNr) XtSetArg(args[j], XtNfromVert, last); j++; XtSetArg(args[j], XtNleft, XtChainLeft); j++; XtSetArg(args[j], XtNright, XtChainLeft); j++; + XtSetArg(args[j], XtNheight, textHeight), j++; XtSetArg(args[j], XtNborderWidth, 0); j++; XtSetArg(args[j], XtNjustify, XtJustifyLeft); j++; XtSetArg(args[j], XtNlabel, _(option[i].name)); j++; @@ -1149,6 +1245,8 @@ GenericPopUp(Option *option, char *title, int dlgNr) XtSetArg(args[j], XtNleft, XtChainLeft); j++; XtSetArg(args[j], XtNmenuName, XtNewString(option[i].name)); j++; XtSetArg(args[j], XtNlabel, _(((char**)option[i].textValue)[option[i].value])); j++; + XtSetArg(args[j], XtNheight, textHeight), j++; + shrink = TRUE; option[i].handle = (void*) (last = XtCreateManagedWidget(" ", menuButtonWidgetClass, form, args, j)); CreateComboPopup(last, option + i, i); @@ -1229,13 +1327,14 @@ GenericPopUp(Option *option, char *title, int dlgNr) } j = 0; XtSetArg(args[j], XtNfromHoriz, last); last = forelast; - } else + } else shrink = FALSE, XtSetArg(args[j], XtNfromHoriz, widest ? widest : dialog); j++; XtSetArg(args[j], XtNfromVert, anchor ? anchor : last); j++; XtSetArg(args[j], XtNbottom, XtChainBottom); j++; XtSetArg(args[j], XtNtop, XtChainBottom); j++; XtSetArg(args[j], XtNleft, XtChainRight); j++; XtSetArg(args[j], XtNright, XtChainRight); j++; + if(shrink) XtSetArg(args[j], XtNheight, textHeight), j++; b_ok = XtCreateManagedWidget(_("OK"), commandWidgetClass, form, args, j); XtAddCallback(b_ok, XtNcallback, GenericCallback, (XtPointer)(intptr_t) dlgNr + (dlgNr<<16)); @@ -1271,100 +1370,71 @@ GenericPopUp(Option *option, char *title, int dlgNr) } -void IcsOptionsProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +IcsOptionsProc () { GenericPopUp(icsOptions, _("ICS Options"), 0); } -void LoadOptionsProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +LoadOptionsProc () { ASSIGN(searchMode, modeValues[appData.searchMode-1]); GenericPopUp(loadOptions, _("Load Game Options"), 0); } -void SaveOptionsProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +SaveOptionsProc () { GenericPopUp(saveOptions, _("Save Game Options"), 0); } -void SoundOptionsProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +SoundOptionsProc () { free(soundFiles[2]); soundFiles[2] = strdup("*"); GenericPopUp(soundOptions, _("Sound Options"), 0); } -void BoardOptionsProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +BoardOptionsProc () { GenericPopUp(boardOptions, _("Board Options"), 0); } -void EngineMenuProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +EngineMenuProc () { GenericPopUp(adjudicationOptions, _("Adjudicate non-ICS Games"), 0); } -void UciMenuProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +UciMenuProc () { oldCores = appData.smpCores; oldPonder = appData.ponderNextMove; GenericPopUp(commonEngineOptions, _("Common Engine Settings"), 0); } -void NewVariantProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +NewVariantProc () { GenericPopUp(variantDescriptors, _("New Variant"), 0); } -void OptionsProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +OptionsProc () { oldPonder = appData.ponderNextMove; + oldShow = appData.showCoords; oldBlind = appData.blindfold; GenericPopUp(generalOptions, _("General Options"), 0); } -void MatchOptionsProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +MatchOptionsProc () { - NamesToList(firstChessProgramNames, engineList, engineMnemonic); + NamesToList(firstChessProgramNames, engineList, engineMnemonic, "all"); comboCallback = &AddToTourney; matchOptions[5].min = -(appData.pairingEngine[0] != NULLCHAR); // with pairing engine, allow Swiss ASSIGN(tfName, appData.tourneyFile[0] ? appData.tourneyFile : MakeName(appData.defName)); @@ -1375,7 +1445,8 @@ void MatchOptionsProc(w, event, prms, nprms) Option textOptions[100]; void PutText P((char *text, int pos)); -void SendString(char *p) +void +SendString (char *p) { char buf[MSG_SIZ], *q; if(q = strstr(p, "$input")) { @@ -1391,8 +1462,8 @@ void SendString(char *p) /* function called when the data to Paste is ready */ static void -SendTextCB(Widget w, XtPointer client_data, Atom *selection, - Atom *type, XtPointer value, unsigned long *len, int *format) +SendTextCB (Widget w, XtPointer client_data, Atom *selection, + Atom *type, XtPointer value, unsigned long *len, int *format) { char buf[MSG_SIZ], *p = (char*) textOptions[(int)(intptr_t) client_data].choice, *name = (char*) value, *q; if (value==NULL || *len==0) return; /* nothing selected, abort */ @@ -1404,7 +1475,8 @@ SendTextCB(Widget w, XtPointer client_data, Atom *selection, XtFree(value); } -void SendText(int n) +void +SendText (int n) { char *p = (char*) textOptions[n].choice; if(strstr(p, "$name")) { @@ -1417,11 +1489,8 @@ void SendText(int n) } else SendString(p); } -void IcsTextProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +IcsTextProc () { int i=0, j; char *p, *q, *r; @@ -1448,7 +1517,7 @@ void IcsTextProc(w, event, prms, nprms) textOptions[i].type = EndMark; textOptions[i].target = NULL; textOptions[i].min = 2; - MarkMenu("menuView.ICStex", 3); + MarkMenu("ICStex", 3); GenericPopUp(textOptions, _("ICS text menu"), 3); } @@ -1457,13 +1526,15 @@ static int commentIndex; void ClearComment P((int n)); extern char commentTranslations[]; -int NewComCallback(int n) +int +NewComCallback (int n) { ReplaceComment(commentIndex, commentText); return 1; } -void SaveChanges(int n) +void +SaveChanges (int n) { GenericReadout(0); ReplaceComment(commentIndex, commentText); @@ -1476,7 +1547,8 @@ Option commentOptions[] = { { 0, 1, 0, NULL, (void*) &NewComCallback, "", NULL, EndMark , "" } }; -void ClearTextWidget(Option *opt) +void +ClearTextWidget (Option *opt) { // XtCallActionProc(opt->handle, "select-all", NULL, NULL, 0); // XtCallActionProc(opt->handle, "kill-selection", NULL, NULL, 0); @@ -1485,12 +1557,14 @@ void ClearTextWidget(Option *opt) XtSetValues(opt->handle, &arg, 1); } -void ClearComment(int n) +void +ClearComment (int n) { ClearTextWidget(&commentOptions[0]); } -void NewCommentPopup(char *title, char *text, int index) +void +NewCommentPopup (char *title, char *text, int index) { Arg args[16]; @@ -1501,20 +1575,22 @@ void NewCommentPopup(char *title, char *text, int index) } if(commentText) free(commentText); commentText = strdup(text); commentIndex = index; - MarkMenu("menuView.Show Comments", 1); + MarkMenu("Show Comments", 1); if(GenericPopUp(commentOptions, title, 1)) XtOverrideTranslations(commentOptions[0].handle, XtParseTranslationTable(commentTranslations)); } static char *tagsText; -int NewTagsCallback(int n) +int +NewTagsCallback (int n) { ReplaceTags(tagsText, &gameInfo); return 1; } -void changeTags(int n) +void +changeTags (int n) { GenericReadout(1); if(bookUp) SaveToBook(tagsText); else @@ -1528,7 +1604,8 @@ Option tagsOptions[] = { { 0, 1, 0, NULL, (void*) &NewTagsCallback, "", NULL, EndMark , "" } }; -void NewTagsPopup(char *text, char *msg) +void +NewTagsPopup (char *text, char *msg) { Arg args[16]; char *title = bookUp ? _("Edit book") : _("Tags"); @@ -1540,7 +1617,7 @@ void NewTagsPopup(char *text, char *msg) } if(tagsText) free(tagsText); tagsText = strdup(text); tagsOptions[0].textValue = msg; - MarkMenu("menuView.Show Tags", 2); + MarkMenu("Show Tags", 2); GenericPopUp(tagsOptions, title, 2); } @@ -1551,7 +1628,8 @@ Option boxOptions[] = { { 0, 3, 0, NULL, NULL, "", NULL, EndMark , "" } }; -void PutText(char *text, int pos) +void +PutText (char *text, int pos) { Arg args[16]; char buf[MSG_SIZ], *p; @@ -1568,18 +1646,16 @@ void PutText(char *text, int pos) XSetInputFocus(xDisplay, XtWindow(boxOptions[0].handle), RevertToPointerRoot, CurrentTime); } -void InputBoxPopup() +void +InputBoxPopup () { - MarkMenu("menuView.ICS Input Box", 4); + MarkMenu("ICS Input Box", 4); if(GenericPopUp(boxOptions, _("ICS input box"), 4)) XtOverrideTranslations(boxOptions[0].handle, XtParseTranslationTable(ICSInputTranslations)); } -void TypeInProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +TypeInProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { char *val; @@ -1594,7 +1670,8 @@ char moveTypeInTranslations[] = "Return: TypeInProc(1) \n" "Escape: TypeInProc(0) \n"; -void PopUpMoveDialog(char firstchar) +void +PopUpMoveDialog (char firstchar) { static char buf[2]; buf[0] = firstchar; icsText = buf; @@ -1602,7 +1679,8 @@ void PopUpMoveDialog(char firstchar) XtOverrideTranslations(boxOptions[0].handle, XtParseTranslationTable(moveTypeInTranslations)); } -void MoveTypeInProc(Widget widget, caddr_t unused, XEvent *event) +void +MoveTypeInProc (Widget widget, caddr_t unused, XEvent *event) { char buf[10], keys[32]; KeySym sym; @@ -1632,32 +1710,27 @@ void MoveTypeInProc(Widget widget, caddr_t unused, XEvent *event) } void -SettingsPopUp(ChessProgramState *cps) +SettingsPopUp (ChessProgramState *cps) { currentCps = cps; GenericPopUp(cps->option, _("Engine Settings"), 0); } -void FirstSettingsProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +FirstSettingsProc () { SettingsPopUp(&first); } -void SecondSettingsProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +SecondSettingsProc () { if(WaitForEngine(&second, SettingsMenuIfReady)) return; SettingsPopUp(&second); } -int InstallOK(int n) +int +InstallOK (int n) { PopDown(0); // early popdown, to allow FreezeUI to instate grab if(engineChoice[0] == engineNr[0][0]) Load(&first, 0); else Load(&second, 1); @@ -1681,11 +1754,8 @@ Option installOptions[] = { { 0, 1, 0, NULL, (void*) &InstallOK, "", NULL, EndMark , "" } }; -void LoadEngineProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +LoadEngineProc () { isUCI = storeVariant = v1 = useNick = False; addToList = hasBook = True; // defaults if(engineChoice) free(engineChoice); engineChoice = strdup(engineNr[0]); @@ -1693,22 +1763,20 @@ void LoadEngineProc(w, event, prms, nprms) if(engineDir) free(engineDir); engineDir = strdup(""); if(nickName) free(nickName); nickName = strdup(""); if(params) free(params); params = strdup(""); - NamesToList(firstChessProgramNames, engineList, engineMnemonic); + NamesToList(firstChessProgramNames, engineList, engineMnemonic, "all"); GenericPopUp(installOptions, _("Load engine"), 0); } -void EditBookProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +EditBookProc () { EditBookEvent(); } void SetRandom P((int n)); -int ShuffleOK(int n) +int +ShuffleOK (int n) { ResetGameEvent(); return 1; @@ -1722,7 +1790,8 @@ Option shuffleOptions[] = { { 0, 1, 0, NULL, (void*) &ShuffleOK, "", NULL, EndMark , "" } }; -void SetRandom(int n) +void +SetRandom (int n) { int r = n==2 ? -1 : random() & (1<<30)-1; char buf[MSG_SIZ]; @@ -1731,31 +1800,31 @@ void SetRandom(int n) SetWidgetState(&shuffleOptions[0], True); } -void ShuffleMenuProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +ShuffleMenuProc () { GenericPopUp(shuffleOptions, _("New Shuffle Game"), 0); } int tmpMoves, tmpTc, tmpInc, tmpOdds1, tmpOdds2, tcType; -void ShowTC(int n) +void +ShowTC (int n) { } void SetTcType P((int n)); -char *Value(int n) +char * +Value (int n) { static char buf[MSG_SIZ]; snprintf(buf, MSG_SIZ, "%d", n); return buf; } -int TcOK(int n) +int +TcOK (int n) { char *tc; if(tcType == 0 && tmpMoves <= 0) return 0; @@ -1796,7 +1865,8 @@ Option tcOptions[] = { { 0, 0, 0, NULL, (void*) &TcOK, "", NULL, EndMark , "" } }; -void SetTcType(int n) +void +SetTcType (int n) { switch(tcType = n) { case 0: @@ -1816,11 +1886,8 @@ void SetTcType(int n) } } -void TimeControlProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +TimeControlProc () { tmpMoves = appData.movesPerSession; tmpInc = appData.timeIncrement; if(tmpInc < 0) tmpInc = 0; @@ -1831,7 +1898,8 @@ void TimeControlProc(w, event, prms, nprms) //---------------------------- Chat Windows ---------------------------------------------- -void OutputChatMessage(int partner, char *mess) +void +OutputChatMessage (int partner, char *mess) { return; // dummy }