From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jared Finder via "Emacs development discussions." Newsgroups: gmane.emacs.devel Subject: Making TTY menus more visual Date: Thu, 01 Oct 2020 23:16:49 -0700 Message-ID: <087df85a965fac6555a755c1bbebf1ea@finder.org> Reply-To: Jared Finder Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=_f6dc306166966aaeb00118ccc27c345d" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20956"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Roundcube Webmail/1.3.15 To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Fri Oct 02 08:25:00 2020 Return-path: Envelope-to: ged-emacs-devel@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 1kOEV1-0005GN-Q3 for ged-emacs-devel@m.gmane-mx.org; Fri, 02 Oct 2020 08:24:59 +0200 Original-Received: from localhost ([::1]:48458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kOEV0-0003Kn-RP for ged-emacs-devel@m.gmane-mx.org; Fri, 02 Oct 2020 02:24:58 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kOENC-0001wg-3m for emacs-devel@gnu.org; Fri, 02 Oct 2020 02:16:54 -0400 Original-Received: from greenhill.hpalace.com ([192.155.80.58]:33992) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kOEN9-0003Fg-NH for emacs-devel@gnu.org; Fri, 02 Oct 2020 02:16:53 -0400 Original-Received: from mail.finder.org (greenhill.hpalace.com [IPv6:2600:3c01::f03c:91ff:fe73:2daa]) by greenhill.hpalace.com (Postfix) with ESMTPSA id 19F6BC96 for ; Fri, 2 Oct 2020 06:16:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=finder.org; s=2018; t=1601619410; bh=GTnbACYByYlUyYdsgyzNL2Cz8kjH0JYOrZgWurrmkMk=; h=Date:From:To:Subject:From; b=R4kur9uZzHhQlj4MwQtSCMifiKesWLqG3CxAWqhhEGzwuNjUpJLfhsq7RVG/ETekK Q3MiujcLXgOFuNJPImjhRWKe9YdY+5u0+mJF6qNBZE6osWF7LMCA+uVm4H3mYrQT1p mGNltcO+J+W0lv/I0byPujnO6vZqYW8MSQykYQaoo0rFK1D8aA1AX8jfLhRndeXzph 1rYT4nB5rqHttrtU9NHF3ADATG6z7pKdrHp9ukAE+0YFeLd5cyK6qy+pseIBQY2dSB fznVrUPoUMox2Sa7zH9bznUeCUlQia65rMAk46jhSw/rrRX7WxcHQLdZTA7oijkFjG KA5oDSkrd3BIA== X-Sender: jared@finder.org Received-SPF: pass client-ip=192.155.80.58; envelope-from=jared@finder.org; helo=greenhill.hpalace.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/02 02:16:50 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 02 Oct 2020 02:24:22 -0400 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:256923 Archived-At: --=_f6dc306166966aaeb00118ccc27c345d Content-Type: multipart/alternative; boundary="=_d53fd331c4b8dc5ec5aa1cfd72d1680e" --=_d53fd331c4b8dc5ec5aa1cfd72d1680e Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII Hi lovely developers, I'm a long time Emacs user, first time Emacs patch submitter. :) Right now in Emacs on a TTY, clicking on the menu bar with the mouse pops up menu navigation through tmm.el. I think it would make more sense for mouse clicks to pop up visual menus via menu-bar-open-mouse by default. But I get why that's not the current default. These visual menus currently behave very poorly with a mouse on a Linux TTY: Clicking anywhere selects the currently selected item, not the item you clicked on. I have a prototype fix for this that I've been working on. If you think it makes sense, I can finish it up. I've attached the changes in case you want to take a look. Let me know your thoughts. -- MJF --=_d53fd331c4b8dc5ec5aa1cfd72d1680e Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=UTF-8

Hi lovely developers, I'm a long time Emacs user, first time Emacs patch= submitter. :)

Right now in Emacs on a TTY, clicking on the menu bar with the mouse pop= s up menu navigation through tmm.el.  I think it would make more sense= for mouse clicks to pop up visual menus via menu-bar-open-mouse by de= fault.

But I get why that's not the current default. These visual menus current= ly behave very poorly with a mouse on a Linux TTY: Clicking <mouse-1>= anywhere selects the currently selected item, not the item you clicked on= =2E I have a prototype fix for this that I've been working on. If you think= it makes sense, I can finish it up. I've attached the changes in case you = want to take a look.

Let me know your thoughts.

  -- MJF

--=_d53fd331c4b8dc5ec5aa1cfd72d1680e-- --=_f6dc306166966aaeb00118ccc27c345d Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=0001-Adding-mouse-controls-to-menu-bar.el.patch Content-Disposition: attachment; filename=0001-Adding-mouse-controls-to-menu-bar.el.patch; size=4392 RnJvbSA5OTcyY2E0OTk1ZTJlNDNjZmFmZjliNTUwZjJiNzNjNzJhZTc2YmI2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYXJlZCBGaW5kZXIgPGphcmVkQGZpbmRlci5vcmc+CkRhdGU6 IFNhdCwgMTkgU2VwIDIwMjAgMDA6NDM6MjkgLTA3MDAKU3ViamVjdDogW1BBVENIIDEvMl0gQWRk aW5nIG1vdXNlIGNvbnRyb2xzIHRvIG1lbnUtYmFyLmVsLgoKLS0tCiBsaXNwL21lbnUtYmFyLmVs IHwgMTIgKysrKysrKysrCiBsaXNwL3RtbS5lbCAgICAgIHwgNjQgKysrKysrKysrKysrKysrKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDUwIGluc2Vy dGlvbnMoKyksIDI2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpc3AvbWVudS1iYXIuZWwg Yi9saXNwL21lbnUtYmFyLmVsCmluZGV4IGQzZTQzNGFlYzkuLjkwMjFiZThlZmYgMTAwNjQ0Ci0t LSBhL2xpc3AvbWVudS1iYXIuZWwKKysrIGIvbGlzcC9tZW51LWJhci5lbApAQCAtMjY2MCw2ICsy NjYwLDE4IEBAIG1lbnUtYmFyLW9wZW4KIAogKGdsb2JhbC1zZXQta2V5IFtmMTBdICdtZW51LWJh ci1vcGVuKQogCisoZGVmdW4gbWVudS1iYXItb3Blbi1tb3VzZSAoZXZlbnQpCisgICJNb3N1ZS10 cmlnZ2VyZWQgdmVyc2lvbiBvZiBgbWVudS1iYXItb3BlbicuCitUaGlzIGNvbW1hbmQgaXMgdG8g YmUgdXNlZCB3aGVuIHlvdSBjbGljayB0aGUgbW91c2UgaW4gdGhlIG1lbnViYXIuIgorICAoaW50 ZXJhY3RpdmUgImUiKQorICAocmVxdWlyZSAndG1tKSAgICAgICA7IFBvc3NpYmx5IGhhdmUgdG1t IGRlcGVuZCBvbiBtZW51LWJhciBpbnN0ZWFkPworICAobGV0KiAoKHgtcG9zaXRpb24gKGNhciAo cG9zbi14LXkgKGV2ZW50LXN0YXJ0IGV2ZW50KSkpKQorICAgICAgICAgKG1lbnUtYmFyLWl0ZW0t Y29ucyAodG1tLW1lbnViYXItaXRlbS1hdC14IHgtcG9zaXRpb24pKSkKKyAgICAobWVudS1iYXIt b3BlbiBuaWwKKyAgICAgICAgICAgICAgICAgICAoaWYgbWVudS1iYXItaXRlbS1jb25zCisgICAg ICAgICAgICAgICAgICAgICAgIChjZHIgbWVudS1iYXItaXRlbS1jb25zKQorICAgICAgICAgICAg ICAgICAgICAgMCkpKSkKKwogKGRlZnVuIGJ1ZmZlci1tZW51LW9wZW4gKCkKICAgIlN0YXJ0IGtl eSBuYXZpZ2F0aW9uIG9mIHRoZSBidWZmZXIgbWVudS4KIFRoaXMgaXMgdGhlIGtleWJvYXJkIGlu dGVyZmFjZSB0byBcXFttb3VzZS1idWZmZXItbWVudV0uIgpkaWZmIC0tZ2l0IGEvbGlzcC90bW0u ZWwgYi9saXNwL3RtbS5lbAppbmRleCAxZTE4YzhiNGFlLi43MTAyOTVjNzc2IDEwMDY0NAotLS0g YS9saXNwL3RtbS5lbAorKysgYi9saXNwL3RtbS5lbApAQCAtNTksNiArNTksNDAgQEAgdG1tLW1l bnViYXIta2V5bWFwCiAgICAgICh0bW0tZ2V0LWtleWJpbmQgW21lbnUtYmFyXSkpCiAgICAgYChr ZXltYXAgLEAobnJldmVyc2UgbWVudS1iYXIpICxAbWVudS1lbmQpKSkKIAorKGRlZnVuIHRtbS1t ZW51YmFyLWl0ZW0tYXQteCAoeC1wb3NpdGlvbikKKyAgIlJldHVybiBhIGNvbnMgb2YgdGhlIGZv cm0gKEtFWSAuIFgpIGZvciB0aGUgaXRlbSBjbGlja2VkIG9uLgorCitJZiBub3RoaW5nIGlzIGNs aWNrZWQgb24sIHJldHVybnMgbmlsLiIKKyAgKGxldCAoKGNvbHVtbiAwKQorICAgICAgICAobWVu dS1iYXIgKHRtbS1tZW51YmFyLWtleW1hcCkpCisgICAgICAgIHByZXYta2V5CisgICAgICAgIHBy ZXYtY29sdW1uCisgICAgICAgIGZvdW5kKQorICAgIChjYXRjaCAnZG9uZQorICAgICAgKG1hcC1r ZXltYXAKKyAgICAgICAobGFtYmRhIChrZXkgYmluZGluZykKKyAgICAgICAgICh3aGVuICg+IGNv bHVtbiB4LXBvc2l0aW9uKQorICAgICAgICAgICAoc2V0cSBmb3VuZCB0KQorICAgICAgICAgICAo dGhyb3cgJ2RvbmUgbmlsKSkKKyAgICAgICAgIChzZXRxIHByZXYta2V5IGtleSkKKyAgICAgICAg IChwY2FzZSBiaW5kaW5nCisgICAgICAgICAgICgob3IgYCgsKGFuZCAocHJlZCBzdHJpbmdwKSBu YW1lKSAuICxfKSA7U2ltcGxlIG1lbnUgaXRlbS4KKyAgICAgICAgICAgICAgICBgKG1lbnUtaXRl bSAsbmFtZSAsX2NtZCAgICAgICAgICAgIDtFeHRlbmRlZCBtZW51IGl0ZW0uCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgLiAsKGFuZCBwcm9wcworICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKGd1YXJkIChsZXQgKCh2aXNpYmxlCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChwbGlzdC1nZXQgcHJvcHMgOnZpc2libGUpKSkK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChvciAobnVsbCB2 aXNpYmxlKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IChldmFsIHZpc2libGUpKSkpKSkpCisgICAgICAgICAgICAoc2V0cSBwcmV2LWNvbHVtbiBjb2x1 bW4KKyAgICAgICAgICAgICAgICAgIGNvbHVtbiAoKyBjb2x1bW4gKGxlbmd0aCBuYW1lKSAxKSkp KSkKKyAgICAgICBtZW51LWJhcikKKyAgICAgIDs7IENoZWNrIHRoZSBsYXN0IG1lbnUgaXRlbS4K KyAgICAgICh3aGVuICg+IGNvbHVtbiB4LXBvc2l0aW9uKQorICAgICAgICAoc2V0cSBmb3VuZCB0 KSkpCisgICAgKGlmIGZvdW5kCisgICAgICAgIChjb25zIHByZXYta2V5IHByZXYtY29sdW1uKQor ICAgICAgbmlsKSkpCisKIDs7OyMjI2F1dG9sb2FkIChkZWZpbmUta2V5IGdsb2JhbC1tYXAgIlxN LWAiICd0bW0tbWVudWJhcikKIDs7OyMjI2F1dG9sb2FkIChkZWZpbmUta2V5IGdsb2JhbC1tYXAg W21lbnUtYmFyIG1vdXNlLTFdICd0bW0tbWVudWJhci1tb3VzZSkKIApAQCAtNzQsMzMgKzEwOCwx MSBAQCB0bW0tbWVudWJhcgogYHR0eS1tZW51LW9wZW4tdXNlLXRtbScgdG8gYSBub24tbmlsIHZh bHVlLiIKICAgKGludGVyYWN0aXZlKQogICAocnVuLWhvb2tzICdtZW51LWJhci11cGRhdGUtaG9v aykKLSAgOzsgT2JleSBtZW51LWJhci1maW5hbC1pdGVtczsgcHV0IHRob3NlIGl0ZW1zIGxhc3Qu CiAgIChsZXQgKChtZW51LWJhciAodG1tLW1lbnViYXIta2V5bWFwKSkKLQltZW51LWJhci1pdGVt KQotICAgIChpZiB4LXBvc2l0aW9uCi0JKGxldCAoKGNvbHVtbiAwKQotICAgICAgICAgICAgICBw cmV2LWtleSkKLSAgICAgICAgICAoY2F0Y2ggJ2RvbmUKLSAgICAgICAgICAgIChtYXAta2V5bWFw Ci0gICAgICAgICAgICAgKGxhbWJkYSAoa2V5IGJpbmRpbmcpCi0gICAgICAgICAgICAgICAod2hl biAoPiBjb2x1bW4geC1wb3NpdGlvbikKLSAgICAgICAgICAgICAgICAgKHNldHEgbWVudS1iYXIt aXRlbSBwcmV2LWtleSkKLSAgICAgICAgICAgICAgICAgKHRocm93ICdkb25lIG5pbCkpCi0gICAg ICAgICAgICAgICAoc2V0cSBwcmV2LWtleSBrZXkpCi0gICAgICAgICAgICAgICAocGNhc2UgYmlu ZGluZwotICAgICAgICAgICAgICAgICAoKG9yIGAoLChhbmQgKHByZWQgc3RyaW5ncCkgbmFtZSkg LiAsXykgO1NpbXBsZSBtZW51IGl0ZW0uCi0gICAgICAgICAgICAgICAgICAgICAgYChtZW51LWl0 ZW0gLG5hbWUgLF9jbWQgICAgICAgICAgICA7RXh0ZW5kZWQgbWVudSBpdGVtLgotICAgICAgICAg ICAgICAgICAgICAgICAgLiAsKGFuZCBwcm9wcwotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAoZ3VhcmQgKGxldCAoKHZpc2libGUKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAocGxpc3QtZ2V0IHByb3BzIDp2aXNpYmxlKSkpCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChvciAobnVsbCB2aXNpYmxlKQotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGV2YWwgdmlzaWJsZSkpKSkp KSkKLSAgICAgICAgICAgICAgICAgIChzZXRxIGNvbHVtbiAoKyBjb2x1bW4gKGxlbmd0aCBuYW1l KSAxKSkpKSkKLSAgICAgICAgICAgICBtZW51LWJhcikKLSAgICAgICAgICAgIDs7IENoZWNrIHRo ZSBsYXN0IG1lbnUgaXRlbS4KLSAgICAgICAgICAgICh3aGVuICg+IGNvbHVtbiB4LXBvc2l0aW9u KQotICAgICAgICAgICAgICAoc2V0cSBtZW51LWJhci1pdGVtIHByZXYta2V5KSkpKSkKLSAgICAo dG1tLXByb21wdCBtZW51LWJhciBuaWwgbWVudS1iYXItaXRlbSkpKQorICAgICAgICAobWVudS1i YXItaXRlbS1jb25zICh0bW0tbWVudWJhci1pdGVtLWF0LXggeC1wb3NpdGlvbikpKQorICAgICh0 bW0tcHJvbXB0IG1lbnUtYmFyCisgICAgICAgICAgICAgICAgbmlsCisgICAgICAgICAgICAgICAg KGFuZCBtZW51LWJhci1pdGVtLWNvbnMgKGNhciBtZW51LWJhci1pdGVtLWNvbnMpKSkpKQogCiA7 OzsjIyNhdXRvbG9hZAogKGRlZnVuIHRtbS1tZW51YmFyLW1vdXNlIChldmVudCkKLS0gCjIuMjAu MQoK --=_f6dc306166966aaeb00118ccc27c345d Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=0002-WIP-Adding-mouse-navigation-of-tty-menus.patch Content-Disposition: attachment; filename=0002-WIP-Adding-mouse-navigation-of-tty-menus.patch; size=2408 RnJvbSA3NTZjMjk3NTM1ZWQxMDUzNDk3M2U4NDM4NzQxOWVhN2Q3Mjg5MzhlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKYXJlZCBGaW5kZXIgPGphcmVkQGZpbmRlci5vcmc+CkRhdGU6 IFRodSwgMSBPY3QgMjAyMCAwMDo0ODoxOSAtMDcwMApTdWJqZWN0OiBbUEFUQ0ggMi8yXSBXSVA6 IEFkZGluZyBtb3VzZSBuYXZpZ2F0aW9uIG9mIHR0eSBtZW51cy4KCi0tLQogc3JjL3Rlcm0uYyB8 IDI2ICsrKysrKysrKysrKysrKysrKysrKysrKystCiAxIGZpbGUgY2hhbmdlZCwgMjUgaW5zZXJ0 aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL3NyYy90ZXJtLmMgYi9zcmMvdGVy bS5jCmluZGV4IDM2Nzc2NDQ4NDUuLjgxNjc3NjNlODQgMTAwNjQ0Ci0tLSBhL3NyYy90ZXJtLmMK KysrIGIvc3JjL3Rlcm0uYwpAQCAtMzEwMSw3ICszMTAxLDI3IEBAIHJlYWRfbWVudV9pbnB1dCAo c3RydWN0IGZyYW1lICpzZiwgaW50ICp4LCBpbnQgKnksIGludCBtaW5feSwgaW50IG1heF95LAog CSAgICBzdCA9IE1JX1NDUk9MTF9CQUNLOwogCX0KICAgICAgIGVsc2UgaWYgKEVRIChjbWQsIFF0 dHlfbWVudV9zZWxlY3QpKQotCXN0ID0gTUlfSVRFTV9TRUxFQ1RFRDsKKyAgICAgICAgeworICAg ICAgICAgIC8vIFJlbWFpbmluZyB0byBkbzoKKyAgICAgICAgICAvLyAqIEFkZCBuZXcgc3ltYm9s ICJ0dHktbWVudS1tb3VzZS1zZWxlY3Qtb3ItZGlzbWlzcyIsIGJpbmQgdG8gbW91c2UgYnV0dG9u cy4KKyAgICAgICAgICAvLyAqIElmIGNsaWNrIGlzIGluIHZpc2libGUgbWVudSBhY3QgYXMgaWYg dHR5LW1lbnUtc2VsZWN0LCBvdGhlcndpc2UgYWN0IGFzIGlmIHR0eS1tZW51LWV4aXQuCisgICAg ICAgICAgLy8gKiBFbnN1cmUgbG9naWMgd29ya3Mgd2l0aCBhbnkgbWVudSBwb3B1cCBwb3NpdGlv bi4KKyAgICAgICAgICBMaXNwX09iamVjdCBwb3NuX3hfeSA9IENBTExOIChGZnVuY2FsbCwgaW50 ZXJuICgicG9zbi14LXkiKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBDQUxMTiAoRmZ1bmNhbGwsIGludGVybiAoImV2ZW50LXN0YXJ0IiksIGxhc3Rfbm9ubWVudV9l dmVudCkpOworICAgICAgICAgIGludCBtb3VzZV94ID0gWEZJWE5VTSAoRmNhciAocG9zbl94X3kp KTsKKyAgICAgICAgICBpbnQgbW91c2VfeSA9IFhGSVhOVU0gKEZjZHIgKHBvc25feF95KSk7Cisg ICAgICAgICAgbWVzc2FnZSAoIkluIHJlYWRfbWVudV9pbnB1dDogdHR5X21lbnVfc2VsZWN0IHcv IG1vdXNlX3g9JWQsIG1vdXNlX3k9JWQsIG1pbl95PSVkLCBtYXhfeT0lZCIsCisgICAgICAgICAg ICAgICAgICAgbW91c2VfeCwgbW91c2VfeSwgbWluX3ksIG1heF95KTsKKworICAgICAgICAgIC8v IFVuY2xlYXIgb2Zmc2V0IC0tIG5lZWQgdG8gZmlndXJlIHRoaXMgb3V0LiBQZXJoYXBzIGR1ZSB0 byBtZW51LWJhcj8KKyAgICAgICAgICBtb3VzZV95Kys7CisgICAgICAgICAgaWYgKG1vdXNlX3kg Pj0gbWluX3kgJiYgbW91c2VfeSA8PSBtYXhfeSkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgKnkgPSBtb3VzZV95OworICAgICAgICAgICAgfQorCisgICAgICAgICAgc3QgPSBNSV9JVEVN X1NFTEVDVEVEOworICAgICAgICB9CiAgICAgICBlbHNlIGlmICghRVEgKGNtZCwgUXR0eV9tZW51 X2lnbm9yZSkpCiAJdXNhYmxlX2lucHV0ID0gMDsKICAgICAgIGlmICh1c2FibGVfaW5wdXQpCkBA IC0zMjI0LDYgKzMyNDQsOSBAQCB0dHlfbWVudV9hY3RpdmF0ZSAodHR5X21lbnUgKm1lbnUsIGlu dCAqcGFuZSwgaW50ICpzZWxpZHgsCiAgICAgICBpbnQgbWF4X3kgPSBtaW4gKG1pbl95ICsgc3Rh dGVbMF0ubWVudS0+Y291bnQsIEZSQU1FX1RPVEFMX0xJTkVTIChzZikgLSAxKSAtIDE7CiAKICAg ICAgIGlucHV0X3N0YXR1cyA9IHJlYWRfbWVudV9pbnB1dCAoc2YsICZ4LCAmeSwgbWluX3ksIG1h eF95LCAmZmlyc3RfdGltZSk7CisKKyAgICAgIG1lc3NhZ2UoIkluIHR0eV9tZW51X2FjdGl2YXRl OiByZWFkX21lbnVfaW5wdXQgLS0+IGlucHV0X3N0YXR1cz0lZCwgeD0lZCwgeT0lZCwgZmlyc3Rf dGltZT0lZCIsCisgICAgICAgICAgICAgIGlucHV0X3N0YXR1cywgeCwgeSwgZmlyc3RfdGltZSk7 CiAgICAgICBpZiAoaW5wdXRfc3RhdHVzKQogCXsKIAkgIGxlYXZlID0gMTsKQEAgLTMzNjksNiAr MzM5Miw3IEBAIHR0eV9tZW51X2FjdGl2YXRlICh0dHlfbWVudSAqbWVudSwgaW50ICpwYW5lLCBp bnQgKnNlbGlkeCwKICAgICBjbGVhcl9pbnB1dF9wZW5kaW5nICgpOwogICBTQUZFX0ZSRUUgKCk7 CiAgIFZpbmhpYml0X3JlZGlzcGxheSA9IHByZXZfaW5oaWJpdF9yZWRpc3BsYXk7CisgIG1lc3Nh Z2UgKCJSZXR1cm5pbmcgcmVzdWx0PSVkIiwgcmVzdWx0KTsKICAgcmV0dXJuIHJlc3VsdDsKIH0K IAotLSAKMi4yMC4xCgo= --=_f6dc306166966aaeb00118ccc27c345d--