X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xoptions.c;h=ab6efac1a4764ac79dcc915c08935ef28c70aad7;hb=7112c9346e502b141b5a5d5c677856559ed347b2;hp=cb0be5885d86051063dbc0ce38fdbfe9aee41eb4;hpb=d374c33760f3faec1c674c74a2712d1d018153a0;p=xboard.git

diff --git a/xoptions.c b/xoptions.c
index cb0be58..ab6efac 100644
--- a/xoptions.c
+++ b/xoptions.c
@@ -82,7 +82,7 @@ extern char *getenv();
 
 extern void SendToProgram P((char *message, ChessProgramState *cps));
 FILE * XsraSelFile P((Widget w, char *prompt, char *ok, char *cancel, char *failed,
-		char *init_path, char *mode, int (*show_entry)(), char **name_return));
+		char *init_path, char *filter, char *mode, int (*show_entry)(), char **name_return));
 
 extern Widget formWidget, shellWidget, boardWidget, menuBarWidget;
 extern Display *xDisplay;
@@ -624,6 +624,19 @@ int values[MAX_OPTIONS];
 ChessProgramState *currentCps;
 static Option *currentOption;
 extern Widget shells[];
+static Boolean browserUp;
+
+void CheckCallback(Widget ww, XtPointer data, XEvent *event, Boolean *b)
+{
+    Widget w = currentOption[(int)(intptr_t)data].handle;
+    Boolean s;
+    Arg args[16];
+
+    XtSetArg(args[0], XtNstate, &s);
+    XtGetValues(w, args, 1);
+    XtSetArg(args[0], XtNstate, !s);
+    XtSetValues(w, args, 1);
+}
 
 void SpinCallback(w, client_data, call_data)
      Widget w;
@@ -643,13 +656,19 @@ void SpinCallback(w, client_data, call_data)
     XtGetValues(currentOption[data].handle, args, 1);
     sscanf(val, "%d", &j);
     if (strcmp(name, "browse") == 0) {
-	if(XsraSelFile(shells[0], currentOption[data].name, NULL, NULL, "", "", 
+	char *q, *r;
+	XtSetArg(args[0], XtNstring, &q);
+	XtGetValues(currentOption[data].handle, args, 1);
+	for(r = ""; *q; q++) if(*q == '.') r = q; else if(*q == '/') r = ""; // last dot after last slash
+	browserUp = True;
+	if(XsraSelFile(shells[0], currentOption[data].name, NULL, NULL, "", "", r,
 			 	  currentOption[data].type == PathName ? "p" : "f", NULL, &p)) {
 		int len = strlen(p);
 		if(len && p[len-1] == '/') p[len-1] = NULLCHAR;
 		XtSetArg(args[0], XtNstring, p);
 		XtSetValues(currentOption[data].handle, args, 1);
 	}
+	browserUp = False;
 	SetFocus(currentOption[data].handle, shells[0], (XEvent*) NULL, False);
 	return;
     } else
@@ -662,6 +681,7 @@ void SpinCallback(w, client_data, call_data)
     snprintf(buf, MSG_SIZ,  "%d", j);
     XtSetArg(args[0], XtNstring, buf);
     XtSetValues(currentOption[data].handle, args, 1);
+    SetFocus(currentOption[data].handle, shells[0], NULL, False);
 }
 
 void ComboSelect(w, addr, index) // callback for all combo items
@@ -710,17 +730,17 @@ void CreateComboPopup(parent, name, n, mb)
 
 typedef void ButtonCallback(int n);
 
+extern WindowPlacement wpComment, wpTags;
 char *trialSound;
 static int oldCores, oldPonder;
 int MakeColors P((void));
 void CreateGCs P((int redo));
-void CreateXPMBoard P((char *s, int kind));
-void CreateXPMPieces P((void));
+void CreateAnyPieces P((void));
 void GenericReadout();
 Widget shells[10];
 Widget marked[10];
 Boolean shellUp[10];
-WindowPlacement *wp[10];
+WindowPlacement *wp[10] = { NULL, &wpComment, &wpTags };
 Option *dialogOptions[10];
 
 void MarkMenu(char *item, int dlgNr)
@@ -767,6 +787,7 @@ void GenericPopDown(w, event, prms, nprms)
      Cardinal *nprms;
 {
     int n;
+    if(browserUp) return; // prevent closing dialog when it has an open file-browse daughter
     PopDown(prms[0][0] - '0');
 }
 
@@ -789,7 +810,7 @@ void GeneralOptionsOK(int n)
 }
 
 Option generalOptions[] = {
-{ 0,  0, 0, NULL, (void*) &appData.alwaysPromoteToQueen, "", NULL, CheckBox, _("Always Queen") },
+{ 0,  0, 0, NULL, (void*) &appData.sweepSelect, "", NULL, CheckBox, _("Almost Always Queen (Detour Under-Promote)") },
 { 0,  0, 0, NULL, (void*) &appData.animateDragging, "", NULL, CheckBox, _("Animate Dragging") },
 { 0,  0, 0, NULL, (void*) &appData.animate, "", NULL, CheckBox, _("Animate Moving") },
 { 0,  0, 0, NULL, (void*) &appData.autoCallFlag, "", NULL, CheckBox, _("Auto Flag") },
@@ -1075,82 +1096,106 @@ void SetColor(char *colorName, Widget box)
 	XtSetValues(box, args, 1);
 }
 
