X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xaw%2Fxoptions.c;h=5feb56a169058598850403ecee8e3687856df5ee;hb=711d00943c8dc11eb3dede32695182defbb96c1f;hp=5caa95a0097b1c5774769e091131d18d9766a465;hpb=5cb748f018a80d22ef6cd98e3521c43fd98102a3;p=xboard.git

diff --git a/xaw/xoptions.c b/xaw/xoptions.c
index 5caa95a..5feb56a 100644
--- a/xaw/xoptions.c
+++ b/xaw/xoptions.c
@@ -1,7 +1,7 @@
 /*
  * xoptions.c -- Move list window, part of X front end for XBoard
  *
- * Copyright 2000, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+ * Copyright 2000, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free Software Foundation, Inc.
  * ------------------------------------------------------------------------
  *
  * GNU XBoard is free software: you can redistribute it and/or modify
@@ -181,6 +181,11 @@ SetWidgetState (Option *opt, int state)
 }
 
 void
+WidgetEcho (Option *opt, int state)
+{
+}
+
+void
 SetWidgetLabel (Option *opt, char *buf)
 {
     Arg arg;
@@ -189,6 +194,12 @@ SetWidgetLabel (Option *opt, char *buf)
 }
 
 void
+SetComboChoice (Option *opt, int n)
+{
+    SetWidgetText(opt, opt->choice[n], MasterDlg);
+}
+
+void
 SetDialogTitle (DialogClass dlg, char *title)
 {
     Arg args[16];
@@ -273,12 +284,34 @@ SetTextColor (char **cnames, int fg, int bg, int attr)
 void
 AppendColorized (Option *opt, char *message, int count)
 {
+  if(!opt->handle) return;
   AppendText(opt, message);
 }
 
 void
+ApplyFont (Option *opt, char *font)
+{ // dummy
+}
+
+void
 Show (Option *opt, int hide)
 {
+    static Dimension h;
+    Arg args[16];
+    Dimension v;
+    int j=0;
+return; // FIXME: it would be nice if the Chat window did have an ICS pane we could hide behind
+//printf("Show(%d) %x\n", hide, opt->handle);
+    if(!opt->handle) return;
+    if(hide) { // make sure original size is saved
+      XtSetArg(args[j], XtNheight, &v); j++;
+      XtGetValues(opt->handle, args, j);
+      if(v != 1) h = v;
+    }
+printf("h = %d\n",h);
+    j = 0;
+    XtSetArg(args[j], XtNheight, hide ? 1 : h); j++;
+    XtSetValues(opt->handle, args, j);
 }
 
 void
@@ -1112,9 +1145,11 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent
 	    j = SetPositionAndSize(args, last, lastrow, 3 /* border */,
 				   option[i].max /* w */, shrink ? textHeight : 0 /* h */, option[i].min & 0xE | chain /* chain */);
 	    XtSetArg(args[j], XtNlabel, _(option[i].name));  j++;
-	    if(option[i].textValue) { // special for buttons of New Variant dialog
+	    if(option[i].textValue && *option[i].textValue == '#') { // special for buttons of New Variant dialog
+		char *p = NULL, *v, n = option[i].value;
+		if(n >= 0) v = VariantName(n), p = strstr(first.variants, v);
 		XtSetArg(args[j], XtNsensitive, option[i].value >= 0 && (appData.noChessProgram
-					 || strstr(first.variants, VariantName(option[i].value)))); j++;
+					 || p && (!*v || strlen(p) == strlen(v) || p[strlen(v)] == ','))); j++;
 		XtSetArg(args[j], XtNborderWidth, (gameInfo.variant == option[i].value)+1); j++;
 	    }
 	    option[i].handle = (void*)
@@ -1124,7 +1159,7 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent
 		XtAddEventHandler(option[i-1].handle, KeyReleaseMask, False, ColorChanged, (XtPointer)(intptr_t) i-1);
 	    }
 	    XtAddCallback(last, XtNcallback, GenericCallback, (XtPointer)(intptr_t) i + (dlgNr<<16)); // invokes user callback
-	    if(option[i].textValue) SetColor( option[i].textValue, &option[i]); // for new-variant buttons
+	    if(option[i].textValue && *option[i].textValue == '#') SetColor( option[i].textValue, &option[i]); // for new-variant buttons
 	    break;
 	  case ComboBox:
 	    j = SetPositionAndSize(args, last, lastrow, 0 /* border */,
@@ -1200,6 +1235,11 @@ GenericPopUp (Option *option, char *title, DialogClass dlgNr, DialogClass parent
 				   0 /* w */, 0 /* h */, 1 /* chain (always on same row) */);
 	    forelast = lastrow;
 	    msg = _(option[i].name); // write name on the menu button
+	    if(msg) { if(*msg == '_') msg++; else if(msg[1] == '_') { // kludge to remove GTK shortkut-key indicators
+		static char buf[MSG_SIZ];
+		strncpy(buf, msg, MSG_SIZ); msg = buf + 1;
+		*msg = *buf;
+	    }}
 	    XtSetArg(args[j], XtNmenuName, XtNewString(option[i].name));  j++;
 	    XtSetArg(args[j], XtNlabel, msg);  j++;
 	    option[i].handle = (void*)