Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGE

2 files changed, 29 insertions, 6 deletions

diff --git a/xset.c b/xset.c
index 27c3914..c2c4ab3 100644
--- a/xset.c
+++ b/xset.c
@@ -88,6 +88,9 @@ in this Software without prior written authorization from The Open Group.
 static Status set_font_cache(Display *, long, long, long);
 static void query_cache_status(Display *dpy);
 #endif
+#ifdef INCLUDE_XPRINT_SUPPORT
+#include <X11/extensions/Print.h>
+#endif
 
 #define ON 1
 #define OFF 0
@@ -353,6 +356,16 @@ for (i = 1; i < argc; ) {
       }
   }
 #endif
+#ifdef INCLUDE_XPRINT_SUPPORT
+  else if (strcmp(arg, "rehashprinterlist") == 0) { /* rehash list of printers */
+      short dummy;
+      if (XpQueryVersion(dpy, &dummy, &dummy)) {
+          XpRehashPrinterList(dpy);
+      } else {
+          fprintf(stderr, "server does not have extension for rehashprinterlist option\n");
+      }
+  }
+#endif
   else if (strcmp(arg, "fp") == 0) {	       /* set font path */
     if (i >= argc) {
 	arg = "default";
@@ -1500,6 +1513,10 @@ usage(char *fmt, ...)
     fprintf (stderr, "    Show font cache statistics:\n");
     fprintf (stderr, "\t fc s\n");
 #endif
+#ifdef INCLUDE_XPRINT_SUPPORT
+    fprintf (stderr, "    To control Xprint features:\n");
+    fprintf (stderr, "\t rehashprinterlist      Recomputes the list of available printers\n");
+#endif
     fprintf (stderr, "    To set the font path:\n" );
     fprintf (stderr, "\t fp= path[,path...]\n" );
     fprintf (stderr, "    To restore the default font path:\n");
diff --git a/xset.man b/xset.man
index 86466c3..9c204aa 100644
--- a/xset.man
+++ b/xset.man
@@ -189,12 +189,16 @@ or an error will result.
 .TP 8
 .B r
 The \fBr\fP option controls the autorepeat.
-If a preceding dash or the 'off' flag is used, autorepeat will be disabled.
-If no parameters or the 'on' flag is used, autorepeat will be enabled.
-If a specific keycode is specified as a parameter, autorepeat for that
-keycode is enabled or disabled.
-If the server supports the XFree86-Misc extension,
-or the XKB extension, then a parameter
+Invoking with "\fB-r\fP", or "\fBr\ off\fP", will disable autorepeat, whereas
+"\fBr\fP", or "\fBr\ on\fP" will enable autorepeat.
+Following the "\fB-r\fP" or "\fBr\fP" option with an integer keycode between 0 and
+255 will disable or enable autorepeat on that key respectively, but only
+if it makes sense for the particular keycode.  Keycodes below 8 are
+not typically valid for this command.  Example: "\fBxset\ -r\ 10\fP" will
+disable autorepeat for the "1" key on the top row of an IBM PC keyboard.
+
+If the server supports the XFree86-Misc extension, or the XKB extension, 
+then a parameter
 of 'rate' is accepted and should be followed by zero, one or two numeric
 values. The first specifies the delay before autorepeat starts and
 the second specifies the repeat rate.  In the case that the server
@@ -247,3 +251,5 @@ Bob Scheifler, MIT Laboratory for Computer Science
 David Krikorian, MIT Project Athena (X11 version)
 .br
 XFree86-Misc support added by David Dawes and Joe Moss
+.br
+Manpage updates added by Mike A. Harris <mharris@redhat.com>