[Emacs-diffs] /srv/bzr/emacs/trunk r110613: * nsfont.m (nsfont_open, ns_glyph_metrics): Force integer advancement

[Jan D.]

------------------------------------------------------------
revno: 110613
fixes bug: http://debbugs.gnu.org/11484
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2012-10-21 20:48:11 +0200
message:
  * nsfont.m (nsfont_open, ns_glyph_metrics): Force integer advancement
  for screen font.
  (nsfont_draw): Turn off LCD-smoothing.
modified:
  src/ChangeLog
  src/nsfont.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-21 14:53:28 +0000
+++ b/src/ChangeLog     2012-10-21 18:48:11 +0000
@@ -1,5 +1,9 @@
 2012-10-21  Jan Djärv  <address@hidden>
 
+       * nsfont.m (nsfont_open, ns_glyph_metrics): Force integer advancement
+       for screen font.
+       (nsfont_draw): Turn off LCD-smoothing (Bug#11484).
+
        * xterm.c (x_focus_changed): Check if daemonp when sending focus in
        event (Bug#12681).
 

=== modified file 'src/nsfont.m'
--- a/src/nsfont.m      2012-10-12 10:01:05 +0000
+++ b/src/nsfont.m      2012-10-21 18:48:11 +0000
@@ -797,7 +797,13 @@
   block_input ();
 
   /* for metrics */
+#ifdef NS_IMPL_COCOA
+  sfont = [nsfont screenFontWithRenderingMode:
+                    NSFontAntialiasedIntegerAdvancementsRenderingMode];
+#else
   sfont = [nsfont screenFont];
+#endif
+
   if (sfont == nil)
     sfont = nsfont;
 
@@ -1229,6 +1235,7 @@
     else
       CGContextSetShouldAntialias (gcontext, 1);
 
+    CGContextSetShouldSmoothFonts (gcontext, NO);
     CGContextSetTextMatrix (gcontext, fliptf);
 
     if (bgCol != nil)
@@ -1372,7 +1379,12 @@
 #endif
 
   block_input ();
- sfont = [font_info->nsfont screenFont];
+#ifdef NS_IMPL_COCOA
+  sfont = [font_info->nsfont screenFontWithRenderingMode:
+                      NSFontAntialiasedIntegerAdvancementsRenderingMode];
+#else
+  sfont = [font_info->nsfont screenFont];
+#endif
 
   font_info->metrics[block] = xzalloc (0x100 * sizeof (struct font_metrics));
   if (!(font_info->metrics[block]))