[Emacs-diffs] /srv/bzr/emacs/trunk r102546: Draw text under filled box cursor in inverted color (Bug#7479).

[Jan D.]

------------------------------------------------------------
revno: 102546
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Thu 2010-12-02 09:24:16 +0100
message:
  Draw text under filled box cursor in inverted color (Bug#7479).
  
  * src/nsterm.m (ns_draw_glyph_string): Switch fore- and background if
  drawing text under filled box cursor.
modified:
  src/ChangeLog
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-27 20:04:57 +0000
+++ b/src/ChangeLog     2010-12-02 08:24:16 +0000
@@ -1,3 +1,8 @@
+2010-12-02  Jan Djärv  <address@hidden>
+
+       * nsterm.m (ns_draw_glyph_string): Switch fore- and background if
+       drawing text under filled box cursor (Bug#7479).
+
 2010-11-27  Kenichi Handa  <address@hidden>
 
        * charset.c (emacs_mule_charset): Make it an array of charset ID;

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2010-11-24 14:52:14 +0000
+++ b/src/nsterm.m      2010-12-02 08:24:16 +0000
@@ -2996,11 +2996,25 @@
       if (ns_tmp_font == NULL)
           ns_tmp_font = (struct nsfont_info *)FRAME_FONT (s->f);
 
+      if (s->hl == DRAW_CURSOR && s->w->phys_cursor_type == FILLED_BOX_CURSOR)
+        {
+          unsigned long tmp = NS_FACE_BACKGROUND (s->face);
+          NS_FACE_BACKGROUND (s->face) = NS_FACE_FOREGROUND (s->face);
+          NS_FACE_FOREGROUND (s->face) = tmp;
+        }
+                    
       ns_tmp_font->font.driver->draw
         (s, 0, s->nchars, s->x, s->y,
          (ns_tmp_flags == NS_DUMPGLYPH_NORMAL && !s->background_filled_p)
          || ns_tmp_flags == NS_DUMPGLYPH_MOUSEFACE);
 
+      if (s->hl == DRAW_CURSOR && s->w->phys_cursor_type == FILLED_BOX_CURSOR)
+        {
+          unsigned long tmp = NS_FACE_BACKGROUND (s->face);
+          NS_FACE_BACKGROUND (s->face) = NS_FACE_FOREGROUND (s->face);
+          NS_FACE_FOREGROUND (s->face) = tmp;
+        }
+
       ns_unfocus (s->f);
       break;