X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwsettings.c;h=0c92fbc42a54ab9cfef17840c1741cbae462a6a4;hb=36aefa2380480aa22c30c0a8c02a02fb961d600f;hp=43fcd069a554d9cb9eff1750e4721f654ccf709e;hpb=71c3de687d33523d83dec50208b0e44815fd7d20;p=xboard.git

diff --git a/winboard/wsettings.c b/winboard/wsettings.c
index 43fcd06..0c92fbc 100644
--- a/winboard/wsettings.c
+++ b/winboard/wsettings.c
@@ -12,6 +12,7 @@
 #include "config.h"
 
 #include <windows.h>
+#include <Windowsx.h>
 #include <stdio.h>
 #include <string.h>
 #include "common.h"
@@ -33,7 +34,7 @@ int breaks[MAX_OPTIONS];
 int checks, combos, buttons, layout, groups;
 char title[MSG_SIZ];
 char *engineName, *engineDir, *engineChoice, *engineLine, *nickName, *params;
-Boolean isUCI, hasBook, storeVariant, v1, addToList;
+Boolean isUCI, hasBook, storeVariant, v1, addToList, useNick, isUCCI;
 extern Option installOptions[], matchOptions[];
 char *engineNr[] = { N_("First"), N_("Second"), NULL };
 char *engineList[1000] = {" "}, *engineMnemonic[1000] = {""};
@@ -42,6 +43,7 @@ ChessProgramState *activeCps;
 Option *activeList;
 void InstallOK P((void));
 typedef void ButtonCallback(HWND h);
+ButtonCallback *comboCallback;
 
 void
 PrintOpt(int i, int right, Option *optionList)
