X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xoptions.c;h=fd61145e26b01a010dd86b99792db2c00fa46c20;hb=4f14696c5aa9a10817022fcb4cbaa857e40a176b;hp=78bd9d73bb9d6876e9d8a3d631d6f7894e6b93c1;hpb=c90dc392ef0e30c7fd481ee47bd9a39aafebcdf4;p=xboard.git

diff --git a/xoptions.c b/xoptions.c
index 78bd9d7..fd61145 100644
--- a/xoptions.c
+++ b/xoptions.c
@@ -88,6 +88,7 @@ void SetFocus(Widget w, XtPointer data, XEvent *event, Boolean *b)
 {
     Arg args[2];
     char *s;
+    int j;
 
     if(previous) {
 	XtSetArg(args[0], XtNdisplayCaret, False);
@@ -95,9 +96,10 @@ void SetFocus(Widget w, XtPointer data, XEvent *event, Boolean *b)
     }
     XtSetArg(args[0], XtNstring, &s);
     XtGetValues(w, args, 1);
+    j = 1;
     XtSetArg(args[0], XtNdisplayCaret, True);
-    XtSetArg(args[1], XtNinsertPosition, strlen(s));
-    XtSetValues(w, args, 2);
+    if(!strchr(s, '\n')) XtSetArg(args[1], XtNinsertPosition, strlen(s)), j++;
+    XtSetValues(w, args, j);
     XtSetKeyboardFocus((Widget) data, w);
     previous = w;
 }
@@ -1517,7 +1519,7 @@ GenericPopUp(Option *option, char *title, int dlgNr)
 	    XtSetArg(args[j], XtNlabel, _(option[i].name));  j++;
 	    if(option[i].min & 1) { XtSetArg(args[j], XtNfromHoriz, last);  j++; }
 	    else  { XtSetArg(args[j], XtNfromHoriz, NULL);  j++; lastrow = forelast; }
-	    if(option[i].max) XtSetArg(args[j], XtNwidth, option[i].max);  j++;
+	    if(option[i].max) { XtSetArg(args[j], XtNwidth, option[i].max);  j++; }
 	    if(option[i].textValue) { // special for buttons of New Variant dialog
 		XtSetArg(args[j], XtNsensitive, appData.noChessProgram || option[i].value < 0
 					 || strstr(first.variants, VariantName(option[i].value))); j++;
@@ -1905,6 +1907,7 @@ void changeTags(int n)
     Arg args[16];
     XtSetArg(args[0], XtNstring, &tagsText);
     XtGetValues(currentOption[1].handle, args, 1);
+    if(bookUp) SaveToBook(tagsText); else
     ReplaceTags(tagsText, &gameInfo);
 }
 
@@ -1919,15 +1922,18 @@ void NewTagsPopup(char *text, char *msg)
 {
     Widget edit;
     Arg args[16];
+    char *title = bookUp ? _("Edit book") : _("Tags");
 
     if(shells[2]) { // if already exists, alter title and content
 	XtSetArg(args[0], XtNstring, text);
 	XtSetValues(tagsOptions[1].handle, args, 1);
+	XtSetArg(args[0], XtNtitle, title);
+	XtSetValues(shells[2], args, 1);
     }
     if(tagsText) free(tagsText); tagsText = strdup(text);
     tagsOptions[0].textValue = msg;
     MarkMenu("menuView.Show Tags", 2);
-    GenericPopUp(tagsOptions, _("Tags"), 2);
+    GenericPopUp(tagsOptions, title, 2);
 }
 
 char *icsText;
@@ -2061,7 +2067,7 @@ void LoadEngineProc(w, event, prms, nprms)
      String *prms;
      Cardinal *nprms;
 {
-   isUCI = addToList = storeVariant = v1 = useNick = False; hasBook = True; // defaults
+   isUCI = storeVariant = v1 = useNick = False; addToList = hasBook = True; // defaults
    if(engineChoice) free(engineChoice); engineChoice = strdup(engineNr[0]);
    if(engineLine)   free(engineLine);   engineLine = strdup("");
    if(engineDir)    free(engineDir);    engineDir = strdup("");
@@ -2071,6 +2077,15 @@ void LoadEngineProc(w, event, prms, nprms)
    GenericPopUp(installOptions, _("Load engine"), 0);
 }
 
+void EditBookProc(w, event, prms, nprms)
+     Widget w;
+     XEvent *event;
+     String *prms;
+     Cardinal *nprms;
+{
+    EditBookEvent();
+}
+
 //---------------------------- Chat Windows ----------------------------------------------
 
 void OutputChatMessage(int partner, char *mess)