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: Wed, 28 Dec 2022 11:08:34 +0100 Message-ID: <66499633-3283-3cb2-2322-77a357a3c1b7@gmx.at> References: <80e7f515-e16f-5ce8-86a3-e5f47cd2d2f5@yandex.ru> <83wnk4fpyw.fsf@gnu.org> <9df1ebce-83ff-068c-20ed-b849697a06b2@yandex.ru> <8faaa5db-7099-b4d5-fae2-97b1eb28b90c@gmx.at> <2f876c63-d9f5-4dbe-6d82-5d46eb73118d@gmx.at> <8ca8c5c6-c8a1-bf48-a9e6-1e16935de2d6@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> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------7fNCgcQD2xdaW4gTYGHSNpHL" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4705"; 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 Wed Dec 28 11:09:31 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 1pATNL-00010i-6K for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 28 Dec 2022 11:09:31 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pATMz-0004vn-Md; Wed, 28 Dec 2022 05:09:09 -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 1pATMw-0004qU-PD for bug-gnu-emacs@gnu.org; Wed, 28 Dec 2022 05:09:06 -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 1pATMs-0001hT-Pg for bug-gnu-emacs@gnu.org; Wed, 28 Dec 2022 05:09:06 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pATMs-0002n1-7i for bug-gnu-emacs@gnu.org; Wed, 28 Dec 2022 05:09: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: Wed, 28 Dec 2022 10:09:02 +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.167222212710698 (code B ref 52493); Wed, 28 Dec 2022 10:09:02 +0000 Original-Received: (at 52493) by debbugs.gnu.org; 28 Dec 2022 10:08:47 +0000 Original-Received: from localhost ([127.0.0.1]:57160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pATMc-0002mU-Om for submit@debbugs.gnu.org; Wed, 28 Dec 2022 05:08:47 -0500 Original-Received: from mout.gmx.net ([212.227.17.21]:32921) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pATMa-0002mA-TY for 52493@debbugs.gnu.org; Wed, 28 Dec 2022 05:08:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.at; s=s31663417; t=1672222118; bh=R1Vfups9LxtDbv7i6SyRiRzoFM4/aAnji/dUKrJMJzg=; h=X-UI-Sender-Class:Date:Subject:To:Cc:References:From:In-Reply-To; b=of+tDopNjAWmK7YfOrz1zPCBZYbPyqk1uhKcFDhHK4m7PJeUo9ZY5fCxs1q36Ue5M /fF9f8kZ0aWJmI89m40kXkOR2q7KC7FNBDaLyfp4zDwXUNGco+S3AYmSpGP4wgfdWH 8aFWgM0482CQ5IlRIv+PDxymLp08tzSi0ZpjTNou1ZXf+RTH8qUqi2LTJka3tZ2VUV I48UEbFJ1sVRJeoa+BNzUoJhL5TzuBgX9PeyS+VDTSq/hdTjf+ZUVMYxvKPoXd31oO 0hatttcni/pR4u2E2SzIizlHnrN4vlLB7NdkBLf3PYgpxjk1QBD8rViEUk149DttoF LUqvfPFSFvBuQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from [192.168.1.100] ([46.125.249.21]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N7zFj-1opWUf0AiZ-014yo3; Wed, 28 Dec 2022 11:08:38 +0100 Content-Language: en-US In-Reply-To: <266ad500-da74-13a5-2434-81bd3d5b3554@yandex.ru> X-Provags-ID: V03:K1:3sNtIslu6y3fkP7lNVz75Whxm/BdQk0KyNYa5uZxnnEi8sxIu+C qci4ZbPRen5bftewZxlj75edYCT3b2FRqifZ3PgMGGpwtsAScACCcdjSWbi2N221Ahvd7Du nqTDsWxBcWgP7fOqJhI+u81O8xTDsPL9+FVGrNdVwNvOJBOTDrSVTSzpT8C3HRMVNeroOwU /qByg4H1uNqQhstrGJV2w== UI-OutboundReport: notjunk:1;M01:P0:Qxw1Geb7Y6s=;uE0hm269tGUI6C1X0FaQ3mq4Qb0 7BmULs1fnYReV3luIe202fG3F0IjNagzJn7YSLKAbONp6b9QOxWvdFfl+vfojrofr0z1r9x4j BgB07g43q5JnXbEOfYdW7Hw1dFh0cm5sKi6/bdqm3qdEwofr9sr+TwWwQZhvqMvJPJA/KVt5N T0P13kdVu9ugVkThSBBQstmojEV2IIIIvV9ou5ppJ5zP1VPODXzDh18zALgPgdDHYL6kBjVQn gOXfcgtpJ5sRD444MLpBAb9HutcACWhjgHxvUeNv3WS8m8R1GQkJ7ZOb3jiQpNwsQD5ulUc3x PdnSGXPxH/71jSEuzhOjXHtIQ2GLv8YsYF6KsPgu3DD2V96MgCC2WCqPgHhE1aJZpAK1W3biJ PR6FwvTNGhooi2QlJVO3WObjj1FkzQFFRWHEXvA4ppccohFx1zxzfA/JESaAXJkC3hLwKVGmT WAkGT/SaaA57Tw5Uk5gnAG/+CECKr9chwC6XnCa0M+2H34xre2VrUQFLMpLqO+75/Z1uSpB5f IvEBxOPx3co+N90Q21zPe0d4z7r+2Beh+u3rBLWMnfb8u+4mzP1Z3vh8pmxejhrBmSw/smoUd qHRcp+IR3+vAih1umA2pulLoyR001wqiczeSs1FPPinlpnooK4Y4QNXtZqEj8n0O7FLP0kvfZ 2gviGT528Tb1oKeZF+TZwobbtJvRazHupDxMgcxVBpVinFeaMpWuFnYMepO68CtRFpuwj2kPc ktfiikigKFrGPa76sfoC6ZjNPNm9VWPUg92PBptCRAZpEXXDTHbAasiP+/HLh+bQe1str1Op 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:251979 Archived-At: This is a multi-part message in MIME format. --------------7fNCgcQD2xdaW4gTYGHSNpHL Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit > Here you go, three attachments. Thank you, they now contain all we need. > As you previously guessed, the effect didn't show up when the scaling was off, or when resize-pixelwise was enabled. In both cases we don't scale. Scaling introduces a rounding effect mutter apparently doesn't like. Take, for example, these lines of foo-with-scaling.txt produced when we set a new font (actually the first line belongs to the previous request and is here only to show that we start with a frame of 35 lines): adjust_frame_size .. old pixels/lines .. 1296 .. 36 .. new pixels/lines .. 1584 .. 35 x_new_font .. line_height .. 37 .. lines .. 35 .. new_text_height .. 1295 xg_wm_set_size_hint .. line_height & scale .. 37 .. 2 .. base_height .. 84 .. height_inc .. 18 menubar_height .. 50 .. toolbar_height .. 82 xg_frame_set_char_size .. old .. 1584 .. arg .. 1295 .. new .. -1 outer .. 713 .. gheight .. 858 xg_frame_resized .. old .. 1584 .. req .. -1 .. con/text .. 1260 .. 1260 adjust_frame_size .. old pixels/lines .. 1584 .. 35 .. new pixels/lines .. 1260 .. 34 The base_height value (84 pixels) we calculate here is the sum of the line_height value, the menubar_height value and the toolbar_height values divided by the scale factor: (/ (+ 37 50 82) 2) height_inc (18) is the line height divided by the scale factor (/ 37 2). These size hints have mutter expect us to resize our frame to something like (+ base_height (* height_inc N)) for some positive integer N. Now we want to resize the frame to line_height times lines, that is (* 37 35) yielding 1295 pixels. But (% (/ 1295 2) 18) is not zero and so mutter declines our request giving us 1260 pixels text height instead. Apparently, mutter starts with (/ 1295 2) that is 647, 630 is the next multiple of 18 it finds, so (* 630 2) is the value it concedes us. So the height we should ask for with scaling is 1296 instead of 1295. Please try the attached patch - I can't test it here because I don't scale. If it doesn't work, please post the contents of *foo* as usual. Thanks, martin --------------7fNCgcQD2xdaW4gTYGHSNpHL 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 MjkzZDM3Mi4uM2QwNjRlMTJkNyAxMDA2NDQKLS0tIGEvbGlzcC93aW5kb3cuZWwKKysrIGIv bGlzcC93aW5kb3cuZWwKQEAgLTEwNTk2LDYgKzEwNTk2LDE3IEBAIHdpbmRvdy1wcmVmaXgt bWFwCiAgICIwIiAjJ2RlbGV0ZS13aW5kb3dzLW9uKQogKGRlZmluZS1rZXkgY3RsLXgtbWFw ICJ3IiB3aW5kb3ctcHJlZml4LW1hcCkKIAorKGRlZnVuIGZvby1pdCAoJnJlc3QgcmVzdCkK KyAgKHdpdGgtY3VycmVudC1idWZmZXIgKGdldC1idWZmZXItY3JlYXRlICIqZm9vKiIpCisg ICAgKGdvdG8tY2hhciAocG9pbnQtbWF4KSkKKyAgICAod2hlbiByZXN0CisgICAgICAoaW5z ZXJ0IChmb3JtYXQgIiVzIiAoY2FyIHJlc3QpKSkKKyAgICAgIChzZXRxIHJlc3QgKGNkciBy ZXN0KSkKKyAgICAgICh3aGlsZSByZXN0CisJKGluc2VydCAoZm9ybWF0ICIgLi4gJXMiIChj YXIgcmVzdCkpKQorCShzZXRxIHJlc3QgKGNkciByZXN0KSkpCisgICAgICAoaW5zZXJ0ICJc biIpKSkpCisKIChwcm92aWRlICd3aW5kb3cpCiAKIDs7OyB3aW5kb3cuZWwgZW5kcyBoZXJl CmRpZmYgLS1naXQgYS9zcmMvZnJhbWUuYyBiL3NyYy9mcmFtZS5jCmluZGV4IGI1N2IyOTZi ZTUuLjQ1MDFjOGRjMTQgMTAwNjQ0Ci0tLSBhL3NyYy9mcmFtZS5jCisrKyBiL3NyYy9mcmFt ZS5jCkBAIC05MDYsNiArOTA2LDE0IEBAIGFkanVzdF9mcmFtZV9zaXplIChzdHJ1Y3QgZnJh bWUgKmYsIGludCBuZXdfdGV4dF93aWR0aCwgaW50IG5ld190ZXh0X2hlaWdodCwKIAogICB1 bmJsb2NrX2lucHV0ICgpOwogCisgIGlmIChvbGRfbmF0aXZlX2hlaWdodCAhPSBuZXdfbmF0 aXZlX2hlaWdodAorICAgICAgfHwgb2xkX3RleHRfbGluZXMgIT0gbmV3X3RleHRfbGluZXMp CisgICAgY2FsbDcgKFFmb29faXQsIGludGVybiAoImFkanVzdF9mcmFtZV9zaXplIiksCisJ ICAgaW50ZXJuICgib2xkIHBpeGVscy9saW5lcyIpLCBtYWtlX2ZpeG51bSAob2xkX25hdGl2 ZV9oZWlnaHQpLAorCSAgIG1ha2VfZml4bnVtIChvbGRfdGV4dF9saW5lcyksCisJICAgaW50 ZXJuICgibmV3IHBpeGVscy9saW5lcyIpLCBtYWtlX2ZpeG51bSAobmV3X25hdGl2ZV9oZWln aHQpLAorCSAgIG1ha2VfZml4bnVtIChuZXdfdGV4dF9saW5lcykpOworCiAjaWZkZWYgSEFW RV9XSU5ET1dfU1lTVEVNCiAgIHsKICAgICAvKiBBZGp1c3Qgc2l6ZSBvZiBGJ3MgY2hpbGQg ZnJhbWVzLiAgKi8KZGlmZiAtLWdpdCBhL3NyYy9ndGt1dGlsLmMgYi9zcmMvZ3RrdXRpbC5j CmluZGV4IGE2YmJhMDk2YTQuLjY4MWNiY2Q1MmMgMTAwNjQ0Ci0tLSBhL3NyYy9ndGt1dGls LmMKKysrIGIvc3JjL2d0a3V0aWwuYwpAQCAtMTE0OSw2ICsxMTQ5LDEzIEBAIHhnX2ZyYW1l X3Jlc2l6ZWQgKHN0cnVjdCBmcmFtZSAqZiwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KQogCSAg IGYtPm5ld19zaXplX3AgPyBmLT5uZXdfaGVpZ2h0IDogLTEpOwogCiAgICAgICBGUkFNRV9S SUYgKGYpLT5jbGVhcl91bmRlcl9pbnRlcm5hbF9ib3JkZXIgKGYpOworCisgICAgICBjYWxs OCAoUWZvb19pdCwgaW50ZXJuICgieGdfZnJhbWVfcmVzaXplZCIpLAorCSAgICAgaW50ZXJu ICgib2xkIiksIG1ha2VfZml4bnVtIChGUkFNRV9QSVhFTF9IRUlHSFQgKGYpKSwKKwkgICAg IGludGVybiAoInJlcSIpLCBtYWtlX2ZpeG51bSAoZi0+bmV3X2hlaWdodCksCisJICAgICBp bnRlcm4gKCJjb24vdGV4dCIpLCBtYWtlX2ZpeG51bSAoaGVpZ2h0KSwKKwkgICAgIG1ha2Vf Zml4bnVtIChGUkFNRV9QSVhFTF9UT19URVhUX0hFSUdIVCAoZiwgaGVpZ2h0KSkpOworCiAg ICAgICBjaGFuZ2VfZnJhbWVfc2l6ZSAoZiwgd2lkdGgsIGhlaWdodCwgZmFsc2UsIHRydWUs IGZhbHNlKTsKICAgICAgIFNFVF9GUkFNRV9HQVJCQUdFRCAoZik7CiAgICAgICBjYW5jZWxf bW91c2VfZmFjZSAoZik7CkBAIC0xMTc0LDYgKzExODEsMjMgQEAgeGdfZnJhbWVfc2V0X2No YXJfc2l6ZSAoc3RydWN0IGZyYW1lICpmLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCiAgIGlu dCBvdXRlcl93aWR0aCA9IHdpZHRoICsgRlJBTUVfVE9PTEJBUl9XSURUSCAoZik7CiAgIGJv b2wgd2FzX3Zpc2libGUgPSBmYWxzZTsKICAgYm9vbCBoaWRlX2NoaWxkX2ZyYW1lOworICBp bnQgc2NhbGUgPSB4Z19nZXRfc2NhbGUgKGYpOworCisgIGlmIChzY2FsZSAhPSAxICYmICFm cmFtZV9yZXNpemVfcGl4ZWx3aXNlKQorICAgIHsKKyAgICAgIGlmIChGUkFNRV9DT0xVTU5f V0lEVEggKGYpICUgMiAhPSAwKQorCXsKKwkgIHdpZHRoID0gRlJBTUVfQ09MUyAoZikgKiAo RlJBTUVfQ09MVU1OX1dJRFRIIChmKSArIDEpOworCSAgb3V0ZXJfd2lkdGggPSB3aWR0aCAr IEZSQU1FX1RPT0xCQVJfV0lEVEggKGYpOworCX0KKworICAgICAgaWYgKEZSQU1FX0xJTkVf SEVJR0hUIChmKSAlIDIgIT0gMCkKKwl7CisJICBoZWlnaHQgPSBGUkFNRV9MSU5FUyAoZikg KiAoRlJBTUVfTElORV9IRUlHSFQgKGYpICsgMSk7CisJICBvdXRlcl9oZWlnaHQKKwkgICAg PSBoZWlnaHQgKyBGUkFNRV9UT09MQkFSX0hFSUdIVCAoZikgKyBGUkFNRV9NRU5VQkFSX0hF SUdIVCAoZik7CisJfQorICAgIH0KIAogI2lmbmRlZiBIQVZFX1BHVEsKICAgZ3RrX3dpbmRv d19nZXRfc2l6ZSAoR1RLX1dJTkRPVyAoRlJBTUVfR1RLX09VVEVSX1dJREdFVCAoZikpLApA QCAtMTE5Niw4ICsxMjIwLDggQEAgeGdfZnJhbWVfc2V0X2NoYXJfc2l6ZSAoc3RydWN0IGZy YW1lICpmLCBpbnQgd2lkdGgsIGludCBoZWlnaHQpCiAgIC8qIERvIHRoaXMgYmVmb3JlIHJl c2l6ZSwgYXMgd2UgZG9uJ3Qga25vdyB5ZXQgaWYgd2Ugd2lsbCBiZSByZXNpemVkLiAgKi8K ICAgRlJBTUVfUklGIChmKS0+Y2xlYXJfdW5kZXJfaW50ZXJuYWxfYm9yZGVyIChmKTsKIAot ICBvdXRlcl9oZWlnaHQgLz0geGdfZ2V0X3NjYWxlIChmKTsKLSAgb3V0ZXJfd2lkdGggLz0g eGdfZ2V0X3NjYWxlIChmKTsKKyAgb3V0ZXJfaGVpZ2h0IC89IHNjYWxlOworICBvdXRlcl93 aWR0aCAvPSBzY2FsZTsKIAogICB4Z193bV9zZXRfc2l6ZV9oaW50IChmLCAwLCAwKTsKIApA QCAtMTMxNyw2ICsxMzQxLDE0IEBAIHhnX2ZyYW1lX3NldF9jaGFyX3NpemUgKHN0cnVjdCBm cmFtZSAqZiwgaW50IHdpZHRoLCBpbnQgaGVpZ2h0KQogICBTRVRfRlJBTUVfR0FSQkFHRUQg KGYpOwogICBjYW5jZWxfbW91c2VfZmFjZSAoZik7CiAKKyAgY2FsbDcgKFFmb29faXQsIGlu dGVybiAoInhnX2ZyYW1lX3NldF9jaGFyX3NpemUiKSwKKwkgaW50ZXJuICgib2xkIiksIG1h a2VfZml4bnVtIChGUkFNRV9QSVhFTF9IRUlHSFQgKGYpKSwKKwkgaW50ZXJuICgiYXJnIiks IG1ha2VfZml4bnVtIChoZWlnaHQpLAorCSBpbnRlcm4gKCJuZXciKSwgbWFrZV9maXhudW0g KGYtPm5ld19oZWlnaHQpKTsKKyAgY2FsbDQgKFFmb29faXQsCisJIGludGVybiAoIiAgb3V0 ZXIiKSwgbWFrZV9maXhudW0gKG91dGVyX2hlaWdodCksCisJIGludGVybiAoImdoZWlnaHQi KSwgbWFrZV9maXhudW0gKGdoZWlnaHQpKTsKKwogICAvKiBXZSBjYW4gbm90IGNhbGwgY2hh bmdlX2ZyYW1lX3NpemUgZm9yIGEgbWFwcGVkIGZyYW1lLAogICAgICB3ZSBjYW4gbm90IHNl dCBwaXhlbCB3aWR0aC9oZWlnaHQgZWl0aGVyLiAgVGhlIHdpbmRvdyBtYW5hZ2VyIG1heQog ICAgICBvdmVycmlkZSBvdXIgcmVzaXplIHJlcXVlc3QsIFhNb25hZCBkb2VzIHRoaXMgYWxs IHRoZSB0aW1lLgpAQCAtMjAyOCw2ICsyMDYwLDEzIEBAIHhnX3dtX3NldF9zaXplX2hpbnQg KHN0cnVjdCBmcmFtZSAqZiwgbG9uZyBpbnQgZmxhZ3MsIGJvb2wgdXNlcl9wb3NpdGlvbikK IAkJICZmLT5vdXRwdXRfZGF0YS54cC0+c2l6ZV9oaW50cywKIAkJIHNpemVvZiAoc2l6ZV9o aW50cykpICE9IDApCiAgICAgeworICAgICAgY2FsbDggKFFmb29faXQsIGludGVybiAoInhn X3dtX3NldF9zaXplX2hpbnQiKSwKKwkgICAgIGludGVybiAoImxpbmVfaGVpZ2h0ICYgc2Nh bGUiKSwKKwkgICAgIG1ha2VfZml4bnVtIChGUkFNRV9MSU5FX0hFSUdIVCAoZikpLCBtYWtl X2ZpeG51bSAoc2NhbGUpLAorCSAgICAgaW50ZXJuICgiYmFzZV9oZWlnaHQiKSwgbWFrZV9m aXhudW0gKHNpemVfaGludHMuYmFzZV9oZWlnaHQpLAorCSAgICAgaW50ZXJuICgiaGVpZ2h0 X2luYyIpLCBtYWtlX2ZpeG51bSAoc2l6ZV9oaW50cy5oZWlnaHRfaW5jKSk7CisgICAgICBj YWxsNCAoUWZvb19pdCwgaW50ZXJuICgiICBtZW51YmFyX2hlaWdodCIpLCBtYWtlX2ZpeG51 bSAoRlJBTUVfTUVOVUJBUl9IRUlHSFQgKGYpKSwKKwkgICAgIGludGVybiAoInRvb2xiYXJf aGVpZ2h0IiksIG1ha2VfZml4bnVtIChGUkFNRV9UT09MQkFSX0hFSUdIVCAoZikpKTsKICAg ICAgIGJsb2NrX2lucHV0ICgpOwogICAgICAgZ3RrX3dpbmRvd19zZXRfZ2VvbWV0cnlfaGlu dHMgKEdUS19XSU5ET1cgKEZSQU1FX0dUS19PVVRFUl9XSURHRVQgKGYpKSwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMLCAmc2l6ZV9oaW50cywgaGludF9m bGFncyk7CmRpZmYgLS1naXQgYS9zcmMvd2luZG93LmMgYi9zcmMvd2luZG93LmMKaW5kZXgg ZjExNmI5YTlkNy4uYzA5MGYyOTQ2MSAxMDA2NDQKLS0tIGEvc3JjL3dpbmRvdy5jCisrKyBi L3NyYy93aW5kb3cuYwpAQCAtODM5NCw2ICs4Mzk0LDcgQEAgc3ltc19vZl93aW5kb3cgKHZv aWQpCiAgIERFRlNZTSAoUWhlYWRlcl9saW5lX2Zvcm1hdCwgImhlYWRlci1saW5lLWZvcm1h dCIpOwogICBERUZTWU0gKFF0YWJfbGluZV9mb3JtYXQsICJ0YWItbGluZS1mb3JtYXQiKTsK ICAgREVGU1lNIChRbm9fb3RoZXJfd2luZG93LCAibm8tb3RoZXItd2luZG93Iik7CisgIERF RlNZTSAoUWZvb19pdCwgImZvby1pdCIpOwogCiAgIERFRlZBUl9MSVNQICgidGVtcC1idWZm ZXItc2hvdy1mdW5jdGlvbiIsIFZ0ZW1wX2J1ZmZlcl9zaG93X2Z1bmN0aW9uLAogCSAgICAg ICBkb2M6IC8qIE5vbi1uaWwgbWVhbnMgY2FsbCBhcyBmdW5jdGlvbiB0byBkaXNwbGF5IGEg aGVscCBidWZmZXIuCmRpZmYgLS1naXQgYS9zcmMveHRlcm0uYyBiL3NyYy94dGVybS5jCmlu ZGV4IDdlYWY1OWQ1NGIuLjI3N2I1MzA0M2EgMTAwNjQ0Ci0tLSBhL3NyYy94dGVybS5jCisr KyBiL3NyYy94dGVybS5jCkBAIC0yNjE5Nyw5ICsyNjE5NywxNyBAQCB4X25ld19mb250IChz dHJ1Y3QgZnJhbWUgKmYsIExpc3BfT2JqZWN0IGZvbnRfb2JqZWN0LCBpbnQgZm9udHNldCkK ICAgICAgYmVjYXVzZSBpdCdzIGRvbmUgaW4gRnhfc2hvd190aXAsIGFuZCBpdCBsZWFkcyB0 byBwcm9ibGVtcyBiZWNhdXNlCiAgICAgIHRoZSB0aXAgZnJhbWUgaGFzIG5vIHdpZGdldC4g ICovCiAgIGlmIChGUkFNRV9YX1dJTkRPVyAoZikgIT0gMCAmJiAhRlJBTUVfVE9PTFRJUF9Q IChmKSkKLSAgICBhZGp1c3RfZnJhbWVfc2l6ZQotICAgICAgKGYsIEZSQU1FX0NPTFMgKGYp ICogRlJBTUVfQ09MVU1OX1dJRFRIIChmKSwKLSAgICAgICBGUkFNRV9MSU5FUyAoZikgKiBG UkFNRV9MSU5FX0hFSUdIVCAoZiksIDMsIGZhbHNlLCBRZm9udCk7CisgICAgeworICAgICAg Y2FsbDcgKFFmb29faXQsIGludGVybiAoInhfbmV3X2ZvbnQiKSwKKwkgICAgIGludGVybiAo ImxpbmVfaGVpZ2h0IiksIG1ha2VfZml4bnVtIChGUkFNRV9MSU5FX0hFSUdIVCAoZikpLAor CSAgICAgaW50ZXJuICgibGluZXMiKSwgbWFrZV9maXhudW0gKEZSQU1FX0xJTkVTIChmKSks CisJICAgICBpbnRlcm4gKCJuZXdfdGV4dF9oZWlnaHQiKSwKKwkgICAgIG1ha2VfZml4bnVt IChGUkFNRV9MSU5FUyAoZikgKiBGUkFNRV9MSU5FX0hFSUdIVCAoZikpKTsKKworICAgICAg YWRqdXN0X2ZyYW1lX3NpemUKKwkoZiwgRlJBTUVfQ09MUyAoZikgKiBGUkFNRV9DT0xVTU5f V0lEVEggKGYpLAorCSBGUkFNRV9MSU5FUyAoZikgKiBGUkFNRV9MSU5FX0hFSUdIVCAoZiks IDMsIGZhbHNlLCBRZm9udCk7CisgICAgfQogCiAjaWZkZWYgSEFWRV9YX0kxOE4KICAgaWYg KEZSQU1FX1hJQyAoZikK --------------7fNCgcQD2xdaW4gTYGHSNpHL--