static int oldCores, oldPonder;
int MakeColors P((void));
void CreateGCs P((int redo));
-void CreateXPMBoard P((char *s, int kind));
-void CreateXPMPieces P((void));
+void CreateAnyPieces P((void));
void GenericReadout();
Widget shells[10];
Widget marked[10];
void BoardOptionsOK(int n)
{
- extern int defaultLineGap;
+ extern int defaultLineGap, useImages, useImageSqs;
if(appData.overrideLineGap >= 0) lineGap = appData.overrideLineGap; else lineGap = defaultLineGap;
+ useImages = useImageSqs = 0;
MakeColors(); CreateGCs(True);
- CreateXPMPieces();
- CreateXPMBoard(appData.liteBackTextureFile, 1);
- CreateXPMBoard(appData.darkBackTextureFile, 0);
+ CreateAnyPieces();
InitDrawingSizes(-1, 0);
DrawPosition(True, NULL);
}
{ 3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "B" },
{ 4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "D" },
{ 0, 0, 0, NULL, (void*) &appData.upsideDown, "", NULL, CheckBox, _("Flip Pieces Shogi Style (Colored buttons restore default)") },
-{ 0, 0, 0, NULL, (void*) &appData.allWhite, "", NULL, CheckBox, _("Use Outline Pieces for Black") },
+//{ 0, 0, 0, NULL, (void*) &appData.allWhite, "", NULL, CheckBox, _("Use Outline Pieces for Black") },
{ 0, 0, 0, NULL, (void*) &appData.monoMode, "", NULL, CheckBox, _("Mono Mode") },
{ 0,-1, 5, NULL, (void*) &appData.overrideLineGap, "", NULL, Spin, _("Line Gap ( -1 = default for board size):") },
{ 0, 0, 0, NULL, (void*) &appData.liteBackTextureFile, "", NULL, FileName, _("Light-Squares Texture File:") },
if(!(option[i].min & 2)) {
j=0;
- if(option[i].min & 1) { XtSetArg(args[j], XtNfromHoriz, last); last = forelast; } else
+ if(option[i].min & 1) {
+ for(j=i-1; option[j+1].min&1 && option[j].type == Button; j--) {
+ XtSetArg(args[0], XtNtop, XtChainBottom);
+ XtSetArg(args[1], XtNbottom, XtChainBottom);
+ XtSetValues(option[j].handle, args, 2);
+ }
+ if(option[j].type == TextBox && option[j].name[0] == NULLCHAR) {
+ XtSetArg(args[0], XtNbottom, XtChainBottom);
+ XtSetValues(option[j].handle, args, 1);
+ }
+ j = 0;
+ XtSetArg(args[j], XtNfromHoriz, last); last = forelast;
+ } else
XtSetArg(args[j], XtNfromHoriz, widest ? widest : dialog); j++;
XtSetArg(args[j], XtNfromVert, anchor ? anchor : last); j++;
XtSetArg(args[j], XtNbottom, XtChainBottom); j++;
{
Arg args[16];
XtSetArg(args[0], XtNstring, &tagsText);
- XtGetValues(currentOption[0].handle, args, 1);
+ XtGetValues(currentOption[1].handle, args, 1);
ReplaceTags(tagsText, &gameInfo);
}
Option tagsOptions[] = {
-{ 0xD, 200, 250, NULL, (void*) &tagsText, "", NULL, TextBox, "" },
{ 0, 0, 0, NULL, NULL, NULL, NULL, Label, "" },
+{ 0xD, 200, 250, NULL, (void*) &tagsText, "", NULL, TextBox, "" },
{ 0, 0, 0, NULL, (void*) &changeTags, NULL, NULL, Button, "save changes" },
{ 0, 1, 0, NULL, (void*) &NewTagsCallback, "", NULL, EndMark , "" }
};
if(shells[2]) { // if already exists, alter title and content
XtSetArg(args[0], XtNstring, text);
- XtSetValues(tagsOptions[0].handle, args, 1);
+ XtSetValues(tagsOptions[1].handle, args, 1);
}
tagsText = text;
- tagsOptions[1].textValue = msg;
+ tagsOptions[0].textValue = msg;
MarkMenu("menuView.Show Tags", 2);
GenericPopUp(tagsOptions, _("Tags"), 2);
}