X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=c50651af4f47e41a2e8f76293897e0e083a43ca7;hb=1e39d89485cd604e9008f947a24dde2842100e32;hp=df8750ab0d76fe2d5ef47b1b8077da2e38f8cfea;hpb=9d455a7f4ce66cc25d540d4dc5a65fdb1895cc2e;p=xboard.git

diff --git a/dialogs.c b/dialogs.c
index df8750a..c50651a 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -103,45 +103,47 @@ SetCurrentComboSelection (Option *opt)
 void
 GenericUpdate (Option *opts, int selected)
 {
-    int i, j;
+    int i;
     char buf[MSG_SIZ];
-    float x;
-	for(i=0; ; i++) {
-	    if(selected >= 0) { if(i < selected) continue; else if(i > selected) break; }
-	    switch(opts[i].type) {
-		case TextBox:
-		case FileName:
-		case PathName:
-		    SetWidgetText(&opts[i],  *(char**) opts[i].target, -1);
-		    break;
-		case Spin:
-		    sprintf(buf, "%d", *(int*) opts[i].target);
-		    SetWidgetText(&opts[i], buf, -1);
-		    break;
-		case Fractional:
-		    sprintf(buf, "%4.2f", *(float*) opts[i].target);
-		    SetWidgetText(&opts[i], buf, -1);
-		    break;
-		case CheckBox:
-		    SetWidgetState(&opts[i],  *(Boolean*) opts[i].target);
-		    break;
-		case ComboBox:
-		  if(opts[i].min & COMBO_CALLBACK) break;
-		  SetCurrentComboSelection(opts+i);
-		    // TODO: actually display this (but it is never used that way...)
-		    break;
-		case EndMark:
-		    return;
-	    default:
-		printf("GenericUpdate: unexpected case in switch.\n");
-		case ListBox:
-		case Button:
-		case SaveButton:
-		case Label:
-		case Break:
-	      break;
-	    }
-	}
+
+    for(i=0; ; i++)
+      {
+	if(selected >= 0) { if(i < selected) continue; else if(i > selected) break; }
+	switch(opts[i].type)
+	  {
+	  case TextBox:
+	  case FileName:
+	  case PathName:
+	    SetWidgetText(&opts[i],  *(char**) opts[i].target, -1);
+	    break;
+	  case Spin:
+	    sprintf(buf, "%d", *(int*) opts[i].target);
+	    SetWidgetText(&opts[i], buf, -1);
+	    break;
+	  case Fractional:
+	    sprintf(buf, "%4.2f", *(float*) opts[i].target);
+	    SetWidgetText(&opts[i], buf, -1);
+	    break;
+	  case CheckBox:
+	    SetWidgetState(&opts[i],  *(Boolean*) opts[i].target);
+	    break;
+	  case ComboBox:
+	    if(opts[i].min & COMBO_CALLBACK) break;
+	    SetCurrentComboSelection(opts+i);
+	    // TODO: actually display this (but it is never used that way...)
+	    break;
+	  case EndMark:
+	    return;
+	  default:
+	    printf("GenericUpdate: unexpected case in switch.\n");
+	  case ListBox:
+	  case Button:
+	  case SaveButton:
+	  case Label:
+	  case Break:
+	    break;
+	  }
+      }
 }
 
 //------------------------------------------- Read out dialog controls ------------------------------------