@@ -160,6 +162,10 @@ LayoutOptions(int firstOption, int endOption, char *groupName, Option *optionLis
 	    breaks[layout/2] = lastType == Button ? 0 : 100;
 	    layoutList[layout++] = -1;
 	    layoutList[layout++] = nextOption - 1;
+	    for(i=optionList[nextOption-1].min; i>0; i--) { // extra high text edit
+		layoutList[layout++] = -1;
+		layoutList[layout++] = -1;
+	    }
 	} else if(nextType == Spin) {
 	    // A spin will go in the next available position (right to left!). If it had to be prefixed with
 	    // a check or combo, this next position must be to the right, and the prefix goes left to it.
@@ -320,8 +326,8 @@ GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
 // read out all controls, and if value is altered, remember it and send it to the engine
 {
     HANDLE hwndCombo;
-    int i, k, new=0, changed=0;
-    char **choices, newText[MSG_SIZ], buf[MSG_SIZ];
+    int i, k, new=0, changed=0, len;
+    char **choices, newText[MSG_SIZ], buf[MSG_SIZ], *text;
     BOOL success;
 
     for(i=0; i<layout; i++) {
@@ -340,11 +346,16 @@ GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
 	    case TextBox:
 	    case FileName:
 	    case PathName:
-		success = GetDlgItemText( hDlg, 2001+2*i, newText, MSG_SIZ - strlen(optionList[j].name) - 9 );
+		if(cps) len = MSG_SIZ - strlen(optionList[j].name) - 9, text = newText;
+		else    len = GetWindowTextLength(GetDlgItem(hDlg, 2001+2*i)) + 1, text = (char*) malloc(len);
+		success = GetDlgItemText( hDlg, 2001+2*i, text, len );
 		if(!success) break;
 		if(!cps) {
-		    if(*(char**)optionList[j].target) free(*(char**)optionList[j].target);
-		    *(char**)optionList[j].target = strdup(newText);
+		    char *p;
+		    p = (optionList[j].type != FileName ? strdup(text) : InterpretFileName(text, homeDir)); // all files relative to homeDir!
+		    FREE(*(char**)optionList[j].target); *(char**)optionList[j].target = p;
+		    free(text); text = p;
+		    while(*p++ = *text++) if(p[-1] == '\r') p--; // crush CR
 		    break;
 		}
 		changed = strcmp(optionList[j].textValue, newText) != 0;
@@ -386,10 +397,12 @@ GetOptionValues(HWND hDlg, ChessProgramState *cps, Option *optionList)
     if(!cps && okFunc) ((ButtonCallback*) okFunc)(0);
 }
 
+char *defaultExt[] = { NULL, "pgn", "fen", "exe", "trn", "bin", "log", "ini" };
+
 LRESULT CALLBACK SettingsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     char buf[MSG_SIZ];
-    int i, j;
+    int i, j, ext;
 
     switch( message )
     {
@@ -407,12 +420,12 @@ LRESULT CALLBACK SettingsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
         case IDOK:
 	    GetOptionValues(hDlg, activeCps, activeList);
             EndDialog( hDlg, 0 );
-	    activeCps = NULL;
+	    comboCallback = NULL; activeCps = NULL;
             return TRUE;
 
         case IDCANCEL:
             EndDialog( hDlg, 1 );
-	    activeCps = NULL;
+	    comboCallback = NULL; activeCps = NULL;
             return TRUE;
 
 	default:
@@ -422,15 +435,9 @@ LRESULT CALLBACK SettingsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
 		j = layoutList[(i - 2000)/2];
 		if(j == -2) {
 		          char filter[] =
-				"All files\0*.*\0BIN Files\0*.bin\0LOG Files\0*.log\0INI Files\0*.ini\0\0";
-/*
-{
-		              'A','l','l',' ','F','i','l','e','s', 0,
-		              '*','.','*', 0,
-		              'B','I','N',' ','F','i','l','e','s', 0,
-		              '*','.','b','i','n', 0,
-		              0 };
-*/
+				"All files\0*.*\0Game files\0*.pgn;*.gam\0Position files\0*.fen;*.epd;*.pos\0"
+				"EXE files\0*.exe\0Tournament files (*.trn)\0*.trn\0"
+				"BIN Files\0*.bin\0LOG Files\0*.log\0INI Files\0*.ini\0\0";
 		          OPENFILENAME ofn;
 
 		          safeStrCpy( buf, "" , sizeof( buf)/sizeof( buf[0]) );
@@ -441,6 +448,8 @@ LRESULT CALLBACK SettingsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
 		          ofn.hwndOwner = hDlg;
 		          ofn.hInstance = hInst;
 		          ofn.lpstrFilter = filter;
+			  ofn.nFilterIndex      = 1L + (ext = activeCps ? 0 : activeList[layoutList[(i-2000)/2+1]].max);
+			  ofn.lpstrDefExt       = defaultExt[ext];
 		          ofn.lpstrFile = buf;
 		          ofn.nMaxFile = sizeof(buf);
 		          ofn.lpstrTitle = _("Choose File");
@@ -456,6 +465,10 @@ LRESULT CALLBACK SettingsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
 		    }
 		}
 		if(j < 0) break;
+		if(comboCallback && activeList[j].type == ComboBox && HIWORD(wParam) == CBN_SELCHANGE) {
+		    (*comboCallback)(hDlg);
+		    break;
+		} else
 		if( activeList[j].type  == SaveButton)
 		     GetOptionValues(hDlg, activeCps, activeList);
 		else if( activeList[j].type  != Button) break;
@@ -492,6 +505,7 @@ void AddControl(int x, int y, int w, int h, int type, int style, int n)
 
 void AddOption(int x, int y, Control type, int i)
 {
+    int extra;
 
     switch(type) {
 	case Slider:
@@ -501,7 +515,9 @@ void AddOption(int x, int y, Control type, int i)
 	    break;
 	case TextBox:
 	    AddControl(x, y+1, 95, 9, 0x0082, SS_ENDELLIPSIS | WS_VISIBLE | WS_CHILD, i);
-	    AddControl(x+95, y, 200, 11, 0x0081, ES_AUTOHSCROLL | WS_BORDER | WS_VISIBLE | WS_CHILD | WS_TABSTOP, i+1);
+	    extra = 13*activeList[layoutList[i/2]].min;
+	    AddControl(x+95, y, 200, 11+extra, 0x0081, ES_AUTOHSCROLL | WS_BORDER | WS_VISIBLE | WS_CHILD | WS_TABSTOP | 
+								(extra ? ES_MULTILINE | WS_VSCROLL :0), i+1);
 	    break;
 	case Label:
 	    extra = activeList[layoutList[i/2]].value;
@@ -595,7 +611,8 @@ EngineOptionsPopup(HWND hwnd, ChessProgramState *cps)
 }
 
 void InstallOK()
-{
+{
+    if(isUCCI) isUCI = 2;
     if(engineChoice[0] == engineNr[0][0])  Load(&first, 0); else Load(&second, 1);
 }
 
@@ -603,11 +620,13 @@ Option installOptions[] = {
   {   0,  0,    0, NULL, (void*) &engineLine, (char*) engineMnemonic, engineList, ComboBox, N_("Select engine from list:") },
   {   0,  0,    0, NULL, NULL, NULL, NULL, Label, N_("or specify one below:") },
   {   0,  0,    0, NULL, (void*) &nickName, NULL, NULL, TextBox, N_("Nickname (optional):") },
-  {   0,  0,    3, NULL, (void*) &engineName, NULL, NULL, FileName, N_("Engine Executable:") },
-  {   0,  0,    0, NULL, (void*) &params, NULL, NULL, TextBox, N_("Engine command-line Parameters:") },
-  {   0,  0,    0, NULL, (void*) &engineDir, NULL, NULL, PathName, N_("Engine Directory:") },
+  {   0,  0,    0, NULL, (void*) &useNick, NULL, NULL, CheckBox, N_("Use nickname in PGN tag") },
+  {   0,  0,    3, NULL, (void*) &engineName, NULL, NULL, FileName, N_("Engine (*.exe):") },
+  {   0,  0,    0, NULL, (void*) &params, NULL, NULL, TextBox, N_("command-line parameters:") },
+  {   0,  0,    0, NULL, (void*) &engineDir, NULL, NULL, PathName, N_("directory:") },
   {  95,  0,    0, NULL, NULL, NULL, NULL, Label, N_("(Directory will be derived from engine path when empty)") },
   {   0,  0,    0, NULL, (void*) &isUCI, NULL, NULL, CheckBox, N_("UCI") },
+  {   0,  0,    0, NULL, (void*) &isUCCI, NULL, NULL, CheckBox, N_("UCCI / USI (uses specified /uxiAdapter)") },
   {   0,  0,    0, NULL, (void*) &v1, NULL, NULL, CheckBox, N_("WB protocol v1 (skip waiting for features)") },
   {   0,  0,    0, NULL, (void*) &addToList, NULL, NULL, CheckBox, N_("Add this engine to the list") },
   {   0,  0,    0, NULL, (void*) &hasBook, NULL, NULL, CheckBox, N_("Must not use GUI book") },
@@ -638,15 +657,73 @@ void LoadEnginePopUp(HWND hwnd)
 {
     int n=0;
 
-    isUCI = addToList = storeVariant = v1 = FALSE; hasBook = TRUE; // defaults
+    isUCI = isUCCI = storeVariant = v1 = useNick = FALSE; addToList = hasBook = TRUE; // defaults
     if(engineDir)    free(engineDir);    engineDir = strdup("");
     if(params)       free(params);       params = strdup("");
     if(nickName)     free(nickName);     nickName = strdup("");
     if(engineChoice) free(engineChoice); engineChoice = strdup(engineNr[0]);
     if(engineLine)   free(engineLine);   engineLine = strdup("");
+    if(engineName)   free(engineName);   engineName = strdup("");
     NamesToList(firstChessProgramNames, engineList, engineMnemonic);
     while(engineList[n]) n++; installOptions[0].max = n;
     snprintf(title, MSG_SIZ, _("Load Engine"));
 
     GenericPopup(hwnd, installOptions);
 }
+
+Boolean autoinc, twice;
+
+void MatchOK()
+{
+    if(autoinc) appData.loadGameIndex = appData.loadPositionIndex = -(twice + 1);
+    if(appData.participants) free(appData.participants);
+    appData.participants = strdup(engineName);
+    if(CreateTourney(appData.tourneyFile)) MatchEvent(2); 
+//	ScheduleDelayedEvent(MatchEvent(2), 10); // start tourney
+}
+
+Option tourneyOptions[] = {
+  { 0,  0,          4, NULL, (void*) &appData.tourneyFile, "", NULL, FileName, N_("Tournament file:") },
+  { 0,  1,          0, NULL, (void*) &engineChoice, (char*) (engineMnemonic+1), (engineMnemonic+1), ComboBox, N_("Select Engine:") },
+  { 0xD, 7,         0, NULL, (void*) &engineName, "", NULL, TextBox, "Tourney participants:" },
+  { 0,  0,         10, NULL, (void*) &appData.tourneyType, "", NULL, Spin, N_("Tourney type (0=RR, 1=gauntlet):") },
+  { 0,  0,          0, NULL, (void*) &appData.cycleSync, "", NULL, CheckBox, N_("Sync after cycle") },
+  { 0,  1, 1000000000, NULL, (void*) &appData.tourneyCycles, "", NULL, Spin, N_("Number of tourney cycles:") },
+  { 0,  0,          0, NULL, (void*) &appData.roundSync, "", NULL, CheckBox, N_("Sync after round") },
+  { 0,  1, 1000000000, NULL, (void*) &appData.defaultMatchGames, "", NULL, Spin, N_("Games per Match / Pairing:") },
+  { 0,  0,          1, NULL, (void*) &appData.saveGameFile, "", NULL, FileName, N_("File for saving tourney games:") },
+  { 0,  0,          1, NULL, (void*) &appData.loadGameFile, "", NULL, FileName, N_("Game File with Opening Lines:") },
+  { 0, -2, 1000000000, NULL, (void*) &appData.loadGameIndex, "", NULL, Spin, N_("Game Number:") },
+  { 0,  0,          2, NULL, (void*) &appData.loadPositionFile, "", NULL, FileName, N_("File with Start Positions:") },
+  { 0, -2, 1000000000, NULL, (void*) &appData.loadPositionIndex, "", NULL, Spin, N_("Position Number:") },
+  { 0,  0,          0, NULL, (void*) &autoinc, "", NULL, CheckBox, N_("Step through lines/positions in file") },
+  { 0,  0, 1000000000, NULL, (void*) &appData.rewindIndex, "", NULL, Spin, N_("Rewind after (0 = never):") },
+  { 0,  0,          0, NULL, (void*) &twice, "", NULL, CheckBox, N_("Use each line/position twice") },
+  { 0,  0, 1000000000, NULL, (void*) &appData.matchPause, "", NULL, Spin, N_("Pause between Games (ms):") },
+  { 0, 0, 0, NULL, (void*) &MatchOK, "", NULL, EndMark , "" }
+};
+
+void AddToTourney(HWND hDlg)
+{
+    char buf[MSG_SIZ];
+//    GetDlgItemText( hDlg, 2001+2*3, buf, MSG_SIZ-3 ); // this gives the previous selection !!!
+//    strncat(buf, "\r\n", MSG_SIZ);
+    int i = ComboBox_GetCurSel(GetDlgItem(hDlg, 2001+2*3));
+    snprintf(buf, MSG_SIZ, "%s\r\n", engineMnemonic[i+1]);
+    SendMessage( GetDlgItem(hDlg, 2001+2*5), EM_SETSEL, 99999, 99999 );
+    SendMessage( GetDlgItem(hDlg, 2001+2*5), EM_REPLACESEL, (WPARAM) FALSE, (LPARAM) buf );
+}
+
+void TourneyPopup(HWND hwnd)
+{
+    int n=0;
+
+    NamesToList(firstChessProgramNames, engineList, engineMnemonic);
+    comboCallback = &AddToTourney;
+    autoinc = appData.loadGameIndex < 0 || appData.loadPositionIndex < 0;
+    twice = TRUE;
+    while(engineList[n]) n++; tourneyOptions[1].max = n-1;
+    snprintf(title, MSG_SIZ, _("Tournament and Match Options"));
+
+    GenericPopup(hwnd, tourneyOptions);
+}