Index: xc/ChangeLog =================================================================== RCS file: /cvs/xorg/xc/ChangeLog,v retrieving revision 1.15 diff -u -r1.15 ChangeLog --- a/xc/ChangeLog 4 May 2004 22:58:59 -0000 1.15 +++ b/xc/ChangeLog 5 May 2004 01:38:26 -0000 @@ -1,4 +1,10 @@ 2004-05-04 Roland Mainz + * xc/programs/xset/Imakefile + * xc/programs/xset/xset.c + BugZilla #597: "xset" should have an option to rehash + the list of available printers + +2004-05-04 Roland Mainz * xc/config/cf/X11.tmpl * xc/config/cf/xf86site.def * xc/config/cf/xfree86.cf Index: xc/programs/xset/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/xset/Imakefile,v retrieving revision 1.2 diff -u -r1.2 Imakefile --- a/xc/programs/xset/Imakefile 23 Apr 2004 19:55:04 -0000 1.2 +++ b/xc/programs/xset/Imakefile 5 May 2004 01:38:46 -0000 @@ -9,7 +9,7 @@ FontCacheExtensionDefines \ XkbDefines DEPLIBS = $(DEPXMUULIB) $(DEPXLIB) $(DEPXF86LIBS) $(DEPFONTLIBS) -LOCAL_LIBRARIES = $(XMUULIB) $(XF86LIBS) $(FONTLIBS) $(XLIB) +LOCAL_LIBRARIES = $(XMUULIB) $(XF86LIBS) $(FONTLIBS) $(XPLIB) $(XLIB) #if BuildXF86MiscLibrary DEPXF86LIBS = $(DEPXXF86MISCLIB) Index: xc/programs/xset/xset.c =================================================================== RCS file: /cvs/xorg/xc/programs/xset/xset.c,v retrieving revision 1.2 diff -u -r1.2 xset.c --- a/xc/programs/xset/xset.c 23 Apr 2004 19:55:04 -0000 1.2 +++ b/xc/programs/xset/xset.c 5 May 2004 01:38:46 -0000 @@ -88,6 +88,7 @@ static Status set_font_cache(Display *, long, long, long); static void query_cache_status(Display *dpy); #endif +#include #define ON 1 #define OFF 0 @@ -353,6 +354,14 @@ } } #endif + 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"); + } + } else if (strcmp(arg, "fp") == 0) { /* set font path */ if (i >= argc) { arg = "default"; @@ -1500,6 +1509,8 @@ fprintf (stderr, " Show font cache statistics:\n"); fprintf (stderr, "\t fc s\n"); #endif + fprintf (stderr, " To control Xprint features:\n"); + fprintf (stderr, "\t rehashprinterlist\n"); fprintf (stderr, " To set the font path:\n" ); fprintf (stderr, "\t fp= path[,path...]\n" ); fprintf (stderr, " To restore the default font path:\n");