martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Check for GUI frame in ns_color_index_to_rgba"

Browse Source 
This reverts commit ea84a95bd8.
This commit is contained in:
Robert Pluim
2019-12-29 20:34:20 +01:00
parent 732dcfc850
commit 9ce4207969
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nsterm.m
View File

@@ -2290,24 +2290,19 @@ ns_lisp_to_color (Lisp_Object color, NSColor **col)
/* Convert an index into the color table into an RGBA value. Used in
xdisp.c:extend_face_to_end_of_line when comparing faces and frame
color values. No-op on non-gui frames. */
color values. */
unsigned long
ns_color_index_to_rgba(int idx, struct frame *f)
{
if (FRAME_DISPLAY_INFO (f))
{
NSColor *col;
col = ns_lookup_indexed_color (idx, f);
NSColor *col;
col = ns_lookup_indexed_color (idx, f);
EmacsCGFloat r, g, b, a;
[col getRed: &r green: &g blue: &b alpha: &a];
EmacsCGFloat r, g, b, a;
[col getRed: &r green: &g blue: &b alpha: &a];
return ARGB_TO_ULONG((int)(a*255),
(int)(r*255), (int)(g*255), (int)(b*255));
}
else
return idx;
return ARGB_TO_ULONG((int)(a*255),
(int)(r*255), (int)(g*255), (int)(b*255));
}
void