bug#6303: 23.2; Win32 Antialiased fonts

bug#6303: 23.2; Win32 Antialiased fonts

[Damyan Pepper]

I'm having trouble getting antialiased fonts to work correctly in
emacs 23.2, to the extent that it appears that it doesn't actually
support antialised fonts.

If I do the following in emacs 23.1:

(set-face-font 'default "DejaVu Sans Mono-9.0:antialias=subpixel")
(describe-font nil)

Then this reports the full name as "DejaVu Sans
Mono-9.0:antialias=subpixel", and the font looks nice and smooth.

However, doing the same thing in emacs 23.2 gives the full name as
"DejaVu Sans Mono-9.0" and the font looks nasty and chunky.

Using bzr bisect I've narrowed this down to revision 98629 - "Handle
system default font and changing font parameters".  This seems to add
some new code for dealing with font changes.  It looks like the
'antialias' argument is now recognised on non-win32 systems and so
this may have inadvertently changed the way it behaves under windows.

In GNU Emacs 23.2.1 (i386-mingw-nt5.2.3790)
 of 2010-05-08 on G41R2F1
Windowing system distributor `Microsoft Corp.', version 5.2.3790
configured using `configure --with-gcc (3.4) --no-opt --cflags -Ic:/xpm/include'

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: nil
  value of $LC_CTYPE: nil
  value of $LC_MESSAGES: nil
  value of $LC_MONETARY: nil
  value of $LC_NUMERIC: nil
  value of $LC_TIME: nil
  value of $LANG: ENG
  value of $XMODIFIERS: nil
  locale-coding-system: cp1252
  default enable-multibyte-characters: t

Major mode: Fundamental

Minor modes in effect:
  tooltip-mode: t
  mouse-wheel-mode: t
  tool-bar-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  blink-cursor-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  line-number-mode: t
  transient-mark-mode: t

Recent input:
<help-echo> <help-echo> <help-echo> <help-echo> <help-echo>
<help-echo> <help-echo> M-x r e p o r t <tab> <ret
urn>

Recent messages:
For information about GNU Emacs and the GNU system, type C-h C-a.

Load-path shadows:
None found.

Features:
(shadow sort mail-extr message ecomplete rfc822 mml easymenu mml-sec
password-cache mm-decode mm-bodies mm-encode mailcap mail-parse rfc2231
rfc2047 rfc2045 qp ietf-drums mailabbrev nnheader gnus-util netrc
time-date mm-util mail-prsvr gmm-utils wid-edit mailheader canlock sha1
hex-util hashcash mail-utils emacsbug tooltip ediff-hook vc-hooks
lisp-float-type mwheel dos-w32 disp-table ls-lisp w32-win w32-vars
tool-bar dnd fontset image fringe lisp-mode register page menu-bar
rfn-eshadow timer select scroll-bar mldrag mouse jit-lock font-lock
syntax facemenu font-core frame cham georgian utf-8-lang misc-lang
vietnamese tibetan thai tai-viet lao korean japanese hebrew greek
romanian slovak czech european ethiopic indian cyrillic chinese
case-table epa-hook jka-cmpr-hook help simple abbrev loaddefs button
minibuffer faces cus-face files text-properties overlay md5 base64
format env code-pages mule custom widget hashtable-print-readable
backquote make-network-process multi-tty emacs)

bug#6303: Acknowledgement (23.2; Win32 Antialiased fonts)

[Damyan Pepper]

Damyan Pepper <damyanp@gmail.com> writes:

> I'm having trouble getting antialiased fonts to work correctly in
> emacs 23.2, to the extent that it appears that it doesn't actually
> support antialised fonts.

The problem here seems to be that the w32 font driver doesn't have a
filter_properties function.

I'm putting together a patch now to give it one - as far as I can tell
this needs to be done to get the :script and :antialias properties to
work.

bug#6303: Acknowledgement (23.2; Win32 Antialiased fonts)

[Damyan Pepper]

[-- Attachment #1: Type: text/plain, Size: 53 bytes --]

Attached is a bzr bundle that should fix this issue.

[-- Attachment #2: bugfix_6303.txt --]
[-- Type: text/plain, Size: 5048 bytes --]

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dpepper@sw-gbbr-brsd015-20100603115304-efdx2p1rxkr33nrw
# target_branch: http://bzr.savannah.gnu.org/r/emacs/trunk/
# testament_sha1: 10916b73a779dc2471a1329e7952048079784c8e
# timestamp: 2010-06-03 12:53:47 +0100
# base_revision_id: rgm@gnu.org-20100603055711-es6101poicnt5vec
# 
# Begin patch
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-06-03 05:50:48 +0000
+++ src/ChangeLog	2010-06-03 11:53:04 +0000
@@ -1,3 +1,7 @@
+2010-06-03  Damyan Pepper  <damyanp@gmail.com>
+
+	* w32font.c (w32font_filter_properties): New function.
+
 2010-06-03  Glenn Morris  <rgm@gnu.org>
 
 	* m/template.h (NO_SOCK_SIGIO): Remove, no longer used.

=== modified file 'src/w32font.c'
--- src/w32font.c	2010-01-13 08:35:10 +0000
+++ src/w32font.c	2010-06-03 11:53:04 +0000
@@ -2446,6 +2446,59 @@
   return DECODE_SYSTEM (build_string (buf));
 }
 
+static const char *w32font_booleans [] = {
+  NULL,
+};
+
+static const char *w32font_non_booleans [] = {
+  ":script",
+  ":antialias",
+  NULL,
+};
+
+static void
+w32font_filter_properties (font, alist)
+    Lisp_Object font;
+    Lisp_Object alist;
+{
+  Lisp_Object it;
+  int i;
+  
+  /* Set boolean values to Qt or Qnil */
+  for (i = 0; w32font_booleans[i] != NULL; ++i)
+    for (it = alist; ! NILP (it); it = XCDR (it))
+      {
+        Lisp_Object key = XCAR (XCAR (it));
+        Lisp_Object val = XCDR (XCAR (it));
+        char *keystr = SDATA (SYMBOL_NAME (key));
+
+        if (strcmp (w32font_booleans[i], keystr) == 0)
+          {
+            char *str = SYMBOLP (val) ? SDATA (SYMBOL_NAME (val)) : NULL;
+            if (INTEGERP (val)) str = XINT (val) != 0 ? "true" : "false";
+            if (str == NULL) str = "true";
+
+            val = Qt;
+            if (strcmp ("false", str) == 0 || strcmp ("False", str) == 0
+                || strcmp ("FALSE", str) == 0 || strcmp ("FcFalse", str) == 0
+                || strcmp ("off", str) == 0 || strcmp ("OFF", str) == 0
+                || strcmp ("Off", str) == 0)
+              val = Qnil;
+            Ffont_put (font, key, val);
+          }
+      }
+
+  for (i = 0; w32font_non_booleans[i] != NULL; ++i)
+    for (it = alist; ! NILP (it); it = XCDR (it))
+      {
+        Lisp_Object key = XCAR (XCAR (it));
+        Lisp_Object val = XCDR (XCAR (it));
+        char *keystr = SDATA (SYMBOL_NAME (key));
+        if (strcmp (w32font_non_booleans[i], keystr) == 0)
+          Ffont_put (font, key, val);
+      }
+}
+
 struct font_driver w32font_driver =
   {
     0, /* Qgdi */
@@ -2475,7 +2528,7 @@
     NULL, /* shape */
     NULL, /* check */
     NULL, /* get_variation_glyphs */
-    NULL, /* filter_properties */
+    w32font_filter_properties,
   };
 
 

# Begin bundle
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

bug#6303: Acknowledgement (23.2; Win32 Antialiased fonts)

[Damyan Pepper]

On Thu, Jun 3, 2010 at 12:56 PM, Damyan Pepper <damyanp@gmail.com> wrote:
> Attached is a bzr bundle that should fix this issue.
>

Is there anything I need to do to get this committed, or should I just
wait until someone gets round to it?

bug#6303: Acknowledgement (23.2; Win32 Antialiased fonts)

[Juanma Barranquero]

On Tue, Jun 29, 2010 at 10:24, Damyan Pepper <damyanp@gmail.com> wrote:

> Is there anything I need to do to get this committed, or should I just
> wait until someone gets round to it?

Could you provide an example of an antialiased font that works better
with your patch? (Just to see the difference).

Also, your contribution is long enought that it would likely require
for you to sign papers. Have you done so?

Another thing. This bit:

           char *str = SYMBOLP (val) ? SDATA (SYMBOL_NAME (val)) : NULL;
           if (INTEGERP (val)) str = XINT (val) != 0 ? "true" : "false";
           if (str == NULL) str = "true";

would perhaps be clearer as

	    char *str;

	    if (INTEGERP (val))
	      str = XINT (val) ? "true" : "false";
	    else if (SYMBOLP (val))
	      str = SDATA (SYMBOL_NAME (val));
	    else
	      str = "true";

don't you agree?

    Juanma

bug#6303: Acknowledgement (23.2; Win32 Antialiased fonts)

[Juanma Barranquero]

On Tue, Jun 29, 2010 at 11:03, Juanma Barranquero <lekktu@gmail.com> wrote:

> Could you provide an example of an antialiased font that works better
> with your patch? (Just to see the difference).

Excuse the noise, I see that you already did that on the original report.

    Juanma

bug#6303: Acknowledgement (23.2; Win32 Antialiased fonts)

[Damyan Pepper]

On Tue, Jun 29, 2010 at 10:03 AM, Juanma Barranquero <lekktu@gmail.com> wrote:

Thanks for having a look at this.


> Also, your contribution is long enought that it would likely require
> for you to sign papers. Have you done so?

I haven't.


> Another thing. This bit:
>
>           char *str = SYMBOLP (val) ? SDATA (SYMBOL_NAME (val)) : NULL;
>           if (INTEGERP (val)) str = XINT (val) != 0 ? "true" : "false";
>           if (str == NULL) str = "true";
>
> would perhaps be clearer as
>
>            char *str;
>
>            if (INTEGERP (val))
>              str = XINT (val) ? "true" : "false";
>            else if (SYMBOLP (val))
>              str = SDATA (SYMBOL_NAME (val));
>            else
>              str = "true";
>
> don't you agree?

I do.

I arranged for the code to be very similar to the code in ftfont.c -
it's pretty much a copy with some renamings and a different list of
properties.  The idea was that it should be easy to refactor this so
that the two versions share the same code but pass in different arrays
of property names.  Unfortunately I don't have access to a machine to
test any changes to ftfont.c on and so wasn't confident to make it
blind and without some guidance from someone more experience with the
code base.

I'm happy to try and do the refactor myself - perhaps moving the
generic version of w32font_filter_properties/ftfont_filter_properties
into font.h/font.c?  At that point I'd be happier about doing a pass
through to clear up any logic in there.

bug#6303: Acknowledgement (23.2; Win32 Antialiased fonts)

[Juanma Barranquero]

On Tue, Jun 29, 2010 at 11:28, Damyan Pepper <damyanp@gmail.com> wrote:

> I haven't.

Well, then I recommend you do (assuming you're not philosophically or
legally unable to do it), because we need them to accept contributions
larger than about 10 significant lines.

> I arranged for the code to be very similar to the code in ftfont.c -
> it's pretty much a copy with some renamings and a different list of
> properties.

Oh, I see. I didn't look at the ftfont.c code; but if it is like so,
it's a bit obscure IMHO.

> I'm happy to try and do the refactor myself - perhaps moving the
> generic version of w32font_filter_properties/ftfont_filter_properties
> into font.h/font.c?  At that point I'd be happier about doing a pass
> through to clear up any logic in there.

Send the refactored patch, so we don't need to test two different ones.

    Juanma

bug#6303: Acknowledgement (23.2; Win32 Antialiased fonts)

[Damyan Pepper]

On Tue, Jun 29, 2010 at 10:38 AM, Juanma Barranquero <lekktu@gmail.com> wrote:
> Send the refactored patch, so we don't need to test two different ones.

I'll do that.

Thanks for the help,

Damyan.

bug#6303: Acknowledgement (23.2; Lose32 Antialiased fonts)

[Richard Stallman]

Would you please not use the term "win" to refer to that pile of
lossage?

bug#6303: Acknowledgement (23.2; Win32 Antialiased fonts)

[Stefan Monnier]

> Another thing. This bit:

>            char *str = SYMBOLP (val) ? SDATA (SYMBOL_NAME (val)) : NULL;
>            if (INTEGERP (val)) str = XINT (val) != 0 ? "true" : "false";
>            if (str == NULL) str = "true";

> would perhaps be clearer as

> 	    char *str;

> 	    if (INTEGERP (val))
> 	      str = XINT (val) ? "true" : "false";
> 	    else if (SYMBOLP (val))
> 	      str = SDATA (SYMBOL_NAME (val));
> 	    else
> 	      str = "true";

Actually, I'd write it:

    char *str = (INTEGERP (val) ? (XINT (val) ? "true" : "false")
                 : SYMBOLP (val) ? SDATA (SYMBOL_NAME (val))
                 : "true")


-- Stefan "look'ma! no assignment!"

bug#6303: Acknowledgement (23.2; Win32 Antialiased fonts)

[Juanma Barranquero]

On Fri, Aug 20, 2010 at 23:58, Stefan Monnier <monnier@iro.umontreal.ca> wrote:

> Actually, I'd write it:
>
>    char *str = (INTEGERP (val) ? (XINT (val) ? "true" : "false")
>                 : SYMBOLP (val) ? SDATA (SYMBOL_NAME (val))
>                 : "true")
>

I'm all for that kind of thing, but I'm not sure I actually find it
more readable (more "elegant", for some definition of elegant, yes).

    Juanma

bug#6303: Acknowledgement (23.2; Win32 Antialiased fonts)

[Juanma Barranquero]

On Thu, Jun 3, 2010 at 13:33, Damyan Pepper <damyanp@gmail.com> wrote:

> I'm putting together a patch now to give it one - as far as I can tell
> this needs to be done to get the :script and :antialias properties to
> work.

Yes, the patch works (at least for :antialias, I didn't test :script),
though of course you need to deactivate ClearType to see it.

    Juanma

bug#6303: W32 Antialiased fonts

[Damyan Pepper]

[-- Attachment #1: Type: text/plain, Size: 588 bytes --]

> On Tue, Jun 29, 2010 at 10:38 AM, Juanma Barranquero <lekktu@gmail.com> wrote:
>> Send the refactored patch, so we don't need to test two different ones.

Attached is the refactored patch.

I've moved the implementation of ftfont_filter_properties into
font_filter_properties, also applying the cleanup you suggested.
ftfont_filter_properties now calls this new function. Added
w32font_filter_properties.

I'm afraid I've not been able to test this in an environment that uses ftfont.

Are you able to advise me on how to go about getting hold of the papers to sign?

Regards,

Damyan.

[-- Attachment #2: bugfix_6303-v2.txt --]
[-- Type: text/plain, Size: 10578 bytes --]

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dpepper@sw-gbbr-brsd015-20100701155900-jpejfg0c2hm1ruhp
# target_branch: http://bzr.savannah.gnu.org/r/emacs/trunk/
# testament_sha1: 00e5e10c74ec1a385bf3916399c1c3a9b75cf656
# timestamp: 2010-07-01 17:00:50 +0100
# base_revision_id: jan.h.d@swipnet.se-20100629094920-iq2l9ojeiqiq41n8
# 
# Begin patch
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2010-06-29 09:49:20 +0000
+++ src/ChangeLog	2010-07-01 15:59:00 +0000
@@ -1,3 +1,11 @@
+2010-07-01  Damyan Pepper  <damyanp@gmail.com>
+
+	* gtfont.c (gtfont_filter_properties): Now calls
+	font_filter_properties.
+	* font.c (font_filter_properties): New function, refactored from
+	gtfont_filter_properties.
+	* w32font.c (w32font_filter_properties): New function (Bug#6303).
+
 2010-06-29  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* nsfns.m: extern declare Vmenu_bar_mode, Vtool_bar_mode.

=== modified file 'src/font.c'
--- src/font.c	2010-06-22 06:42:00 +0000
+++ src/font.c	2010-07-01 15:54:59 +0000
@@ -3895,6 +3895,62 @@
 }
 
 
+/* Sets attributes on a font.  Any properties that appear in ALIST and
+   BOOLEAN_PROPERTIES or NON_BOOLEAN_PROPERTIES are set on the font.
+   BOOLEAN_PROPERTIES and NON_BOOLEAN_PROPERTIES are NULL-terminated
+   arrays of strings.  This function is intended for use by the font
+   drivers to implement their specific font_filter_properties.  */
+void
+font_filter_properties (font, alist, boolean_properties, non_boolean_properties)
+     Lisp_Object font;
+     Lisp_Object alist;
+     const char *boolean_properties[];
+     const char *non_boolean_properties[];
+{
+  Lisp_Object it;
+  int i;
+
+  /* Set boolean values to Qt or Qnil */
+  for (i = 0; boolean_properties[i] != NULL; ++i)
+    for (it = alist; ! NILP (it); it = XCDR (it))
+      {
+        Lisp_Object key = XCAR (XCAR (it));
+        Lisp_Object val = XCDR (XCAR (it));
+        char *keystr = SDATA (SYMBOL_NAME (key));
+
+        if (strcmp (boolean_properties[i], keystr) == 0)
+          {
+            char *str;
+
+            if (INTEGERP (val)) 
+	      str = XINT (val) != 0 ? "true" : "false";
+	    else if (SYMBOLP (val))
+	      str = SDATA (SYMBOL_NAME (val));
+	    else
+	      str = "true";
+
+            val = Qt;
+            if (strcmp ("false", str) == 0 || strcmp ("False", str) == 0
+                || strcmp ("FALSE", str) == 0 || strcmp ("FcFalse", str) == 0
+                || strcmp ("off", str) == 0 || strcmp ("OFF", str) == 0
+                || strcmp ("Off", str) == 0)
+              val = Qnil;
+            Ffont_put (font, key, val);
+          }
+      }
+
+  for (i = 0; non_boolean_properties[i] != NULL; ++i)
+    for (it = alist; ! NILP (it); it = XCDR (it))
+      {
+        Lisp_Object key = XCAR (XCAR (it));
+        Lisp_Object val = XCDR (XCAR (it));
+        char *keystr = SDATA (SYMBOL_NAME (key));
+        if (strcmp (non_boolean_properties[i], keystr) == 0)
+          Ffont_put (font, key, val);
+      }
+}
+
+
 /* Return the font used to draw character C by FACE at buffer position
    POS in window W.  If STRING is non-nil, it is a string containing C
    at index POS.  If C is negative, get C from the current buffer or

=== modified file 'src/font.h'
--- src/font.h	2010-01-13 08:35:10 +0000
+++ src/font.h	2010-07-01 15:54:59 +0000
@@ -814,6 +814,11 @@
 extern void *font_get_frame_data P_ ((FRAME_PTR f,
 				      struct font_driver *driver));
 
+extern void font_filter_properties P_ ((Lisp_Object font,
+                                        Lisp_Object alist,
+                                        const char *boolean_properties[],
+                                        const char *non_boolean_properties[]));
+
 #ifdef HAVE_FREETYPE
 extern struct font_driver ftfont_driver;
 #endif	/* HAVE_FREETYPE */

=== modified file 'src/ftfont.c'
--- src/ftfont.c	2010-05-11 11:15:29 +0000
+++ src/ftfont.c	2010-07-01 15:54:59 +0000
@@ -2681,42 +2681,7 @@
      Lisp_Object font;
      Lisp_Object alist;
 {
-  Lisp_Object it;
-  int i;
-
-  /* Set boolean values to Qt or Qnil */
-  for (i = 0; ftfont_booleans[i] != NULL; ++i)
-    for (it = alist; ! NILP (it); it = XCDR (it))
-      {
-        Lisp_Object key = XCAR (XCAR (it));
-        Lisp_Object val = XCDR (XCAR (it));
-        char *keystr = SDATA (SYMBOL_NAME (key));
-
-        if (strcmp (ftfont_booleans[i], keystr) == 0)
-          {
-            char *str = SYMBOLP (val) ? SDATA (SYMBOL_NAME (val)) : NULL;
-            if (INTEGERP (val)) str = XINT (val) != 0 ? "true" : "false";
-            if (str == NULL) str = "true";
-
-            val = Qt;
-            if (strcmp ("false", str) == 0 || strcmp ("False", str) == 0
-                || strcmp ("FALSE", str) == 0 || strcmp ("FcFalse", str) == 0
-                || strcmp ("off", str) == 0 || strcmp ("OFF", str) == 0
-                || strcmp ("Off", str) == 0)
-              val = Qnil;
-            Ffont_put (font, key, val);
-          }
-      }
-
-  for (i = 0; ftfont_non_booleans[i] != NULL; ++i)
-    for (it = alist; ! NILP (it); it = XCDR (it))
-      {
-        Lisp_Object key = XCAR (XCAR (it));
-        Lisp_Object val = XCDR (XCAR (it));
-        char *keystr = SDATA (SYMBOL_NAME (key));
-        if (strcmp (ftfont_non_booleans[i], keystr) == 0)
-          Ffont_put (font, key, val);
-      }
+  font_filter_properties (font, alist, ftfont_booleans, ftfont_non_booleans);
 }
 
 

=== modified file 'src/w32font.c'
--- src/w32font.c	2010-01-13 08:35:10 +0000
+++ src/w32font.c	2010-07-01 15:54:59 +0000
@@ -2446,6 +2446,24 @@
   return DECODE_SYSTEM (build_string (buf));
 }
 
+static const char *w32font_booleans [] = {
+  NULL,
+};
+
+static const char *w32font_non_booleans [] = {
+  ":script",
+  ":antialias",
+  NULL,
+};
+
+static void
+w32font_filter_properties (font, alist)
+    Lisp_Object font;
+    Lisp_Object alist;
+{
+  font_filter_properties (font, alist, w32font_booleans, w32font_non_booleans);
+}
+
 struct font_driver w32font_driver =
   {
     0, /* Qgdi */
@@ -2475,7 +2493,7 @@
     NULL, /* shape */
     NULL, /* check */
     NULL, /* get_variation_glyphs */
-    NULL, /* filter_properties */
+    w32font_filter_properties,
   };
 
 

# Begin bundle
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
tYRPIe1xcFfmT9VkouYFQyD/i7kinChIBnyg8YA=

bug#6303: W32 Antialiased fonts

[Juanma Barranquero]

On Thu, Jul 1, 2010 at 18:07, Damyan Pepper <damyanp@gmail.com> wrote:

> Attached is the refactored patch.

Thanks.

> I'm afraid I've not been able to test this in an environment that uses ftfont.

I'll try it, but I don't think there will be any shortage of testers
for the non-Windows parts of the change ;-)

> Are you able to advise me on how to go about getting hold of the papers to sign?

Glenn knows about that more than I do. I'm Cc:ing him.

    Juanma

bug#6303: W32 Antialiased fonts

[Glenn Morris]

>> Are you able to advise me on how to go about getting hold of the
>> papers to sign?

Sent off-list.

bug#6303: W32 Antialiased fonts

[Juanma Barranquero]

On Fri, Jul 2, 2010 at 19:15, Glenn Morris <rgm@gnu.org> wrote:

> Sent off-list.

Thanks.

    Juanma

bug#6303: W32 Antialiased fonts

[Damyan Pepper]

Just to let you know, my signed papers have been received by the FSF.

Regards,

Damyan.

bug#6303: W32 Antialiased fonts

[Juanma Barranquero]

On Thu, Aug 12, 2010 at 15:59, Damyan Pepper <damyanp@gmail.com> wrote:

> Just to let you know, my signed papers have been received by the FSF.

Great. I'll install your change as soon as possible.

    Juanma

bug#6303: W32 Antialiased fonts

[Juanma Barranquero]

On Thu, Aug 12, 2010 at 20:33, Juanma Barranquero <lekktu@gmail.com> wrote:

> Great. I'll install your change as soon as possible.

Well, perhaps not "as soon as possible", but it is now committed to
emacs-23, and will be in the trunk in a few days.

Thanks,

    Juanma