{ VariantXiangqi, SAME_ROW,135, NULL, (void*) &Pick, "#BFFFFF", NULL, Button, N_("xiangqi (9x10)")},
{ VariantLion, 0, 135, NULL, (void*) &Pick, "#BFBFBF", NULL, Button, N_("mighty lion")},
{ VariantCourier, SAME_ROW,135, NULL, (void*) &Pick, "#BFFFBF", NULL, Button, N_("courier (12x8)")},
-{ VariantChuChess, 0, 135, NULL, (void*) &Pick, "#BFBFBF", NULL, Button, N_("chu chess (10x10)")},
+{ VariantChuChess, 0, 135, NULL, (void*) &Pick, "#BFBFBF", NULL, Button, N_("elven chess (10x10)")},
{ 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
static char *modeNames[] = { N_("Exact position match"), N_("Shown position is subset"), N_("Same material with exactly same Pawn chain"),
N_("Same material"), N_("Material range (top board half optional)"), N_("Material difference (optional stuff balanced)"), NULL };
static char *modeValues[] = { "1", "2", "3", "4", "5", "6" };
-static char *searchMode;
+static char *searchMode, *countRange;
static int
LoadOptionsOK ()
{
+ appData.minPieces = appData.maxPieces = 0;
+ sscanf(countRange, "%d-%d", &appData.minPieces, &appData.maxPieces);
+ if(appData.maxPieces < appData.minPieces) appData.maxPieces = appData.minPieces;
appData.searchMode = atoi(searchMode);
return 1;
}
{ 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:") },
+{ 0, 0,197, NULL, (void*) &countRange, "", NULL, TextBox, "Final nr of pieces" },
{ 0, 0,205, NULL, (void*) &searchMode, (char*) modeValues, modeNames, 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") },
void
LoadOptionsPopUp (DialogClass parent)
{
+ ASSIGN(countRange, "");
ASSIGN(searchMode, modeValues[appData.searchMode-1]);
GenericPopUp(loadOptions, _("Load Game Options"), TransientDlg, parent, MODAL, 0);
}
static void DefColor P((int n));
static void AdjustColor P((int i));
+static void ThemeSel P((int n, int sel));
+static int BoardOptionsOK P((int n));
static char oldPieceDir[MSG_SIZ];
+extern char *engineLine, *nickName; // defined later on
-static int
-BoardOptionsOK (int n)
-{
- if(appData.overrideLineGap >= 0) lineGap = appData.overrideLineGap; else lineGap = defaultLineGap;
- InitDrawingParams(strcmp(oldPieceDir, appData.pieceDirectory));
- InitDrawingSizes(-1, 0);
- DrawPosition(True, NULL);
- return 1;
-}
+#define THEMELIST 1
static Option boardOptions[] = {
+{ 0,LR|T2T, 0, NULL, NULL, NULL, NULL, Label, N_("Selectable themes:") },
+{ 300,LR|TB,200, NULL, (void*) engineMnemonic, (char*) &ThemeSel, NULL, ListBox, "" },
+{ 0,LR|T2T, 0, NULL, NULL, NULL, NULL, Label, N_("New name for current theme:") },
+{ 0, 0, 0, NULL, (void*) &nickName, ".png", NULL, TextBox, "" },
+{ 0,SAME_ROW, 0, NULL, NULL, NULL, NULL, Break, NULL },
{ 0, 0, 70, NULL, (void*) &appData.whitePieceColor, "", NULL, TextBox, N_("White Piece Color:") },
{ 1000, SAME_ROW, 0, NULL, (void*) &DefColor, NULL, (char**) "#FFFFCC", Button, " " },
/* TRANSLATORS: R = single letter for the color red */
{ 0, 0, 0, NULL, (void*) &BoardOptionsOK, "", NULL, EndMark , "" }
};
+static int
+BoardOptionsOK (int n)
+{
+ if(n && (n = SelectedListBoxItem(&boardOptions[THEMELIST])) > 0 && *engineList[n] != '#') { // called by pressing OK, and theme selected
+ ASSIGN(engineLine, engineList[n]);
+ }
+ LoadTheme();
+ return 1;
+}
+
static void
SetColorText (int n, char *buf)
{
}
void
+ThemeSel (int n, int sel)
+{
+ int nr;
+ char buf[MSG_SIZ];
+ if(sel < 1) buf[0] = NULLCHAR; // back to top level
+ else if(engineList[sel][0] == '#') safeStrCpy(buf, engineList[sel], MSG_SIZ); // group header, open group
+ else { // normal line, select engine
+ ASSIGN(engineLine, engineList[sel]);
+ LoadTheme();
+ PopDown(TransientDlg);
+ return;
+ }
+ nr = NamesToList(appData.themeNames, engineList, engineMnemonic, buf); // replace list by only the group contents
+ ASSIGN(engineMnemonic[0], buf);
+ LoadListBox(&boardOptions[THEMELIST], _("# no themes are defined"), -1, -1);
+ HighlightWithScroll(&boardOptions[THEMELIST], 0, nr);
+}
+
+void
BoardOptionsProc ()
{
strncpy(oldPieceDir, appData.pieceDirectory, MSG_SIZ-1); // to see if it changed
+ ASSIGN(engineLine, "");
+ ASSIGN(nickName, "");
+ ASSIGN(engineMnemonic[0], "");
+ NamesToList(appData.themeNames, engineList, engineMnemonic, "");
GenericPopUp(boardOptions, _("Board Options"), TransientDlg, BoardWindow, MODAL, 0);
}
snprintf(buf2 + (q-p), MSG_SIZ -(q-p), "%s%s", clickedWord, q+5);
p = buf2;
}
+ if(!strcmp(p, "$copy")) { // special case for copy selection
+ CopySomething(clickedWord);
+ } else
if(!strcmp(p, "$chat")) { // special case for opening chat
NewChat(clickedWord);
} else
}
void
-IcsTextProc ()
+IcsTextPopUp ()
{
int i=0, j;
char *p, *q, *r;
GenericPopUp(textOptions, _("ICS text menu"), TextMenuDlg, BoardWindow, NONMODAL, appData.topLevel);
}
+void
+IcsTextProc ()
+{
+ if(shellUp[TextMenuDlg]) PopDown(TextMenuDlg);
+ else IcsTextPopUp();
+}
+
//---------------------------------------------------- Edit Comment -----------------------------------
static char *commentText;
}
Option commentOptions[] = {
-{ 200, T_VSCRL | T_FILL | T_WRAP | T_TOP, 250, NULL, (void*) &commentText, "", (char **) &CommentClick, TextBox, "" },
+{ 200, T_VSCRL | T_FILL | T_WRAP | T_TOP, 250, NULL, (void*) &commentText, (char*) &appData.commentFont, (char **) &CommentClick, TextBox, "" },
{ 0, 0, 50, NULL, (void*) &ClearComment, NULL, NULL, Button, N_("clear") },
{ 0, SAME_ROW, 100, NULL, (void*) &SaveChanges, NULL, NULL, Button, N_("save changes") },
{ 0, SAME_ROW, 0, NULL, (void*) &NewComCallback, "", NULL, EndMark , "" }
static void changeTags P((int n));
static char *tagsText, **resPtr;
+static int TagsClick P((Option *opt, int n, int x, int y, char *val, int index));
+
static int
NewTagsCallback (int n)
{
return 1;
}
+static void
+NewMove ()
+{
+ addToBookFlag = !addToBookFlag;
+}
+
static Option tagsOptions[] = {
{ 0, 0, 0, NULL, NULL, NULL, NULL, Label, NULL },
-{ 200, T_VSCRL | T_FILL | T_WRAP | T_TOP, 200, NULL, (void*) &tagsText, "", NULL, TextBox, "" },
-{ 0, 0, 100, NULL, (void*) &changeTags, NULL, NULL, Button, N_("save changes") },
+{ 200, T_VSCRL | T_FILL | T_WRAP | T_TOP, 200, NULL, (void*) &tagsText, (char*) &appData.tagsFont, (char **) &TagsClick, TextBox, "" },
+{ 0, 0, 100, NULL, (void*) &NewMove, NULL, NULL, Button, N_("add next move") },
+{ 0,SAME_ROW,100,NULL, (void*) &changeTags, NULL, NULL, Button, N_("save changes") },
{ 0,SAME_ROW, 0, NULL, (void*) &NewTagsCallback, "", NULL, EndMark , "" }
};
+static int TagsClick (Option *opt, int n, int x, int y, char *val, int index)
+{
+ if(!bookUp || n != 3) return FALSE; // only button-3 press in Edit Book is of interest
+ PlayBookMove(val, index);
+ return TRUE;
+}
+
static void
changeTags (int n)
{
{
char *title = bookUp ? _("Edit book") : _("Tags");
+ tagsOptions[2].type = bookUp ? Button : Skip;
+ tagsOptions[3].min = bookUp ? SAME_ROW : 0;
if(DialogExists(TagsDlg)) { // if already exists, alter title and content
SetWidgetText(&tagsOptions[1], text, TagsDlg);
SetDialogTitle(TagsDlg, title);
if (bookUp || !PopDown(TagsDlg)) EditTagsEvent();
}
+void
+AddBookMove (char *text)
+{
+ AppendText(&tagsOptions[1], text);
+}
+
//---------------------------------------------- ICS Input Box ----------------------------------
char *icsText;
//---------------------------- Chat Windows ----------------------------------------------
static char *line, *memo, *chatMemo, *partner, *texts[MAX_CHAT], dirty[MAX_CHAT], *inputs[MAX_CHAT], *icsLine, *tmpLine;
-static int activePartner, hidden = 1;
+static int activePartner;
+int 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
+#define CHAT_OUT 11
+#define CHAT_PANE 12
+#define CHAT_IN 13
void PaneSwitch P((void));
+void ClearChat P((void));
WindowPlacement wpTextMenu;
int
ContextMenu (Option *opt, int button, int x, int y, char *text, int index)
{ // callback for ICS-output clicks; handles button 3, passes on other events
- char *start, *end;
int h;
if(button == -3) return TRUE; // supress default GTK context menu on up-click
if(button != 3) return FALSE;
- start = end = text + index; // figure out what text was clicked
- while(isalnum(*end)) end++;
- while(start > text && isalnum(start[-1])) start--;
- clickedWord[0] = NULLCHAR;
- if(end-start >= 80) end = start + 80; // intended for small words and numbers
- strncpy(clickedWord, start, end-start); clickedWord[end-start] = NULLCHAR;
+ if(index == -1) { // pre-existing selection in memo
+ strncpy(clickedWord, text, MSG_SIZ);
+ } else { // figure out what word was clicked
+ char *start, *end;
+ start = end = text + index;
+ while(isalnum(*end)) end++;
+ while(start > text && isalnum(start[-1])) start--;
+ clickedWord[0] = NULLCHAR;
+ if(end-start >= 80) end = start + 80; // intended for small words and numbers
+ strncpy(clickedWord, start, end-start); clickedWord[end-start] = NULLCHAR;
+ }
click = !shellUp[TextMenuDlg]; // request auto-popdown of textmenu when we popped it up
h = wpTextMenu.height; // remembered height of text menu
if(h <= 0) h = 65; // when not available, position w.r.t. top
if(wpTextMenu.x < 0) wpTextMenu.x = 0;
if(wpTextMenu.y < 0) wpTextMenu.y = 0;
wpTextMenu.width = wpTextMenu.height = -1;
- IcsTextProc();
+ IcsTextPopUp();
return TRUE;
}
{ 250, T_VSCRL | T_FILL | T_WRAP | T_TOP, 510, NULL, (void*) &memo, NULL, (void*) &ContextMenu, TextBox, "" },
{ 0, 0, 0, NULL, NULL, "", NULL, Break , "" },
{ 0, T_TOP, 100, NULL, (void*) &partner, NULL, NULL, TextBox, N_("Chat partner:") },
+{ 0, SAME_ROW, 0, NULL, (void*) &ClearChat, NULL, NULL, Button, N_("End Chat") },
{ 0, SAME_ROW, 0, NULL, (void*) &PaneSwitch, NULL, NULL, Button, N_("Hide") },
{ 250, T_VSCRL | T_FILL | T_WRAP | T_TOP, 510, NULL, (void*) &chatMemo, NULL, (void*) &ContextMenu, TextBox, "" },
{ 0, 0, 0, NULL, NULL, "", NULL, Break , "" },
if(hidden) BoardToTop();
else PaneSwitch();
break;
+ case 15:
+ NewChat(lastTalker);
+ break;
+ case 14:
+ for(chat=0; chat < MAX_CHAT; chat++) if(!chatPartner[chat][0]) break;
+ if(chat < MAX_CHAT) ChatSwitch(chat + 1);
+ break;
case 10: // <Tab>
chat = start = (activePartner - hidden + MAX_CHAT) % MAX_CHAT;
while(!dirty[chat = (chat + 1)%MAX_CHAT]) if(chat == start) break;
// 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(hidden || !*chatPartner[activePartner]) 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
DelayedSetText ()
{
- SetWidgetText(&chatOptions[CHAT_IN], tmpLine, ChatDlg);
+ SetWidgetText(&chatOptions[CHAT_IN], tmpLine, -1); // leave focus on chat-partner field!
SetInsertPos(&chatOptions[CHAT_IN], strlen(tmpLine));
}
{
int i, j;
char *v;
+ if(chatOptions[CHAT_ICS].type == Skip) hidden = 0; // In Xaw there is no ICS pane we can hide behind
Show(&chatOptions[CHAT_PANE], 0); // show
if(hidden) ScheduleDelayedEvent(DelayedScroll, 50); // Awful!
else ScheduleDelayedEvent(DelayedSetText, 50);
// SetInsertPos(&chatOptions[CHAT_IN], strlen(icsLine));
}
+void
+ClearChat ()
+{ // clear the chat to make it free for other use
+ chatPartner[activePartner][0] = NULLCHAR;
+ ASSIGN(texts[activePartner], "");
+ ASSIGN(inputs[activePartner], "");
+ SetWidgetText(&chatOptions[CHAT_PARTNER], "", ChatDlg);
+ SetWidgetText(&chatOptions[CHAT_OUT], "", ChatDlg);
+ SetWidgetText(&chatOptions[CHAT_IN], "", ChatDlg);
+ SetWidgetLabel(&chatOptions[activePartner+1], _("New Chat"));
+ HardSetFocus(&chatOptions[CHAT_PARTNER], 0);
+}
+
static void
NewChat (char *name)
{ // open a chat on program request. If no empty one available, use last
void
ConsoleWrite(char *message, int count)
{
- if(shellUp[ChatDlg]) {
+ if(shellUp[ChatDlg] && chatOptions[CHAT_ICS].type != Skip) { // in Xaw this is a no-op
AppendColorized(&chatOptions[CHAT_ICS], message, count);
SetInsertPos(&chatOptions[CHAT_ICS], 999999);
}
}
void
-ChatProc ()
+ChatPopUp ()
{
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
Show(&chatOptions[CHAT_PANE], hidden = 1); // hide
- HardSetFocus(&chatOptions[CHAT_IN], 0);
+// HardSetFocus(&chatOptions[CHAT_IN], 0);
MarkMenu("View.OpenChatWindow", ChatDlg);
CursorAtEnd(&chatOptions[CHAT_IN]);
}
void
+ChatProc ()
+{
+ if(shellUp[ChatDlg]) PopDown(ChatDlg);
+ else ChatPopUp();
+}
+
+void
ConsoleAutoPopUp (char *buf)
{
if(!appData.autoBox) return;
SetWidgetText(&chatOptions[CHAT_IN], newText, ChatDlg);
if(shellUp[ChatDlg]) HardSetFocus (&chatOptions[CHAT_IN], ChatDlg); //why???
} else { ASSIGN(line, buf); } // box did not exist: make sure it pops up with char in it
- ChatProc();
+ ChatPopUp();
} else PopUpMoveDialog(*buf);
}
static int GLT_OK P((int n));
static Option listOptions[] = {
-{300, LR|TB, 200, NULL, (void*) strings, "", NULL, ListBox, "" }, // For GTK we need to specify a height, as default would just show 3 lines
+{300, LR|TB, 200, NULL, (void*) strings, NULL, NULL, ListBox, "" }, // For GTK we need to specify a height, as default would just show 3 lines
{ 0, 0, 0, NULL, (void*) &GLT_Button, NULL, NULL, Button, N_("factory") },
{ 0, SAME_ROW, 0, NULL, (void*) &GLT_Button, NULL, NULL, Button, N_("up") },
{ 0, SAME_ROW, 0, NULL, (void*) &GLT_Button, NULL, NULL, Button, N_("down") },
{ 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, 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, LR|T2T|BORDER, 270, NULL, NULL, (char*)&appData.font, 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_("<<") },
- { 0, SAME_ROW, 0, NULL, (void*) &BackwardEvent, NULL, NULL, Button, N_("<") },
- { 0, SAME_ROW, 0, NULL, (void*) &PauseEvent, NULL, NULL, Button, N_(PAUSE_BUTTON) },
- { 0, SAME_ROW, 0, NULL, (void*) &ForwardEvent, NULL, NULL, Button, N_(">") },
- { 0, SAME_ROW, 0, NULL, (void*) &ToEndEvent, NULL, NULL, Button, N_(">>") },
+ { 0, 0, 0, NULL, (void*) &ToStartEvent, (char*)&appData.font, NULL, Button, N_("<<") },
+ { 0, SAME_ROW, 0, NULL, (void*) &BackwardEvent, (char*)&appData.font, NULL, Button, N_("<") },
+ { 0, SAME_ROW, 0, NULL, (void*) &PauseEvent, (char*)&appData.font, NULL, Button, N_(PAUSE_BUTTON) },
+ { 0, SAME_ROW, 0, NULL, (void*) &ForwardEvent, (char*)&appData.font, NULL, Button, N_(">") },
+ { 0, SAME_ROW, 0, NULL, (void*) &ToEndEvent, (char*)&appData.font, NULL, Button, N_(">>") },
{ 0, 0, 0, NULL, NULL, "", NULL, BoxEnd, "" },
{ 401, LR|TB, 401, NULL, (char*) &Exp, NULL, NULL, Graph, "shadow board" }, // board
{ 2, COMBO_CALLBACK, 0, NULL, (void*) &PMSelect, NULL, pieceMenuStrings[0], PopUp, "menuW" },
{
static int but1, but3, oldW, oldH;
int menuNr = -3, sizing, f, r;
+ TimeMark now;
if(n == 0) { // motion
if(SeekGraphClick(Press, x, y, 1)) return NULL;
return NULL;
}
if(n != 10 && PopDown(PromoDlg)) fromX = fromY = -1; // user starts fiddling with board when promotion dialog is up
+ else GetTimeMark(&now);
shiftKey = ShiftKeys();
controlKey = (shiftKey & 0xC) != 0;
shiftKey = (shiftKey & 3) != 0;
case 3: menuNr = RightClick(Press, x, y, &pmFromX, &pmFromY), but3 = 1; break;
case -2: shiftKey = !shiftKey;
case -3: menuNr = RightClick(Release, x, y, &pmFromX, &pmFromY), but3 = 0; break;
+ case 4: BackwardEvent(); break;
+ case 5: ForwardEvent(); break;
case 10:
sizing = (oldW != x || oldH != y);
oldW = x; oldH = y;
InitDrawingHandle(mainOptions + W_BOARD);
- if(sizing) return NULL; // don't redraw while sizing
+ if(sizing && SubtractTimeMarks(&now, &programStartTime) > 10000) return NULL; // don't redraw while sizing (except at startup)
DrawPosition(True, NULL);
default:
return NULL;
void
ActivateTheme (int col)
{
+ if(appData.overrideLineGap >= 0) lineGap = appData.overrideLineGap; else lineGap = defaultLineGap;
+ InitDrawingParams(strcmp(oldPieceDir, appData.pieceDirectory));
+ InitDrawingSizes(-1, 0);
+ DrawPosition(True, NULL);
}
-char *
-Col2Text (int n)
-{
- return NULL;
-}
projects / xboard.git / blobdiff