-void AdjustColor(int i)
+void SetColorText(int n, char *buf)
 {
-    int n = currentOption[i].value, col, j, r, g, b, step = 10;
+    Arg args[5];
+    XtSetArg(args[0], XtNstring, buf);
+    XtSetValues(currentOption[n-1].handle, args, 1);
+    SetFocus(currentOption[n-1].handle, shells[0], NULL, False);
+    SetColor(buf, currentOption[n].handle);
+}
+
+void DefColor(int n)
+{
+    SetColorText(n, (char*) currentOption[n].choice);
+}
+
+void RefreshColor(int source, int n)
+{
+    int col, j, r, g, b, step = 10;
     char *s, buf[MSG_SIZ]; // color string
     Arg args[5];
     XtSetArg(args[0], XtNstring, &s);
-    XtGetValues(currentOption[i-n-1].handle, args, 1);
+    XtGetValues(currentOption[source].handle, args, 1);
     if(sscanf(s, "#%x", &col) != 1) return;   // malformed
     b = col & 0xFF; g = col & 0xFF00; r = col & 0xFF0000;
     switch(n) {
-	case 1: g -= 0x100*step; b -= step; break;
-	case 2: r -= 0x10000*step; b -= step; break;
-	case 3: g -= 0x100*step; r -= 0x10000*step; break;
-	case 4: r += 0x10000*step; g += 0x100*step; b += step; break;
+	case 1: r += 0x10000*step;break;
+	case 2: g += 0x100*step;  break;
+	case 3: b += step;        break;
+	case 4: r -= 0x10000*step; g -= 0x100*step; b -= step; break;
     }
     if(r < 0) r = 0; if(g < 0) g = 0; if(b < 0) b = 0;
     if(r > 0xFF0000) r = 0xFF0000; if(g > 0xFF00) g = 0xFF00; if(b > 0xFF) b = 0xFF;
     col = r | g | b;
     snprintf(buf, MSG_SIZ, "#%06x", col);
     for(j=1; j<7; j++) if(buf[j] >= 'a') buf[j] -= 32; // capitalize
-    SetColor(buf, currentOption[i-n].handle);
-    XtSetArg(args[0], XtNstring, buf);
-    XtSetValues(currentOption[i-n-1].handle, args, 1);
+    SetColorText(source+1, buf);
+}
+
+void ColorChanged(Widget w, XtPointer data, XEvent *event, Boolean *b)
+{
+    char buf[10];
+    if ( (XLookupString(&(event->xkey), buf, 2, NULL, NULL) == 1) && *buf == '\r' )
+	RefreshColor((int)(intptr_t) data, 0);
+}
+
+void AdjustColor(int i)
+{
+    int n = currentOption[i].value;
+    RefreshColor(i-n-1, n);
 }
 
 void BoardOptionsOK(int n)
 {
-    extern int defaultLineGap;
+    extern int defaultLineGap, useImages, useImageSqs;
     if(appData.overrideLineGap >= 0) lineGap = appData.overrideLineGap; else lineGap = defaultLineGap;
+    useImages = useImageSqs = 0;
     MakeColors(); CreateGCs(True);
-    CreateXPMPieces();
-    CreateXPMBoard(appData.liteBackTextureFile, 1);
-    CreateXPMBoard(appData.darkBackTextureFile, 0);
+    CreateAnyPieces();
     InitDrawingSizes(-1, 0);
     DrawPosition(True, NULL);
 }
 
 Option boardOptions[] = {
 { 0,   0, 70, NULL, (void*) &appData.whitePieceColor, "", NULL, TextBox, _("White Piece Color:") },
-{ 1000, 1, 0, NULL, NULL, NULL, NULL, Button, "      " },
+{ 1000, 1, 0, NULL, (void*) &DefColor, NULL, (char**) "#FFFFCC", Button, "      " },
 {    1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "R" },
 {    2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "G" },
 {    3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "B" },
-{    4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "W" },
+{    4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "D" },
 { 0,   0, 70, NULL, (void*) &appData.blackPieceColor, "", NULL, TextBox, _("Black Piece Color:") },
-{ 1000, 1, 0, NULL, NULL, NULL, NULL, Button, "      " },
+{ 1000, 1, 0, NULL, (void*) &DefColor, NULL, (char**) "#202020", Button, "      " },
 {    1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "R" },
 {    2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "G" },
 {    3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "B" },
-{    4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "W" },
+{    4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "D" },
 { 0,   0, 70, NULL, (void*) &appData.lightSquareColor, "", NULL, TextBox, _("Light Square Color:") },
-{ 1000, 1, 0, NULL, NULL, NULL, NULL, Button, "      " },
+{ 1000, 1, 0, NULL, (void*) &DefColor, NULL, (char**) "#C8C365", Button, "      " },
 {    1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "R" },
 {    2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "G" },
 {    3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "B" },
-{    4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "W" },
+{    4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "D" },
 { 0,   0, 70, NULL, (void*) &appData.darkSquareColor, "", NULL, TextBox, _("Dark Square Color:") },
-{ 1000, 1, 0, NULL, NULL, NULL, NULL, Button, "      " },
+{ 1000, 1, 0, NULL, (void*) &DefColor, NULL, (char**) "#77A26D", Button, "      " },
 {    1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "R" },
 {    2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "G" },
 {    3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "B" },
-{    4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "W" },
+{    4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "D" },
 { 0,   0, 70, NULL, (void*) &appData.highlightSquareColor, "", NULL, TextBox, _("Highlight Color:") },
-{ 1000, 1, 0, NULL, NULL, NULL, NULL, Button, "      " },
+{ 1000, 1, 0, NULL, (void*) &DefColor, NULL, (char**) "#FFFF00", Button, "      " },
 {    1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "R" },
 {    2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "G" },
 {    3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "B" },
-{    4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "W" },
+{    4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "D" },
 { 0,   0, 70, NULL, (void*) &appData.premoveHighlightColor, "", NULL, TextBox, _("Premove Highlight Color:") },
-{ 1000, 1, 0, NULL, NULL, NULL, NULL, Button, "      " },
+{ 1000, 1, 0, NULL, (void*) &DefColor, NULL, (char**) "#FF0000", Button, "      " },
 {    1, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "R" },
 {    2, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "G" },
 {    3, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "B" },
-{    4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "W" },
-{ 0, 0, 0, NULL, (void*) &appData.upsideDown, "", NULL, CheckBox, _("Flip Pieces Shogi Style") },
-{ 0, 0, 0, NULL, (void*) &appData.allWhite, "", NULL, CheckBox, _("Use Outline Pieces for Black") },
+{    4, 1, 0, NULL, (void*) &AdjustColor, NULL, NULL, Button, "D" },
+{ 0, 0, 0, NULL, (void*) &appData.upsideDown, "", NULL, CheckBox, _("Flip Pieces Shogi Style        (Colored buttons restore default)") },
+//{ 0, 0, 0, NULL, (void*) &appData.allWhite, "", NULL, CheckBox, _("Use Outline Pieces for Black") },
 { 0, 0, 0, NULL, (void*) &appData.monoMode, "", NULL, CheckBox, _("Mono Mode") },
 { 0,-1, 5, NULL, (void*) &appData.overrideLineGap, "", NULL, Spin, _("Line Gap ( -1 = default for board size):") },
 { 0, 0, 0, NULL, (void*) &appData.liteBackTextureFile, "", NULL, FileName, _("Light-Squares Texture File:") },
@@ -1190,13 +1235,14 @@ void GenericReadout()
 		    sscanf(val, "%f", &x);
 		    if(x > currentOption[i].max) x = currentOption[i].max;
 		    if(x < currentOption[i].min) x = currentOption[i].min;
-		    if(currentOption[i].value != x) {
+		    if(currentOption[i].type == Fractional)
+			*(float*) currentOption[i].target = x; // engines never have float options!
+		    else if(currentOption[i].value != x) {
 			currentOption[i].value = x;
-			if(currentCps) { // engines never have float options, so no decimals!
+			if(currentCps) {
 			    snprintf(buf, MSG_SIZ,  "option %s=%.0f\n", currentOption[i].name, x);
 			    SendToProgram(buf, currentCps);
-			} else if(currentOption[i].type == Spin) *(int*) currentOption[i].target = x;
-			else *(float*) currentOption[i].target = x;
+			} else *(int*) currentOption[i].target = x;
 		    }
 		    break;
 		case CheckBox:
@@ -1233,6 +1279,7 @@ void GenericReadout()
 		case Button:
 		case SaveButton:
 		case Label:
+		case Break:
 	      break;
 	    }
 	    if(currentOption[i].type == EndMark) break;
@@ -1270,6 +1317,8 @@ void GenericCallback(w, client_data, call_data)
     } else ((ButtonCallback*) currentOption[data].target)(data);
 }
 
