aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu <[email protected]>2009-08-20 09:44:06 +0000
committerYAMAMOTO Mitsuharu <[email protected]>2009-08-20 09:44:06 +0000
commitfb67c21b69ec4f4f34d5d6d1627bc1eaef208c8f (patch)
treea30cc47a120ff72fe510fcd8a14541d44bdbe565
parentfb89fad99d75c3ff3ca695864abf4446ab4487e7 (diff)
(Fxw_color_values): Return 3-element list. Doc fix.
-rw-r--r--src/nsfns.m15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/nsfns.m b/src/nsfns.m
index 9414f47d83..136ae0310c 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -2232,16 +2232,12 @@ The optional argument FRAME is currently ignored. */)
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 @@ The optional argument FRAME is currently ignored. */)
[[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)));
}