X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=046fbc6df5366058d2dcfb28c50eb1c824e0c01e;hb=e131fadbb0f396098fb300283227bdf042c71d45;hp=c8c7fc2dc7a0a26ffdf98deaee9f72933b636196;hpb=25b9dd471b02847a646237ad5888f0f1186917ad;p=xboard.git

diff --git a/dialogs.c b/dialogs.c
index c8c7fc2..046fbc6 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 ------------------------------------
@@ -202,7 +204,7 @@ GenericReadout (Option *opts, int selected)
 		    break;
 		case ComboBox:
 		    if(opts[i].min & COMBO_CALLBACK) break;
-		    if(!opts[i].textValue) { *(int*)opts[i].target == opts[i].value; break; } // numeric
+		    if(!opts[i].textValue) { *(int*)opts[i].target = values[i]; break; } // numeric
 		    val = ((char**)opts[i].textValue)[values[i]];
 		    if(currentCps) {
 			if(opts[i].value == values[i]) break; // not changed
@@ -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);
@@ -1077,7 +1078,7 @@ ICSInputSendText ()
     GetWidgetText(&boxOptions[0], &val);
     SaveInHistory(val);
     SendMultiLineToICS(val);
-    SetWidgetText(&boxOptions[0], val, InputBoxDlg);
+    SetWidgetText(&boxOptions[0], "", InputBoxDlg);
 }
 
 void
@@ -1319,11 +1320,6 @@ ShuffleMenuProc ()
 static int TcOK P((int n));
 int tmpMoves, tmpTc, tmpInc, tmpOdds1, tmpOdds2, tcType;
 
-static void
-ShowTC (int n)
-{
-}
-
 static void SetTcType P((int n));
 
 static char *
@@ -1764,6 +1760,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]) );
@@ -1844,7 +1842,7 @@ PMSelect (int n)
     else EditPositionMenuEvent(pieceMenuTranslation[n - W_MENUW][values[n]], pmFromX, pmFromY);
 }
 
-int
+static void
 CCB (int n)
 {
     shiftKey = (ShiftKeys() & 3) != 0;
@@ -1911,6 +1909,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;
@@ -1941,7 +1940,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;
@@ -1980,12 +1978,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);
 }
 
@@ -2060,7 +2059,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];
 
@@ -2192,7 +2191,6 @@ ListDir (int pathFlag)
 	struct dirent *dp;
 	struct stat statBuf;
 	static int lastFlag;
-	char buf[MSG_SIZ];
 
 	if(pathFlag < 0) pathFlag = lastFlag;
 	lastFlag = pathFlag;
@@ -2202,7 +2200,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++;
@@ -2280,7 +2278,7 @@ DirSelProc (int n, int sel)
     }
 }
 
-FILE *
+void
 Browse (DialogClass dlg, char *label, char *proposed, char *ext, Boolean pathFlag, char *mode, char **name, FILE **fp)
 {
     int j=0;
@@ -2294,9 +2292,30 @@ Browse (DialogClass dlg, char *label, char *proposed, char *ext, Boolean pathFla
     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)) {
-    }
+    GenericPopUp(browseOptions, label, BrowserDlg, dlg, MODAL, 0);
     SetWidgetLabel(&browseOptions[9], FileTypes[j]);
 }
 
+static char *openName;
+FileProc fileProc;
+char *fileOpenMode;
+FILE *openFP;
+
+void
+DelayedLoad ()
+{
+  (void) (*fileProc)(openFP, 0, openName);
+}
+
+void
+FileNamePopUp (char *label, char *def, char *filter, FileProc proc, char *openMode)
+{
+    fileProc = proc;		/* I can't see a way not */
+    fileOpenMode = openMode;	/*   to use globals here */
+    {   // [HGM] use file-selector dialog stolen from Ghostview
+	// int index; // this is not supported yet
+	Browse(BoardWindow, label, (def[0] ? def : NULL), filter, False, openMode, &openName, &openFP);
+    }
+}
+