+static char *oneLiner  = "<Key>Return:	redraw-display()\n";
+
 int
 GenericPopUp(Option *option, char *title, int dlgNr)
 {
@@ -1283,7 +1332,7 @@ GenericPopUp(Option *option, char *title, int dlgNr)
     static char pane[6] = "paneX";
     Widget texts[100], forelast = NULL, anchor, widest, lastrow = NULL;
 
-    if(shellUp[dlgNr]) return 0; // already up
+    if(shellUp[dlgNr]) return 0; // already up		
     if(dlgNr && shells[dlgNr]) {
 	XtPopup(shells[dlgNr], XtGrabNone);
 	shellUp[dlgNr] = True;
@@ -1376,6 +1425,8 @@ GenericPopUp(Option *option, char *title, int dlgNr)
 	    option[i].handle = (void*)
 		(textField = last = XtCreateManagedWidget("text", asciiTextWidgetClass, form, args, j));
 	    XtAddEventHandler(last, ButtonPressMask, False, SetFocus, (XtPointer) popup);
+	    if(option[i].min == 0 || option[i].type != TextBox)
+		XtOverrideTranslations(last, XtParseTranslationTable(oneLiner));
 
 	    if(option[i].type == TextBox || option[i].type == Fractional) break;
 
@@ -1393,8 +1444,7 @@ GenericPopUp(Option *option, char *title, int dlgNr)
 	    }
 	    XtSetArg(args[j], XtNwidth, w);  j++;
 	    edit = XtCreateManagedWidget(msg, commandWidgetClass, form, args, j);
-	    XtAddCallback(edit, XtNcallback, SpinCallback,
-			  (XtPointer)(intptr_t) i);
+	    XtAddCallback(edit, XtNcallback, SpinCallback, (XtPointer)(intptr_t) i);
 
 	    if(option[i].type != Spin) break;
 
@@ -1406,8 +1456,7 @@ GenericPopUp(Option *option, char *title, int dlgNr)
 	    XtSetArg(args[j], XtNleft, XtChainRight); j++;
 	    XtSetArg(args[j], XtNright, XtChainRight); j++;
 	    last = XtCreateManagedWidget("-", commandWidgetClass, form, args, j);
-	    XtAddCallback(last, XtNcallback, SpinCallback,
-			  (XtPointer)(intptr_t) i);
+	    XtAddCallback(last, XtNcallback, SpinCallback, (XtPointer)(intptr_t) i);
 	    break;
 	  case CheckBox:
 	    if(!currentCps) option[i].value = *(Boolean*)option[i].target;
@@ -1431,6 +1480,8 @@ GenericPopUp(Option *option, char *title, int dlgNr)
 	    XtSetArg(args[j], XtNborderWidth, 0);  j++;
 	    XtSetArg(args[j], XtNjustify, XtJustifyLeft);  j++;
 	    last = XtCreateManagedWidget(msg, labelWidgetClass, form, args, j);
+	    if(option[i].type == CheckBox)
+		XtAddEventHandler(last, ButtonPressMask, False, CheckCallback, (XtPointer)(intptr_t) i);
 	    break;
 	  case SaveButton:
 	  case Button:
@@ -1446,7 +1497,10 @@ GenericPopUp(Option *option, char *title, int dlgNr)
 	    }
 	    option[i].handle = (void*)
 		(dialog = last = XtCreateManagedWidget(option[i].name, commandWidgetClass, form, args, j));
