X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utils%2Fvisual.c;h=8bb97646c2b14dd57394c26bf45b68db90358007;hb=6a1da724858673ac40aa13a9612340d8bed8c7b9;hp=c9f5f27817e3192c7b59c6ec6cbd4c5f42f62393;hpb=c28aecf9fc41e3a03494bacf7279745425e2fa18;p=xscreensaver

diff --git a/utils/visual.c b/utils/visual.c
index c9f5f278..8bb97646 100644
--- a/utils/visual.c
+++ b/utils/visual.c
@@ -1,4 +1,5 @@
-/* xscreensaver, Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+/* xscreensaver, Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2003
+ * 
  *  by Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -77,7 +78,7 @@ get_visual (Screen *screen, const char *string, Bool prefer_writable_cells,
   else if (!strcmp (v, "greyscale"))		  vclass = GrayScale;
   else if (!strcmp (v, "pseudocolor"))		  vclass = PseudoColor;
   else if (!strcmp (v, "directcolor"))		  vclass = DirectColor;
-  else if (1 == sscanf (v, " %ld %c", &id, &c))	  vclass = SPECIFIC_VISUAL;
+  else if (1 == sscanf (v, " %lu %c", &id, &c))	  vclass = SPECIFIC_VISUAL;
   else if (1 == sscanf (v, " 0x%lx %c", &id, &c)) vclass = SPECIFIC_VISUAL;
   else
     {
@@ -429,13 +430,12 @@ has_writable_cells (Screen *screen, Visual *visual)
     {
     case GrayScale:	/* Mappable grays. */
     case PseudoColor:	/* Mappable colors. */
+    case DirectColor:	/* Like TrueColor, but with three colormaps:
+                           one each for red, green, and blue. */
       return True;
     case StaticGray:	/* Fixed grays. */
     case TrueColor:	/* Fixed colors. */
-    case StaticColor:	/* (What's the difference again?) */
-    case DirectColor:	/* DirectColor visuals are like TrueColor, but have
-			   three colormaps - one for each component of RGB.
-			   Screw it. */
+    case StaticColor:	/* Like PseudoColor with an unmodifiable colormap. */
       return False;
     default:
       abort();