X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xoptions.c;h=6742e3f39a5b97e08dadbff25af6993a489735e3;hb=4e062d14429ed3a3a251c971690bade4c8cba946;hp=9188fd476de3ec1782b6d0fab4da49968039ec33;hpb=e70077aab0199817f37aef9ed0bdba1bbca93b45;p=xboard.git diff --git a/xoptions.c b/xoptions.c index 9188fd4..6742e3f 100644 --- a/xoptions.c +++ b/xoptions.c @@ -84,7 +84,8 @@ extern char *getenv(); static Widget previous = NULL; -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; @@ -115,14 +116,16 @@ 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); @@ -130,14 +133,16 @@ void SetWidgetText(Option *opt, char *buf, int n) 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 +153,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 +194,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,10 +213,8 @@ 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; @@ -259,14 +259,16 @@ 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); } -int PopDown(int n) +int +PopDown (int n) { int j; Arg args[10]; @@ -296,11 +298,8 @@ int PopDown(int n) 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 PopDown(prms[0][0] - '0'); @@ -312,7 +311,8 @@ extern Option installOptions[], matchOptions[]; char *engineNr[] = { N_("First Engine"), N_("Second Engine"), NULL }; char *engineList[100] = {" "}, *engineMnemonic[100] = {""}; -int AppendText(Option *opt, char *s) +int +AppendText (Option *opt, char *s) { XawTextBlock t; char *v; @@ -324,19 +324,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,13 +348,15 @@ 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); @@ -380,7 +385,8 @@ Option matchOptions[] = { { 0, 1, 0, NULL, (void*) &MatchOK, "", NULL, EndMark , "" } }; -int GeneralOptionsOK(int n) +int +GeneralOptionsOK (int n) { int newPonder = appData.ponderNextMove; appData.ponderNextMove = oldPonder; @@ -418,7 +424,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 +502,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 +548,8 @@ Option adjudicationOptions[] = { { 0, 1, 0, NULL, NULL, "", NULL, EndMark , "" } }; -int IcsOptionsOK(int n) +int +IcsOptionsOK (int n) { ParseIcsTextColors(); return 1; @@ -584,7 +593,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; @@ -655,7 +665,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 +696,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; @@ -704,18 +716,21 @@ void SetColor(char *colorName, Option *box) 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 +751,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; @@ -809,7 +827,8 @@ Option boardOptions[] = { { 0, 0, 0, NULL, (void*) &BoardOptionsOK, "", NULL, EndMark , "" } }; -int GenericReadout(int selected) +int +GenericReadout (int selected) { int i, j, res=1; String val; @@ -896,9 +915,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,7 +946,7 @@ 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; @@ -1271,98 +1289,68 @@ GenericPopUp(Option *option, char *title, int dlgNr) } -void IcsOptionsProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +IcsOptionsProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { GenericPopUp(icsOptions, _("ICS Options"), 0); } -void LoadOptionsProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +LoadOptionsProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { 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 (Widget w, XEvent *event, String *prms, Cardinal *nprms) { GenericPopUp(saveOptions, _("Save Game Options"), 0); } -void SoundOptionsProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +SoundOptionsProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { 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 (Widget w, XEvent *event, String *prms, Cardinal *nprms) { GenericPopUp(boardOptions, _("Board Options"), 0); } -void EngineMenuProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +EngineMenuProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { GenericPopUp(adjudicationOptions, _("Adjudicate non-ICS Games"), 0); } -void UciMenuProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +UciMenuProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { 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 (Widget w, XEvent *event, String *prms, Cardinal *nprms) { GenericPopUp(variantDescriptors, _("New Variant"), 0); } -void OptionsProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +OptionsProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { oldPonder = appData.ponderNextMove; GenericPopUp(generalOptions, _("General Options"), 0); } -void MatchOptionsProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +MatchOptionsProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { NamesToList(firstChessProgramNames, engineList, engineMnemonic); comboCallback = &AddToTourney; @@ -1375,7 +1363,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 +1380,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 +1393,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 +1407,8 @@ void SendText(int n) } else SendString(p); } -void IcsTextProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +IcsTextProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { int i=0, j; char *p, *q, *r; @@ -1457,13 +1444,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 +1465,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 +1475,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]; @@ -1508,13 +1500,15 @@ void NewCommentPopup(char *title, char *text, int index) 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 +1522,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"); @@ -1551,7 +1546,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 +1564,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); 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 +1588,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 +1597,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 +1628,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 (Widget w, XEvent *event, String *prms, Cardinal *nprms) { SettingsPopUp(&first); } -void SecondSettingsProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +SecondSettingsProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { 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 +1672,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 (Widget w, XEvent *event, String *prms, Cardinal *nprms) { isUCI = storeVariant = v1 = useNick = False; addToList = hasBook = True; // defaults if(engineChoice) free(engineChoice); engineChoice = strdup(engineNr[0]); @@ -1697,18 +1685,16 @@ void LoadEngineProc(w, event, prms, nprms) GenericPopUp(installOptions, _("Load engine"), 0); } -void EditBookProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +EditBookProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { EditBookEvent(); } void SetRandom P((int n)); -int ShuffleOK(int n) +int +ShuffleOK (int n) { ResetGameEvent(); return 1; @@ -1722,7 +1708,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 +1718,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 (Widget w, XEvent *event, String *prms, Cardinal *nprms) { 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 +1783,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 +1804,8 @@ void SetTcType(int n) } } -void TimeControlProc(w, event, prms, nprms) - Widget w; - XEvent *event; - String *prms; - Cardinal *nprms; +void +TimeControlProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { tmpMoves = appData.movesPerSession; tmpInc = appData.timeIncrement; if(tmpInc < 0) tmpInc = 0; @@ -1831,7 +1816,8 @@ void TimeControlProc(w, event, prms, nprms) //---------------------------- Chat Windows ---------------------------------------------- -void OutputChatMessage(int partner, char *mess) +void +OutputChatMessage (int partner, char *mess) { return; // dummy }