-	    if(option[i].target == NULL && !currentCps) SetColor( *(char**) option[i-1].target, last); else
+	    if(option[i].choice && ((char*)option[i].choice)[0] == '#' && !currentCps) {
+		SetColor( *(char**) option[i-1].target, last);
+		XtAddEventHandler(option[i-1].handle, KeyReleaseMask, False, ColorChanged, (XtPointer)(intptr_t) i-1);
+	    }
 	    XtAddCallback(last, XtNcallback, GenericCallback,
 			  (XtPointer)(intptr_t) i + (dlgNr<<16));
 	    if(option[i].textValue) SetColor( option[i].textValue, last);
@@ -1539,11 +1593,11 @@ GenericPopUp(Option *option, char *title, int dlgNr)
     XtSetArg(args[j], XtNleft, XtChainRight);  j++;
     XtSetArg(args[j], XtNright, XtChainRight);  j++;
     b_ok = XtCreateManagedWidget(_("OK"), commandWidgetClass, form, args, j);
-    XtAddCallback(b_ok, XtNcallback, GenericCallback, (XtPointer) dlgNr);
+    XtAddCallback(b_ok, XtNcallback, GenericCallback, (XtPointer)(intptr_t) dlgNr + (dlgNr<<16));
 
     XtSetArg(args[0], XtNfromHoriz, b_ok);
     b_cancel = XtCreateManagedWidget(_("cancel"), commandWidgetClass, form, args, j);
