Commit e2a57b34 authored by Miles Bader's avatar Miles Bader
Browse files

(x_setup_relief_colors): Use `IMAGE_BACKGROUND' and

`IMAGE_BACKGROUND_TRANSPARENT' to calculate the correct background color
to use for image glyph reliefs.
parent f20a3b7a
2001-10-25 Miles Bader <miles@gnu.org>
* dispextern.h (struct image): Add `background',
`background_valid', and `background_transparent' fields.
(image_background, image_background_transparent): New declarations.
(IMAGE_BACKGROUND, IMAGE_BACKGROUND_TRANSPARENT): New macros.
* xfns.c (image_background, image_background_transparent)
(four_corners_best): New functions.
(xpm_format, png_format, jpeg_format, tiff_format, gif_format)
(gs_format): Add `:background' entry.
(lookup_image): Set IMG's background color if specified.
(pbm_load, xbm_load_image, png_load): Set IMG's background field
when appropriate.
(x_clear_image_1): Reset `background_valid' and
`background_transparent_valid' fields.
(x_build_heuristic_mask): Use IMAGE_BACKGROUND instead of
calculating it here. Set IMG's background_transparent field.
(enum xpm_keyword_index): Add XPM_BACKGROUND.
(enum png_keyword_index): Add PNG_BACKGROUND.
(enum jpeg_keyword_index): Add JPEG_BACKGROUND.
(enum tiff_keyword_index): Add TIFF_BACKGROUND.
(enum gif_keyword_index): Add GIF_BACKGROUND.
(enum gs_keyword_index): Add GS_BACKGROUND.
(pbm_load, png_load, jpeg_load, tiff_load, gif_load):
Pre-calculate image background color where necessary.
* xterm.c (x_setup_relief_colors): Use `IMAGE_BACKGROUND' and
`IMAGE_BACKGROUND_TRANSPARENT' to calculate the correct background
color to use for image glyph reliefs.
2001-10-24 Gerd Moellmann <gerd@gnu.org>
* xterm.c (x_draw_glyphs): Don't check for cursor overwriting
......
......@@ -3823,6 +3823,9 @@ x_setup_relief_colors (s)
if (s->face->use_box_color_for_shadows_p)
color = s->face->box_color;
else if (s->first_glyph->type == IMAGE_GLYPH
&& !IMAGE_BACKGROUND_TRANSPARENT (s->img, s->f, 0))
color = IMAGE_BACKGROUND (s->img, s->f, 0);
else
{
XGCValues xgcv;
......
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