andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check for GUI frame in ns_color_index_to_rgba

Browse source 
* nsterm.m (ns_color_index_to_rgba): Check that we're using a GUI
frame before converting color (Bug#38564).
This commit is contained in:
Robert Pluim 2019-12-11 11:21:22 +01:00
parent 8aaa92a4b6
commit ea84a95bd8
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/nsterm.m
View file

@ -2290,19 +2290,24 @@ 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. */
color values. No-op on non-gui frames. */
unsigned long
ns_color_index_to_rgba(int idx, struct frame *f)
{
NSColor *col;
col = ns_lookup_indexed_color (idx, f);
if (FRAME_DISPLAY_INFO (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));
return ARGB_TO_ULONG((int)(a*255),
(int)(r*255), (int)(g*255), (int)(b*255));
}
else
return idx;
}
void