(Fx_display_grayscale_p): Return t or nil.

Return t for color displays.
This commit is contained in:
Richard M. Stallman 1995-06-21 18:44:42 +00:00
parent a18042d782
commit ae6b58f9d4

View file

@ -3416,6 +3416,7 @@ If omitted or nil, that stands for the selected frame's display.")
DEFUN ("x-display-grayscale-p", Fx_display_grayscale_p, Sx_display_grayscale_p, DEFUN ("x-display-grayscale-p", Fx_display_grayscale_p, Sx_display_grayscale_p,
0, 1, 0, 0, 1, 0,
"Return t if the X display supports shades of gray.\n\ "Return t if the X display supports shades of gray.\n\
Note that color displays do support shades of gray.\n\
The optional argument DISPLAY specifies which display to ask about.\n\ The optional argument DISPLAY specifies which display to ask about.\n\
DISPLAY should be either a frame or a display name (a string).\n\ DISPLAY should be either a frame or a display name (a string).\n\
If omitted or nil, that stands for the selected frame's display.") If omitted or nil, that stands for the selected frame's display.")
@ -3424,12 +3425,22 @@ If omitted or nil, that stands for the selected frame's display.")
{ {
struct x_display_info *dpyinfo = check_x_display_info (display); struct x_display_info *dpyinfo = check_x_display_info (display);
if (dpyinfo->n_planes <= 2) if (dpyinfo->n_planes <= 1)
return Qnil; return Qnil;
return (dpyinfo->n_planes > 1 switch (dpyinfo->visual->class)
&& (dpyinfo->visual->class == StaticGray {
|| dpyinfo->visual->class == GrayScale)); case StaticColor:
case PseudoColor:
case TrueColor:
case DirectColor:
case StaticGray:
case GrayScale:
return Qt;
default:
return Qnil;
}
} }
DEFUN ("x-display-pixel-width", Fx_display_pixel_width, Sx_display_pixel_width, DEFUN ("x-display-pixel-width", Fx_display_pixel_width, Sx_display_pixel_width,