@@ -965,7 +967,6 @@ NewCommentPopup (char *title, char *text, int index)
 void
 EditCommentProc ()
 {
-    int j;
     if (PopDown(CommentDlg)) { // popdown succesful
 //	MarkMenuItem("Edit.EditComment", False);
 //	MarkMenuItem("View.Comments", False);
@@ -1454,13 +1455,13 @@ static int count;
 static void PromoPick P((int n));
 
 static Option promoOptions[] = {
-{   0,         0,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{   0,  SAME_ROW,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{   0,  SAME_ROW,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{   0,  SAME_ROW,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{   0,  SAME_ROW,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{   0,  SAME_ROW,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
-{   0,  SAME_ROW,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, "" },
+{   0,         0,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{   0,  SAME_ROW,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{   0,  SAME_ROW,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{   0,  SAME_ROW,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{   0,  SAME_ROW,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{   0,  SAME_ROW,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{   0,  SAME_ROW,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
 {   0, SAME_ROW | NO_OK, 0, NULL, NULL, "", NULL, EndMark , "" }
 };
 
@@ -1489,8 +1490,9 @@ PromoPick (int n)
 static void
 SetPromo (char *name, int nr, char promoChar)
 {
-    safeStrCpy(promoOptions[nr].name, name, MSG_SIZ);
+    ASSIGN(promoOptions[nr].name, name);
     promoOptions[nr].value = promoChar;
+    promoOptions[nr].min = SAME_ROW;
 }
 
 void
@@ -1526,6 +1528,7 @@ PromotionPopUp ()
       SetPromo(_("Defer"), --count, '=');
       SetPromo(_("Promote"), --count, '+');
   }
+  promoOptions[count].min = 0;
   GenericPopUp(promoOptions + count, "Promotion", PromoDlg, BoardWindow, NONMODAL, 0);
 }
 
@@ -1762,6 +1765,8 @@ DisplayTitle (char *text)
 
     if (text == NULL) text = "";
 
+    if(partnerUp) { SetDialogTitle(DummyDlg, text); return; }
+
     if (*text != NULLCHAR) {
       safeStrCpy(icon, text, sizeof(icon)/sizeof(icon[0]) );
       safeStrCpy(title, text, sizeof(title)/sizeof(title[0]) );
@@ -1838,15 +1843,15 @@ static void
 PMSelect (int n)
 {   // user callback for board context menus
     if (pmFromX < 0 || pmFromY < 0) return;
-    if(n == 25) DropMenuEvent(dropMenuTranslation[values[n]], pmFromX, pmFromY);
-    else EditPositionMenuEvent(pieceMenuTranslation[n-23][values[n]], pmFromX, pmFromY);
+    if(n == W_DROP) DropMenuEvent(dropMenuTranslation[values[n]], pmFromX, pmFromY);
+    else EditPositionMenuEvent(pieceMenuTranslation[n - W_MENUW][values[n]], pmFromX, pmFromY);
 }
 
-int
+static void
 CCB (int n)
 {
     shiftKey = (ShiftKeys() & 3) != 0;
-    ClockClick(n == 12);
+    ClockClick(n == W_BLACK);
 }
 
 Option mainOptions[] = { // description of main window in terms of generic dialog creator
@@ -1909,6 +1914,7 @@ Exp (int n, int x, int y)
 	if(but3) MovePV(x, y, lineGap + BOARD_HEIGHT * (squareSize + lineGap));
 	return NULL;
     }
+    if(n != 10 && PopDown(PromoDlg)) fromX = fromY = -1; // user starts fiddling with board when promotion dialog is up
     shiftKey = ShiftKeys();
     controlKey = (shiftKey & 0xC) != 0;
     shiftKey = (shiftKey & 3) != 0;
@@ -1939,7 +1945,6 @@ Exp (int n, int x, int y)
 Option *
 BoardPopUp (int squareSize, int lineGap, void *clockFontThingy)
 {
-    extern Option *dialogOptions[];
     int i, size = BOARD_WIDTH*(squareSize + lineGap) + lineGap;
     mainOptions[W_WHITE].choice = (char**) clockFontThingy;
     mainOptions[W_BLACK].choice = (char**) clockFontThingy;
@@ -1978,12 +1983,13 @@ Option dualOptions[] = { // auxiliary board window
 void
 SlavePopUp ()
 {
+    int size = BOARD_WIDTH*(squareSize + lineGap) + lineGap;
     // copy params from main board
     dualOptions[0].choice = mainOptions[W_WHITE].choice;
     dualOptions[1].choice = mainOptions[W_BLACK].choice;
-    dualOptions[3].value = mainOptions[W_BOARD].value;
-    dualOptions[3].max = dualOptions[2].max = mainOptions[W_BOARD].max; // board size
-    dualOptions[0].max = dualOptions[1].max = mainOptions[W_WHITE].max; // clock width
+    dualOptions[3].value = BOARD_HEIGHT*(squareSize + lineGap) + lineGap;
+    dualOptions[3].max = dualOptions[2].max = size; // board width
+    dualOptions[0].max = dualOptions[1].max = size/2 - 3; // clock width
     GenericPopUp(dualOptions, "XBoard", DummyDlg, BoardWindow, NONMODAL, 1);
 }
 
@@ -2058,7 +2064,7 @@ DisplayMessage (char *message, char *extMessage)
 
 static ChessProgramState *savCps;
 static FILE **savFP;
-static char *fileName, *extFilter, *dirListing, *savMode, **namePtr;
+static char *fileName, *extFilter, *savMode, **namePtr;
 static int folderPtr, filePtr, oldVal, byExtension, extFlag;
 static char curDir[MSG_SIZ], title[MSG_SIZ], *folderList[1000], *fileList[1000];
 
@@ -2067,6 +2073,7 @@ static char *FileTypes[] = {
 "Chess Positions",
 "Tournaments",
 "Opening Books",
+"Sound files",
 "Settings (*.ini)",
 "Log files",
 "All files",
@@ -2084,6 +2091,7 @@ static char *Extensions[] = {
 ".fen .epd .pos",
 ".trn",
 ".bin",
+".wav",
 ".ini",
 ".log",
 "",
@@ -2101,6 +2109,7 @@ void FileSelProc P((int n, int sel));
 void SetTypeFilter P((int n));
 int BrowseOK P((int n));
 void Switch P((int n));
+void CreateDir P((int n));
 
 Option browseOptions[] = {
 {   0,    LR|T2T,      500, NULL, NULL, NULL, NULL, Label, title },
@@ -2110,7 +2119,8 @@ Option browseOptions[] = {
 {   0, R2R|TT|SAME_ROW, 70, NULL, (void*) &Switch, NULL, NULL, Button, N_("by type") },
 { 300,    L2L|TB,      250, NULL, (void*) folderList, (char*) &DirSelProc, NULL, ListBox, "" },
 { 300, R2R|TB|SAME_ROW,250, NULL, (void*) fileList, (char*) &FileSelProc, NULL, ListBox, "" },
-{   0,       0,        350, NULL, (void*) &fileName, NULL, NULL, TextBox, N_("Filename:") },
+{   0,       0,        300, NULL, (void*) &fileName, NULL, NULL, TextBox, N_("Filename:") },
+{   0,    SAME_ROW,    120, NULL, (void*) &CreateDir, NULL, NULL, Button, N_("New directory") },
 {   0, COMBO_CALLBACK, 150, NULL, (void*) &SetTypeFilter, NULL, FileTypes, ComboBox, N_("File type:") },
 {   0,    SAME_ROW,      0, NULL, (void*) &BrowseOK, "", NULL, EndMark , "" }
 };
@@ -2186,7 +2196,6 @@ ListDir (int pathFlag)
 	struct dirent *dp;
 	struct stat statBuf;
 	static int lastFlag;
-	char buf[MSG_SIZ];
 
 	if(pathFlag < 0) pathFlag = lastFlag;
 	lastFlag = pathFlag;
@@ -2196,7 +2205,7 @@ ListDir (int pathFlag)
 	folderPtr = filePtr = 0; // clear listing
 
 	while (dp = readdir(dir)) { // pass 1: list foders
-	    char *s = dp->d_name, match;
+	    char *s = dp->d_name;
 	    if(!stat(s, &statBuf) && S_ISDIR(statBuf.st_mode)) { // stat succeeds and tells us it is directory
 		if(s[0] == '.' && strcmp(s, "..")) continue; // suppress hidden, except ".."
 		ASSIGN(folderList[folderPtr], s); folderPtr++;
@@ -2228,6 +2237,21 @@ Refresh (int pathFlag)
     ListDir(pathFlag); // and make new one
     LoadListBox(&browseOptions[5], "");
     LoadListBox(&browseOptions[6], "");
+    SetWidgetLabel(&browseOptions[0], title);
+}
+
+void
+CreateDir (int n)
+{
+    char *name, *errmsg = "";
+    GetWidgetText(&browseOptions[n-1], &name);
+    if(!name[0]) errmsg = _("FIRST TYPE DIRECTORY NAME HERE"); else
+    if(mkdir(name, 0755)) errmsg = _("TRY ANOTHER NAME");
+    else {
+	chdir(name);
+	Refresh(-1);
+    }
+    SetWidgetText(&browseOptions[n-1], errmsg, BrowserDlg);
 }
 
 void
@@ -2256,27 +2280,25 @@ DirSelProc (int n, int sel)
 {
     if(!chdir(folderList[sel])) { // cd succeeded, so we are in new directory now
 	Refresh(-1);
-	SetWidgetLabel(&browseOptions[0], title);
     }
 }
 
-FILE *
+void
 Browse (DialogClass dlg, char *label, char *proposed, char *ext, Boolean pathFlag, char *mode, char **name, FILE **fp)
 {
     int j=0;
-    savFP = fp; savMode = mode, namePtr = name, savCps = currentCps, oldVal = values[8]; // save params, for use in callback
+    savFP = fp; savMode = mode, namePtr = name, savCps = currentCps, oldVal = values[9]; // save params, for use in callback
     ASSIGN(extFilter, ext);
     ASSIGN(fileName, proposed ? proposed : "");
     for(j=0; Extensions[j]; j++) // look up actual value in list of possible values, to get selection nr
 	if(extFilter && !strcmp(extFilter, Extensions[j])) break;
     if(Extensions[j] == NULL) { j++; ASSIGN(FileTypes[j], extFilter); }
-    browseOptions[8].value = j;
+    browseOptions[9].value = j;
     browseOptions[6].textValue = (char*) (pathFlag ? NULL : &FileSelProc); // disable file listbox during path browsing
     ListDir(pathFlag);
     currentCps = NULL;
-    if(GenericPopUp(browseOptions, label, BrowserDlg, dlg, MODAL, 0)) {
-    }
-    SetWidgetLabel(&browseOptions[8], FileTypes[j]);
+    GenericPopUp(browseOptions, label, BrowserDlg, dlg, MODAL, 0);
+    SetWidgetLabel(&browseOptions[9], FileTypes[j]);
 }