From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Robert Pluim Newsgroups: gmane.emacs.bugs Subject: bug#39133: 28.0.50; Emacs slowdown on special char Date: Fri, 24 Jan 2020 11:13:54 +0100 Message-ID: References: <83lfqa5aa2.fsf@gnu.org> <83r2004rqn.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="105226"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 39133@debbugs.gnu.org, lg.zevlg@gmail.com To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jan 24 11:16:10 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1iuw0X-000RKN-SC for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 24 Jan 2020 11:16:09 +0100 Original-Received: from localhost ([::1]:39914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuw0X-0005z8-1N for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 24 Jan 2020 05:16:09 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41106) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuvzT-0004pu-6X for bug-gnu-emacs@gnu.org; Fri, 24 Jan 2020 05:15:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuvzS-00030H-3G for bug-gnu-emacs@gnu.org; Fri, 24 Jan 2020 05:15:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:47520) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iuvzR-000303-W7 for bug-gnu-emacs@gnu.org; Fri, 24 Jan 2020 05:15:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iuvzR-0002so-QR for bug-gnu-emacs@gnu.org; Fri, 24 Jan 2020 05:15:01 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Robert Pluim Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 24 Jan 2020 10:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39133 X-GNU-PR-Package: emacs Original-Received: via spool by 39133-submit@debbugs.gnu.org id=B39133.157986084411003 (code B ref 39133); Fri, 24 Jan 2020 10:15:01 +0000 Original-Received: (at 39133) by debbugs.gnu.org; 24 Jan 2020 10:14:04 +0000 Original-Received: from localhost ([127.0.0.1]:53493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuvyV-0002rO-Lp for submit@debbugs.gnu.org; Fri, 24 Jan 2020 05:14:03 -0500 Original-Received: from mail-wr1-f45.google.com ([209.85.221.45]:39655) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iuvyT-0002ql-Pj for 39133@debbugs.gnu.org; Fri, 24 Jan 2020 05:14:02 -0500 Original-Received: by mail-wr1-f45.google.com with SMTP id y11so1277200wrt.6 for <39133@debbugs.gnu.org>; Fri, 24 Jan 2020 02:14:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:message-id:mime-version; bh=7qUoo+cz+mtqvQfhoiqCO5XJddBTrgxwZlm8wQ92ltg=; b=lPs3SJencP65QRzCvBGeTLSgnBRR6ietYyIOWeuU6LNH5NHH+gg3N/JGHmyR+ynEWE mz9hgtjwY2spvO4VSHMN8Vg/uH+i7DUoliXgGb76BdzmXP7mo/S2ySK84zqOseuRCmht 3P9k0uq/Gji1AtClUnl6c+KPmXCbKZLTdGeySPfs7uYCZOMIEJdu5X1t5txdiTPrP8yl zZ3w8JaGHFXgT9kH5DhVnw87MJ+3Hw93ykQnryIa7NUsYpQalAq8RjLfxX2C/0CEN15Q CJwJotMaWKLYT2zir4udAWYhnvV3Zn6pTGOwoH5vXUT3AT9kT3huNTbtRkbWoOjAv5sL psvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:message-id :mime-version; bh=7qUoo+cz+mtqvQfhoiqCO5XJddBTrgxwZlm8wQ92ltg=; b=Vl7jjbLs3gVpJLNw4QHMjIWyzmevFtk5ROMUs/AScBxcP8pKcCAKBspwwrlCIswgvL ZlDr+iaE5tOkjLujr2uyhDeRzONvUNrGKsEbmvxLajNv7Cn7zcGDfY0XbtZcx/QVP43p 8aZqVEVtFehVk5HFyJHL34JWp8gRX8RSZEB41GLbCCCt1CZW7u5UbE7wPUIpx8TKPeHk E4PKwh8Ccj3odG6BFcDJl6zOA4VdpYfQljuRzn8BPRN1krZPu/AGOD7l80GUs/HkOGwD 5YO4yjmwbarK07zOCAZ7AYUq8+1fMEwdxpWKBeWXmMZNCwjGXefMzV4ezrNJF6dXQB4O y2rA== X-Gm-Message-State: APjAAAVOAe+lQ9c0tb/y3xGJndyZy5FvB6taYGRsC2QBwqARuV+6JMP2 GQgFYnSfLwWQKRAtUwhoBzE= X-Google-Smtp-Source: APXvYqywQaZe03roxY/A1YRip0t7Gtw7zQ+oot/j4LNx/igYlJLrmS2kFmABoOg8nzoAkXPUPrc/FQ== X-Received: by 2002:adf:f54d:: with SMTP id j13mr3395105wrp.19.1579860835951; Fri, 24 Jan 2020 02:13:55 -0800 (PST) Original-Received: from rpluim-mac ([149.5.228.1]) by smtp.gmail.com with ESMTPSA id r6sm6675997wrq.92.2020.01.24.02.13.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2020 02:13:55 -0800 (PST) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:175210 Archived-At: >>>>> On Wed, 15 Jan 2020 18:19:28 +0200, Eli Zaretskii said: Eli> We could do in the 'else' branch the same we do in the single caller Eli> of this function, fill_gstring_body, when we don't call Eli> font_fill_lglyph_metrics: Rather than duplicate that code, I moved the FONT_INVALID_CODE check up. This works for me: diff --git a/src/composite.c b/src/composite.c index 53e6930b5f..bf5884fa55 100644 --- a/src/composite.c +++ b/src/composite.c @@ -818,6 +818,7 @@ fill_gstring_body (Lisp_Object gstring) Lisp_Object header = AREF (gstring, 0); ptrdiff_t len = LGSTRING_CHAR_LEN (gstring); ptrdiff_t i; + struct font *font = XFONT_OBJECT (font_object); for (i = 0; i < len; i++) { @@ -832,9 +833,12 @@ fill_gstring_body (Lisp_Object gstring) LGLYPH_SET_FROM (g, i); LGLYPH_SET_TO (g, i); LGLYPH_SET_CHAR (g, c); - if (FONT_OBJECT_P (font_object)) + + unsigned int code = font->driver->encode_char (font, LGLYPH_CHAR (g)); + + if (FONT_OBJECT_P (font_object) && code != FONT_INVALID_CODE) { - font_fill_lglyph_metrics (g, font_object); + font_fill_lglyph_metrics (g, font_object, code); } else { diff --git a/src/font.c b/src/font.c index bb39aef92d..03d9cc50ae 100644 --- a/src/font.c +++ b/src/font.c @@ -4416,10 +4416,9 @@ DEFUN ("clear-font-cache", Fclear_font_cache, Sclear_font_cache, 0, 0, 0, void -font_fill_lglyph_metrics (Lisp_Object glyph, Lisp_Object font_object) +font_fill_lglyph_metrics (Lisp_Object glyph, Lisp_Object font_object, unsigned int code) { struct font *font = XFONT_OBJECT (font_object); - unsigned code = font->driver->encode_char (font, LGLYPH_CHAR (glyph)); struct font_metrics metrics; LGLYPH_SET_CODE (glyph, code); diff --git a/src/font.h b/src/font.h index 0561e3c83f..d82039eed8 100644 --- a/src/font.h +++ b/src/font.h @@ -886,7 +886,7 @@ valid_font_driver (struct font_driver const *d) extern Lisp_Object font_range (ptrdiff_t, ptrdiff_t, ptrdiff_t *, struct window *, struct face *, Lisp_Object); -extern void font_fill_lglyph_metrics (Lisp_Object, Lisp_Object); +extern void font_fill_lglyph_metrics (Lisp_Object, Lisp_Object, unsigned int); extern Lisp_Object font_put_extra (Lisp_Object font, Lisp_Object prop, Lisp_Object val);