-    XtAddCallback(b_cancel, XtNcallback, GenericCallback, (XtPointer) dlgNr);
+    XtAddCallback(b_cancel, XtNcallback, GenericCallback, (XtPointer)(intptr_t) dlgNr);
   }
 
     XtRealizeWidget(popup);
@@ -1690,7 +1744,7 @@ static void
 SendTextCB(Widget w, XtPointer client_data, Atom *selection,
 	   Atom *type, XtPointer value, unsigned long *len, int *format)
 {
-  char buf[MSG_SIZ], *p = (char*) textOptions[(int) client_data].choice, *name = (char*) value, *q;
+  char buf[MSG_SIZ], *p = (char*) textOptions[(int)(intptr_t) client_data].choice, *name = (char*) value, *q;
   if (value==NULL || *len==0) return; /* nothing selected, abort */
   name[*len]='\0';
   strncpy(buf, p, MSG_SIZ);
@@ -1707,7 +1761,7 @@ void SendText(int n)
 	XtGetSelectionValue(menuBarWidget,
 	  XA_PRIMARY, XA_STRING,
 	  /* (XtSelectionCallbackProc) */ SendTextCB,
-	  (XtPointer) n, /* client_data passed to PastePositionCB */
+	  (XtPointer) (intptr_t) n, /* client_data passed to PastePositionCB */
 	  CurrentTime
 	);
     } else SendString(p);
@@ -1748,11 +1802,97 @@ void IcsTextProc(w, event, prms, nprms)
    GenericPopUp(textOptions, _("ICS text menu"), 3);
 }
 
