Mercurial > emacs

comparison src/nsterm.m @ 111784:df9e4ed95f9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Jan D. <jan.h.d@swipnet.se>
date Thu, 02 Dec 2010 09:24:16 +0100
parents cb2bf4b8dd70
children 9117da225c2c
comparison
equal deleted inserted replaced
111783:850903c89a9f 111784:df9e4ed95f9b
2994 NS_DUMPGLYPH_NORMAL)); 2994 NS_DUMPGLYPH_NORMAL));
2995 ns_tmp_font = (struct nsfont_info *)s->face->font; 2995 ns_tmp_font = (struct nsfont_info *)s->face->font;
2996 if (ns_tmp_font == NULL) 2996 if (ns_tmp_font == NULL)
2997 ns_tmp_font = (struct nsfont_info *)FRAME_FONT (s->f); 2997 ns_tmp_font = (struct nsfont_info *)FRAME_FONT (s->f);
2998 2998
2999 if (s->hl == DRAW_CURSOR && s->w->phys_cursor_type == FILLED_BOX_CURSOR)
3000 {
3001 unsigned long tmp = NS_FACE_BACKGROUND (s->face);
3002 NS_FACE_BACKGROUND (s->face) = NS_FACE_FOREGROUND (s->face);
3003 NS_FACE_FOREGROUND (s->face) = tmp;
3004 }
3005
2999 ns_tmp_font->font.driver->draw 3006 ns_tmp_font->font.driver->draw
3000 (s, 0, s->nchars, s->x, s->y, 3007 (s, 0, s->nchars, s->x, s->y,
3001 (ns_tmp_flags == NS_DUMPGLYPH_NORMAL && !s->background_filled_p) 3008 (ns_tmp_flags == NS_DUMPGLYPH_NORMAL && !s->background_filled_p)
3002 || ns_tmp_flags == NS_DUMPGLYPH_MOUSEFACE); 3009 || ns_tmp_flags == NS_DUMPGLYPH_MOUSEFACE);
3010
3011 if (s->hl == DRAW_CURSOR && s->w->phys_cursor_type == FILLED_BOX_CURSOR)
3012 {
3013 unsigned long tmp = NS_FACE_BACKGROUND (s->face);
3014 NS_FACE_BACKGROUND (s->face) = NS_FACE_FOREGROUND (s->face);
3015 NS_FACE_FOREGROUND (s->face) = tmp;
3016 }
3003 3017
3004 ns_unfocus (s->f); 3018 ns_unfocus (s->f);
3005 break; 3019 break;
3006 3020
3007 case GLYPHLESS_GLYPH: 3021 case GLYPHLESS_GLYPH: