From: Jan Djärv Date: Sun, 5 Dec 2010 10:33:48 +0000 (+0100) Subject: Fix for 7412 (no cursor on image) backported from trunk. X-Git-Tag: emacs-pretest-23.2.91~23 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a56d164e67624f351b2b89a340fa212f8c5b8efd;p=emacs.git Fix for 7412 (no cursor on image) backported from trunk. * nsterm.m (ns_dumpglyphs_image): If drawing cursor, fill background with cursor color and draw a rectangle around the image. --- diff --git a/src/ChangeLog b/src/ChangeLog index 95f7039eaf7..d10b5d194a9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-12-05 Jan Djärv + + * nsterm.m (ns_dumpglyphs_image): If drawing cursor, fill background + with cursor color and draw a rectangle around the image (Bug#7412). + 2010-12-05 Chong Yidong * xdisp.c (try_scrolling): Avoid infloop if the first line is diff --git a/src/nsterm.m b/src/nsterm.m index 43e53cb30e7..38376e4eb08 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -2753,7 +2753,10 @@ ns_dumpglyphs_image (struct glyph_string *s, NSRect r) 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) @@ -2816,6 +2819,16 @@ ns_dumpglyphs_image (struct glyph_string *s, NSRect r) 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); + } }