From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.bugs Subject: bug#52493: 29.0.50; Setting Inconsolata up in init.el makes default face rendered wrong Date: Sat, 31 Dec 2022 20:01:32 +0100 Message-ID: References: <80e7f515-e16f-5ce8-86a3-e5f47cd2d2f5@yandex.ru> <357a553a-7a5d-9bae-f725-14366b07f52f@yandex.ru> <6889e78d-c296-1d5a-a0d3-66ad2b7a6b09@gmx.at> <92bbfa58-b920-04b9-078b-474fd917daf6@yandex.ru> <0c2d9115-8cec-0870-2ac3-38b8c17a0575@gmx.at> <83abf08e-44d9-8a05-f746-5f6a8469ab02@yandex.ru> <503acc7f-8b06-3ce2-71b0-9f97e8de1966@gmx.at> <66cb788c-6b49-c408-0168-0492e7f8d7ad@gmx.at> <266ad500-da74-13a5-2434-81bd3d5b3554@yandex.ru> <66499633-3283-3cb2-2322-77a357a3c1b7@gmx.at> <1c8f744b-2c71-d6b3-39be-86185ea3650b@yandex.ru> <9bc9f6fe-4fe6-1f75-42db-3a9c3e84d851@gmx.at> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------LlFguf8xIZC25bWsT7Zj3g5A" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="12498"; mail-complaints-to="usenet@ciao.gmane.io" Cc: rpluim@gmail.com, 52493@debbugs.gnu.org To: Dmitry Gutov , Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Dec 31 20:02:23 2022 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 1pBh7d-00034C-L6 for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 31 Dec 2022 20:02:21 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pBh7M-0000yQ-6v; Sat, 31 Dec 2022 14:02:04 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pBh7K-0000yF-Or for bug-gnu-emacs@gnu.org; Sat, 31 Dec 2022 14:02:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pBh7K-0006EW-GZ for bug-gnu-emacs@gnu.org; Sat, 31 Dec 2022 14:02:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pBh7K-00052z-0m for bug-gnu-emacs@gnu.org; Sat, 31 Dec 2022 14:02:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: martin rudalics Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 31 Dec 2022 19:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52493 X-GNU-PR-Package: emacs Original-Received: via spool by 52493-submit@debbugs.gnu.org id=B52493.167251330719381 (code B ref 52493); Sat, 31 Dec 2022 19:02:01 +0000 Original-Received: (at 52493) by debbugs.gnu.org; 31 Dec 2022 19:01:47 +0000 Original-Received: from localhost ([127.0.0.1]:39841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBh74-00052W-2Q for submit@debbugs.gnu.org; Sat, 31 Dec 2022 14:01:46 -0500 Original-Received: from mout.gmx.net ([212.227.17.21]:60173) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBh71-00052H-0y for 52493@debbugs.gnu.org; Sat, 31 Dec 2022 14:01:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.at; s=s31663417; t=1672513294; bh=N8LgXjRngpNNoUOzGpyge73ML/I48euWW/1AFQYdPrw=; h=X-UI-Sender-Class:Date:Subject:To:Cc:References:From:In-Reply-To; b=ZpOPQBGYkZli1BYWHZizquPOG0vO9klDiEIg44E94J4QQlQN1uo0cYwuIgOOSKxJs XkioKHq+T752pK8m2bu+VL8jKtXcM1fvKiAG89vf8Uj5tlXfl4ImhwV0c5R3gT2oyY 9A75zfjF9mF2taHcz4yaXLZyviiDfHA2cCpBovPSqpbWaP2TJ4vqnWbecvTY0J+ccs lDNDOjHyNrcR2xp9rHc1CiG/Orv8yDNKvKC8tHHoICdUhLxK5/dQf0QpR/eGM/BIrO XovAzrYzjFmJm5ELV223G7N8SJz5VQDaZBrd7VNqSMgNjWU/pTvvJGWXkWAA5bPueI V7limEkGpJGdg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from [192.168.1.100] ([213.142.97.230]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MqaxU-1oPDDh33eC-00mcjW; Sat, 31 Dec 2022 20:01:33 +0100 Content-Language: en-US In-Reply-To: X-Provags-ID: V03:K1:UldMYjEwEBY/3Ztb4T/QFjm703FdNekNgD4Tdhp+vsLNhmTn3Fc Mi+j8Y8oF2OLoCVaJJwqf/jVmkMRbHtyekOYS4kB5jyA0Dg632x/iiW0C7kFL/cU27GIgQ1 jUqCctH1csHw9BAM+IfkaOPKXYCQx30+gEb36EKirPGqtVanM6YORAu5Z2iB3EbbiftVyKr sfKjJPpH59JiWlB6fJf2g== UI-OutboundReport: notjunk:1;M01:P0:+d5CxgUdwWg=;F/Z6JhYDBXOR5wSEJEopyNV3ebd mY3RY10RA3LIOMk/H9DDGe48gJ261MGXkfNQsNA6MlZNEAbt8mw+EaLiATbPfTfRo/Lb2U1wu 72ny5uNig6Grtvtl6pcPsDptRADRfxT2c+xhf99OLhi5iyuHrauGQsCqFzp+i7XA1jSmYSngE iEPMYL/I7FMOJnS0lPSZagwBj+vkoar3yTr8RWKjrMKPF7ynLa68zLAi5J/ull/LWV2TLydKK IqeeFAkQznO57y0QBTW1/quh6oXrrCcRJrJRlBB2S0rfq5sZfGlrkotKHA0CCtAOMQb5A7dbl oJ+kXXSLHyMZvTS1UoZfZ1kRogMPcnTena8/NSaoHfAdkRD6gtplYoWK/Yei5ve/IzADSE8+o k9Gf6e4mWJ3YwDYFq3JrQCn8MSb6xiGw/mHyJ19vPkUwYne/F7pTuD3PkyG9G3hG5vd6+56Uy U76WWkePxVqPABthVCVS/DYcpGZWwhqt0W35XKXZGSAY7pByQw2JySsAGbm9urXXkQ+2Ghr0G mwIei3uhAdEeXhNss75CJLG+TRCoCPchixW4oWBl+gTpGiHrdpa62U7RbEhWA/g0EPAxYCJ3F N9qtgHSlkU3R2J1b/sJkutda791nyRQ9ZDieY0wqEaCDWumt+FMKfdEXQeGd2chlkjopC3mlq tIrMPski0Oonfk1Vx60XMnVi523f9pSUctXEUZapsJP0A9QwgWrsjnkPIHyPBdFbxyLtR8Kjh wXCPjfayzHYgKmvr/QlGITKML458M6ViBgFM/QAdMQc5+qZUGo1SQQOgGlaqBRIVqe74Cp4y X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:252214 Archived-At: This is a multi-part message in MIME format. --------------LlFguf8xIZC25bWsT7Zj3g5A Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit I've rewritten the output routines so they catch the width changes but didn't change anything else. The output in *foo* should be almost self-explanatory now but see first one I ran with emacs -Q and the following four evaluations (set-face-attribute 'default nil :height 120 :family "DejaVu Sans Mono") (set-face-attribute 'default nil :height 140 :family "DejaVu Sans Mono") (set-face-attribute 'default nil :height 130 :family "DejaVu Sans Mono") (set-face-attribute 'default nil :height 120 :family "DejaVu Sans Mono") here. This got me adjust_frame_size old native pixels 80x25 new native pixels 80x25 old text pixels 80x25 new text pixels 80x24 old text chars 80x25 new text chars 80x24 adjust_frame_size old native pixels 80x25 new native pixels 736x450 old text pixels 80x25 new text pixels 720x450 old text chars 80x25 new text chars 80x25 adjust_frame_size old native pixels 736x450 new native pixels 736x648 old text pixels 720x450 new text pixels 720x648 old text chars 80x25 new text chars 80x36 adjust_frame_size old native pixels 736x648 new native pixels 752x648 old text pixels 720x648 new text pixels 720x648 old text chars 80x36 new text chars 80x36 xg_frame_set_char_size old native pixels 752x648 new native pixels 752x648 outer pixels 752x673 xg_wm_set_size_hint scale 1 char width 9 vscroll 16 fringes 16 borders 0 base width 41 width inc 9 char height 18 menubar 25 toolbar 0 hscroll 0 borders 0 base height 43 height inc 18 xg_wm_set_size_hint scale 1 char width 9 vscroll 16 fringes 16 borders 0 base width 41 width inc 9 char height 18 menubar 25 toolbar 41 hscroll 0 borders 0 base height 84 height inc 18 xg_frame_set_char_size old native pixels 752x648 new native pixels 752x648 outer pixels 752x714 outer rest 0x0 x_new_font old char size 9x18 new char size 10x19 text chars 80x36 old text pixels 720x648 new text pixels 800x684 xg_wm_set_size_hint scale 1 char width 10 vscroll 16 fringes 16 borders 0 base width 42 width inc 10 char height 19 menubar 25 toolbar 41 hscroll 0 borders 0 base height 85 height inc 19 xg_frame_set_char_size old native pixels 752x648 new native pixels 832x684 outer pixels 832x750 outer rest 0x0 xg_frame_resized old native pixels 752x648 new native pixels 832x684 adjust_frame_size old native pixels 752x648 new native pixels 832x684 old text pixels 720x648 new text pixels 800x684 old text chars 80x36 new text chars 80x36 x_new_font old char size 10x19 new char size 11x23 text chars 80x36 old text pixels 800x684 new text pixels 880x828 xg_wm_set_size_hint scale 1 char width 11 vscroll 16 fringes 16 borders 0 base width 43 width inc 11 char height 23 menubar 25 toolbar 41 hscroll 0 borders 0 base height 89 height inc 23 xg_frame_set_char_size old native pixels 832x684 new native pixels 912x828 outer pixels 912x894 outer rest 0x0 xg_frame_resized old native pixels 832x684 new native pixels 912x828 adjust_frame_size old native pixels 832x684 new native pixels 912x828 old text pixels 800x684 new text pixels 880x828 old text chars 80x36 new text chars 80x36 x_new_font old char size 11x23 new char size 10x21 text chars 80x36 old text pixels 880x828 new text pixels 800x756 xg_wm_set_size_hint scale 1 char width 10 vscroll 16 fringes 16 borders 0 base width 42 width inc 10 char height 21 menubar 25 toolbar 41 hscroll 0 borders 0 base height 87 height inc 21 xg_frame_set_char_size old native pixels 912x828 new native pixels 832x756 outer pixels 832x822 outer rest 0x0 xg_frame_resized old native pixels 912x828 new native pixels 832x756 adjust_frame_size old native pixels 912x828 new native pixels 832x756 old text pixels 880x828 new text pixels 800x756 old text chars 80x36 new text chars 80x36 x_new_font old char size 10x21 new char size 10x19 text chars 80x36 old text pixels 800x756 new text pixels 800x684 xg_wm_set_size_hint scale 1 char width 10 vscroll 16 fringes 16 borders 0 base width 42 width inc 10 char height 19 menubar 25 toolbar 41 hscroll 0 borders 0 base height 85 height inc 19 xg_frame_set_char_size old native pixels 832x756 new native pixels 832x684 outer pixels 832x750 outer rest 0x0 xg_frame_resized old native pixels 832x756 new native pixels 832x684 adjust_frame_size old native pixels 832x756 new native pixels 832x684 old text pixels 800x756 new text pixels 800x684 old text chars 80x36 new text chars 80x36 where each x_new_font paragraph corresponds to one evaluation above. Note the following two properties: - As soon as things clear up, the size of the frame in text characters is 80x36 and never changes after that. The same will have to hold for your 'set-face-attribute' calls regardless of what the pixel sizes say. - "outer rest 0x0" stands for a zero rest when dividing the requested size minus the base size by the size increments. The same will have to hold for your 'set-face-attribute' calls. Maybe I'm just lucky here or it's because I do not scale. I invite everyone on GTK with some spare time to apply the attached x_scale_font.diff, do some random 'set-face-attribute' calls and consult the contents of the *foo* buffer. If the two properties don't hold, something might be wrong and we should investigate that. martin --------------LlFguf8xIZC25bWsT7Zj3g5A Content-Type: text/x-patch; charset=UTF-8; name="x_scale_font.diff" Content-Disposition: attachment; filename="x_scale_font.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpc3Avd2luZG93LmVsIGIvbGlzcC93aW5kb3cuZWwKaW5kZXggYTEx MjkzZDM3Mi4uNzA2Yzk4OGIyZSAxMDA2NDQKLS0tIGEvbGlzcC93aW5kb3cuZWwKKysrIGIv bGlzcC93aW5kb3cuZWwKQEAgLTEwNTk2LDYgKzEwNTk2LDIxIEBAIHdpbmRvdy1wcmVmaXgt bWFwCiAgICIwIiAjJ2RlbGV0ZS13aW5kb3dzLW9uKQogKGRlZmluZS1rZXkgY3RsLXgtbWFw ICJ3IiB3aW5kb3ctcHJlZml4LW1hcCkKIAorKGRlZnVuIGZvby1pdCAoJnJlc3QgcmVzdCkK KyAgKHdpdGgtY3VycmVudC1idWZmZXIgKGdldC1idWZmZXItY3JlYXRlICIqZm9vKiIpCisg ICAgKGdvdG8tY2hhciAocG9pbnQtbWF4KSkKKyAgICAod2hlbiByZXN0CisgICAgICAoaWYg KGNvbnNwIChjYXIgcmVzdCkpCisgICAgICAgICAgKGluc2VydCAoZm9ybWF0ICIlc3glcyIg KGNhYXIgcmVzdCkgKGNkYXIgcmVzdCkpKQorICAgICAgICAoaW5zZXJ0IChmb3JtYXQgIiVz IiAoY2FyIHJlc3QpKSkpCisgICAgICAoc2V0cSByZXN0IChjZHIgcmVzdCkpCisgICAgICAo d2hpbGUgcmVzdAorICAgICAgICAoaWYgKGNvbnNwIChjYXIgcmVzdCkpCisgICAgICAgICAg ICAoaW5zZXJ0IChmb3JtYXQgIiAlc3glcyIgKGNhYXIgcmVzdCkgKGNkYXIgcmVzdCkpKQor CSAgKGluc2VydCAoZm9ybWF0ICIgJXMiIChjYXIgcmVzdCkpKSkKKwkoc2V0cSByZXN0IChj ZHIgcmVzdCkpKQorICAgICAgKGluc2VydCAiXG4iKSkpKQorCiAocHJvdmlkZSAnd2luZG93 KQogCiA7Ozsgd2luZG93LmVsIGVuZHMgaGVyZQpkaWZmIC0tZ2l0IGEvc3JjL2ZyYW1lLmMg Yi9zcmMvZnJhbWUuYwppbmRleCBiNTdiMjk2YmU1Li5kN2QwNjlkOTA4IDEwMDY0NAotLS0g YS9zcmMvZnJhbWUuYworKysgYi9zcmMvZnJhbWUuYwpAQCAtOTA2LDYgKzkwNiwzMiBAQCBh ZGp1c3RfZnJhbWVfc2l6ZSAoc3RydWN0IGZyYW1lICpmLCBpbnQgbmV3X3RleHRfd2lkdGgs IGludCBuZXdfdGV4dF9oZWlnaHQsCiAKICAgdW5ibG9ja19pbnB1dCAoKTsKIAorICBpZiAo b2xkX25hdGl2ZV93aWR0aCAhPSBuZXdfbmF0aXZlX3dpZHRoCisgICAgICB8fCBvbGRfbmF0 aXZlX2hlaWdodCAhPSBuZXdfbmF0aXZlX2hlaWdodAorICAgICAgfHwgb2xkX3RleHRfd2lk dGggIT0gbmV3X3RleHRfd2lkdGgKKyAgICAgIHx8IG9sZF90ZXh0X2hlaWdodCAhPSBuZXdf dGV4dF9oZWlnaHQKKyAgICAgIHx8IG9sZF90ZXh0X2NvbHMgIT0gbmV3X3RleHRfY29scwor ICAgICAgfHwgb2xkX3RleHRfbGluZXMgIT0gbmV3X3RleHRfbGluZXMpCisgICAgQ0FMTE4g KEZmdW5jYWxsLCBRZm9vX2l0LCBpbnRlcm4gKCJhZGp1c3RfZnJhbWVfc2l6ZSIpLAorCSAg IGludGVybiAoIm9sZCBuYXRpdmUgcGl4ZWxzIiksCisJICAgRmNvbnMgKG1ha2VfZml4bnVt IChvbGRfbmF0aXZlX3dpZHRoKSwKKwkJICBtYWtlX2ZpeG51bSAob2xkX25hdGl2ZV9oZWln aHQpKSwKKwkgICBpbnRlcm4gKCJuZXcgbmF0aXZlIHBpeGVscyIpLAorCSAgIEZjb25zICht YWtlX2ZpeG51bSAobmV3X25hdGl2ZV93aWR0aCksCisJCSAgbWFrZV9maXhudW0gKG5ld19u YXRpdmVfaGVpZ2h0KSksCisJICAgaW50ZXJuICgib2xkIHRleHQgcGl4ZWxzIiksCisJICAg RmNvbnMgKG1ha2VfZml4bnVtIChvbGRfdGV4dF93aWR0aCksCisJCSAgbWFrZV9maXhudW0g KG9sZF90ZXh0X2hlaWdodCkpLAorCSAgIGludGVybiAoIm5ldyB0ZXh0IHBpeGVscyIpLAor CSAgIEZjb25zIChtYWtlX2ZpeG51bSAobmV3X3RleHRfd2lkdGgpLAorCQkgIG1ha2VfZml4 bnVtIChuZXdfdGV4dF9oZWlnaHQpKSwKKwkgICBpbnRlcm4gKCJvbGQgdGV4dCBjaGFycyIp LAorCSAgIEZjb25zIChtYWtlX2ZpeG51bSAob2xkX3RleHRfY29scyksCisJCSAgbWFrZV9m aXhudW0gKG9sZF90ZXh0X2xpbmVzKSksCisJICAgaW50ZXJuICgibmV3IHRleHQgY2hhcnMi KSwKKwkgICBGY29ucyAobWFrZV9maXhudW0gKG5ld190ZXh0X2NvbHMpLAorCQkgIG1ha2Vf Zml4bnVtIChuZXdfdGV4dF9saW5lcykpKTsKKwogI2lmZGVmIEhBVkVfV0lORE9XX1NZU1RF TQogICB7CiAgICAgLyogQWRqdXN0IHNpemUgb2YgRidzIGNoaWxkIGZyYW1lcy4gICovCmRp ZmYgLS1naXQgYS9zcmMvZ3RrdXRpbC5jIGIvc3JjL2d0a3V0aWwuYwppbmRleCBhNmJiYTA5 NmE0Li4xNmU5MDYyNjlhIDEwMDY0NAotLS0gYS9zcmMvZ3RrdXRpbC5jCisrKyBiL3NyYy9n dGt1dGlsLmMKQEAgLTExNDksNiArMTE0OSwxNCBAQCB4Z19mcmFtZV9yZXNpemVkIChzdHJ1 Y3QgZnJhbWUgKmYsIGludCB3aWR0aCwgaW50IGhlaWdodCkKIAkgICBmLT5uZXdfc2l6ZV9w ID8gZi0+bmV3X2hlaWdodCA6IC0xKTsKIAogICAgICAgRlJBTUVfUklGIChmKS0+Y2xlYXJf dW5kZXJfaW50ZXJuYWxfYm9yZGVyIChmKTsKKworICAgICAgQ0FMTE4gKEZmdW5jYWxsLCBR Zm9vX2l0LCBpbnRlcm4gKCJ4Z19mcmFtZV9yZXNpemVkIiksCisJICAgICBpbnRlcm4gKCJv bGQgbmF0aXZlIHBpeGVscyIpLAorCSAgICAgRmNvbnMgKG1ha2VfZml4bnVtIChGUkFNRV9Q SVhFTF9XSURUSCAoZikpLAorCQkgICAgbWFrZV9maXhudW0gKEZSQU1FX1BJWEVMX0hFSUdI VCAoZikpKSwKKwkgICAgIGludGVybiAoIm5ldyBuYXRpdmUgcGl4ZWxzIiksCisJICAgICBG Y29ucyAobWFrZV9maXhudW0gKHdpZHRoKSwgbWFrZV9maXhudW0gKGhlaWdodCkpKTsKKwog ICAgICAgY2hhbmdlX2ZyYW1lX3NpemUgKGYsIHdpZHRoLCBoZWlnaHQsIGZhbHNlLCB0cnVl LCBmYWxzZSk7CiAgICAgICBTRVRfRlJBTUVfR0FSQkFHRUQgKGYpOwogICAgICAgY2FuY2Vs X21vdXNlX2ZhY2UgKGYpOwpAQCAtMTE3NCw2ICsxMTgyLDE4IEBAIHhnX2ZyYW1lX3NldF9j aGFyX3NpemUgKHN0cnVjdCBmcmFtZSAqZiwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KQogICBp bnQgb3V0ZXJfd2lkdGggPSB3aWR0aCArIEZSQU1FX1RPT0xCQVJfV0lEVEggKGYpOwogICBi b29sIHdhc192aXNpYmxlID0gZmFsc2U7CiAgIGJvb2wgaGlkZV9jaGlsZF9mcmFtZTsKKyAg aW50IHNjYWxlID0geGdfZ2V0X3NjYWxlIChmKTsKKyAgR2RrR2VvbWV0cnkgc2l6ZV9oaW50 czsKKworICBpZiAoc2NhbGUgIT0gMSAmJiAhZnJhbWVfcmVzaXplX3BpeGVsd2lzZSkKKyAg ICB7CisgICAgICB3aWR0aCA9IHdpZHRoICsgKHdpZHRoICUgKEZSQU1FX0NPTFVNTl9XSURU SCAoZikgLyBzY2FsZSkpOworICAgICAgb3V0ZXJfd2lkdGggPSB3aWR0aCArIEZSQU1FX1RP T0xCQVJfV0lEVEggKGYpOworCisgICAgICBoZWlnaHQgPSBoZWlnaHQgKyAoaGVpZ2h0ICUg KEZSQU1FX0xJTkVfSEVJR0hUIChmKSAvIHNjYWxlKSk7CisgICAgICBvdXRlcl9oZWlnaHQK Kwk9IGhlaWdodCArIEZSQU1FX1RPT0xCQVJfSEVJR0hUIChmKSArIEZSQU1FX01FTlVCQVJf SEVJR0hUIChmKTsKKyAgICB9CiAKICNpZm5kZWYgSEFWRV9QR1RLCiAgIGd0a193aW5kb3df Z2V0X3NpemUgKEdUS19XSU5ET1cgKEZSQU1FX0dUS19PVVRFUl9XSURHRVQgKGYpKSwKQEAg LTExOTYsOCArMTIxNiw4IEBAIHhnX2ZyYW1lX3NldF9jaGFyX3NpemUgKHN0cnVjdCBmcmFt ZSAqZiwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KQogICAvKiBEbyB0aGlzIGJlZm9yZSByZXNp emUsIGFzIHdlIGRvbid0IGtub3cgeWV0IGlmIHdlIHdpbGwgYmUgcmVzaXplZC4gICovCiAg IEZSQU1FX1JJRiAoZiktPmNsZWFyX3VuZGVyX2ludGVybmFsX2JvcmRlciAoZik7CiAKLSAg b3V0ZXJfaGVpZ2h0IC89IHhnX2dldF9zY2FsZSAoZik7Ci0gIG91dGVyX3dpZHRoIC89IHhn X2dldF9zY2FsZSAoZik7CisgIG91dGVyX2hlaWdodCAvPSBzY2FsZTsKKyAgb3V0ZXJfd2lk dGggLz0gc2NhbGU7CiAKICAgeGdfd21fc2V0X3NpemVfaGludCAoZiwgMCwgMCk7CiAKQEAg LTEzMTcsNiArMTMzNywzMCBAQCB4Z19mcmFtZV9zZXRfY2hhcl9zaXplIChzdHJ1Y3QgZnJh bWUgKmYsIGludCB3aWR0aCwgaW50IGhlaWdodCkKICAgU0VUX0ZSQU1FX0dBUkJBR0VEIChm KTsKICAgY2FuY2VsX21vdXNlX2ZhY2UgKGYpOwogCisgIHNpemVfaGludHMgPSBmLT5vdXRw dXRfZGF0YS54cC0+c2l6ZV9oaW50czsKKyAgaWYgKG91dGVyX3dpZHRoID4gMCAmJiBzaXpl X2hpbnRzLmJhc2Vfd2lkdGggPiAwICYmIHNpemVfaGludHMud2lkdGhfaW5jID4gMAorICAg ICAgJiYgb3V0ZXJfaGVpZ2h0ID4gMCAmJiBzaXplX2hpbnRzLmJhc2VfaGVpZ2h0ID4gMCAm JiBzaXplX2hpbnRzLmhlaWdodF9pbmMgPiAwKQorICAgIENBTExOIChGZnVuY2FsbCwgUWZv b19pdCwgaW50ZXJuICgieGdfZnJhbWVfc2V0X2NoYXJfc2l6ZSIpLAorCSAgIGludGVybiAo Im9sZCBuYXRpdmUgcGl4ZWxzIiksCisJICAgRmNvbnMgKG1ha2VfZml4bnVtIChGUkFNRV9Q SVhFTF9XSURUSCAoZikpLAorCQkgIG1ha2VfZml4bnVtIChGUkFNRV9QSVhFTF9IRUlHSFQg KGYpKSksCisJICAgaW50ZXJuICgibmV3IG5hdGl2ZSBwaXhlbHMiKSwKKwkgICBGY29ucyAo bWFrZV9maXhudW0gKHdpZHRoKSwgbWFrZV9maXhudW0gKGhlaWdodCkpLAorCSAgIGludGVy biAoIm91dGVyIHBpeGVscyIpLAorCSAgIEZjb25zIChtYWtlX2ZpeG51bSAob3V0ZXJfd2lk dGgpLCBtYWtlX2ZpeG51bSAob3V0ZXJfaGVpZ2h0KSksCisJICAgaW50ZXJuICgib3V0ZXIg cmVzdCIpLAorCSAgIEZjb25zIChtYWtlX2ZpeG51bSAoKG91dGVyX3dpZHRoIC0gc2l6ZV9o aW50cy5iYXNlX3dpZHRoKSAlIHNpemVfaGludHMud2lkdGhfaW5jKSwKKwkJICBtYWtlX2Zp eG51bSAoKG91dGVyX2hlaWdodCAtIHNpemVfaGludHMuYmFzZV9oZWlnaHQpICUgc2l6ZV9o aW50cy5oZWlnaHRfaW5jKSkpOworICBlbHNlCisgICAgQ0FMTE4gKEZmdW5jYWxsLCBRZm9v X2l0LCBpbnRlcm4gKCJ4Z19mcmFtZV9zZXRfY2hhcl9zaXplIiksCisJICAgaW50ZXJuICgi b2xkIG5hdGl2ZSBwaXhlbHMiKSwKKwkgICBGY29ucyAobWFrZV9maXhudW0gKEZSQU1FX1BJ WEVMX1dJRFRIIChmKSksCisJCSAgbWFrZV9maXhudW0gKEZSQU1FX1BJWEVMX0hFSUdIVCAo ZikpKSwKKwkgICBpbnRlcm4gKCJuZXcgbmF0aXZlIHBpeGVscyIpLAorCSAgIEZjb25zICht YWtlX2ZpeG51bSAod2lkdGgpLCBtYWtlX2ZpeG51bSAoaGVpZ2h0KSksCisJICAgaW50ZXJu ICgib3V0ZXIgcGl4ZWxzIiksCisJICAgRmNvbnMgKG1ha2VfZml4bnVtIChvdXRlcl93aWR0 aCksIG1ha2VfZml4bnVtIChvdXRlcl9oZWlnaHQpKSk7CisKICAgLyogV2UgY2FuIG5vdCBj YWxsIGNoYW5nZV9mcmFtZV9zaXplIGZvciBhIG1hcHBlZCBmcmFtZSwKICAgICAgd2UgY2Fu IG5vdCBzZXQgcGl4ZWwgd2lkdGgvaGVpZ2h0IGVpdGhlci4gIFRoZSB3aW5kb3cgbWFuYWdl ciBtYXkKICAgICAgb3ZlcnJpZGUgb3VyIHJlc2l6ZSByZXF1ZXN0LCBYTW9uYWQgZG9lcyB0 aGlzIGFsbCB0aGUgdGltZS4KQEAgLTIwMjgsNiArMjA3MiwyMyBAQCB4Z193bV9zZXRfc2l6 ZV9oaW50IChzdHJ1Y3QgZnJhbWUgKmYsIGxvbmcgaW50IGZsYWdzLCBib29sIHVzZXJfcG9z aXRpb24pCiAJCSAmZi0+b3V0cHV0X2RhdGEueHAtPnNpemVfaGludHMsCiAJCSBzaXplb2Yg KHNpemVfaGludHMpKSAhPSAwKQogICAgIHsKKyAgICAgIENBTExOIChGZnVuY2FsbCwgUWZv b19pdCwgaW50ZXJuICgieGdfd21fc2V0X3NpemVfaGludCIpLAorCSAgICAgaW50ZXJuICgi c2NhbGUiKSwgbWFrZV9maXhudW0gKHNjYWxlKSwKKwkgICAgIGludGVybiAoImNoYXIgd2lk dGgiKSwgbWFrZV9maXhudW0gKEZSQU1FX0NPTFVNTl9XSURUSCAoZikpLAorCSAgICAgaW50 ZXJuICgidnNjcm9sbCIpLCBtYWtlX2ZpeG51bSAoRlJBTUVfU0NST0xMX0JBUl9BUkVBX1dJ RFRIIChmKSksCisJICAgICBpbnRlcm4gKCJmcmluZ2VzIiksIG1ha2VfZml4bnVtIChGUkFN RV9UT1RBTF9GUklOR0VfV0lEVEggKGYpKSwKKwkgICAgIGludGVybiAoImJvcmRlcnMiKSwg bWFrZV9maXhudW0gKDIgKiBGUkFNRV9JTlRFUk5BTF9CT1JERVJfV0lEVEggKGYpKSwKKwkg ICAgIGludGVybiAoImJhc2Ugd2lkdGgiKSwgbWFrZV9maXhudW0gKHNpemVfaGludHMuYmFz ZV93aWR0aCksCisJICAgICBpbnRlcm4gKCJ3aWR0aCBpbmMiKSwgbWFrZV9maXhudW0gKHNp emVfaGludHMud2lkdGhfaW5jKSk7CisgICAgICBDQUxMTiAoRmZ1bmNhbGwsIFFmb29faXQs IGludGVybiAoIiAgICIpLAorCSAgICAgaW50ZXJuICgiY2hhciBoZWlnaHQiKSwgbWFrZV9m aXhudW0gKEZSQU1FX0xJTkVfSEVJR0hUIChmKSksCisJICAgICBpbnRlcm4gKCJtZW51YmFy IiksIG1ha2VfZml4bnVtIChGUkFNRV9NRU5VQkFSX0hFSUdIVCAoZikpLAorCSAgICAgaW50 ZXJuICgidG9vbGJhciIpLCBtYWtlX2ZpeG51bSAoRlJBTUVfVE9PTEJBUl9IRUlHSFQgKGYp KSwKKwkgICAgIGludGVybiAoImhzY3JvbGwiKSwgbWFrZV9maXhudW0gKEZSQU1FX1NDUk9M TF9CQVJfQVJFQV9IRUlHSFQgKGYpKSwKKwkgICAgIGludGVybiAoImJvcmRlcnMiKSwgbWFr ZV9maXhudW0gKDIgKiBGUkFNRV9JTlRFUk5BTF9CT1JERVJfV0lEVEggKGYpKSwKKwkgICAg IGludGVybiAoImJhc2UgaGVpZ2h0IiksIG1ha2VfZml4bnVtIChzaXplX2hpbnRzLmJhc2Vf aGVpZ2h0KSwKKwkgICAgIGludGVybiAoImhlaWdodCBpbmMiKSwgbWFrZV9maXhudW0gKHNp emVfaGludHMuaGVpZ2h0X2luYykpOworCiAgICAgICBibG9ja19pbnB1dCAoKTsKICAgICAg IGd0a193aW5kb3dfc2V0X2dlb21ldHJ5X2hpbnRzIChHVEtfV0lORE9XIChGUkFNRV9HVEtf T1VURVJfV0lER0VUIChmKSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgTlVMTCwgJnNpemVfaGludHMsIGhpbnRfZmxhZ3MpOwpkaWZmIC0tZ2l0IGEvc3JjL3dp bmRvdy5jIGIvc3JjL3dpbmRvdy5jCmluZGV4IGYxMTZiOWE5ZDcuLmMwOTBmMjk0NjEgMTAw NjQ0Ci0tLSBhL3NyYy93aW5kb3cuYworKysgYi9zcmMvd2luZG93LmMKQEAgLTgzOTQsNiAr ODM5NCw3IEBAIHN5bXNfb2Zfd2luZG93ICh2b2lkKQogICBERUZTWU0gKFFoZWFkZXJfbGlu ZV9mb3JtYXQsICJoZWFkZXItbGluZS1mb3JtYXQiKTsKICAgREVGU1lNIChRdGFiX2xpbmVf Zm9ybWF0LCAidGFiLWxpbmUtZm9ybWF0Iik7CiAgIERFRlNZTSAoUW5vX290aGVyX3dpbmRv dywgIm5vLW90aGVyLXdpbmRvdyIpOworICBERUZTWU0gKFFmb29faXQsICJmb28taXQiKTsK IAogICBERUZWQVJfTElTUCAoInRlbXAtYnVmZmVyLXNob3ctZnVuY3Rpb24iLCBWdGVtcF9i dWZmZXJfc2hvd19mdW5jdGlvbiwKIAkgICAgICAgZG9jOiAvKiBOb24tbmlsIG1lYW5zIGNh bGwgYXMgZnVuY3Rpb24gdG8gZGlzcGxheSBhIGhlbHAgYnVmZmVyLgpkaWZmIC0tZ2l0IGEv c3JjL3h0ZXJtLmMgYi9zcmMveHRlcm0uYwppbmRleCA3ZWFmNTlkNTRiLi5iMmU2ODlmZTg0 IDEwMDY0NAotLS0gYS9zcmMveHRlcm0uYworKysgYi9zcmMveHRlcm0uYwpAQCAtMjYxNjAs NiArMjYxNjAsOCBAQCB4X25ld19mb250IChzdHJ1Y3QgZnJhbWUgKmYsIExpc3BfT2JqZWN0 IGZvbnRfb2JqZWN0LCBpbnQgZm9udHNldCkKIHsKICAgc3RydWN0IGZvbnQgKmZvbnQgPSBY Rk9OVF9PQkpFQ1QgKGZvbnRfb2JqZWN0KTsKICAgaW50IHVuaXQsIGZvbnRfYXNjZW50LCBm b250X2Rlc2NlbnQ7CisgIGludCBvbGRfd2lkdGggPSBGUkFNRV9DT0xVTU5fV0lEVEggKGYp OworICBpbnQgb2xkX2hlaWdodCA9IEZSQU1FX0xJTkVfSEVJR0hUIChmKTsKIAogICBpZiAo Zm9udHNldCA8IDApCiAgICAgZm9udHNldCA9IGZvbnRzZXRfZnJvbV9mb250IChmb250X29i amVjdCk7CkBAIC0yNjE5Nyw5ICsyNjE5OSwyNyBAQCB4X25ld19mb250IChzdHJ1Y3QgZnJh bWUgKmYsIExpc3BfT2JqZWN0IGZvbnRfb2JqZWN0LCBpbnQgZm9udHNldCkKICAgICAgYmVj YXVzZSBpdCdzIGRvbmUgaW4gRnhfc2hvd190aXAsIGFuZCBpdCBsZWFkcyB0byBwcm9ibGVt cyBiZWNhdXNlCiAgICAgIHRoZSB0aXAgZnJhbWUgaGFzIG5vIHdpZGdldC4gICovCiAgIGlm IChGUkFNRV9YX1dJTkRPVyAoZikgIT0gMCAmJiAhRlJBTUVfVE9PTFRJUF9QIChmKSkKLSAg ICBhZGp1c3RfZnJhbWVfc2l6ZQotICAgICAgKGYsIEZSQU1FX0NPTFMgKGYpICogRlJBTUVf Q09MVU1OX1dJRFRIIChmKSwKLSAgICAgICBGUkFNRV9MSU5FUyAoZikgKiBGUkFNRV9MSU5F X0hFSUdIVCAoZiksIDMsIGZhbHNlLCBRZm9udCk7CisgICAgeworICAgICAgQ0FMTE4gKEZm dW5jYWxsLCBRZm9vX2l0LCBpbnRlcm4gKCJcbnhfbmV3X2ZvbnQiKSwKKwkgICAgIGludGVy biAoIm9sZCBjaGFyIHNpemUiKSwKKwkgICAgIEZjb25zIChtYWtlX2ZpeG51bSAob2xkX3dp ZHRoKSwgbWFrZV9maXhudW0gKG9sZF9oZWlnaHQpKSwKKwkgICAgIGludGVybiAoIm5ldyBj aGFyIHNpemUiKSwKKwkgICAgIEZjb25zIChtYWtlX2ZpeG51bSAoRlJBTUVfQ09MVU1OX1dJ RFRIIChmKSksCisJCSAgICBtYWtlX2ZpeG51bSAoRlJBTUVfTElORV9IRUlHSFQgKGYpKSks CisJICAgICBpbnRlcm4gKCJ0ZXh0IGNoYXJzIiksCisJICAgICBGY29ucyAobWFrZV9maXhu dW0gKEZSQU1FX0NPTFMgKGYpKSwKKwkJICAgIG1ha2VfZml4bnVtIChGUkFNRV9MSU5FUyAo ZikpKSwKKwkgICAgIGludGVybiAoIm9sZCB0ZXh0IHBpeGVscyIpLAorCSAgICAgRmNvbnMg KG1ha2VfZml4bnVtIChGUkFNRV9URVhUX1dJRFRIIChmKSksCisJCSAgICBtYWtlX2ZpeG51 bSAoRlJBTUVfVEVYVF9IRUlHSFQgKGYpKSksCisJICAgICBpbnRlcm4gKCJuZXcgdGV4dCBw aXhlbHMiKSwKKwkgICAgIEZjb25zIChtYWtlX2ZpeG51bSAoRlJBTUVfQ09MUyAoZikgKiBG UkFNRV9DT0xVTU5fV0lEVEggKGYpKSwKKwkJICAgIG1ha2VfZml4bnVtIChGUkFNRV9MSU5F UyAoZikgKiBGUkFNRV9MSU5FX0hFSUdIVCAoZikpKSk7CisKKyAgICAgIGFkanVzdF9mcmFt ZV9zaXplCisJKGYsIEZSQU1FX0NPTFMgKGYpICogRlJBTUVfQ09MVU1OX1dJRFRIIChmKSwK KwkgRlJBTUVfTElORVMgKGYpICogRlJBTUVfTElORV9IRUlHSFQgKGYpLCAzLCBmYWxzZSwg UWZvbnQpOworICAgIH0KIAogI2lmZGVmIEhBVkVfWF9JMThOCiAgIGlmIChGUkFNRV9YSUMg KGYpCg== --------------LlFguf8xIZC25bWsT7Zj3g5A--