#if HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include <stdint.h>
#include <X11/Intrinsic.h>
#include <X11/StringDefs.h>
ShufflePopDown();
shuffleOpenings = False; // [HGM] should be moved to New Variant menu, once we have it!
ResetGameEvent();
- EngineOutputPopDown();
return;
}
if (strcmp(name, _("random")) == 0) {
shuffleOpenings = True;
ShufflePopDown();
ResetGameEvent();
- EngineOutputPopDown();
return;
}
}
void TimeControlPopDown()
{
if (!TimeControlUp) return;
+ previous = NULL;
XtPopdown(TimeControlShell);
XtDestroyWidget(TimeControlShell);
TimeControlUp = False;
void EnginePopDown()
{
if (!EngineUp) return;
+ previous = NULL;
XtPopdown(EngineShell);
XtDestroyWidget(EngineShell);
EngineUp = False;
// read all switches
appData.periodicUpdates = ReadToggle(w1);
// appData.hideThinkingFromHuman = ReadToggle(w2);
- appData.firstScoreIsAbsolute = ReadToggle(w3);
- appData.secondScoreIsAbsolute = ReadToggle(w4);
+ first.scoreIsAbsolute = appData.firstScoreIsAbsolute = ReadToggle(w3);
+ second.scoreIsAbsolute = appData.secondScoreIsAbsolute = ReadToggle(w4);
appData.testClaims = ReadToggle(w5);
appData.checkMates = ReadToggle(w6);
appData.materialDraws = ReadToggle(w7);
{N_("berolina"), "#FFFFFF", 0, VariantBerolina},
{N_("cylinder"), "#FFFFFF", 0, VariantCylinder},
{N_("shatranj"), "#FFFFFF", 0, VariantShatranj},
+ {N_("makruk"), "#FFFFFF", 0, VariantMakruk},
{N_("atomic"), "#FFFFFF", 0, VariantAtomic},
{N_("two kings"), "#FFFFFF", 0, VariantTwoKings},
{N_("3-checks"), "#FFFFFF", 0, Variant3Check},
XtGetValues(w, args, 1);
if (strcmp(name, _(" OK ")) == 0) {
- int nr = (int) XawToggleGetCurrent(buttonDesc[0].handle) - 1;
+ int nr = (intptr_t) XawToggleGetCurrent(buttonDesc[0].handle) - 1;
if(nr < 0) return;
v = buttonDesc[nr].variant;
if(!appData.noChessProgram) {
void UciPopDown()
{
if (!UciUp) return;
+ previous = NULL;
XtPopdown(UciShell);
XtDestroyWidget(UciShell);
UciUp = False;
void SettingsPopDown()
{
if (!SettingsUp) return;
+ previous = NULL;
XtPopdown(SettingsShell);
XtDestroyWidget(SettingsShell);
SettingsUp = False;
Arg args[16];
char buf[MSG_SIZ];
int i, j;
+ int data = (intptr_t) client_data;
XtSetArg(args[0], XtNlabel, &name);
XtGetValues(w, args, 1);
j = 0;
XtSetArg(args[0], XtNstring, &val);
- XtGetValues(currentCps->option[(int)client_data].handle, args, 1);
+ XtGetValues(currentCps->option[data].handle, args, 1);
sscanf(val, "%d", &j);
if (strcmp(name, "+") == 0) {
- if(++j > currentCps->option[(int)client_data].max) return;
+ if(++j > currentCps->option[data].max) return;
} else
if (strcmp(name, "-") == 0) {
- if(--j < currentCps->option[(int)client_data].min) return;
+ if(--j < currentCps->option[data].min) return;
} else return;
sprintf(buf, "%d", j);
XtSetArg(args[0], XtNstring, buf);
- XtSetValues(currentCps->option[(int)client_data].handle, args, 1);
+ XtSetValues(currentCps->option[data].handle, args, 1);
}
void SettingsCallback(w, client_data, call_data)
Arg args[16];
char buf[MSG_SIZ];
int i, j;
+ int data = (intptr_t) client_data;
XtSetArg(args[0], XtNlabel, &name);
XtGetValues(w, args, 1);
SettingsPopDown();
return;
}
- if (strcmp(name, _("OK")) == 0 || (int)client_data) { // save buttons imply OK
+ if (strcmp(name, _("OK")) == 0 || data) { // save buttons imply OK
int nr;
for(i=0; i<currentCps->nrOptions; i++) { // send all options that had to be OK-ed to engine
break;
}
}
- if((int)client_data) { // send save-button command to engine
+ if(data) { // send save-button command to engine
sprintf(buf, "option %s\n", name);
SendToProgram(buf, currentCps);
}
caddr_t index;
{
Arg args[16];
- int i = ((int)addr)>>8;
- int j = 255 & (int) addr;
+ int i = ((intptr_t)addr)>>8;
+ int j = 255 & (intptr_t) addr;
values[i] = j; // store in temporary, for transfer at OK
XtSetArg(args[0], XtNlabel, ((char**)currentCps->option[i].textValue)[j]);
menu, args, j);
XtAddCallback(entry, XtNcallback,
(XtCallbackProc) ComboSelect,
- (caddr_t) (256*n+i));
+ (caddr_t)(intptr_t) (256*n+i));
i++;
}
}
Widget popup, layout, dialog, edit=NULL, form, oldform, last, b_ok, b_cancel, leftMargin = NULL;
Window root, child;
int x, y, i, j, height, width, h, c;
- int win_x, win_y;
+ int win_x, win_y, maxWidth, maxTextWidth;
unsigned int mask;
char def[80], *p, *q;
static char pane[6] = "paneX";
+ Widget texts[100], forelast = NULL, anchor, widest;
// to do: start up second engine if needed
if(!cps->initDone || !cps->nrOptions) return; // nothing to be done
XtSetValues(form, args, j);
leftMargin = form;
- last = NULL;
+ last = widest = NULL; anchor = forelast;
for(h=0; h<height; h++) {
+ forelast = last;
i = h + c*height;
if(i >= cps->nrOptions) break;
switch(cps->option[i].type) {
XtSetArg(args[j], XtNfromVert, last); j++;
XtSetArg(args[j], XtNborderWidth, 0); j++;
XtSetArg(args[j], XtNjustify, XtJustifyLeft); j++;
+ texts[h] =
dialog = XtCreateManagedWidget(cps->option[i].name, labelWidgetClass, form, args, j);
j=0;
XtSetArg(args[j], XtNfromVert, last); j++;
XtSetArg(args[j], XtNfromHoriz, dialog); j++;
XtSetArg(args[j], XtNborderWidth, 1); j++;
- XtSetArg(args[j], XtNwidth, cps->option[i].type == Spin ? 40 : 100); j++;
+ XtSetArg(args[j], XtNwidth, cps->option[i].type == Spin ? 40 : 175); j++;
XtSetArg(args[j], XtNeditType, XawtextEdit); j++;
XtSetArg(args[j], XtNuseStringInPlace, False); j++;
XtSetArg(args[j], XtNdisplayCaret, False); j++;
XtSetArg(args[j], XtNheight, 10); j++;
XtSetArg(args[j], XtNwidth, 20); j++;
edit = XtCreateManagedWidget("+", commandWidgetClass, form, args, j);
- XtAddCallback(edit, XtNcallback, SpinCallback, (XtPointer) i);
+ XtAddCallback(edit, XtNcallback, SpinCallback,
+ (XtPointer)(intptr_t) i);
j=0;
XtSetArg(args[j], XtNfromVert, edit); j++;
XtSetArg(args[j], XtNheight, 10); j++;
XtSetArg(args[j], XtNwidth, 20); j++;
last = XtCreateManagedWidget("-", commandWidgetClass, form, args, j);
- XtAddCallback(last, XtNcallback, SpinCallback, (XtPointer) i);
+ XtAddCallback(last, XtNcallback, SpinCallback,
+ (XtPointer)(intptr_t) i);
break;
case CheckBox:
j=0;
XtSetArg(args[j], XtNfromVert, last); j++;
XtSetArg(args[j], XtNstate, cps->option[i].value); j++;
cps->option[i].handle = (void*)
- (last = XtCreateManagedWidget(cps->option[i].name, commandWidgetClass, form, args, j));
- XtAddCallback(last, XtNcallback, SettingsCallback, (XtPointer) (cps->option[i].type == SaveButton));
+ (dialog = last = XtCreateManagedWidget(cps->option[i].name, commandWidgetClass, form, args, j));
+ XtAddCallback(last, XtNcallback, SettingsCallback,
+ (XtPointer)(intptr_t) (cps->option[i].type == SaveButton));
break;
case ComboBox:
j=0;
break;
}
}
+
+ // make an attempt to align all spins and textbox controls
+ maxWidth = maxTextWidth = 0;
+ for(h=0; h<height; h++) {
+ i = h + c*height;
+ if(i >= cps->nrOptions) break;
+ if(cps->option[i].type == Spin || cps->option[i].type == TextBox) {
+ Dimension w;
+ j=0;
+ XtSetArg(args[j], XtNwidth, &w); j++;
+ XtGetValues(texts[h], args, j);
+ if(cps->option[i].type == Spin) {
+ if(w > maxWidth) maxWidth = w;
+ widest = texts[h];
+ } else {
+ if(w > maxTextWidth) maxTextWidth = w;
+ if(!widest) widest = texts[h];
+ }
+ }
+ }
+ if(maxTextWidth + 110 < maxWidth)
+ maxTextWidth = maxWidth - 110;
+ else maxWidth = maxTextWidth + 110;
+ for(h=0; h<height; h++) {
+ i = h + c*height;
+ if(i >= cps->nrOptions) break;
+ j=0;
+ if(cps->option[i].type == Spin) {
+ XtSetArg(args[j], XtNwidth, maxWidth); j++;
+ XtSetValues(texts[h], args, j);
+ } else
+ if(cps->option[i].type == TextBox) {
+ XtSetArg(args[j], XtNwidth, maxTextWidth); j++;
+ XtSetValues(texts[h], args, j);
+ }
+ }
}
j=0;
- XtSetArg(args[j], XtNfromVert, last); 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, XtChainLeft); j++;
- XtSetArg(args[j], XtNright, XtChainLeft); j++;
+ XtSetArg(args[j], XtNleft, XtChainRight); j++;
+ XtSetArg(args[j], XtNright, XtChainRight); j++;
+ XtSetArg(args[j], XtNfromHoriz, widest ? widest : dialog); j++;
b_ok = XtCreateManagedWidget(_("OK"), commandWidgetClass, form, args, j);
XtAddCallback(b_ok, XtNcallback, SettingsCallback, (XtPointer) 0);
- XtSetArg(args[j], XtNfromHoriz, b_ok); j++;
+ XtSetArg(args[j-1], XtNfromHoriz, b_ok);
b_cancel = XtCreateManagedWidget(_("cancel"), commandWidgetClass, form, args, j);
XtAddCallback(b_cancel, XtNcallback, SettingsPopDown, (XtPointer) 0);
projects / xboard.git / blobdiff