case SaveButton:
case Label:
case Break:
- case -1:
+ case Skip:
break;
}
if(opts[i].type == EndMark) break;
{ VariantChu, SAME_ROW, 135, NULL, (void*) &Pick, "#BFFFBF", NULL, Button, N_("chu shogi (12x12)")},
//{ -1, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Button, N_(" ")}, // dummy, to have good alignment
// optional buttons for engine-defined variants
-{ VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, -1, NULL },
-{ VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, -1, NULL },
-{ VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, -1, NULL },
-{ VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, -1, NULL },
-{ VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, -1, NULL },
-{ VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, -1, NULL },
-{ VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, -1, NULL },
-{ VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, -1, NULL },
-{ VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, -1, NULL },
-{ VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, -1, NULL },
-{ VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, -1, NULL },
-{ VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, -1, NULL },
+{ VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL },
+{ VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL },
+{ VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL },
+{ VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL },
+{ VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL },
+{ VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL },
+{ VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL },
+{ VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL },
+{ VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL },
+{ VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL },
+{ VariantUnknown, 0, 135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL },
+{ VariantUnknown, SAME_ROW,135, NULL, (void*) &Pick, "#FFFFFF", NULL, Skip, NULL },
{ 0, NO_OK, 0, NULL, NULL, "", NULL, EndMark , "" }
};
ranksTmp = filesTmp = sizeTmp = -1; // prefer defaults over actual settings
if(appData.noChessProgram) sprintf(warning, _("Only bughouse is not available in viewer mode.")); else
sprintf(warning, _("All variants not supported by the first engine\n(currently %s) are disabled."), first.tidy);
- if(!start) while(variantDescriptors[start].type != -1) start++; // locate first spare
+ if(!start) while(variantDescriptors[start].type != Skip) start++; // locate first spare
last = -1;
for(i=0; variantDescriptors[start+i].type != EndMark; i++) { // create buttons for engine-defined variants
char *v = EngineDefinedVariant(&first, i);
last = i;
ASSIGN(variantDescriptors[start+i].name, v);
variantDescriptors[start+i].type = Button;
- } else variantDescriptors[start+i].type = -1;
+ } else variantDescriptors[start+i].type = Skip;
}
if(!(last&1)) { // odd number, add filler
ASSIGN(variantDescriptors[start+last+1].name, " ");
variantDescriptors[start+last+1].type = Button;
- variantDescriptors[start+last+1].value = -1;
+ variantDescriptors[start+last+1].value = Skip;
}
safeStrCpy(buf, engineVariant, MSG_SIZ); *engineVariant = NULLCHAR; // yeghh...
GenericPopUp(variantDescriptors, _("New Variant"), TransientDlg, BoardWindow, MODAL, 0);
{ 0, 0, 0, NULL, (void*) &appData.colorChallenge, "", NULL, TextBox, N_("Challenge Text Colors:") },
{ 0, 0, 0, NULL, (void*) &appData.colorRequest, "", NULL, TextBox, N_("Request Text Colors:") },
{ 0, 0, 0, NULL, (void*) &appData.colorSeek, "", NULL, TextBox, N_("Seek Text Colors:") },
+{ 0, 0, 0, NULL, (void*) &appData.colorNormal, "", NULL, TextBox, N_("Other Text Colors:") },
{ 0, 0, 0, NULL, (void*) &IcsOptionsOK, "", NULL, EndMark , "" }
};
{ 0, 0, 0, NULL, (void*) &appData.upsideDown, "", NULL, CheckBox, N_("Flip Pieces Shogi Style (Colored buttons restore default)") },
//{ 0, 0, 0, NULL, (void*) &appData.allWhite, "", NULL, CheckBox, N_("Use Outline Pieces for Black") },
{ 0, 0, 0, NULL, (void*) &appData.monoMode, "", NULL, CheckBox, N_("Mono Mode") },
+{ 0, 0, 200, NULL, (void*) &appData.logoSize, "", NULL, Spin, N_("Logo Size (0=off, requires restart):") },
{ 0,-1, 5, NULL, (void*) &appData.overrideLineGap, "", NULL, Spin, N_("Line Gap (-1 = default for board size):") },
{ 0, 0, 0, NULL, (void*) &appData.useBitmaps, "", NULL, CheckBox, N_("Use Board Textures") },
{ 0, 0, 0, NULL, (void*) &appData.liteBackTextureFile, ".png", NULL, FileName, N_("Light-Squares Texture File:") },
//------------------------------------------------------ Edit Tags ----------------------------------
static void changeTags P((int n));
-static char *tagsText;
+static char *tagsText, **resPtr;
static int
NewTagsCallback (int n)
{
- if(!bookUp) ReplaceTags(tagsText, &gameInfo);
+ if(bookUp) SaveToBook(tagsText), DisplayBook(currentMove); else
+ if(resPtr) { ASSIGN(*resPtr, tagsText); } else
+ ReplaceTags(tagsText, &gameInfo);
return 1;
}
{
GenericReadout(tagsOptions, 1);
if(bookUp) SaveToBook(tagsText), DisplayBook(currentMove); else
+ if(resPtr) { ASSIGN(*resPtr, tagsText); } else
ReplaceTags(tagsText, &gameInfo);
}
void
EditTagsPopUp (char *tags, char **dest)
{ // wrapper to preserve old name used in back-end
+ resPtr = dest;
NewTagsPopup(tags, NULL);
}
}
// end of borrowed code
+#define INPUT 0
+
Option boxOptions[] = {
{ 30, T_TOP, 400, NULL, (void*) &icsText, "", NULL, TextBox, "" },
{ 0, NO_OK, 0, NULL, NULL, "", NULL, EndMark , "" }
{
char *val;
- GetWidgetText(&boxOptions[0], &val);
+ GetWidgetText(&boxOptions[INPUT], &val);
SaveInHistory(val);
SendMultiLineToICS(val);
- SetWidgetText(&boxOptions[0], "", InputBoxDlg);
+ SetWidgetText(&boxOptions[INPUT], "", InputBoxDlg);
}
void
ICSInputSendText();
return;
case 1:
- GetWidgetText(&boxOptions[0], &val);
+ GetWidgetText(&boxOptions[INPUT], &val);
val = PrevInHistory(val);
break;
case -1:
val = NextInHistory();
}
- SetWidgetText(&boxOptions[0], val = val ? val : "", InputBoxDlg);
- SetInsertPos(&boxOptions[0], strlen(val));
+ SetWidgetText(&boxOptions[INPUT], val = val ? val : "", InputBoxDlg);
+ SetInsertPos(&boxOptions[INPUT], strlen(val));
}
static void
char buf[MSG_SIZ], *p;
if(strstr(text, "$add ") == text) {
- GetWidgetText(&boxOptions[0], &p);
+ GetWidgetText(&boxOptions[INPUT], &p);
snprintf(buf, MSG_SIZ, "%s%s", p, text+5); text = buf;
pos += strlen(p) - 5;
}
- SetWidgetText(&boxOptions[0], text, TextMenuDlg);
- SetInsertPos(&boxOptions[0], pos);
- HardSetFocus(&boxOptions[0]);
+ SetWidgetText(&boxOptions[INPUT], text, TextMenuDlg);
+ SetInsertPos(&boxOptions[INPUT], pos);
+ HardSetFocus(&boxOptions[INPUT]);
}
void
{
MarkMenu("View.ICSInputBox", InputBoxDlg);
if(GenericPopUp(boxOptions, _("ICS input box"), InputBoxDlg, BoardWindow, NONMODAL, 0))
- AddHandler(&boxOptions[0], InputBoxDlg, 3);
- CursorAtEnd(&boxOptions[0]);
+ AddHandler(&boxOptions[INPUT], InputBoxDlg, 3);
+ CursorAtEnd(&boxOptions[INPUT]);
}
void
if(appData.icsActive) { // text typed to board in ICS mode: divert to ICS input box
if(DialogExists(InputBoxDlg)) { // box already exists: append to current contents
char *p, newText[MSG_SIZ];
- GetWidgetText(&boxOptions[0], &p);
+ GetWidgetText(&boxOptions[INPUT], &p);
snprintf(newText, MSG_SIZ, "%s%c", p, *buf);
- SetWidgetText(&boxOptions[0], newText, InputBoxDlg);
- if(shellUp[InputBoxDlg]) HardSetFocus (&boxOptions[0]); //why???
+ SetWidgetText(&boxOptions[INPUT], newText, InputBoxDlg);
+ if(shellUp[InputBoxDlg]) HardSetFocus (&boxOptions[INPUT]); //why???
} else icsText = buf; // box did not exist: make sure it pops up with char in it
ICSInputBoxPopUp();
} else PopUpMoveDialog(*buf);
//---------------------------- Chat Windows ----------------------------------------------
static char *line, *memo, *partner, *texts[MAX_CHAT], dirty[MAX_CHAT];
-static int activePartner;
+static int activePartner, hidden = 1;
void ChatSwitch P((int n));
int ChatOK P((int n));
+#define CHAT_ICS 6
+#define CHAT_PARTNER 8
+#define CHAT_OUT 10
+#define CHAT_PANE 11
+#define CHAT_IN 12
+
+void PaneSwitch P((void));
+
Option chatOptions[] = {
+{ 0, 0, 0, NULL, NULL, "", NULL, Label , N_("Chats:") },
+{ 1, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, N_("New Chat") },
+{ 2, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, N_("New Chat") },
+{ 3, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, N_("New Chat") },
+{ 4, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, N_("New Chat") },
+{ 5, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, N_("New Chat") },
+{ 250, T_VSCRL | T_FILL | T_WRAP | T_TOP, 510, NULL, (void*) &memo, NULL, NULL, TextBox, "" },
+{ 0, 0, 0, NULL, NULL, "", NULL, Break , "" },
{ 0, T_TOP, 100, NULL, (void*) &partner, NULL, NULL, TextBox, N_("Chat partner:") },
-{ 1, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, "" },
-{ 2, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, "" },
-{ 3, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, "" },
-{ 4, SAME_ROW|TT, 75, NULL, (void*) &ChatSwitch, NULL, NULL, Button, "" },
-{ 100, T_VSCRL | T_FILL | T_WRAP | T_TOP, 510, NULL, (void*) &memo, NULL, NULL, TextBox, "" },
+{ 0, SAME_ROW, 0, NULL, (void*) &PaneSwitch, NULL, NULL, Button, N_("Hide") },
+{ 250, T_VSCRL | T_FILL | T_WRAP | T_TOP, 510, NULL, (void*) &memo, NULL, NULL, TextBox, "" },
+{ 0, 0, 0, NULL, NULL, "", NULL, Break , "" },
{ 0, 0, 510, NULL, (void*) &line, NULL, NULL, TextBox, "" },
{ 0, NO_OK|SAME_ROW, 0, NULL, (void*) &ChatOK, NULL, NULL, EndMark , "" }
};
void
+IcsHist (int n, Option *opt, DialogClass dlg)
+{ // [HGM] input: let up-arrow recall previous line from history
+ char *val = NULL; // to suppress spurious warning
+
+ if(opt != &chatOptions[CHAT_IN]) return;
+ switch(n) {
+ case 1:
+ GetWidgetText(opt, &val);
+ val = PrevInHistory(val);
+ break;
+ case -1:
+ val = NextInHistory();
+ }
+ SetWidgetText(opt, val = val ? val : "", dlg);
+ SetInsertPos(opt, strlen(val));
+}
+
+void
OutputChatMessage (int partner, char *mess)
{
char *p = texts[partner];
texts[partner] = (char*) malloc(len);
snprintf(texts[partner], len, "%s%s", p ? p : "", mess);
FREE(p);
- if(partner == activePartner) {
- AppendText(&chatOptions[5], mess);
- SetInsertPos(&chatOptions[5], len-2);
+ if(partner == activePartner && !hidden) {
+ AppendText(&chatOptions[CHAT_OUT], mess);
+ SetInsertPos(&chatOptions[CHAT_OUT], len-2);
} else {
- SetColor("#FFC000", &chatOptions[partner + (partner < activePartner)]);
+ SetColor("#FFC000", &chatOptions[partner + 1]);
dirty[partner] = 1;
}
}
{ // can only be called through <Enter> in chat-partner text-edit, as there is no OK button
char buf[MSG_SIZ];
- if(!partner || strcmp(partner, chatPartner[activePartner])) {
+ if(!hidden && (!partner || strcmp(partner, chatPartner[activePartner]))) {
safeStrCpy(chatPartner[activePartner], partner, MSG_SIZ);
- SetWidgetText(&chatOptions[5], "", -1); // clear text if we alter partner
- SetWidgetText(&chatOptions[6], "", ChatDlg); // clear text if we alter partner
- HardSetFocus(&chatOptions[6]);
+ SetWidgetText(&chatOptions[CHAT_OUT], "", -1); // clear text if we alter partner
+ SetWidgetText(&chatOptions[CHAT_IN], "", ChatDlg); // clear text if we alter partner
+ SetWidgetLabel(&chatOptions[activePartner+1], chatPartner[activePartner] ? chatPartner[activePartner] : _("New Chat"));
+ HardSetFocus(&chatOptions[CHAT_IN]);
}
- if(line[0]) { // something was typed
- SetWidgetText(&chatOptions[6], "", ChatDlg);
+ if(line[0] || hidden) { // something was typed (for ICS commands we also allow empty line!)
+ SetWidgetText(&chatOptions[CHAT_IN], "", ChatDlg);
// from here on it could be back-end
if(line[strlen(line)-1] == '\n') line[strlen(line)-1] = NULLCHAR;
SaveInHistory(line);
+ if(hidden) snprintf(buf, MSG_SIZ, "%s\n", line); else // command for ICS
if(!strcmp("whispers", chatPartner[activePartner]))
snprintf(buf, MSG_SIZ, "whisper %s\n", line); // WHISPER box uses "whisper" to send
else if(!strcmp("shouts", chatPartner[activePartner]))
}
void
+DelayedScroll ()
+{ // If we do this immediately it does it before shrinking the memo, so the lower half remains hidden (Ughh!)
+ SetInsertPos(&chatOptions[CHAT_ICS], 999999);
+}
+
+void
ChatSwitch (int n)
{
int i, j;
- if(n <= activePartner) n--;
- activePartner = n;
+ Show(&chatOptions[CHAT_PANE], 0); // show
+ if(hidden) ScheduleDelayedEvent(DelayedScroll, 50); // Awful!
+ hidden = 0;
+ activePartner = --n;
if(!texts[n]) texts[n] = strdup("");
dirty[n] = 0;
- SetWidgetText(&chatOptions[5], texts[n], ChatDlg);
- SetInsertPos(&chatOptions[5], strlen(texts[n]));
- SetWidgetText(&chatOptions[0], chatPartner[n], ChatDlg);
+ SetWidgetText(&chatOptions[CHAT_OUT], texts[n], ChatDlg);
+ SetInsertPos(&chatOptions[CHAT_OUT], strlen(texts[n]));
+ SetWidgetText(&chatOptions[CHAT_PARTNER], chatPartner[n], ChatDlg);
for(i=j=0; i<MAX_CHAT; i++) {
- if(i == activePartner) continue;
- SetWidgetLabel(&chatOptions[++j], chatPartner[i]);
+ SetWidgetLabel(&chatOptions[++j], *chatPartner[i] ? chatPartner[i] : _("New Chat"));
SetColor(dirty[i] ? "#FFC000" : "#FFFFFF", &chatOptions[j]);
}
- SetWidgetText(&chatOptions[6], "", ChatDlg);
- HardSetFocus(&chatOptions[6]);
+ SetWidgetText(&chatOptions[CHAT_IN], "", ChatDlg);
+ HardSetFocus(&chatOptions[strcmp(chatPartner[n], "") ? CHAT_IN : CHAT_PARTNER]);
+}
+
+void
+PaneSwitch ()
+{
+ Show(&chatOptions[CHAT_PANE], hidden = 1); // hide
+}
+
+void
+ConsoleWrite(char *message, int count)
+{
+ if(shellUp[ChatDlg]) {
+ AppendColorized(&chatOptions[CHAT_ICS], message, count);
+ SetInsertPos(&chatOptions[CHAT_ICS], 999999);
+ }
}
void
ChatProc ()
{
- if(GenericPopUp(chatOptions, _("Chat box"), ChatDlg, BoardWindow, NONMODAL, appData.topLevel))
- AddHandler(&chatOptions[0], ChatDlg, 2), AddHandler(&chatOptions[6], ChatDlg, 2); // treats return as OK
+ if(GenericPopUp(chatOptions, _("ICS Interaction"), ChatDlg, BoardWindow, NONMODAL, appData.topLevel))
+ AddHandler(&chatOptions[CHAT_PARTNER], ChatDlg, 2), AddHandler(&chatOptions[CHAT_IN], ChatDlg, 2); // treats return as OK
+ PaneSwitch(); HardSetFocus(&chatOptions[CHAT_IN]);
MarkMenu("View.OpenChatWindow", ChatDlg);
}
{ 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("Help") },
{ 0, 0, 0, NULL, (void*)&SizeKludge, "", NULL, BarEnd, "" },
{ 0, LR|T2T|BORDER|SAME_ROW, 0, NULL, NULL, "", NULL, Label, "1" }, // optional title in window
-{ 50, LL|TT, 100, NULL, (void*) &LogoW, NULL, NULL, -1, "" }, // white logo
+{ 50, LL|TT, 100, NULL, (void*) &LogoW, NULL, NULL, Skip, "" }, // white logo
{ 12, L2L|T2T, 200, NULL, (void*) &CCB, NULL, NULL, Label, "White" }, // white clock
{ 13, R2R|T2T|SAME_ROW, 200, NULL, (void*) &CCB, NULL, NULL, Label, "Black" }, // black clock
-{ 50, RR|TT|SAME_ROW, 100, NULL, (void*) &LogoB, NULL, NULL, -1, "" }, // black logo
-{ 0, LR|T2T|BORDER, 401, NULL, NULL, "", NULL, -1, "2" }, // backup for title in window (if no room for other)
+{ 50, RR|TT|SAME_ROW, 100, NULL, (void*) &LogoB, NULL, NULL, Skip, "" }, // black logo
+{ 0, LR|T2T|BORDER, 401, NULL, NULL, "", NULL, Skip, "2" }, // backup for title in window (if no room for other)
{ 0, LR|T2T|BORDER, 270, NULL, NULL, "", NULL, Label, "message" }, // message field
{ 0, RR|TT|SAME_ROW, 125, NULL, NULL, "", NULL, BoxBegin, "" }, // (optional) button bar
{ 0, 0, 0, NULL, (void*) &ToStartEvent, NULL, NULL, Button, N_("<<") },
int w = width - 44 - mainOptions[n].min;
mainOptions[W_TITLE].max = w; // width left behind menu bar
if(w < 0.4*width) // if no reasonable amount of space for title, force small layout
- mainOptions[W_SMALL].type = mainOptions[W_TITLE].type, mainOptions[W_TITLE].type = -1;
+ mainOptions[W_SMALL].type = mainOptions[W_TITLE].type, mainOptions[W_TITLE].type = Skip;
}
void
mainOptions[W_BLACK].max = mainOptions[W_WHITE].max = size/2-3; // clock width
mainOptions[W_MESSG].max = appData.showButtonBar ? size-135 : size-2; // message
mainOptions[W_MENU].max = size-40; // menu bar
- mainOptions[W_TITLE].type = appData.titleInWindow ? Label : -1 ;
+ mainOptions[W_TITLE].type = appData.titleInWindow ? Label : Skip ;
if(logo && logo <= size/4) { // Activate logos
mainOptions[W_WHITE-1].type = mainOptions[W_BLACK+1].type = Graph;
mainOptions[W_WHITE-1].max = mainOptions[W_BLACK+1].max = logo;
mainOptions[W_WHITE].max = mainOptions[W_BLACK].max -= logo + 4;
mainOptions[W_WHITE].name = mainOptions[W_BLACK].name = "Double\nHeight";
}
- if(!appData.showButtonBar) for(i=W_BUTTON; i<W_BOARD; i++) mainOptions[i].type = -1;
+ if(!appData.showButtonBar) for(i=W_BUTTON; i<W_BOARD; i++) mainOptions[i].type = Skip;
for(i=0; i<8; i++) mainOptions[i+1].choice = (char**) menuBar[i].mi;
AppendEnginesToMenu(appData.recentEngineList);
GenericPopUp(mainOptions, "XBoard", BoardWindow, BoardWindow, NONMODAL, 1); // allways top-level