Commit fb67c21b authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu
Browse files

(Fxw_color_values): Return 3-element list. Doc fix.

parent fb89fad9
......@@ -2232,16 +2232,12 @@ and GNUstep implementations ("distributor-specific release
DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0,
doc: /* Return a description of the color named COLOR.
The value is a list of integer RGBA values--(RED GREEN BLUE ALPHA).
These values appear to range from 0 to 65280; white is (65280 65280 65280 0).
The optional argument FRAME is currently ignored. */)
doc: /* Internal function called by `color-values', which see. */)
(color, frame)
Lisp_Object color, frame;
{
NSColor * col;
float red, green, blue, alpha;
Lisp_Object rgba[4];
check_ns ();
CHECK_STRING (color);
......@@ -2251,12 +2247,9 @@ and GNUstep implementations ("distributor-specific release
[[col colorUsingColorSpaceName: NSCalibratedRGBColorSpace]
getRed: &red green: &green blue: &blue alpha: &alpha];
rgba[0] = make_number (lrint (red*65280));
rgba[1] = make_number (lrint (green*65280));
rgba[2] = make_number (lrint (blue*65280));
rgba[3] = make_number (lrint (alpha*65280));
return Flist (4, rgba);
return list3 (make_number (lrint (red*65280)),
make_number (lrint (green*65280)),
make_number (lrint (blue*65280)));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment