procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Draw cursor and images correctly for Nextstep (bug#7412).

Browse source 
* src/nsterm.m (ns_dumpglyphs_image): If drawing cursor, fill background
with cursor color and draw a rectangle around the image.
This commit is contained in:
Jan Djärv 2010-12-03 11:54:44 +01:00
parent babc8f0d4a
commit 146490c35d
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2010-12-03 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (ns_dumpglyphs_image): If drawing cursor, fill background
with cursor color and draw a rectangle around the image (Bug#7412).
2010-12-03 Andreas Schwab <schwab@linux-m68k.org>
* frame.c (x_set_font): Remove unused variable.

15
src/nsterm.m
View file

@ -2779,7 +2779,10 @@ Function modeled after x_draw_glyph_string_box ().
else
face = FACE_FROM_ID (s->f, s->first_glyph->face_id);
[ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), s->f) set];
if (s->hl == DRAW_CURSOR)
[FRAME_CURSOR_COLOR (s->f) set];
else
[ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), s->f) set];
if (bg_height > s->slice.height || s->img->hmargin || s->img->vmargin
|| s->img->mask || s->img->pixmap == 0 || s->width != s->background_width)
@ -2842,6 +2845,16 @@ Function modeled after x_draw_glyph_string_box ().
s->slice.x == 0,
s->slice.x + s->slice.width == s->img->width, s);
}
/* If there is no mask, the background won't be seen,
so draw a rectangle on the image for the cursor.
Do this for all images, getting trancparency right is not reliable. */
if (s->hl == DRAW_CURSOR)
{
int thickness = abs (s->img->relief);
if (thickness == 0) thickness = 1;
ns_draw_box (br, thickness, FRAME_CURSOR_COLOR (s->f), 1, 1);
}
}