X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=utils%2Fvisual.c;h=993db5aa4746f0c1d6f6aa7815a33d77ac863829;hp=c83643601773299068623af60775a641a513c36a;hb=481b95e2617b69e6fd4444432747d7e1e0c3dc85;hpb=0bd2eabab3e404c6769fe8f59b639275e960c415

diff --git a/utils/visual.c b/utils/visual.c
index c8364360..993db5aa 100644
--- a/utils/visual.c
+++ b/utils/visual.c
@@ -373,8 +373,9 @@ has_writable_cells (Screen *screen, Visual *visual)
 }
 
 void
-describe_visual (FILE *f, Screen *screen, Visual *visual)
+describe_visual (FILE *f, Screen *screen, Visual *visual, Bool private_cmap_p)
 {
+  char n[10];
   Display *dpy = DisplayOfScreen (screen);
   XVisualInfo vi_in, *vi_out;
   int out_count;
@@ -383,7 +384,12 @@ describe_visual (FILE *f, Screen *screen, Visual *visual)
   vi_out = XGetVisualInfo (dpy, (VisualScreenMask | VisualIDMask),
 			   &vi_in, &out_count);
   if (! vi_out) abort ();
-  fprintf (f, "0x%02x (%s depth: %2d, cmap: %3d)\n",
+  if (private_cmap_p)
+    sprintf(n, "%3d", vi_out->colormap_size);
+  else
+    strcpy(n, "default");
+
+  fprintf (f, "0x%02x (%s depth: %2d, cmap: %s)\n",
 	   (unsigned int) vi_out->visualid,
 	   (vi_out->class == StaticGray  ? "StaticGray, " :
 	    vi_out->class == StaticColor ? "StaticColor," :
@@ -392,7 +398,7 @@ describe_visual (FILE *f, Screen *screen, Visual *visual)
 	    vi_out->class == PseudoColor ? "PseudoColor," :
 	    vi_out->class == DirectColor ? "DirectColor," :
 					   "UNKNOWN:    "),
-	   vi_out->depth, vi_out->colormap_size /*, vi_out->bits_per_rgb*/);
+	   vi_out->depth, n);
   XFree ((char *) vi_out);
 }