From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dima Kogan Newsgroups: gmane.emacs.bugs Subject: bug#19117: 25.0.50; emacs on x11 chooses different fonts for the same face sometimes Date: Tue, 30 Dec 2014 20:06:38 -0800 Message-ID: <87h9wcmpaf.fsf@secretsauce.net> References: <878uj674zh.fsf@secretsauce.net> <831tox7t03.fsf@gnu.org> <87a92zrj4b.fsf@secretsauce.net> <83egsbzbfu.fsf@gnu.org> <87r3vykdse.fsf@secretsauce.net> <87ppbikb6g.fsf@secretsauce.net> <54944426.6090900@yandex.ru> <878ui3jkx0.fsf@secretsauce.net> <5497D623.7040406@swipnet.se> <87bnmqi1ps.fsf@secretsauce.net> <87mw65momt.fsf@secretsauce.net> <87lhlonc7c.fsf@secretsauce.net> <83sifwaooq.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1419999138 2506 80.91.229.3 (31 Dec 2014 04:12:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 31 Dec 2014 04:12:18 +0000 (UTC) Cc: 19117@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Dec 31 05:12:12 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Y6Adn-0006jl-9I for geb-bug-gnu-emacs@m.gmane.org; Wed, 31 Dec 2014 05:12:11 +0100 Original-Received: from localhost ([::1]:39087 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y6Adm-00013F-CP for geb-bug-gnu-emacs@m.gmane.org; Tue, 30 Dec 2014 23:12:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47596) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y6Adi-00013A-0I for bug-gnu-emacs@gnu.org; Tue, 30 Dec 2014 23:12:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y6Ade-0000n4-Mn for bug-gnu-emacs@gnu.org; Tue, 30 Dec 2014 23:12:05 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:52126) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y6Ade-0000mz-JZ for bug-gnu-emacs@gnu.org; Tue, 30 Dec 2014 23:12:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Y6Ade-00051w-2a for bug-gnu-emacs@gnu.org; Tue, 30 Dec 2014 23:12:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dima Kogan Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 31 Dec 2014 04:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19117 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 19117-submit@debbugs.gnu.org id=B19117.141999911019315 (code B ref 19117); Wed, 31 Dec 2014 04:12:01 +0000 Original-Received: (at 19117) by debbugs.gnu.org; 31 Dec 2014 04:11:50 +0000 Original-Received: from localhost ([127.0.0.1]:33259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y6AdR-00051S-JY for submit@debbugs.gnu.org; Tue, 30 Dec 2014 23:11:50 -0500 Original-Received: from out1-smtp.messagingengine.com ([66.111.4.25]:60755) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y6AdM-00051H-WC for 19117@debbugs.gnu.org; Tue, 30 Dec 2014 23:11:46 -0500 Original-Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 899B8210DD for <19117@debbugs.gnu.org>; Tue, 30 Dec 2014 23:11:44 -0500 (EST) Original-Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Tue, 30 Dec 2014 23:11:44 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=secretsauce.net; h=x-sasl-enc:references:from:to:cc:subject:date:in-reply-to :message-id:mime-version:content-type; s=mesmtp; bh=oqxEi2VwF4Ej j25serkS9qT/l6c=; b=S/oPDqvhgVM8lt1p0oWbXH42ffyEP5urEJ7OHiPVGt2a sMymSs7HFNVsNj/9thBdmnruzU5niZHbHQu82EHwxJoPeI/HeKufZHdL7/tqets2 W/MC5bKD6t3RyKzPsuyId0iohb7CuqW9jOMEbpfuKUqptdXjUxCcsu+sgJr4Q4U= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=x-sasl-enc:references:from:to:cc:subject :date:in-reply-to:message-id:mime-version:content-type; s= smtpout; bh=oqxEi2VwF4Ejj25serkS9qT/l6c=; b=iFe2As99a5ojt3YBh8ZW IXH//5cNWEQnXqeeiAoRrqDHoiT1ZJXHVQqdMRZRnV4WXNplnRwm38yY0SvuQLFC av8xSauPUJQgFti0DR5r1nXQdl91uqK6mkNy1KNhkS+WNdJDKD1XreLmMWNUKlWk qT8lzV2lvQ30kioj0HFEHJE= X-Sasl-enc: 0VOh5XRpPAdBFeqzVZ4qY1e4qYplloY+L6722D7yuzBI 1419999102 Original-Received: from shorty.local (unknown [172.56.0.178]) by mail.messagingengine.com (Postfix) with ESMTPA id F1496680116; Tue, 30 Dec 2014 23:11:41 -0500 (EST) Original-Received: from dima by shorty.local with local (Exim 4.84) (envelope-from ) id 1Y6AdH-0007zf-3w; Tue, 30 Dec 2014 20:11:39 -0800 In-reply-to: <83sifwaooq.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:97889 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: >> From: Dima Kogan >> Date: Tue, 30 Dec 2014 10:33:17 -0800 >> Cc: 19117@debbugs.gnu.org >> >> I will patch xfont_list_pattern() to accept a 3rd type of >> scalable-fonts-allowed: 'fallback where we add these fonts only if no >> others are available, and in realize_basic_faces() I'll use THAT value. >> Does that sound reasonable? > > Please note that on MS-Windows the scalable fonts were always used in > this scenario, back with that code, and there was a comment explaining > that otherwise too few fonts will be available on Windows. Hi. I'm attaching patches. The first one does this: scalable font logic now matches the docs and is more consistent A nil value of scalable-fonts-allowed allows scalable fonts if no others were found. This is the previously-documented behavior. realize_basic_faces() no longer forces scalable-fonts-allowed to t. If nil, some fonts will always be found even if only scalable fonts are available, as set by the other part of this patch. This is simpler than what I proposed earlier, since it does not introduce a third setting to scalable-fonts-allowed: the default nil value is sufficient. The patch mimics the older behavior to loop through the whole font list a second time if no non-scalable fonts were found and some scalable fonts WERE found, but were skipped the first time around due to scalable-fonts-allowed. This fixes my bug. The patch touches many lines, but almost all of it is indentation. The second patch is mostly unrelated. It removes some redundant code. I don't believe the behavior on Windows should be affected at all, but I have not verified this. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-scalable-font-logic-now-matches-the-docs-and-is-more.patch >From af0ec4452c5157e526af3c1190c3e8ba6f72c982 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Tue, 30 Dec 2014 20:05:11 -0800 Subject: [PATCH 1/2] scalable font logic now matches the docs and is more consistent A nil value of scalable-fonts-allowed allows scalable fonts if no others were found. This is the previously-documented behavior. realize_basic_faces() no longer forces scalable-fonts-allowed to t. If nil, some fonts will always be found even if only scalable fonts are available, as set by the other part of this patch. --- src/xfaces.c | 3 -- src/xfont.c | 172 +++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 95 insertions(+), 80 deletions(-) diff --git a/src/xfaces.c b/src/xfaces.c index 446107e..0aa9968 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -5228,12 +5228,10 @@ static bool realize_basic_faces (struct frame *f) { bool success_p = 0; - ptrdiff_t count = SPECPDL_INDEX (); /* Block input here so that we won't be surprised by an X expose event, for instance, without having the faces set up. */ block_input (); - specbind (Qscalable_fonts_allowed, Qt); if (realize_default_face (f)) { @@ -5267,7 +5265,6 @@ realize_basic_faces (struct frame *f) success_p = 1; } - unbind_to (count, Qnil); unblock_input (); return success_p; } diff --git a/src/xfont.c b/src/xfont.c index 06a4479..c6a3f2b 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -388,94 +388,112 @@ xfont_list_pattern (Display *display, const char *pattern, Lisp_Object *props = XVECTOR (xfont_scratch_props)->contents; Lisp_Object scripts = Qnil, entity = Qnil; + /* We take two passes over the font list. The second pass is + taken only if scalable-fonts-allowed is nil, and only + scalable fonts were found. + */ + int i_pass; + bool skipped_some_scalable_fonts = false; + for (i = 0; i < ASIZE (xfont_scratch_props); i++) ASET (xfont_scratch_props, i, Qnil); for (i = 0; i < num_fonts; i++) indices[i] = names[i]; qsort (indices, num_fonts, sizeof (char *), compare_font_names); - for (i = 0; i < num_fonts; i++) - { - ptrdiff_t len; + for (i_pass = 0; i_pass < 2; i_pass++) + { + for (i = 0; i < num_fonts; i++) + { + ptrdiff_t len; - if (i > 0 && xstrcasecmp (indices[i - 1], indices[i]) == 0) - continue; - if (NILP (entity)) - entity = font_make_entity (); - len = xfont_decode_coding_xlfd (indices[i], -1, buf); - if (font_parse_xlfd (buf, len, entity) < 0) - continue; - ASET (entity, FONT_TYPE_INDEX, Qx); - /* Avoid auto-scaled fonts. */ - if (INTEGERP (AREF (entity, FONT_DPI_INDEX)) - && INTEGERP (AREF (entity, FONT_AVGWIDTH_INDEX)) - && XINT (AREF (entity, FONT_DPI_INDEX)) != 0 - && XINT (AREF (entity, FONT_AVGWIDTH_INDEX)) == 0) - continue; - /* Avoid not-allowed scalable fonts. */ - if (NILP (Vscalable_fonts_allowed)) - { - int size = 0; + if (i > 0 && xstrcasecmp (indices[i - 1], indices[i]) == 0) + continue; + if (NILP (entity)) + entity = font_make_entity (); + len = xfont_decode_coding_xlfd (indices[i], -1, buf); + if (font_parse_xlfd (buf, len, entity) < 0) + continue; + ASET (entity, FONT_TYPE_INDEX, Qx); + /* Avoid auto-scaled fonts. */ + if (INTEGERP (AREF (entity, FONT_DPI_INDEX)) + && INTEGERP (AREF (entity, FONT_AVGWIDTH_INDEX)) + && XINT (AREF (entity, FONT_DPI_INDEX)) != 0 + && XINT (AREF (entity, FONT_AVGWIDTH_INDEX)) == 0) + continue; + /* Avoid not-allowed scalable fonts. */ + if (NILP (Vscalable_fonts_allowed)) + { + int size = 0; - if (INTEGERP (AREF (entity, FONT_SIZE_INDEX))) - size = XINT (AREF (entity, FONT_SIZE_INDEX)); - else if (FLOATP (AREF (entity, FONT_SIZE_INDEX))) - size = XFLOAT_DATA (AREF (entity, FONT_SIZE_INDEX)); - if (size == 0) - continue; - } - else if (CONSP (Vscalable_fonts_allowed)) - { - Lisp_Object tail, elt; + if (INTEGERP (AREF (entity, FONT_SIZE_INDEX))) + size = XINT (AREF (entity, FONT_SIZE_INDEX)); + else if (FLOATP (AREF (entity, FONT_SIZE_INDEX))) + size = XFLOAT_DATA (AREF (entity, FONT_SIZE_INDEX)); + if (size == 0 && i_pass == 0) + { + skipped_some_scalable_fonts = true; + continue; + } + } + else if (CONSP (Vscalable_fonts_allowed)) + { + Lisp_Object tail, elt; - for (tail = Vscalable_fonts_allowed; CONSP (tail); - tail = XCDR (tail)) - { - elt = XCAR (tail); - if (STRINGP (elt) - && fast_c_string_match_ignore_case (elt, indices[i], - len) >= 0) - break; - } - if (! CONSP (tail)) - continue; - } + for (tail = Vscalable_fonts_allowed; CONSP (tail); + tail = XCDR (tail)) + { + elt = XCAR (tail); + if (STRINGP (elt) + && fast_c_string_match_ignore_case (elt, indices[i], + len) >= 0) + break; + } + if (! CONSP (tail)) + continue; + } - /* Avoid fonts of invalid registry. */ - if (NILP (AREF (entity, FONT_REGISTRY_INDEX))) - continue; + /* Avoid fonts of invalid registry. */ + if (NILP (AREF (entity, FONT_REGISTRY_INDEX))) + continue; - /* Update encoding and repertory if necessary. */ - if (! EQ (registry, AREF (entity, FONT_REGISTRY_INDEX))) - { - registry = AREF (entity, FONT_REGISTRY_INDEX); - if (font_registry_charsets (registry, &encoding, &repertory) < 0) - encoding = NULL; - } - if (! encoding) - /* Unknown REGISTRY, not supported. */ - continue; - if (repertory) - { - if (NILP (script) - || xfont_chars_supported (chars, NULL, encoding, repertory)) - list = Fcons (entity, list), entity = Qnil; - continue; - } - if (memcmp (props, aref_addr (entity, FONT_FOUNDRY_INDEX), - word_size * 7) - || ! EQ (AREF (entity, FONT_SPACING_INDEX), props[7])) - { - vcopy (xfont_scratch_props, 0, - aref_addr (entity, FONT_FOUNDRY_INDEX), 7); - ASET (xfont_scratch_props, 7, AREF (entity, FONT_SPACING_INDEX)); - scripts = xfont_supported_scripts (display, indices[i], - xfont_scratch_props, encoding); - } - if (NILP (script) - || ! NILP (Fmemq (script, scripts))) - list = Fcons (entity, list), entity = Qnil; - } + /* Update encoding and repertory if necessary. */ + if (! EQ (registry, AREF (entity, FONT_REGISTRY_INDEX))) + { + registry = AREF (entity, FONT_REGISTRY_INDEX); + if (font_registry_charsets (registry, &encoding, &repertory) < 0) + encoding = NULL; + } + if (! encoding) + /* Unknown REGISTRY, not supported. */ + continue; + if (repertory) + { + if (NILP (script) + || xfont_chars_supported (chars, NULL, encoding, repertory)) + list = Fcons (entity, list), entity = Qnil; + continue; + } + if (memcmp (props, aref_addr (entity, FONT_FOUNDRY_INDEX), + word_size * 7) + || ! EQ (AREF (entity, FONT_SPACING_INDEX), props[7])) + { + vcopy (xfont_scratch_props, 0, + aref_addr (entity, FONT_FOUNDRY_INDEX), 7); + ASET (xfont_scratch_props, 7, AREF (entity, FONT_SPACING_INDEX)); + scripts = xfont_supported_scripts (display, indices[i], + xfont_scratch_props, encoding); + } + if (NILP (script) + || ! NILP (Fmemq (script, scripts))) + list = Fcons (entity, list), entity = Qnil; + } + + /* We skip the second pass unless we really need it. */ + if (!(NILP (list) /* No fonts found on the first pass */ + && skipped_some_scalable_fonts)) /* and we skipped some scalable ones. */ + break; + } XFreeFontNames (names); } -- 2.1.3 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-removed-unused-variable-assignment.patch >From 282bee4cfe6775063358c616e966593501620b54 Mon Sep 17 00:00:00 2001 From: Dima Kogan Date: Tue, 30 Dec 2014 20:05:58 -0800 Subject: [PATCH 2/2] removed unused variable assignment --- src/font.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/font.c b/src/font.c index 70e6316..dc821dd 100644 --- a/src/font.c +++ b/src/font.c @@ -2160,7 +2160,6 @@ font_score (Lisp_Object entity, Lisp_Object *spec_prop) } /* Score the size. Maximum difference is 127. */ - i = FONT_SIZE_INDEX; if (! NILP (spec_prop[FONT_SIZE_INDEX]) && XINT (AREF (entity, FONT_SIZE_INDEX)) > 0) { -- 2.1.3 --=-=-=--