+static char *commentText;
+static int commentIndex;
+void ClearComment P((int n));
+extern char commentTranslations[];
+
+void NewComCallback(int n)
+{
+    ReplaceComment(commentIndex, commentText);
+}
+
+void SaveChanges(int n)
+{
+    Arg args[16];
+    XtSetArg(args[0], XtNstring, &commentText);
+    XtGetValues(currentOption[0].handle, args, 1);
+    ReplaceComment(commentIndex, commentText);
+}
+
+Option commentOptions[] = {
+{ 0xD, 200, 300, NULL, (void*) &commentText, "", NULL, TextBox, "" },
+{   0,  0,    0, NULL, (void*) &ClearComment, NULL, NULL, Button, "clear" },
+{   0,  1,    0, NULL, (void*) &SaveChanges, NULL, NULL, Button, "save changes" },
+{   0,  1,    0, NULL, (void*) &NewComCallback, "", NULL, EndMark , "" }
+};
+
+void ClearComment(int n)
+{
+    XtCallActionProc(commentOptions[0].handle, "select-all", NULL, NULL, 0);
+    XtCallActionProc(commentOptions[0].handle, "kill-selection", NULL, NULL, 0);
+}
+
+void NewCommentPopup(char *title, char *text, int index)
+{
+    Widget edit;
+    Arg args[16];
+
+    if(shells[1]) { // if already exists, alter title and content
+	XtSetArg(args[0], XtNtitle, title);
+	XtSetValues(shells[1], args, 1);
+	XtSetArg(args[0], XtNstring, text);
+	XtSetValues(commentOptions[0].handle, args, 1);
+    }
+    commentText = text;
+    commentIndex = index;
+    MarkMenu("menuView.Show Comments", 1);
+    if(GenericPopUp(commentOptions, title, 1))
+	XtOverrideTranslations(commentOptions[0].handle, XtParseTranslationTable(commentTranslations));
+}
+
+static char *tagsText, *msgText;
+
+void NewTagsCallback(int n)
+{
+    ReplaceTags(tagsText, &gameInfo);
+}
+
+void changeTags(int n)
+{
+    Arg args[16];
+    XtSetArg(args[0], XtNstring, &tagsText);
+    XtGetValues(currentOption[0].handle, args, 1);
+    ReplaceTags(tagsText, &gameInfo);
+}
+
+Option tagsOptions[] = {
+{ 0xD, 200, 250, NULL, (void*) &tagsText, "", NULL, TextBox, "" },
+{   0,  0,    0, NULL, NULL, NULL, NULL, Label,  "" },
+{   0,  0,    0, NULL, (void*) &changeTags, NULL, NULL, Button, "save changes" },
+{   0,  1,    0, NULL, (void*) &NewTagsCallback, "", NULL, EndMark , "" }
+};
+
+void NewTagsPopup(char *text, char *msg)
+{
+    Widget edit;
+    Arg args[16];
+
+    if(shells[2]) { // if already exists, alter title and content
+	XtSetArg(args[0], XtNstring, text);
+	XtSetValues(tagsOptions[0].handle, args, 1);
+    }
+    tagsText = text;
+    tagsOptions[1].textValue = msg;
+    MarkMenu("menuView.Show Tags", 2);
+    GenericPopUp(tagsOptions, _("Tags"), 2);
+}
+
 extern char ICSInputTranslations[];
 char *icsText;
 
 Option boxOptions[] = {
-{   0, 20,  400, NULL, (void*) &icsText, "", NULL, TextBox, "" },
+{   0, 30,  400, NULL, (void*) &icsText, "", NULL, TextBox, "" },
 {   0,  3,    0, NULL, NULL, "", NULL, EndMark , "" }
 };
 
@@ -1783,6 +1923,49 @@ void InputBoxPopup()
 	XtOverrideTranslations(boxOptions[0].handle, XtParseTranslationTable(ICSInputTranslations));
 }
 
+void TypeInProc(w, event, prms, nprms)
+     Widget w;
+     XEvent *event;
+     String *prms;
+     Cardinal *nprms;
+{
+    Arg args[2];
+    String val;
+
+    if(prms[0][0] == '1') {
+	XtSetArg(args[0], XtNstring, &val);
+	XtGetValues(boxOptions[0].handle, args, 1);
+	TypeInDoneEvent((char*)val);
+    }
+    PopDown(0);
+}
+
+char moveTypeInTranslations[] =
+    "<Key>Return: TypeInProc(1) \n"
+    "<Key>Escape: TypeInProc(0) \n";
+
+void PopUpMoveDialog(char firstchar)
+{
+    static char buf[2];
+    buf[0] = firstchar; icsText = buf;
+    if(GenericPopUp(boxOptions, _("Type a move"), 0))
+	XtOverrideTranslations(boxOptions[0].handle, XtParseTranslationTable(moveTypeInTranslations));
+}
+
+void MoveTypeInProc(Widget widget, caddr_t unused, XEvent *event)
+{
+    char buf[10], keys[32];
+    KeySym sym;
+    KeyCode metaL, metaR;
+    int n = XLookupString(&(event->xkey), buf, 10, &sym, NULL);
+    XQueryKeymap(xDisplay,keys);
+    metaL = XKeysymToKeycode(xDisplay, XK_Meta_L);
+    metaR = XKeysymToKeycode(xDisplay, XK_Meta_R);
+    if ( n == 1 && *buf > 32 && !(keys[metaL>>3]&1<<(metaL&7)) && !(keys[metaR>>3]&1<<(metaR&7))) // printable, no alt
+	PopUpMoveDialog(*buf);
+
+}
+
 void
 SettingsPopUp(ChessProgramState *cps)
 {