aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2009-07-15 08:25:02 +0000
committerYAMAMOTO Mitsuharu2009-07-15 08:25:02 +0000
commita185697365c96506d632c3c8359ab1367a6378d5 (patch)
tree28657b9a58e64676f31679097adbc62e8ab3e2d7 /src
parent652e5d209a60d0f63f2787588e658fb6527d540a (diff)
downloademacs-a185697365c96506d632c3c8359ab1367a6378d5.tar.gz
emacs-a185697365c96506d632c3c8359ab1367a6378d5.zip
(ns_maybe_dumpglyphs_background): Remove code for stippling, which actually
does tiling.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/nsterm.m4
2 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d1d13b32a9a..31103378691 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12009-07-15 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2
3 * nsfont.m (nsfont_draw): Remove code for stippling, which actually
4 does tiling.
5
6 * nsterm.m (ns_maybe_dumpglyphs_background): Likewise.
7
12009-07-14 Kenichi Handa <handa@m17n.org> 82009-07-14 Kenichi Handa <handa@m17n.org>
2 9
3 * font.c (font_vconcat_entity_vectors): New function. 10 * font.c (font_vconcat_entity_vectors): New function.
diff --git a/src/nsterm.m b/src/nsterm.m
index 75567de0e57..6457b88eef7 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -2758,15 +2758,19 @@ ns_maybe_dumpglyphs_background (struct glyph_string *s, char force_p)
2758 } 2758 }
2759 else 2759 else
2760 face = FACE_FROM_ID (s->f, s->first_glyph->face_id); 2760 face = FACE_FROM_ID (s->f, s->first_glyph->face_id);
2761#if 0
2761 if (!face->stipple) 2762 if (!face->stipple)
2763#endif
2762 [(NS_FACE_BACKGROUND (face) != 0 2764 [(NS_FACE_BACKGROUND (face) != 0
2763 ? ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), s->f) 2765 ? ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), s->f)
2764 : FRAME_BACKGROUND_COLOR (s->f)) set]; 2766 : FRAME_BACKGROUND_COLOR (s->f)) set];
2767#if 0 /* This is tiling, not stippling. */
2765 else 2768 else
2766 { 2769 {
2767 struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (s->f); 2770 struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (s->f);
2768 [[dpyinfo->bitmaps[face->stipple-1].img stippleMask] set]; 2771 [[dpyinfo->bitmaps[face->stipple-1].img stippleMask] set];
2769 } 2772 }
2773#endif
2770 2774
2771 if (s->hl != DRAW_CURSOR) 2775 if (s->hl != DRAW_CURSOR)
2772 { 2776 {