projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://ftp.nluug.nl/pub/os/Linux/distr/pardusrepo/sources/xscreensaver-5.02.tar.gz
[xscreensaver]
/
utils
/
visual.c
diff --git
a/utils/visual.c
b/utils/visual.c
index c9f5f27817e3192c7b59c6ec6cbd4c5f42f62393..7c89f5a0c7a55bcdcbc3b70aed3d56c9afab2aab 100644
(file)
--- a/
utils/visual.c
+++ b/
utils/visual.c
@@
-1,4
+1,6
@@
-/* xscreensaver, Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+/* xscreensaver, Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2003, 2006
+ *
+ *
* by Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* by Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@
-77,7
+79,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 (!strcmp (v, "greyscale")) vclass = GrayScale;
else if (!strcmp (v, "pseudocolor")) vclass = PseudoColor;
else if (!strcmp (v, "directcolor")) vclass = DirectColor;
- else if (1 == sscanf (v, " %l
d
%c", &id, &c)) vclass = SPECIFIC_VISUAL;
+ else if (1 == sscanf (v, " %l
u
%c", &id, &c)) vclass = SPECIFIC_VISUAL;
else if (1 == sscanf (v, " 0x%lx %c", &id, &c)) vclass = SPECIFIC_VISUAL;
else
{
else if (1 == sscanf (v, " 0x%lx %c", &id, &c)) vclass = SPECIFIC_VISUAL;
else
{
@@
-160,7
+162,7
@@
Visual *
get_visual_resource (Screen *screen, char *name, char *class,
Bool prefer_writable_cells)
{
get_visual_resource (Screen *screen, char *name, char *class,
Bool prefer_writable_cells)
{
- char *string = get_string_resource (name, class);
+ char *string = get_string_resource (
DisplayOfScreen (screen),
name, class);
Visual *v = get_visual (screen, string, prefer_writable_cells, True);
if (string)
free(string);
Visual *v = get_visual (screen, string, prefer_writable_cells, True);
if (string)
free(string);
@@
-429,13
+431,12
@@
has_writable_cells (Screen *screen, Visual *visual)
{
case GrayScale: /* Mappable grays. */
case PseudoColor: /* Mappable colors. */
{
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. */
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();
return False;
default:
abort();