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 95f7039eaf765fd9ca5b9d5cbb86fa8b78532e54..d10b5d194a91e9b4783f36183c34618bbd33ffc0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-05  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-05  Chong Yidong  <cyd@stupidchicken.com>
 
        * xdisp.c (try_scrolling): Avoid infloop if the first line is

diff --git a/src/nsterm.m b/src/nsterm.m
index 43e53cb30e7c13c71b8ca56e84d486b60c317e9d..38376e4eb0889408bafd15d37e41a1fc9bd62878 100644 (file)
--- 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);
+    }
 }