15911 2007-11-08 17:07:34 -0800 [GTK] Use GtkBindingSet to make key bindings user-configurable 2007-12-04 05:16:58 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED Gtk P2 Minor --- 1 alp webkit-unassigned alp oldest_to_newest 60707 0 alp 2007-11-08 17:07:34 -0800 EditorClientGtk.cpp has a hard-coded switch statement at the time of writing, which should be replaced by proper use of GtkBindingSet as seen in widgets like GtkTextView. 60708 1 alp 2007-11-08 17:08:30 -0800 See also bug #15653 62224 2 alp 2007-11-24 18:34:00 -0800 One place to look for inspiration on this outside of GTK+ is the gtkhtml widget. They have an emacs editor keybinding there too. 63185 3 17686 lethalman88 2007-12-03 15:37:26 -0800 Created attachment 17686 patch key bindings and clipboard This patch fixes this bug and #16144. Fixing key bindings fixed also clipboard and other keys for the page. Take care epiphany issue on these bindings is not related to this. 63214 4 17686 lethalman88 2007-12-04 00:32:41 -0800 Comment on attachment 17686 patch key bindings and clipboard review + 63215 5 alp 2007-12-04 01:24:06 -0800 This patch is looking good, thanks. Works well. I'm just going to do some research to make sure the API changes are supportable before actually reviewing this. 63223 6 17696 lethalman88 2007-12-04 03:22:58 -0800 Created attachment 17696 same patch without bold, italic, undo, redo Hi, this one does the same thing as the previous one but does not change bold, italic and redo/undo actions behavior. Those can be left as is however, since they work only in editable regions. That's the job of handleKeypress. 63224 7 17697 lethalman88 2007-12-04 03:49:38 -0800 Created attachment 17697 patch indentation 63227 8 17697 alp 2007-12-04 05:09:36 -0800 Comment on attachment 17697 patch indentation r=me Thanks! Before landing I'll fix some remaining whitespace issues and remove some tabs. Also cleaning up the docs a bit, and changing the order of cut/copy/paste to match convention, but that's just aesthetic. 63228 9 alp 2007-12-04 05:16:58 -0800 Landed in r28386. Further enhancements (like covering the rest of the bindings) should be made in new bug reports. Thanks! 17686 2007-12-03 15:37:26 -0800 2007-12-04 03:22:58 -0800 patch key bindings and clipboard keybindings.patch text/plain 15599 lethalman88 SW5kZXg6IFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50R3RrLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEd0ay5jcHAJ KHJldmlzaW9uIDI4MzQ2KQorKysgV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGll bnRHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMjYsOSArMjI2LDYgQEAKICAgICBpZiAoIXN0 YXJ0KQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyBGSVhNRTogVXNlIEd0a0JpbmRpbmdTZXQg aW5zdGVhZCBvZiB0aGlzIGhhcmQtY29kZWQgc3dpdGNoCi0gICAgLy8gaHR0cDovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU5MTEKLQogICAgIGlmIChzdGFydC0+aXNDb250ZW50 RWRpdGFibGUoKSkgewogICAgICAgICBzd2l0Y2goa2V2ZW50LT5XaW5kb3dzS2V5Q29kZSgpKSB7 CiAgICAgICAgICAgICBjYXNlIFZLX0JBQ0s6CkBAIC0yODMsMzUgKzI4MCw2IEBACiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgICAgICAgICAgZnJhbWUtPmVkaXRvcigpLT5pbnNlcnRUZXh0KGtldmVudC0+dGV4dCgp LCBldmVudCk7Ci0gICAgICAgICAgICAgICAgfSBlbHNlIGlmIChrZXZlbnQtPmN0cmxLZXkoKSkg ewotICAgICAgICAgICAgICAgICAgICBzd2l0Y2ggKGtldmVudC0+V2luZG93c0tleUNvZGUoKSkg ewotICAgICAgICAgICAgICAgICAgICAgICAgY2FzZSBWS19BOgotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGZyYW1lLT5lZGl0b3IoKS0+ZXhlY0NvbW1hbmQoIlNlbGVjdEFsbCIpOwotICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgICAgICAgICAg Y2FzZSBWS19COgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZyYW1lLT5lZGl0b3IoKS0+ ZXhlY0NvbW1hbmQoIlRvZ2dsZUJvbGQiKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBi cmVhazsKLSAgICAgICAgICAgICAgICAgICAgICAgIGNhc2UgVktfQzoKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICBmcmFtZS0+ZWRpdG9yKCktPmV4ZWNDb21tYW5kKCJDb3B5Iik7Ci0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgICAgICAgICBj YXNlIFZLX0k6Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgZnJhbWUtPmVkaXRvcigpLT5l eGVjQ29tbWFuZCgiVG9nZ2xlSXRhbGljIik7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAg YnJlYWs7Ci0gICAgICAgICAgICAgICAgICAgICAgICBjYXNlIFZLX1Y6Ci0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgZnJhbWUtPmVkaXRvcigpLT5leGVjQ29tbWFuZCgiUGFzdGUiKTsKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICAgICAgICAg IGNhc2UgVktfWDoKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBmcmFtZS0+ZWRpdG9yKCkt PmV4ZWNDb21tYW5kKCJDdXQiKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsK LSAgICAgICAgICAgICAgICAgICAgICAgIGNhc2UgVktfWToKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICBmcmFtZS0+ZWRpdG9yKCktPmV4ZWNDb21tYW5kKCJSZWRvIik7Ci0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgICAgICAgICBjYXNlIFZL X1o6Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgZnJhbWUtPmVkaXRvcigpLT5leGVjQ29t bWFuZCgiVW5kbyIpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAg ICAgICAgICAgICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9IGVsc2UgcmV0 dXJuOwogICAgICAgICB9CiAgICAgfSBlbHNlIHsKSW5kZXg6IFdlYktpdC9ndGsvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvQ2hhbmdlTG9nCShyZXZpc2lvbiAyODM0NikKKysr IFdlYktpdC9ndGsvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIw MDctMTItMDQgIEx1Y2EgQnJ1bm8gIDxsZXRoYWxtYW44OEBnbWFpbC5jb20+CisKKwlUaGlzIGNo YW5nZSBhbGxvd3Mga2V5IGJpbmRpbmdzIHRvIHdvcmsgd2hlbiB0aGUgZXZlbnQgaXMgZGlzcGF0 Y2hlZAorCWFnYWluc3Qgbm90IGVkaXRhYmxlIGNvbnRlbnRzLgorCQorCSogV2ViQ29yZVN1cHBv cnQvRWRpdG9yQ2xpZW50R3RrLmNwcDoKKwkoV2ViS2l0OjpFZGl0b3JDbGllbnQ6OmhhbmRsZUtl eXByZXNzKTogZG8gbm90IGhhbmRsZSBrZXkgYmluZGluZ3MKKworCSogV2ViS2l0L2d0ay9XZWJW aWV3L3dlYmtpdHdlYnZpZXcuY3BwOgorCShXZWJLaXQ6OndlYmtpdF93ZWJfdmlld19jbGFzc19p bml0KTogYWRkIHNpZ25hbHMgd2l0aCBrZXkgYmluZGluZ3MKKwkoV2ViS2l0Ojp3ZWJraXRfd2Vi X3ZpZXdfa2V5X2V2ZW50KTogaGFuZGxlIGtleSBiaW5kaW5ncyAoaXNzdWVzICMxNjE0NCBhbmQg IzE1OTExKQorCiAyMDA3LTEyLTAzICBBbHAgVG9rZXIgIDxhbHBAYXRva2VyLmNvbT4KIAogICAg ICAgICBnbG9iYWxPYmplY3QoKSBHVEsrIGJ1aWxkIGZpeC4KSW5kZXg6IFdlYktpdC9ndGsvV2Vi Vmlldy93ZWJraXR3ZWJ2aWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL1dlYlZpZXcv d2Via2l0d2Vidmlldy5jcHAJKHJldmlzaW9uIDI4MzQ2KQorKysgV2ViS2l0L2d0ay9XZWJWaWV3 L3dlYmtpdHdlYnZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw2ICs0Nyw3IEBACiAjaW5j bHVkZSAiSW5zcGVjdG9yQ2xpZW50R3RrLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXIuaCIKICNp bmNsdWRlICJGcmFtZVZpZXcuaCIKKyNpbmNsdWRlICJFZGl0b3IuaCIKICNpbmNsdWRlICJQbGF0 Zm9ybUtleWJvYXJkRXZlbnQuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVdoZWVsRXZlbnQuaCIKICNp bmNsdWRlICJTdWJzdGl0dXRlRGF0YS5oIgpAQCAtNzQsMTEgKzc1LDE5IEBACiAgICAgU0NSSVBU X0FMRVJULAogICAgIFNDUklQVF9DT05GSVJNLAogICAgIFNDUklQVF9QUk9NUFQsCisgICAgU0VM RUNUX0FMTCwKKyAgICBUT0dHTEVfQk9MRCwKKyAgICBUT0dHTEVfSVRBTElDLAorICAgIENPUFlf Q0xJUEJPQVJELAorICAgIFBBU1RFX0NMSVBCT0FSRCwKKyAgICBDVVRfQ0xJUEJPQVJELAorICAg IFJFRE8sCisgICAgVU5ETywKICAgICBMQVNUX1NJR05BTAogfTsKIAogc3RhdGljIGd1aW50IHdl YmtpdF93ZWJfdmlld19zaWduYWxzW0xBU1RfU0lHTkFMXSA9IHsgMCwgfTsKLQorICAKIEdfREVG SU5FX1RZUEUoV2ViS2l0V2ViVmlldywgd2Via2l0X3dlYl92aWV3LCBHVEtfVFlQRV9DT05UQUlO RVIpCiAKIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfZXhwb3NlX2V2ZW50KEd0a1dp ZGdldCogd2lkZ2V0LCBHZGtFdmVudEV4cG9zZSogZXZlbnQpCkBAIC0xMDIsMzcgKzExMSwzNSBA QAogewogICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUoZ2V0RnJhbWVGcm9tVmlldyhXRUJLSVRfV0VC X1ZJRVcod2lkZ2V0KSkpOwogICAgIFBsYXRmb3JtS2V5Ym9hcmRFdmVudCBrZXlib2FyZEV2ZW50 KGV2ZW50KTsKKyAgICBGcmFtZVZpZXcgKnZpZXc7CiAKLSAgICBpZiAoZnJhbWUtPmV2ZW50SGFu ZGxlcigpLT5rZXlFdmVudChrZXlib2FyZEV2ZW50KSkKLSAgICAgICAgcmV0dXJuIFRSVUU7Cisg ICAgaWYgKCFmcmFtZS0+ZXZlbnRIYW5kbGVyKCktPmtleUV2ZW50KGtleWJvYXJkRXZlbnQpICYm IGV2ZW50LT50eXBlID09IEdES19LRVlfUFJFU1MpCisgICAgICB7CisJdmlldyA9IGZyYW1lLT52 aWV3KCk7CiAKLSAgICBpZiAoZXZlbnQtPnR5cGUgIT0gR0RLX0tFWV9QUkVTUykKLSAgICAgICAg cmV0dXJuIEZBTFNFOworCS8qIEZJWE1FOiBhdCB0aGUgdmVyeSBsZWFzdCB3ZSBzaG91bGQgYmUg dXNpbmcgdGhlIHNhbWUgY29kZSB0aGFuIHRoZQorCSAgIFdpbmRvd3MgcG9ydCBoZXJlLCBidXQg b3VyIFNjcm9sbFZpZXcgZmlsZSBkaXZlcmdlcyBlbm91Z2ggdG8gbWFrZQorCSAgIHRoYXQgaW1w b3NzaWJsZS4gQSBzaG9ydCB0ZXJtIHNvbHV0aW9uIHdvdWxkIGJlIHRvIHVuaWZ5IFNjcm9sbFZp ZXdXaW4KKwkgICBhbmQgU2Nyb2xsVmlld0d0ay4gTG9uZy10ZXJtIFNjcm9sbFZpZXcgYW5kIEZy YW1lVmlldyBzaG91bGQgYmUKKwkgICB1bmlmaWVkIGFuZCB1c2VkIGV2ZXJ5d2hlcmUgZm9yIHNj cm9sbGJhcnMgKi8KKwkKKwlzd2l0Y2ggKGV2ZW50LT5rZXl2YWwpIHsKKwljYXNlIChHREtfRG93 bik6CisJICB2aWV3LT5zY3JvbGxCeSgwLCBMSU5FX1NURVApOworCSAgcmV0dXJuIFRSVUU7CisJ Y2FzZSAoR0RLX1VwKToKKwkgIHZpZXctPnNjcm9sbEJ5KDAsIC1MSU5FX1NURVApOworCSAgcmV0 dXJuIFRSVUU7CisJY2FzZSAoR0RLX1JpZ2h0KToKKwkgIHZpZXctPnNjcm9sbEJ5KExJTkVfU1RF UCwgMCk7CisJICByZXR1cm4gVFJVRTsKKwljYXNlIChHREtfTGVmdCk6CisJICB2aWV3LT5zY3Jv bGxCeSgtTElORV9TVEVQLCAwKTsKKwkgIHJldHVybiBUUlVFOworCX0KKyAgICAgIH0KIAotICAg IEZyYW1lVmlldyogdmlldyA9IGZyYW1lLT52aWV3KCk7Ci0KLSAgICAvKiBGSVhNRTogYXQgdGhl IHZlcnkgbGVhc3Qgd2Ugc2hvdWxkIGJlIHVzaW5nIHRoZSBzYW1lIGNvZGUgdGhhbiB0aGUKLSAg ICAgICBXaW5kb3dzIHBvcnQgaGVyZSwgYnV0IG91ciBTY3JvbGxWaWV3IGZpbGUgZGl2ZXJnZXMg ZW5vdWdoIHRvIG1ha2UKLSAgICAgICB0aGF0IGltcG9zc2libGUuIEEgc2hvcnQgdGVybSBzb2x1 dGlvbiB3b3VsZCBiZSB0byB1bmlmeSBTY3JvbGxWaWV3V2luCi0gICAgICAgYW5kIFNjcm9sbFZp ZXdHdGsuIExvbmctdGVybSBTY3JvbGxWaWV3IGFuZCBGcmFtZVZpZXcgc2hvdWxkIGJlCi0gICAg ICAgdW5pZmllZCBhbmQgdXNlZCBldmVyeXdoZXJlIGZvciBzY3JvbGxiYXJzICovCi0KLSAgICBz d2l0Y2ggKGV2ZW50LT5rZXl2YWwpIHsKLSAgICBjYXNlIChHREtfRG93bik6Ci0gICAgICAgIHZp ZXctPnNjcm9sbEJ5KDAsIExJTkVfU1RFUCk7Ci0gICAgICAgIHJldHVybiBUUlVFOwotICAgIGNh c2UgKEdES19VcCk6Ci0gICAgICAgIHZpZXctPnNjcm9sbEJ5KDAsIC1MSU5FX1NURVApOwotICAg ICAgICByZXR1cm4gVFJVRTsKLSAgICBjYXNlIChHREtfUmlnaHQpOgotICAgICAgICB2aWV3LT5z Y3JvbGxCeShMSU5FX1NURVAsIDApOwotICAgICAgICByZXR1cm4gVFJVRTsKLSAgICBjYXNlIChH REtfTGVmdCk6Ci0gICAgICAgIHZpZXctPnNjcm9sbEJ5KC1MSU5FX1NURVAsIDApOwotICAgICAg ICByZXR1cm4gVFJVRTsKLSAgICB9Ci0KLSAgICByZXR1cm4gRkFMU0U7CisgICAgcmV0dXJuIGd0 a19iaW5kaW5nc19hY3RpdmF0ZV9ldmVudCAoR1RLX09CSkVDVCAod2lkZ2V0KSwgZXZlbnQpOwog fQogCiBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2J1dHRvbl9ldmVudChHdGtXaWRn ZXQqIHdpZGdldCwgR2RrRXZlbnRCdXR0b24qIGV2ZW50KQpAQCAtMzYxLDYgKzM2OCw1NCBAQAog ICAgIHJldHVybiBUUlVFOwogfQogCitzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfcmVhbF9z ZWxlY3RfYWxsKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCit7CisgICAgRnJhbWUqIGZyYW1lID0g Y29yZShnZXRGcmFtZUZyb21WaWV3KHdlYlZpZXcpKTsKKyAgICBmcmFtZS0+ZWRpdG9yKCktPmV4 ZWNDb21tYW5kKCJTZWxlY3RBbGwiKTsKK30KKworc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3 X3JlYWxfdG9nZ2xlX2JvbGQoV2ViS2l0V2ViVmlldyogd2ViVmlldykKK3sKKyAgICBGcmFtZSog ZnJhbWUgPSBjb3JlKGdldEZyYW1lRnJvbVZpZXcod2ViVmlldykpOworICAgIGZyYW1lLT5lZGl0 b3IoKS0+ZXhlY0NvbW1hbmQoIlRvZ2dsZUJvbGQiKTsKK30KKworc3RhdGljIHZvaWQgd2Via2l0 X3dlYl92aWV3X3JlYWxfdG9nZ2xlX2l0YWxpYyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQorewor ICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUoZ2V0RnJhbWVGcm9tVmlldyh3ZWJWaWV3KSk7CisgICAg ZnJhbWUtPmVkaXRvcigpLT5leGVjQ29tbWFuZCgiVG9nZ2xlSXRhbGljIik7Cit9CisKK3N0YXRp YyB2b2lkIHdlYmtpdF93ZWJfdmlld19yZWFsX2NvcHlfY2xpcGJvYXJkKFdlYktpdFdlYlZpZXcq IHdlYlZpZXcpCit7CisgICAgRnJhbWUqIGZyYW1lID0gY29yZShnZXRGcmFtZUZyb21WaWV3KHdl YlZpZXcpKTsKKyAgICBmcmFtZS0+ZWRpdG9yKCktPmV4ZWNDb21tYW5kKCJDb3B5Iik7Cit9CisK K3N0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19yZWFsX3Bhc3RlX2NsaXBib2FyZChXZWJLaXRX ZWJWaWV3KiB3ZWJWaWV3KQoreworICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUoZ2V0RnJhbWVGcm9t Vmlldyh3ZWJWaWV3KSk7CisgICAgZnJhbWUtPmVkaXRvcigpLT5leGVjQ29tbWFuZCgiUGFzdGUi KTsgCit9CisKK3N0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19yZWFsX2N1dF9jbGlwYm9hcmQo V2ViS2l0V2ViVmlldyogd2ViVmlldykKK3sKKyAgICBGcmFtZSogZnJhbWUgPSBjb3JlKGdldEZy YW1lRnJvbVZpZXcod2ViVmlldykpOworICAgIGZyYW1lLT5lZGl0b3IoKS0+ZXhlY0NvbW1hbmQo IkN1dCIpOyAKK30KKworc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X3JlYWxfcmVkbyhXZWJL aXRXZWJWaWV3KiB3ZWJWaWV3KQoreworICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUoZ2V0RnJhbWVG cm9tVmlldyh3ZWJWaWV3KSk7CisgICAgZnJhbWUtPmVkaXRvcigpLT5leGVjQ29tbWFuZCgiUmVk byIpOyAKK30KKworc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X3JlYWxfdW5kbyhXZWJLaXRX ZWJWaWV3KiB3ZWJWaWV3KQoreworICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUoZ2V0RnJhbWVGcm9t Vmlldyh3ZWJWaWV3KSk7CisgICAgZnJhbWUtPmVkaXRvcigpLT5leGVjQ29tbWFuZCgiVW5kbyIp OyAKK30KKwogc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2ZpbmFsaXplKEdPYmplY3QqIG9i amVjdCkKIHsKICAgICB3ZWJraXRfd2ViX3ZpZXdfc3RvcF9sb2FkaW5nKFdFQktJVF9XRUJfVklF VyhvYmplY3QpKTsKQEAgLTM3Niw2ICs0MzEsOCBAQAogCiBzdGF0aWMgdm9pZCB3ZWJraXRfd2Vi X3ZpZXdfY2xhc3NfaW5pdChXZWJLaXRXZWJWaWV3Q2xhc3MqIHdlYlZpZXdDbGFzcykKIHsKKyAg ICBHdGtCaW5kaW5nU2V0ICpiaW5kaW5nX3NldDsKKwogICAgIGdfdHlwZV9jbGFzc19hZGRfcHJp dmF0ZSh3ZWJWaWV3Q2xhc3MsIHNpemVvZihXZWJLaXRXZWJWaWV3UHJpdmF0ZSkpOwogCiAgICAg LyoKQEAgLTU5MSw3ICs2NDgsMTI2IEBACiAgICAgICAgICAgICBHX1RZUEVfQk9PTEVBTiwgNCwK ICAgICAgICAgICAgIEdfVFlQRV9PQkpFQ1QsIEdfVFlQRV9TVFJJTkcsIEdfVFlQRV9TVFJJTkcs IEdfVFlQRV9QT0lOVEVSKTsKIAorICAgIC8qKgorICAgICAqIFdlYktpdFdlYlZpZXc6OnNlbGVj dC1hbGw6CisgICAgICogQHdlYl92aWV3OiB0aGUgb2JqZWN0IG9uIHdoaWNoIHRoZSBzaWduYWwg aXMgZW1pdHRlZAorICAgICAqIEByZXR1cm46IFRSVUUgdG8gc3RvcCBvdGhlciBoYW5kbGVycyBm cm9tIGJlaW5nIGludm9rZWQgZm9yIHRoZSBldmVudC4gRkFMU0UgdG8gcHJvcGFnYXRlIHRoZSBl dmVudCBmdXJ0aGVyLgorICAgICAqCisgICAgICogU2VsZWN0IGFsbCB0ZXh0IGluIHRoZSB3ZWIg dmlldy4KKyAgICAgKi8KKyAgICB3ZWJraXRfd2ViX3ZpZXdfc2lnbmFsc1tTRUxFQ1RfQUxMXSA9 IGdfc2lnbmFsX25ldygic2VsZWN0X2FsbCIsCisgICAgICAgICAgICBHX1RZUEVfRlJPTV9DTEFT Uyh3ZWJWaWV3Q2xhc3MpLAorICAgICAgICAgICAgKEdTaWduYWxGbGFncykoR19TSUdOQUxfUlVO X0xBU1QgfCBHX1NJR05BTF9BQ1RJT04pLAorICAgICAgICAgICAgR19TVFJVQ1RfT0ZGU0VUKFdl YktpdFdlYlZpZXdDbGFzcywgc2VsZWN0X2FsbCksCisgCSAgICBOVUxMLCBOVUxMLAorIAkgICAg Z19jY2xvc3VyZV9tYXJzaGFsX1ZPSURfX1ZPSUQsCisJICAgIEdfVFlQRV9OT05FLCAwKTsKIAor ICAgIC8qKgorICAgICAqIFdlYktpdFdlYlZpZXc6OnRvZ2dsZS1ib2xkOgorICAgICAqIEB3ZWJf dmlldzogdGhlIG9iamVjdCBvbiB3aGljaCB0aGUgc2lnbmFsIGlzIGVtaXR0ZWQKKyAgICAgKiBA cmV0dXJuOiBUUlVFIHRvIHN0b3Agb3RoZXIgaGFuZGxlcnMgZnJvbSBiZWluZyBpbnZva2VkIGZv ciB0aGUgZXZlbnQuIEZBTFNFIHRvIHByb3BhZ2F0ZSB0aGUgZXZlbnQgZnVydGhlci4KKyAgICAg KgorICAgICAqIFRvZ2dsZSBib2xkLgorICAgICAqLworICAgIHdlYmtpdF93ZWJfdmlld19zaWdu YWxzW1RPR0dMRV9CT0xEXSA9IGdfc2lnbmFsX25ldygidG9nZ2xlX2JvbGQiLAorICAgICAgICAg ICAgR19UWVBFX0ZST01fQ0xBU1Mod2ViVmlld0NsYXNzKSwKKyAgICAgICAgICAgIChHU2lnbmFs RmxhZ3MpKEdfU0lHTkFMX1JVTl9MQVNUIHwgR19TSUdOQUxfQUNUSU9OKSwKKyAgICAgICAgICAg IEdfU1RSVUNUX09GRlNFVChXZWJLaXRXZWJWaWV3Q2xhc3MsIHRvZ2dsZV9ib2xkKSwKKyAJICAg IE5VTEwsIE5VTEwsCisgCSAgICBnX2NjbG9zdXJlX21hcnNoYWxfVk9JRF9fVk9JRCwKKwkgICAg R19UWVBFX05PTkUsIDApOworCisgICAgLyoqCisgICAgICogV2ViS2l0V2ViVmlldzo6dG9nZ2xl LWl0YWxpYzoKKyAgICAgKiBAd2ViX3ZpZXc6IHRoZSBvYmplY3Qgb24gd2hpY2ggdGhlIHNpZ25h bCBpcyBlbWl0dGVkCisgICAgICogQHJldHVybjogVFJVRSB0byBzdG9wIG90aGVyIGhhbmRsZXJz IGZyb20gYmVpbmcgaW52b2tlZCBmb3IgdGhlIGV2ZW50LiBGQUxTRSB0byBwcm9wYWdhdGUgdGhl IGV2ZW50IGZ1cnRoZXIuCisgICAgICoKKyAgICAgKiBUb2dnbGUgaXRhbGljLgorICAgICAqLwor ICAgIHdlYmtpdF93ZWJfdmlld19zaWduYWxzW1RPR0dMRV9JVEFMSUNdID0gZ19zaWduYWxfbmV3 KCJ0b2dnbGVfaXRhbGljIiwKKyAgICAgICAgICAgIEdfVFlQRV9GUk9NX0NMQVNTKHdlYlZpZXdD bGFzcyksCisgICAgICAgICAgICAoR1NpZ25hbEZsYWdzKShHX1NJR05BTF9SVU5fTEFTVCB8IEdf U0lHTkFMX0FDVElPTiksCisgICAgICAgICAgICBHX1NUUlVDVF9PRkZTRVQoV2ViS2l0V2ViVmll d0NsYXNzLCB0b2dnbGVfaXRhbGljKSwKKyAJICAgIE5VTEwsIE5VTEwsCisgCSAgICBnX2NjbG9z dXJlX21hcnNoYWxfVk9JRF9fVk9JRCwKKwkgICAgR19UWVBFX05PTkUsIDApOworCisgICAgLyoq CisgICAgICogV2ViS2l0V2ViVmlldzo6Y29weS1jbGlwYm9hcmQ6CisgICAgICogQHdlYl92aWV3 OiB0aGUgb2JqZWN0IG9uIHdoaWNoIHRoZSBzaWduYWwgaXMgZW1pdHRlZAorICAgICAqIEByZXR1 cm46IFRSVUUgdG8gc3RvcCBvdGhlciBoYW5kbGVycyBmcm9tIGJlaW5nIGludm9rZWQgZm9yIHRo ZSBldmVudC4gRkFMU0UgdG8gcHJvcGFnYXRlIHRoZSBldmVudCBmdXJ0aGVyLgorICAgICAqCisg ICAgICogVGV4dCBoYXMgYmVlbiBjb3BpZWQgZnJvbSB0aGUgd2lkZ2V0LgorICAgICAqLworICAg IHdlYmtpdF93ZWJfdmlld19zaWduYWxzW0NPUFlfQ0xJUEJPQVJEXSA9IGdfc2lnbmFsX25ldygi Y29weV9jbGlwYm9hcmQiLAorICAgICAgICAgICAgR19UWVBFX0ZST01fQ0xBU1Mod2ViVmlld0Ns YXNzKSwKKyAgICAgICAgICAgIChHU2lnbmFsRmxhZ3MpKEdfU0lHTkFMX1JVTl9MQVNUIHwgR19T SUdOQUxfQUNUSU9OKSwKKyAgICAgICAgICAgIEdfU1RSVUNUX09GRlNFVChXZWJLaXRXZWJWaWV3 Q2xhc3MsIGNvcHlfY2xpcGJvYXJkKSwKKyAJICAgIE5VTEwsIE5VTEwsCisgCSAgICBnX2NjbG9z dXJlX21hcnNoYWxfVk9JRF9fVk9JRCwKKwkgICAgR19UWVBFX05PTkUsIDApOworCisgICAgLyoq CisgICAgICogV2ViS2l0V2ViVmlldzo6cGFzdGUtY2xpcGJvYXJkOgorICAgICAqIEB3ZWJfdmll dzogdGhlIG9iamVjdCBvbiB3aGljaCB0aGUgc2lnbmFsIGlzIGVtaXR0ZWQKKyAgICAgKiBAcmV0 dXJuOiBUUlVFIHRvIHN0b3Agb3RoZXIgaGFuZGxlcnMgZnJvbSBiZWluZyBpbnZva2VkIGZvciB0 aGUgZXZlbnQuIEZBTFNFIHRvIHByb3BhZ2F0ZSB0aGUgZXZlbnQgZnVydGhlci4KKyAgICAgKgor ICAgICAqIFBhc3RlIGNsaXBib2FyZCBjb250ZW50cyBpbiB0aGUgd2lkZ2V0LgorICAgICAqLwor ICAgIHdlYmtpdF93ZWJfdmlld19zaWduYWxzW1BBU1RFX0NMSVBCT0FSRF0gPSBnX3NpZ25hbF9u ZXcoInBhc3RlX2NsaXBib2FyZCIsCisgICAgICAgICAgICBHX1RZUEVfRlJPTV9DTEFTUyh3ZWJW aWV3Q2xhc3MpLAorICAgICAgICAgICAgKEdTaWduYWxGbGFncykoR19TSUdOQUxfUlVOX0xBU1Qg fCBHX1NJR05BTF9BQ1RJT04pLAorICAgICAgICAgICAgR19TVFJVQ1RfT0ZGU0VUKFdlYktpdFdl YlZpZXdDbGFzcywgcGFzdGVfY2xpcGJvYXJkKSwKKyAJICAgIE5VTEwsIE5VTEwsCisgCSAgICBn X2NjbG9zdXJlX21hcnNoYWxfVk9JRF9fVk9JRCwKKwkgICAgR19UWVBFX05PTkUsIDApOworCisg ICAgLyoqCisgICAgICogV2ViS2l0V2ViVmlldzo6Y3V0LWNsaXBib2FyZDoKKyAgICAgKiBAd2Vi X3ZpZXc6IHRoZSBvYmplY3Qgb24gd2hpY2ggdGhlIHNpZ25hbCBpcyBlbWl0dGVkCisgICAgICog QHJldHVybjogVFJVRSB0byBzdG9wIG90aGVyIGhhbmRsZXJzIGZyb20gYmVpbmcgaW52b2tlZCBm b3IgdGhlIGV2ZW50LiBGQUxTRSB0byBwcm9wYWdhdGUgdGhlIGV2ZW50IGZ1cnRoZXIuCisgICAg ICoKKyAgICAgKiBDdXQgc2VsZWN0ZWQgdGV4dAorICAgICAqLworICAgIHdlYmtpdF93ZWJfdmll d19zaWduYWxzW0NVVF9DTElQQk9BUkRdID0gZ19zaWduYWxfbmV3KCJjdXRfY2xpcGJvYXJkIiwK KyAgICAgICAgICAgIEdfVFlQRV9GUk9NX0NMQVNTKHdlYlZpZXdDbGFzcyksCisgICAgICAgICAg ICAoR1NpZ25hbEZsYWdzKShHX1NJR05BTF9SVU5fTEFTVCB8IEdfU0lHTkFMX0FDVElPTiksCisg ICAgICAgICAgICBHX1NUUlVDVF9PRkZTRVQoV2ViS2l0V2ViVmlld0NsYXNzLCBjdXRfY2xpcGJv YXJkKSwKKyAJICAgIE5VTEwsIE5VTEwsCisgCSAgICBnX2NjbG9zdXJlX21hcnNoYWxfVk9JRF9f Vk9JRCwKKwkgICAgR19UWVBFX05PTkUsIDApOworCisgICAgLyoqCisgICAgICogV2ViS2l0V2Vi Vmlldzo6cmVkbzoKKyAgICAgKiBAd2ViX3ZpZXc6IHRoZSBvYmplY3Qgb24gd2hpY2ggdGhlIHNp Z25hbCBpcyBlbWl0dGVkCisgICAgICogQHJldHVybjogVFJVRSB0byBzdG9wIG90aGVyIGhhbmRs ZXJzIGZyb20gYmVpbmcgaW52b2tlZCBmb3IgdGhlIGV2ZW50LiBGQUxTRSB0byBwcm9wYWdhdGUg dGhlIGV2ZW50IGZ1cnRoZXIuCisgICAgICoKKyAgICAgKiBSZWRvIGFjdGlvbi4KKyAgICAgKi8K KyAgICB3ZWJraXRfd2ViX3ZpZXdfc2lnbmFsc1tSRURPXSA9IGdfc2lnbmFsX25ldygicmVkbyIs CisgICAgICAgICAgICBHX1RZUEVfRlJPTV9DTEFTUyh3ZWJWaWV3Q2xhc3MpLAorICAgICAgICAg ICAgKEdTaWduYWxGbGFncykoR19TSUdOQUxfUlVOX0xBU1QgfCBHX1NJR05BTF9BQ1RJT04pLAor ICAgICAgICAgICAgR19TVFJVQ1RfT0ZGU0VUKFdlYktpdFdlYlZpZXdDbGFzcywgcmVkbyksCisg CSAgICBOVUxMLCBOVUxMLAorIAkgICAgZ19jY2xvc3VyZV9tYXJzaGFsX1ZPSURfX1ZPSUQsCisJ ICAgIEdfVFlQRV9OT05FLCAwKTsKKworICAgIC8qKgorICAgICAqIFdlYktpdFdlYlZpZXc6OnVu ZG86CisgICAgICogQHdlYl92aWV3OiB0aGUgb2JqZWN0IG9uIHdoaWNoIHRoZSBzaWduYWwgaXMg ZW1pdHRlZAorICAgICAqIEByZXR1cm46IFRSVUUgdG8gc3RvcCBvdGhlciBoYW5kbGVycyBmcm9t IGJlaW5nIGludm9rZWQgZm9yIHRoZSBldmVudC4gRkFMU0UgdG8gcHJvcGFnYXRlIHRoZSBldmVu dCBmdXJ0aGVyLgorICAgICAqCisgICAgICogVW5kbyBhY3Rpb24uCisgICAgICovCisgICAgd2Vi a2l0X3dlYl92aWV3X3NpZ25hbHNbVU5ET10gPSBnX3NpZ25hbF9uZXcoInVuZG8iLAorICAgICAg ICAgICAgR19UWVBFX0ZST01fQ0xBU1Mod2ViVmlld0NsYXNzKSwKKyAgICAgICAgICAgIChHU2ln bmFsRmxhZ3MpKEdfU0lHTkFMX1JVTl9MQVNUIHwgR19TSUdOQUxfQUNUSU9OKSwKKyAgICAgICAg ICAgIEdfU1RSVUNUX09GRlNFVChXZWJLaXRXZWJWaWV3Q2xhc3MsIHVuZG8pLAorIAkgICAgTlVM TCwgTlVMTCwKKyAJICAgIGdfY2Nsb3N1cmVfbWFyc2hhbF9WT0lEX19WT0lELAorCSAgICBHX1RZ UEVfTk9ORSwgMCk7CisKICAgICAvKgogICAgICAqIGltcGxlbWVudGF0aW9ucyBvZiB2aXJ0dWFs IG1ldGhvZHMKICAgICAgKi8KQEAgLTYwMyw2ICs3NzksMTQgQEAKICAgICB3ZWJWaWV3Q2xhc3Mt PnNjcmlwdF9jb25maXJtID0gd2Via2l0X3dlYl92aWV3X3JlYWxfc2NyaXB0X2NvbmZpcm07CiAg ICAgd2ViVmlld0NsYXNzLT5zY3JpcHRfcHJvbXB0ID0gd2Via2l0X3dlYl92aWV3X3JlYWxfc2Ny aXB0X3Byb21wdDsKICAgICB3ZWJWaWV3Q2xhc3MtPmNvbnNvbGVfbWVzc2FnZSA9IHdlYmtpdF93 ZWJfdmlld19yZWFsX2NvbnNvbGVfbWVzc2FnZTsKKyAgICB3ZWJWaWV3Q2xhc3MtPnNlbGVjdF9h bGwgPSB3ZWJraXRfd2ViX3ZpZXdfcmVhbF9zZWxlY3RfYWxsOworICAgIHdlYlZpZXdDbGFzcy0+ dG9nZ2xlX2JvbGQgPSB3ZWJraXRfd2ViX3ZpZXdfcmVhbF90b2dnbGVfYm9sZDsKKyAgICB3ZWJW aWV3Q2xhc3MtPnRvZ2dsZV9pdGFsaWMgPSB3ZWJraXRfd2ViX3ZpZXdfcmVhbF90b2dnbGVfaXRh bGljOworICAgIHdlYlZpZXdDbGFzcy0+Y29weV9jbGlwYm9hcmQgPSB3ZWJraXRfd2ViX3ZpZXdf cmVhbF9jb3B5X2NsaXBib2FyZDsKKyAgICB3ZWJWaWV3Q2xhc3MtPnBhc3RlX2NsaXBib2FyZCA9 IHdlYmtpdF93ZWJfdmlld19yZWFsX3Bhc3RlX2NsaXBib2FyZDsKKyAgICB3ZWJWaWV3Q2xhc3Mt PmN1dF9jbGlwYm9hcmQgPSB3ZWJraXRfd2ViX3ZpZXdfcmVhbF9jdXRfY2xpcGJvYXJkOworICAg IHdlYlZpZXdDbGFzcy0+cmVkbyA9IHdlYmtpdF93ZWJfdmlld19yZWFsX3JlZG87CisgICAgd2Vi Vmlld0NsYXNzLT51bmRvID0gd2Via2l0X3dlYl92aWV3X3JlYWxfdW5kbzsKIAogICAgIEdfT0JK RUNUX0NMQVNTKHdlYlZpZXdDbGFzcyktPmZpbmFsaXplID0gd2Via2l0X3dlYl92aWV3X2ZpbmFs aXplOwogCkBAIC02MzQsNiArODE4LDI3IEBACiAgICAgICAgICAgICB3ZWJraXRfbWFyc2hhbF9W T0lEX19PQkpFQ1RfT0JKRUNULAogICAgICAgICAgICAgR19UWVBFX05PTkUsIDIsCiAgICAgICAg ICAgICBHVEtfVFlQRV9BREpVU1RNRU5ULCBHVEtfVFlQRV9BREpVU1RNRU5UKTsKKworICAgIC8q CisgICAgICogS2V5IGJpbmRpbmdzCisgICAgICovCisgICAgYmluZGluZ19zZXQgPSBndGtfYmlu ZGluZ19zZXRfYnlfY2xhc3MgKHdlYlZpZXdDbGFzcyk7CisgICAgZ3RrX2JpbmRpbmdfZW50cnlf YWRkX3NpZ25hbCAoYmluZGluZ19zZXQsIEdES19hLCBHREtfQ09OVFJPTF9NQVNLLAorCQkJCSAg InNlbGVjdF9hbGwiLCAwKTsKKyAgICBndGtfYmluZGluZ19lbnRyeV9hZGRfc2lnbmFsIChiaW5k aW5nX3NldCwgR0RLX2IsIEdES19DT05UUk9MX01BU0ssCisJCQkJICAidG9nZ2xlX2JvbGQiLCAw KTsKKyAgICBndGtfYmluZGluZ19lbnRyeV9hZGRfc2lnbmFsIChiaW5kaW5nX3NldCwgR0RLX2ks IEdES19DT05UUk9MX01BU0ssCisJCQkJICAidG9nZ2xlX2l0YWxpYyIsIDApOworICAgIGd0a19i aW5kaW5nX2VudHJ5X2FkZF9zaWduYWwgKGJpbmRpbmdfc2V0LCBHREtfYywgR0RLX0NPTlRST0xf TUFTSywKKwkJCQkgICJjb3B5X2NsaXBib2FyZCIsIDApOworICAgIGd0a19iaW5kaW5nX2VudHJ5 X2FkZF9zaWduYWwgKGJpbmRpbmdfc2V0LCBHREtfdiwgR0RLX0NPTlRST0xfTUFTSywKKwkJCQkg ICJwYXN0ZV9jbGlwYm9hcmQiLCAwKTsKKyAgICBndGtfYmluZGluZ19lbnRyeV9hZGRfc2lnbmFs IChiaW5kaW5nX3NldCwgR0RLX3gsIEdES19DT05UUk9MX01BU0ssCisJCQkJICAiY3V0X2NsaXBi b2FyZCIsIDApOworICAgIGd0a19iaW5kaW5nX2VudHJ5X2FkZF9zaWduYWwgKGJpbmRpbmdfc2V0 LCBHREtfeSwgR0RLX0NPTlRST0xfTUFTSywKKwkJCQkgICJyZWRvIiwgMCk7CisgICAgZ3RrX2Jp bmRpbmdfZW50cnlfYWRkX3NpZ25hbCAoYmluZGluZ19zZXQsIEdES196LCBHREtfQ09OVFJPTF9N QVNLLAorCQkJCSAgInVuZG8iLCAwKTsKIH0KIAogc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3 X2luaXQoV2ViS2l0V2ViVmlldyogd2ViVmlldykKSW5kZXg6IFdlYktpdC9ndGsvV2ViVmlldy93 ZWJraXR3ZWJ2aWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2d0ay9XZWJWaWV3L3dlYmtpdHdl YnZpZXcuaAkocmV2aXNpb24gMjgzNDYpCisrKyBXZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0d2Vi dmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC03OCw2ICs3OCwxNCBAQAogICAgIGdib29sZWFuICgq c2NyaXB0X2NvbmZpcm0pIChXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldywgV2ViS2l0V2ViRnJhbWUq IGZyYW1lLCBjb25zdCBnY2hhciogY29uZmlybV9tZXNzYWdlLCBnYm9vbGVhbiogZGlkX2NvbmZp cm0pOwogICAgIGdib29sZWFuICgqc2NyaXB0X3Byb21wdCkgKFdlYktpdFdlYlZpZXcqIHdlYl92 aWV3LCBXZWJLaXRXZWJGcmFtZSogZnJhbWUsIGNvbnN0IGdjaGFyKiBtZXNzYWdlLCBjb25zdCBn Y2hhciogZGVmYXVsdF92YWx1ZSwgZ2NoYXIqKiB2YWx1ZSk7CiAgICAgZ2Jvb2xlYW4gKCpjb25z b2xlX21lc3NhZ2UpIChXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldywgY29uc3QgZ2NoYXIqIG1lc3Nh Z2UsIHVuc2lnbmVkIGludCBsaW5lX251bWJlciwgY29uc3QgZ2NoYXIqIHNvdXJjZV9pZCk7Cisg ICAgdm9pZCAoKnNlbGVjdF9hbGwpIChXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldyk7CisgICAgdm9p ZCAoKnRvZ2dsZV9ib2xkKSAoV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcpOworICAgIHZvaWQgKCp0 b2dnbGVfaXRhbGljKSAoV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcpOworICAgIHZvaWQgKCpjb3B5 X2NsaXBib2FyZCkgKFdlYktpdFdlYlZpZXcqIHdlYl92aWV3KTsKKyAgICB2b2lkICgqcGFzdGVf Y2xpcGJvYXJkKSAoV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcpOworICAgIHZvaWQgKCpjdXRfY2xp cGJvYXJkKSAoV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcpOworICAgIHZvaWQgKCpyZWRvKSAoV2Vi S2l0V2ViVmlldyogd2ViX3ZpZXcpOworICAgIHZvaWQgKCp1bmRvKSAoV2ViS2l0V2ViVmlldyog d2ViX3ZpZXcpOwogCiAgICAgLyoKICAgICAgKiBpbnRlcm5hbAo= 17696 2007-12-04 03:22:58 -0800 2007-12-04 03:49:38 -0800 same patch without bold, italic, undo, redo keybindings.patch text/plain 12058 lethalman88 SW5kZXg6IFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50R3RrLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEd0ay5jcHAJ KHJldmlzaW9uIDI4MzgzKQorKysgV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGll bnRHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yODUsMjQgKzI4NSwxMiBAQAogICAgICAgICAg ICAgICAgICAgICBmcmFtZS0+ZWRpdG9yKCktPmluc2VydFRleHQoa2V2ZW50LT50ZXh0KCksIGV2 ZW50KTsKICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKGtldmVudC0+Y3RybEtleSgpKSB7CiAg ICAgICAgICAgICAgICAgICAgIHN3aXRjaCAoa2V2ZW50LT5XaW5kb3dzS2V5Q29kZSgpKSB7Ci0g ICAgICAgICAgICAgICAgICAgICAgICBjYXNlIFZLX0E6Ci0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgZnJhbWUtPmVkaXRvcigpLT5leGVjQ29tbWFuZCgiU2VsZWN0QWxsIik7Ci0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgICAgICAgICBjYXNl IFZLX0I6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZnJhbWUtPmVkaXRvcigpLT5leGVj Q29tbWFuZCgiVG9nZ2xlQm9sZCIpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFr OwotICAgICAgICAgICAgICAgICAgICAgICAgY2FzZSBWS19DOgotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGZyYW1lLT5lZGl0b3IoKS0+ZXhlY0NvbW1hbmQoIkNvcHkiKTsKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICAgICAgICAgIGNhc2Ug VktfSToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmcmFtZS0+ZWRpdG9yKCktPmV4ZWND b21tYW5kKCJUb2dnbGVJdGFsaWMiKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVh azsKLSAgICAgICAgICAgICAgICAgICAgICAgIGNhc2UgVktfVjoKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICBmcmFtZS0+ZWRpdG9yKCktPmV4ZWNDb21tYW5kKCJQYXN0ZSIpOwotICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgICAgICAgICAgY2Fz ZSBWS19YOgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZyYW1lLT5lZGl0b3IoKS0+ZXhl Y0NvbW1hbmQoIkN1dCIpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICAgICAgICAgICAgICAgICAgY2FzZSBWS19ZOgogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGZyYW1lLT5lZGl0b3IoKS0+ZXhlY0NvbW1hbmQoIlJlZG8iKTsKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBicmVhazsKQEAgLTMzNywxOCArMzI1LDcgQEAKICAgICAgICAgICAgICAg ICAgICAgZnJhbWUtPmVkaXRvcigpLT5leGVjQ29tbWFuZCgiTW92ZVRvRW5kT2ZEb2N1bWVudCIp OwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAg ICAgICAgICBpZiAoa2V2ZW50LT5jdHJsS2V5KCkpIHsKLSAgICAgICAgICAgICAgICAgICAgc3dp dGNoKGtldmVudC0+V2luZG93c0tleUNvZGUoKSkgewotICAgICAgICAgICAgICAgICAgICAgICAg Y2FzZSBWS19BOgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZyYW1lLT5lZGl0b3IoKS0+ ZXhlY0NvbW1hbmQoIlNlbGVjdEFsbCIpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICAgICAgICAgICAgICAgICAgY2FzZSBWS19DOiBjYXNlIFZLX1g6Ci0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgZnJhbWUtPmVkaXRvcigpLT5leGVjQ29tbWFuZCgiQ29w eSIpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAg ICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICB9IGVsc2UgcmV0dXJuOworCQly ZXR1cm47CiAgICAgICAgIH0KICAgICB9CiAgICAgZXZlbnQtPnNldERlZmF1bHRIYW5kbGVkKCk7 CkluZGV4OiBXZWJLaXQvZ3RrL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL0No YW5nZUxvZwkocmV2aXNpb24gMjgzODMpCisrKyBXZWJLaXQvZ3RrL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDA3LTEyLTA0ICBMdWNhIEJydW5vICA8bGV0aGFs bWFuODhAZ21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IEFscCBUb2tlci4KKworICAg ICAgICAqIFdlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEd0ay5jcHA6CisgICAgICAgIChXZWJL aXQ6OkVkaXRvckNsaWVudDo6aGFuZGxlS2V5cHJlc3MpOiBkbyBub3QgaGFuZGxlIGNsaXBib2Fy ZCBvcGVyYXRpb25zIGFuZCBzZWxlY3QtYWxsCisgICAgICAgICogV2ViVmlldy93ZWJraXR3ZWJ2 aWV3LmNwcDogYWRkIGNvcHksIHBhc3RlLCBjdXQgYW5kIHNlbGVjdC1hbGwgc2lnbmFscyBhbmQg YWxsb3cgYmluZGluZyBzZXRzIChpc3N1ZSAjMTU5MTEgYW5kICMxNjE0NCkKKyAgICAgICAgKiBX ZWJWaWV3L3dlYmtpdHdlYnZpZXcuaDoKKwogMjAwNy0xMi0wMyAgRGFuIEJlcm5zdGVpbiAgPG1p dHpAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmUgSHlhdHQuCkluZGV4OiBX ZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0d2Vidmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 L2d0ay9XZWJWaWV3L3dlYmtpdHdlYnZpZXcuY3BwCShyZXZpc2lvbiAyODM4MykKKysrIFdlYktp dC9ndGsvV2ViVmlldy93ZWJraXR3ZWJ2aWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDcsNiAr NDcsNyBAQAogI2luY2x1ZGUgIkluc3BlY3RvckNsaWVudEd0ay5oIgogI2luY2x1ZGUgIkZyYW1l TG9hZGVyLmgiCiAjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCisjaW5jbHVkZSAiRWRpdG9yLmgiCiAj aW5jbHVkZSAiUGxhdGZvcm1LZXlib2FyZEV2ZW50LmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1XaGVl bEV2ZW50LmgiCiAjaW5jbHVkZSAiU3Vic3RpdHV0ZURhdGEuaCIKQEAgLTc0LDExICs3NSwxNSBA QAogICAgIFNDUklQVF9BTEVSVCwKICAgICBTQ1JJUFRfQ09ORklSTSwKICAgICBTQ1JJUFRfUFJP TVBULAorICAgIFNFTEVDVF9BTEwsCisgICAgQ09QWV9DTElQQk9BUkQsCisgICAgUEFTVEVfQ0xJ UEJPQVJELAorICAgIENVVF9DTElQQk9BUkQsCiAgICAgTEFTVF9TSUdOQUwKIH07CiAKIHN0YXRp YyBndWludCB3ZWJraXRfd2ViX3ZpZXdfc2lnbmFsc1tMQVNUX1NJR05BTF0gPSB7IDAsIH07Ci0K KyAgCiBHX0RFRklORV9UWVBFKFdlYktpdFdlYlZpZXcsIHdlYmtpdF93ZWJfdmlldywgR1RLX1RZ UEVfQ09OVEFJTkVSKQogCiBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2V4cG9zZV9l dmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRFeHBvc2UqIGV2ZW50KQpAQCAtMTAyLDM3 ICsxMDcsMzUgQEAKIHsKICAgICBGcmFtZSogZnJhbWUgPSBjb3JlKGdldEZyYW1lRnJvbVZpZXco V0VCS0lUX1dFQl9WSUVXKHdpZGdldCkpKTsKICAgICBQbGF0Zm9ybUtleWJvYXJkRXZlbnQga2V5 Ym9hcmRFdmVudChldmVudCk7CisgICAgRnJhbWVWaWV3ICp2aWV3OwogCi0gICAgaWYgKGZyYW1l LT5ldmVudEhhbmRsZXIoKS0+a2V5RXZlbnQoa2V5Ym9hcmRFdmVudCkpCi0gICAgICAgIHJldHVy biBUUlVFOworICAgIGlmICghZnJhbWUtPmV2ZW50SGFuZGxlcigpLT5rZXlFdmVudChrZXlib2Fy ZEV2ZW50KSAmJiBldmVudC0+dHlwZSA9PSBHREtfS0VZX1BSRVNTKQorICAgICAgeworCXZpZXcg PSBmcmFtZS0+dmlldygpOwogCi0gICAgaWYgKGV2ZW50LT50eXBlICE9IEdES19LRVlfUFJFU1Mp Ci0gICAgICAgIHJldHVybiBGQUxTRTsKKwkvKiBGSVhNRTogYXQgdGhlIHZlcnkgbGVhc3Qgd2Ug c2hvdWxkIGJlIHVzaW5nIHRoZSBzYW1lIGNvZGUgdGhhbiB0aGUKKwkgICBXaW5kb3dzIHBvcnQg aGVyZSwgYnV0IG91ciBTY3JvbGxWaWV3IGZpbGUgZGl2ZXJnZXMgZW5vdWdoIHRvIG1ha2UKKwkg ICB0aGF0IGltcG9zc2libGUuIEEgc2hvcnQgdGVybSBzb2x1dGlvbiB3b3VsZCBiZSB0byB1bmlm eSBTY3JvbGxWaWV3V2luCisJICAgYW5kIFNjcm9sbFZpZXdHdGsuIExvbmctdGVybSBTY3JvbGxW aWV3IGFuZCBGcmFtZVZpZXcgc2hvdWxkIGJlCisJICAgdW5pZmllZCBhbmQgdXNlZCBldmVyeXdo ZXJlIGZvciBzY3JvbGxiYXJzICovCisJCisJc3dpdGNoIChldmVudC0+a2V5dmFsKSB7CisJY2Fz ZSAoR0RLX0Rvd24pOgorCSAgdmlldy0+c2Nyb2xsQnkoMCwgTElORV9TVEVQKTsKKwkgIHJldHVy biBUUlVFOworCWNhc2UgKEdES19VcCk6CisJICB2aWV3LT5zY3JvbGxCeSgwLCAtTElORV9TVEVQ KTsKKwkgIHJldHVybiBUUlVFOworCWNhc2UgKEdES19SaWdodCk6CisJICB2aWV3LT5zY3JvbGxC eShMSU5FX1NURVAsIDApOworCSAgcmV0dXJuIFRSVUU7CisJY2FzZSAoR0RLX0xlZnQpOgorCSAg dmlldy0+c2Nyb2xsQnkoLUxJTkVfU1RFUCwgMCk7CisJICByZXR1cm4gVFJVRTsKKwl9CisgICAg ICB9CiAKLSAgICBGcmFtZVZpZXcqIHZpZXcgPSBmcmFtZS0+dmlldygpOwotCi0gICAgLyogRklY TUU6IGF0IHRoZSB2ZXJ5IGxlYXN0IHdlIHNob3VsZCBiZSB1c2luZyB0aGUgc2FtZSBjb2RlIHRo YW4gdGhlCi0gICAgICAgV2luZG93cyBwb3J0IGhlcmUsIGJ1dCBvdXIgU2Nyb2xsVmlldyBmaWxl IGRpdmVyZ2VzIGVub3VnaCB0byBtYWtlCi0gICAgICAgdGhhdCBpbXBvc3NpYmxlLiBBIHNob3J0 IHRlcm0gc29sdXRpb24gd291bGQgYmUgdG8gdW5pZnkgU2Nyb2xsVmlld1dpbgotICAgICAgIGFu ZCBTY3JvbGxWaWV3R3RrLiBMb25nLXRlcm0gU2Nyb2xsVmlldyBhbmQgRnJhbWVWaWV3IHNob3Vs ZCBiZQotICAgICAgIHVuaWZpZWQgYW5kIHVzZWQgZXZlcnl3aGVyZSBmb3Igc2Nyb2xsYmFycyAq LwotCi0gICAgc3dpdGNoIChldmVudC0+a2V5dmFsKSB7Ci0gICAgY2FzZSAoR0RLX0Rvd24pOgot ICAgICAgICB2aWV3LT5zY3JvbGxCeSgwLCBMSU5FX1NURVApOwotICAgICAgICByZXR1cm4gVFJV RTsKLSAgICBjYXNlIChHREtfVXApOgotICAgICAgICB2aWV3LT5zY3JvbGxCeSgwLCAtTElORV9T VEVQKTsKLSAgICAgICAgcmV0dXJuIFRSVUU7Ci0gICAgY2FzZSAoR0RLX1JpZ2h0KToKLSAgICAg ICAgdmlldy0+c2Nyb2xsQnkoTElORV9TVEVQLCAwKTsKLSAgICAgICAgcmV0dXJuIFRSVUU7Ci0g ICAgY2FzZSAoR0RLX0xlZnQpOgotICAgICAgICB2aWV3LT5zY3JvbGxCeSgtTElORV9TVEVQLCAw KTsKLSAgICAgICAgcmV0dXJuIFRSVUU7Ci0gICAgfQotCi0gICAgcmV0dXJuIEZBTFNFOworICAg IHJldHVybiBndGtfYmluZGluZ3NfYWN0aXZhdGVfZXZlbnQgKEdUS19PQkpFQ1QgKHdpZGdldCks IGV2ZW50KTsKIH0KIAogc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19idXR0b25fZXZl bnQoR3RrV2lkZ2V0KiB3aWRnZXQsIEdka0V2ZW50QnV0dG9uKiBldmVudCkKQEAgLTM2MCw2ICsz NjMsMzAgQEAKICAgICByZXR1cm4gVFJVRTsKIH0KIAorc3RhdGljIHZvaWQgd2Via2l0X3dlYl92 aWV3X3JlYWxfc2VsZWN0X2FsbChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQoreworICAgIEZyYW1l KiBmcmFtZSA9IGNvcmUoZ2V0RnJhbWVGcm9tVmlldyh3ZWJWaWV3KSk7CisgICAgZnJhbWUtPmVk aXRvcigpLT5leGVjQ29tbWFuZCgiU2VsZWN0QWxsIik7Cit9CisKK3N0YXRpYyB2b2lkIHdlYmtp dF93ZWJfdmlld19yZWFsX2NvcHlfY2xpcGJvYXJkKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCit7 CisgICAgRnJhbWUqIGZyYW1lID0gY29yZShnZXRGcmFtZUZyb21WaWV3KHdlYlZpZXcpKTsKKyAg ICBmcmFtZS0+ZWRpdG9yKCktPmV4ZWNDb21tYW5kKCJDb3B5Iik7Cit9CisKK3N0YXRpYyB2b2lk IHdlYmtpdF93ZWJfdmlld19yZWFsX3Bhc3RlX2NsaXBib2FyZChXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3KQoreworICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUoZ2V0RnJhbWVGcm9tVmlldyh3ZWJWaWV3 KSk7CisgICAgZnJhbWUtPmVkaXRvcigpLT5leGVjQ29tbWFuZCgiUGFzdGUiKTsKK30KKworc3Rh dGljIHZvaWQgd2Via2l0X3dlYl92aWV3X3JlYWxfY3V0X2NsaXBib2FyZChXZWJLaXRXZWJWaWV3 KiB3ZWJWaWV3KQoreworICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUoZ2V0RnJhbWVGcm9tVmlldyh3 ZWJWaWV3KSk7CisgICAgZnJhbWUtPmVkaXRvcigpLT5leGVjQ29tbWFuZCgiQ3V0Iik7IAorfQor CiBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfZmluYWxpemUoR09iamVjdCogb2JqZWN0KQog ewogICAgIHdlYmtpdF93ZWJfdmlld19zdG9wX2xvYWRpbmcoV0VCS0lUX1dFQl9WSUVXKG9iamVj dCkpOwpAQCAtMzc1LDYgKzQwMiw4IEBACiAKIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19j bGFzc19pbml0KFdlYktpdFdlYlZpZXdDbGFzcyogd2ViVmlld0NsYXNzKQogeworICAgIEd0a0Jp bmRpbmdTZXQgKmJpbmRpbmdfc2V0OworCiAgICAgZ190eXBlX2NsYXNzX2FkZF9wcml2YXRlKHdl YlZpZXdDbGFzcywgc2l6ZW9mKFdlYktpdFdlYlZpZXdQcml2YXRlKSk7CiAKICAgICAvKgpAQCAt NTkwLDcgKzYxOSw2NiBAQAogICAgICAgICAgICAgR19UWVBFX0JPT0xFQU4sIDQsCiAgICAgICAg ICAgICBHX1RZUEVfT0JKRUNULCBHX1RZUEVfU1RSSU5HLCBHX1RZUEVfU1RSSU5HLCBHX1RZUEVf UE9JTlRFUik7CiAKKyAgICAvKioKKyAgICAgKiBXZWJLaXRXZWJWaWV3OjpzZWxlY3QtYWxsOgor ICAgICAqIEB3ZWJfdmlldzogdGhlIG9iamVjdCBvbiB3aGljaCB0aGUgc2lnbmFsIGlzIGVtaXR0 ZWQKKyAgICAgKiBAcmV0dXJuOiBUUlVFIHRvIHN0b3Agb3RoZXIgaGFuZGxlcnMgZnJvbSBiZWlu ZyBpbnZva2VkIGZvciB0aGUgZXZlbnQuIEZBTFNFIHRvIHByb3BhZ2F0ZSB0aGUgZXZlbnQgZnVy dGhlci4KKyAgICAgKgorICAgICAqIFNlbGVjdCBhbGwgdGV4dCBpbiB0aGUgd2ViIHZpZXcuCisg ICAgICovCisgICAgd2Via2l0X3dlYl92aWV3X3NpZ25hbHNbU0VMRUNUX0FMTF0gPSBnX3NpZ25h bF9uZXcoInNlbGVjdF9hbGwiLAorICAgICAgICAgICAgR19UWVBFX0ZST01fQ0xBU1Mod2ViVmll d0NsYXNzKSwKKyAgICAgICAgICAgIChHU2lnbmFsRmxhZ3MpKEdfU0lHTkFMX1JVTl9MQVNUIHwg R19TSUdOQUxfQUNUSU9OKSwKKyAgICAgICAgICAgIEdfU1RSVUNUX09GRlNFVChXZWJLaXRXZWJW aWV3Q2xhc3MsIHNlbGVjdF9hbGwpLAorIAkgICAgTlVMTCwgTlVMTCwKKyAJICAgIGdfY2Nsb3N1 cmVfbWFyc2hhbF9WT0lEX19WT0lELAorCSAgICBHX1RZUEVfTk9ORSwgMCk7CiAKKyAgICAvKioK KyAgICAgKiBXZWJLaXRXZWJWaWV3Ojpjb3B5LWNsaXBib2FyZDoKKyAgICAgKiBAd2ViX3ZpZXc6 IHRoZSBvYmplY3Qgb24gd2hpY2ggdGhlIHNpZ25hbCBpcyBlbWl0dGVkCisgICAgICogQHJldHVy bjogVFJVRSB0byBzdG9wIG90aGVyIGhhbmRsZXJzIGZyb20gYmVpbmcgaW52b2tlZCBmb3IgdGhl IGV2ZW50LiBGQUxTRSB0byBwcm9wYWdhdGUgdGhlIGV2ZW50IGZ1cnRoZXIuCisgICAgICoKKyAg ICAgKiBUZXh0IGhhcyBiZWVuIGNvcGllZCBmcm9tIHRoZSB3aWRnZXQuCisgICAgICovCisgICAg d2Via2l0X3dlYl92aWV3X3NpZ25hbHNbQ09QWV9DTElQQk9BUkRdID0gZ19zaWduYWxfbmV3KCJj b3B5X2NsaXBib2FyZCIsCisgICAgICAgICAgICBHX1RZUEVfRlJPTV9DTEFTUyh3ZWJWaWV3Q2xh c3MpLAorICAgICAgICAgICAgKEdTaWduYWxGbGFncykoR19TSUdOQUxfUlVOX0xBU1QgfCBHX1NJ R05BTF9BQ1RJT04pLAorICAgICAgICAgICAgR19TVFJVQ1RfT0ZGU0VUKFdlYktpdFdlYlZpZXdD bGFzcywgY29weV9jbGlwYm9hcmQpLAorIAkgICAgTlVMTCwgTlVMTCwKKyAJICAgIGdfY2Nsb3N1 cmVfbWFyc2hhbF9WT0lEX19WT0lELAorCSAgICBHX1RZUEVfTk9ORSwgMCk7CisKKyAgICAvKioK KyAgICAgKiBXZWJLaXRXZWJWaWV3OjpwYXN0ZS1jbGlwYm9hcmQ6CisgICAgICogQHdlYl92aWV3 OiB0aGUgb2JqZWN0IG9uIHdoaWNoIHRoZSBzaWduYWwgaXMgZW1pdHRlZAorICAgICAqIEByZXR1 cm46IFRSVUUgdG8gc3RvcCBvdGhlciBoYW5kbGVycyBmcm9tIGJlaW5nIGludm9rZWQgZm9yIHRo ZSBldmVudC4gRkFMU0UgdG8gcHJvcGFnYXRlIHRoZSBldmVudCBmdXJ0aGVyLgorICAgICAqCisg ICAgICogUGFzdGUgY2xpcGJvYXJkIGNvbnRlbnRzIGluIHRoZSB3aWRnZXQuCisgICAgICovCisg ICAgd2Via2l0X3dlYl92aWV3X3NpZ25hbHNbUEFTVEVfQ0xJUEJPQVJEXSA9IGdfc2lnbmFsX25l dygicGFzdGVfY2xpcGJvYXJkIiwKKyAgICAgICAgICAgIEdfVFlQRV9GUk9NX0NMQVNTKHdlYlZp ZXdDbGFzcyksCisgICAgICAgICAgICAoR1NpZ25hbEZsYWdzKShHX1NJR05BTF9SVU5fTEFTVCB8 IEdfU0lHTkFMX0FDVElPTiksCisgICAgICAgICAgICBHX1NUUlVDVF9PRkZTRVQoV2ViS2l0V2Vi Vmlld0NsYXNzLCBwYXN0ZV9jbGlwYm9hcmQpLAorIAkgICAgTlVMTCwgTlVMTCwKKyAJICAgIGdf Y2Nsb3N1cmVfbWFyc2hhbF9WT0lEX19WT0lELAorCSAgICBHX1RZUEVfTk9ORSwgMCk7CisKKyAg ICAvKioKKyAgICAgKiBXZWJLaXRXZWJWaWV3OjpjdXQtY2xpcGJvYXJkOgorICAgICAqIEB3ZWJf dmlldzogdGhlIG9iamVjdCBvbiB3aGljaCB0aGUgc2lnbmFsIGlzIGVtaXR0ZWQKKyAgICAgKiBA cmV0dXJuOiBUUlVFIHRvIHN0b3Agb3RoZXIgaGFuZGxlcnMgZnJvbSBiZWluZyBpbnZva2VkIGZv ciB0aGUgZXZlbnQuIEZBTFNFIHRvIHByb3BhZ2F0ZSB0aGUgZXZlbnQgZnVydGhlci4KKyAgICAg KgorICAgICAqIEN1dCBzZWxlY3RlZCB0ZXh0CisgICAgICovCisgICAgd2Via2l0X3dlYl92aWV3 X3NpZ25hbHNbQ1VUX0NMSVBCT0FSRF0gPSBnX3NpZ25hbF9uZXcoImN1dF9jbGlwYm9hcmQiLAor ICAgICAgICAgICAgR19UWVBFX0ZST01fQ0xBU1Mod2ViVmlld0NsYXNzKSwKKyAgICAgICAgICAg IChHU2lnbmFsRmxhZ3MpKEdfU0lHTkFMX1JVTl9MQVNUIHwgR19TSUdOQUxfQUNUSU9OKSwKKyAg ICAgICAgICAgIEdfU1RSVUNUX09GRlNFVChXZWJLaXRXZWJWaWV3Q2xhc3MsIGN1dF9jbGlwYm9h cmQpLAorIAkgICAgTlVMTCwgTlVMTCwKKyAJICAgIGdfY2Nsb3N1cmVfbWFyc2hhbF9WT0lEX19W T0lELAorCSAgICBHX1RZUEVfTk9ORSwgMCk7CisKICAgICAvKgogICAgICAqIGltcGxlbWVudGF0 aW9ucyBvZiB2aXJ0dWFsIG1ldGhvZHMKICAgICAgKi8KQEAgLTYwMiw2ICs2OTAsMTAgQEAKICAg ICB3ZWJWaWV3Q2xhc3MtPnNjcmlwdF9jb25maXJtID0gd2Via2l0X3dlYl92aWV3X3JlYWxfc2Ny aXB0X2NvbmZpcm07CiAgICAgd2ViVmlld0NsYXNzLT5zY3JpcHRfcHJvbXB0ID0gd2Via2l0X3dl Yl92aWV3X3JlYWxfc2NyaXB0X3Byb21wdDsKICAgICB3ZWJWaWV3Q2xhc3MtPmNvbnNvbGVfbWVz c2FnZSA9IHdlYmtpdF93ZWJfdmlld19yZWFsX2NvbnNvbGVfbWVzc2FnZTsKKyAgICB3ZWJWaWV3 Q2xhc3MtPnNlbGVjdF9hbGwgPSB3ZWJraXRfd2ViX3ZpZXdfcmVhbF9zZWxlY3RfYWxsOworICAg IHdlYlZpZXdDbGFzcy0+Y29weV9jbGlwYm9hcmQgPSB3ZWJraXRfd2ViX3ZpZXdfcmVhbF9jb3B5 X2NsaXBib2FyZDsKKyAgICB3ZWJWaWV3Q2xhc3MtPnBhc3RlX2NsaXBib2FyZCA9IHdlYmtpdF93 ZWJfdmlld19yZWFsX3Bhc3RlX2NsaXBib2FyZDsKKyAgICB3ZWJWaWV3Q2xhc3MtPmN1dF9jbGlw Ym9hcmQgPSB3ZWJraXRfd2ViX3ZpZXdfcmVhbF9jdXRfY2xpcGJvYXJkOwogCiAgICAgR19PQkpF Q1RfQ0xBU1Mod2ViVmlld0NsYXNzKS0+ZmluYWxpemUgPSB3ZWJraXRfd2ViX3ZpZXdfZmluYWxp emU7CiAKQEAgLTYzMyw2ICs3MjUsMTkgQEAKICAgICAgICAgICAgIHdlYmtpdF9tYXJzaGFsX1ZP SURfX09CSkVDVF9PQkpFQ1QsCiAgICAgICAgICAgICBHX1RZUEVfTk9ORSwgMiwKICAgICAgICAg ICAgIEdUS19UWVBFX0FESlVTVE1FTlQsIEdUS19UWVBFX0FESlVTVE1FTlQpOworCisgICAgLyoK KyAgICAgKiBLZXkgYmluZGluZ3MKKyAgICAgKi8KKyAgICBiaW5kaW5nX3NldCA9IGd0a19iaW5k aW5nX3NldF9ieV9jbGFzcyAod2ViVmlld0NsYXNzKTsKKyAgICBndGtfYmluZGluZ19lbnRyeV9h ZGRfc2lnbmFsIChiaW5kaW5nX3NldCwgR0RLX2EsIEdES19DT05UUk9MX01BU0ssCisJCQkJICAi c2VsZWN0X2FsbCIsIDApOworICAgIGd0a19iaW5kaW5nX2VudHJ5X2FkZF9zaWduYWwgKGJpbmRp bmdfc2V0LCBHREtfYywgR0RLX0NPTlRST0xfTUFTSywKKwkJCQkgICJjb3B5X2NsaXBib2FyZCIs IDApOworICAgIGd0a19iaW5kaW5nX2VudHJ5X2FkZF9zaWduYWwgKGJpbmRpbmdfc2V0LCBHREtf diwgR0RLX0NPTlRST0xfTUFTSywKKwkJCQkgICJwYXN0ZV9jbGlwYm9hcmQiLCAwKTsKKyAgICBn dGtfYmluZGluZ19lbnRyeV9hZGRfc2lnbmFsIChiaW5kaW5nX3NldCwgR0RLX3gsIEdES19DT05U Uk9MX01BU0ssCisJCQkJICAiY3V0X2NsaXBib2FyZCIsIDApOwogfQogCiBzdGF0aWMgdm9pZCB3 ZWJraXRfd2ViX3ZpZXdfaW5pdChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQpAQCAtNjQzLDYgKzc0 OCw3IEBACiAgICAgU2V0dGluZ3MqIHNldHRpbmdzID0gd2ViVmlld0RhdGEtPmNvcmVQYWdlLT5z ZXR0aW5ncygpOwogICAgIHNldHRpbmdzLT5zZXRMb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkodHJ1 ZSk7CiAgICAgc2V0dGluZ3MtPnNldE1pbmltdW1Gb250U2l6ZSg1KTsKKyAgICBzZXR0aW5ncy0+ c2V0RE9NUGFzdGVBbGxvd2VkKHRydWUpOwogICAgIHNldHRpbmdzLT5zZXRNaW5pbXVtTG9naWNh bEZvbnRTaXplKDUpOwogICAgIHNldHRpbmdzLT5zZXRTaG91bGRQcmludEJhY2tncm91bmRzKHRy dWUpOwogICAgIHNldHRpbmdzLT5zZXRKYXZhU2NyaXB0RW5hYmxlZCh0cnVlKTsKSW5kZXg6IFdl YktpdC9ndGsvV2ViVmlldy93ZWJraXR3ZWJ2aWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2d0 ay9XZWJWaWV3L3dlYmtpdHdlYnZpZXcuaAkocmV2aXNpb24gMjgzODMpCisrKyBXZWJLaXQvZ3Rr L1dlYlZpZXcvd2Via2l0d2Vidmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC03OCw2ICs3OCwxMCBA QAogICAgIGdib29sZWFuICgqc2NyaXB0X2NvbmZpcm0pIChXZWJLaXRXZWJWaWV3KiB3ZWJfdmll dywgV2ViS2l0V2ViRnJhbWUqIGZyYW1lLCBjb25zdCBnY2hhciogY29uZmlybV9tZXNzYWdlLCBn Ym9vbGVhbiogZGlkX2NvbmZpcm0pOwogICAgIGdib29sZWFuICgqc2NyaXB0X3Byb21wdCkgKFdl YktpdFdlYlZpZXcqIHdlYl92aWV3LCBXZWJLaXRXZWJGcmFtZSogZnJhbWUsIGNvbnN0IGdjaGFy KiBtZXNzYWdlLCBjb25zdCBnY2hhciogZGVmYXVsdF92YWx1ZSwgZ2NoYXIqKiB2YWx1ZSk7CiAg ICAgZ2Jvb2xlYW4gKCpjb25zb2xlX21lc3NhZ2UpIChXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldywg Y29uc3QgZ2NoYXIqIG1lc3NhZ2UsIHVuc2lnbmVkIGludCBsaW5lX251bWJlciwgY29uc3QgZ2No YXIqIHNvdXJjZV9pZCk7CisgICAgdm9pZCAoKnNlbGVjdF9hbGwpIChXZWJLaXRXZWJWaWV3KiB3 ZWJfdmlldyk7CisgICAgdm9pZCAoKmNvcHlfY2xpcGJvYXJkKSAoV2ViS2l0V2ViVmlldyogd2Vi X3ZpZXcpOworICAgIHZvaWQgKCpwYXN0ZV9jbGlwYm9hcmQpIChXZWJLaXRXZWJWaWV3KiB3ZWJf dmlldyk7CisgICAgdm9pZCAoKmN1dF9jbGlwYm9hcmQpIChXZWJLaXRXZWJWaWV3KiB3ZWJfdmll dyk7CiAKICAgICAvKgogICAgICAqIGludGVybmFsCg== 17697 2007-12-04 03:49:38 -0800 2007-12-04 05:09:36 -0800 patch indentation keybindings.patch text/plain 12432 lethalman88 SW5kZXg6IFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50R3RrLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEd0ay5jcHAJ KHJldmlzaW9uIDI4MzgzKQorKysgV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGll bnRHdGsuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yODUsMjQgKzI4NSwxMiBAQAogICAgICAgICAg ICAgICAgICAgICBmcmFtZS0+ZWRpdG9yKCktPmluc2VydFRleHQoa2V2ZW50LT50ZXh0KCksIGV2 ZW50KTsKICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKGtldmVudC0+Y3RybEtleSgpKSB7CiAg ICAgICAgICAgICAgICAgICAgIHN3aXRjaCAoa2V2ZW50LT5XaW5kb3dzS2V5Q29kZSgpKSB7Ci0g ICAgICAgICAgICAgICAgICAgICAgICBjYXNlIFZLX0E6Ci0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgZnJhbWUtPmVkaXRvcigpLT5leGVjQ29tbWFuZCgiU2VsZWN0QWxsIik7Ci0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgICAgICAgICBjYXNl IFZLX0I6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZnJhbWUtPmVkaXRvcigpLT5leGVj Q29tbWFuZCgiVG9nZ2xlQm9sZCIpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFr OwotICAgICAgICAgICAgICAgICAgICAgICAgY2FzZSBWS19DOgotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGZyYW1lLT5lZGl0b3IoKS0+ZXhlY0NvbW1hbmQoIkNvcHkiKTsKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICAgICAgICAgIGNhc2Ug VktfSToKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmcmFtZS0+ZWRpdG9yKCktPmV4ZWND b21tYW5kKCJUb2dnbGVJdGFsaWMiKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVh azsKLSAgICAgICAgICAgICAgICAgICAgICAgIGNhc2UgVktfVjoKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICBmcmFtZS0+ZWRpdG9yKCktPmV4ZWNDb21tYW5kKCJQYXN0ZSIpOwotICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgICAgICAgICAgY2Fz ZSBWS19YOgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZyYW1lLT5lZGl0b3IoKS0+ZXhl Y0NvbW1hbmQoIkN1dCIpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICAgICAgICAgICAgICAgICAgY2FzZSBWS19ZOgogICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGZyYW1lLT5lZGl0b3IoKS0+ZXhlY0NvbW1hbmQoIlJlZG8iKTsKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBicmVhazsKQEAgLTMzNywxOCArMzI1LDcgQEAKICAgICAgICAgICAgICAg ICAgICAgZnJhbWUtPmVkaXRvcigpLT5leGVjQ29tbWFuZCgiTW92ZVRvRW5kT2ZEb2N1bWVudCIp OwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAg ICAgICAgICBpZiAoa2V2ZW50LT5jdHJsS2V5KCkpIHsKLSAgICAgICAgICAgICAgICAgICAgc3dp dGNoKGtldmVudC0+V2luZG93c0tleUNvZGUoKSkgewotICAgICAgICAgICAgICAgICAgICAgICAg Y2FzZSBWS19BOgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZyYW1lLT5lZGl0b3IoKS0+ ZXhlY0NvbW1hbmQoIlNlbGVjdEFsbCIpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICAgICAgICAgICAgICAgICAgY2FzZSBWS19DOiBjYXNlIFZLX1g6Ci0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgZnJhbWUtPmVkaXRvcigpLT5leGVjQ29tbWFuZCgiQ29w eSIpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAg ICAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICB9IGVsc2UgcmV0dXJuOworCQly ZXR1cm47CiAgICAgICAgIH0KICAgICB9CiAgICAgZXZlbnQtPnNldERlZmF1bHRIYW5kbGVkKCk7 CkluZGV4OiBXZWJLaXQvZ3RrL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL0No YW5nZUxvZwkocmV2aXNpb24gMjgzODMpCisrKyBXZWJLaXQvZ3RrL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDA3LTEyLTA0ICBMdWNhIEJydW5vICA8bGV0aGFs bWFuODhAZ21haWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IEFscCBUb2tlci4KKworICAg ICAgICAqIFdlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEd0ay5jcHA6CisgICAgICAgIChXZWJL aXQ6OkVkaXRvckNsaWVudDo6aGFuZGxlS2V5cHJlc3MpOiBkbyBub3QgaGFuZGxlIGNsaXBib2Fy ZCBvcGVyYXRpb25zIGFuZCBzZWxlY3QtYWxsCisgICAgICAgICogV2ViVmlldy93ZWJraXR3ZWJ2 aWV3LmNwcDogYWRkIGNvcHksIHBhc3RlLCBjdXQgYW5kIHNlbGVjdC1hbGwgc2lnbmFscyBhbmQg YWxsb3cgYmluZGluZyBzZXRzIChpc3N1ZSAjMTU5MTEgYW5kICMxNjE0NCkKKyAgICAgICAgKiBX ZWJWaWV3L3dlYmtpdHdlYnZpZXcuaDoKKwogMjAwNy0xMi0wMyAgRGFuIEJlcm5zdGVpbiAgPG1p dHpAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmUgSHlhdHQuCkluZGV4OiBX ZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0d2Vidmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 L2d0ay9XZWJWaWV3L3dlYmtpdHdlYnZpZXcuY3BwCShyZXZpc2lvbiAyODM4MykKKysrIFdlYktp dC9ndGsvV2ViVmlldy93ZWJraXR3ZWJ2aWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDcsNiAr NDcsNyBAQAogI2luY2x1ZGUgIkluc3BlY3RvckNsaWVudEd0ay5oIgogI2luY2x1ZGUgIkZyYW1l TG9hZGVyLmgiCiAjaW5jbHVkZSAiRnJhbWVWaWV3LmgiCisjaW5jbHVkZSAiRWRpdG9yLmgiCiAj aW5jbHVkZSAiUGxhdGZvcm1LZXlib2FyZEV2ZW50LmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1XaGVl bEV2ZW50LmgiCiAjaW5jbHVkZSAiU3Vic3RpdHV0ZURhdGEuaCIKQEAgLTc0LDExICs3NSwxNSBA QAogICAgIFNDUklQVF9BTEVSVCwKICAgICBTQ1JJUFRfQ09ORklSTSwKICAgICBTQ1JJUFRfUFJP TVBULAorICAgIFNFTEVDVF9BTEwsCisgICAgQ09QWV9DTElQQk9BUkQsCisgICAgUEFTVEVfQ0xJ UEJPQVJELAorICAgIENVVF9DTElQQk9BUkQsCiAgICAgTEFTVF9TSUdOQUwKIH07CiAKIHN0YXRp YyBndWludCB3ZWJraXRfd2ViX3ZpZXdfc2lnbmFsc1tMQVNUX1NJR05BTF0gPSB7IDAsIH07Ci0K KyAgCiBHX0RFRklORV9UWVBFKFdlYktpdFdlYlZpZXcsIHdlYmtpdF93ZWJfdmlldywgR1RLX1RZ UEVfQ09OVEFJTkVSKQogCiBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2V4cG9zZV9l dmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRFeHBvc2UqIGV2ZW50KQpAQCAtMTAyLDM3 ICsxMDcsMzUgQEAKIHsKICAgICBGcmFtZSogZnJhbWUgPSBjb3JlKGdldEZyYW1lRnJvbVZpZXco V0VCS0lUX1dFQl9WSUVXKHdpZGdldCkpKTsKICAgICBQbGF0Zm9ybUtleWJvYXJkRXZlbnQga2V5 Ym9hcmRFdmVudChldmVudCk7CisgICAgRnJhbWVWaWV3ICp2aWV3OwogCi0gICAgaWYgKGZyYW1l LT5ldmVudEhhbmRsZXIoKS0+a2V5RXZlbnQoa2V5Ym9hcmRFdmVudCkpCi0gICAgICAgIHJldHVy biBUUlVFOworICAgIGlmICghZnJhbWUtPmV2ZW50SGFuZGxlcigpLT5rZXlFdmVudChrZXlib2Fy ZEV2ZW50KSAmJiBldmVudC0+dHlwZSA9PSBHREtfS0VZX1BSRVNTKQorICAgICAgeworICAgICAg ICAgIHZpZXcgPSBmcmFtZS0+dmlldygpOwogCi0gICAgaWYgKGV2ZW50LT50eXBlICE9IEdES19L RVlfUFJFU1MpCi0gICAgICAgIHJldHVybiBGQUxTRTsKKyAgICAgICAgICAvKiBGSVhNRTogYXQg dGhlIHZlcnkgbGVhc3Qgd2Ugc2hvdWxkIGJlIHVzaW5nIHRoZSBzYW1lIGNvZGUgdGhhbiB0aGUK KyAgICAgICAgICAgICBXaW5kb3dzIHBvcnQgaGVyZSwgYnV0IG91ciBTY3JvbGxWaWV3IGZpbGUg ZGl2ZXJnZXMgZW5vdWdoIHRvIG1ha2UKKyAgICAgICAgICAgICB0aGF0IGltcG9zc2libGUuIEEg c2hvcnQgdGVybSBzb2x1dGlvbiB3b3VsZCBiZSB0byB1bmlmeSBTY3JvbGxWaWV3V2luCisgICAg ICAgICAgICAgYW5kIFNjcm9sbFZpZXdHdGsuIExvbmctdGVybSBTY3JvbGxWaWV3IGFuZCBGcmFt ZVZpZXcgc2hvdWxkIGJlCisgICAgICAgICAgICAgdW5pZmllZCBhbmQgdXNlZCBldmVyeXdoZXJl IGZvciBzY3JvbGxiYXJzICovCisgICAgICAgICAgCisgICAgICAgICAgc3dpdGNoIChldmVudC0+ a2V5dmFsKSB7CisgICAgICAgICAgY2FzZSAoR0RLX0Rvd24pOgorICAgICAgICAgICAgICB2aWV3 LT5zY3JvbGxCeSgwLCBMSU5FX1NURVApOworICAgICAgICAgICAgICByZXR1cm4gVFJVRTsKKyAg ICAgICAgICBjYXNlIChHREtfVXApOgorICAgICAgICAgICAgICB2aWV3LT5zY3JvbGxCeSgwLCAt TElORV9TVEVQKTsKKyAgICAgICAgICAgICAgcmV0dXJuIFRSVUU7CisgICAgICAgICAgY2FzZSAo R0RLX1JpZ2h0KToKKyAgICAgICAgICAgICAgdmlldy0+c2Nyb2xsQnkoTElORV9TVEVQLCAwKTsK KyAgICAgICAgICAgICAgcmV0dXJuIFRSVUU7CisgICAgICAgICAgY2FzZSAoR0RLX0xlZnQpOgor ICAgICAgICAgICAgICB2aWV3LT5zY3JvbGxCeSgtTElORV9TVEVQLCAwKTsKKyAgICAgICAgICAg ICAgcmV0dXJuIFRSVUU7CisgICAgICAgICAgfQorICAgICAgfQogCi0gICAgRnJhbWVWaWV3KiB2 aWV3ID0gZnJhbWUtPnZpZXcoKTsKLQotICAgIC8qIEZJWE1FOiBhdCB0aGUgdmVyeSBsZWFzdCB3 ZSBzaG91bGQgYmUgdXNpbmcgdGhlIHNhbWUgY29kZSB0aGFuIHRoZQotICAgICAgIFdpbmRvd3Mg cG9ydCBoZXJlLCBidXQgb3VyIFNjcm9sbFZpZXcgZmlsZSBkaXZlcmdlcyBlbm91Z2ggdG8gbWFr ZQotICAgICAgIHRoYXQgaW1wb3NzaWJsZS4gQSBzaG9ydCB0ZXJtIHNvbHV0aW9uIHdvdWxkIGJl IHRvIHVuaWZ5IFNjcm9sbFZpZXdXaW4KLSAgICAgICBhbmQgU2Nyb2xsVmlld0d0ay4gTG9uZy10 ZXJtIFNjcm9sbFZpZXcgYW5kIEZyYW1lVmlldyBzaG91bGQgYmUKLSAgICAgICB1bmlmaWVkIGFu ZCB1c2VkIGV2ZXJ5d2hlcmUgZm9yIHNjcm9sbGJhcnMgKi8KLQotICAgIHN3aXRjaCAoZXZlbnQt PmtleXZhbCkgewotICAgIGNhc2UgKEdES19Eb3duKToKLSAgICAgICAgdmlldy0+c2Nyb2xsQnko MCwgTElORV9TVEVQKTsKLSAgICAgICAgcmV0dXJuIFRSVUU7Ci0gICAgY2FzZSAoR0RLX1VwKToK LSAgICAgICAgdmlldy0+c2Nyb2xsQnkoMCwgLUxJTkVfU1RFUCk7Ci0gICAgICAgIHJldHVybiBU UlVFOwotICAgIGNhc2UgKEdES19SaWdodCk6Ci0gICAgICAgIHZpZXctPnNjcm9sbEJ5KExJTkVf U1RFUCwgMCk7Ci0gICAgICAgIHJldHVybiBUUlVFOwotICAgIGNhc2UgKEdES19MZWZ0KToKLSAg ICAgICAgdmlldy0+c2Nyb2xsQnkoLUxJTkVfU1RFUCwgMCk7Ci0gICAgICAgIHJldHVybiBUUlVF OwotICAgIH0KLQotICAgIHJldHVybiBGQUxTRTsKKyAgICByZXR1cm4gZ3RrX2JpbmRpbmdzX2Fj dGl2YXRlX2V2ZW50IChHVEtfT0JKRUNUICh3aWRnZXQpLCBldmVudCk7CiB9CiAKIHN0YXRpYyBn Ym9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfYnV0dG9uX2V2ZW50KEd0a1dpZGdldCogd2lkZ2V0LCBH ZGtFdmVudEJ1dHRvbiogZXZlbnQpCkBAIC0zNjAsNiArMzYzLDMwIEBACiAgICAgcmV0dXJuIFRS VUU7CiB9CiAKK3N0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19yZWFsX3NlbGVjdF9hbGwoV2Vi S2l0V2ViVmlldyogd2ViVmlldykKK3sKKyAgICBGcmFtZSogZnJhbWUgPSBjb3JlKGdldEZyYW1l RnJvbVZpZXcod2ViVmlldykpOworICAgIGZyYW1lLT5lZGl0b3IoKS0+ZXhlY0NvbW1hbmQoIlNl bGVjdEFsbCIpOworfQorCitzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfcmVhbF9jb3B5X2Ns aXBib2FyZChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQoreworICAgIEZyYW1lKiBmcmFtZSA9IGNv cmUoZ2V0RnJhbWVGcm9tVmlldyh3ZWJWaWV3KSk7CisgICAgZnJhbWUtPmVkaXRvcigpLT5leGVj Q29tbWFuZCgiQ29weSIpOworfQorCitzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfcmVhbF9w YXN0ZV9jbGlwYm9hcmQoV2ViS2l0V2ViVmlldyogd2ViVmlldykKK3sKKyAgICBGcmFtZSogZnJh bWUgPSBjb3JlKGdldEZyYW1lRnJvbVZpZXcod2ViVmlldykpOworICAgIGZyYW1lLT5lZGl0b3Io KS0+ZXhlY0NvbW1hbmQoIlBhc3RlIik7Cit9CisKK3N0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmll d19yZWFsX2N1dF9jbGlwYm9hcmQoV2ViS2l0V2ViVmlldyogd2ViVmlldykKK3sKKyAgICBGcmFt ZSogZnJhbWUgPSBjb3JlKGdldEZyYW1lRnJvbVZpZXcod2ViVmlldykpOworICAgIGZyYW1lLT5l ZGl0b3IoKS0+ZXhlY0NvbW1hbmQoIkN1dCIpOyAKK30KKwogc3RhdGljIHZvaWQgd2Via2l0X3dl Yl92aWV3X2ZpbmFsaXplKEdPYmplY3QqIG9iamVjdCkKIHsKICAgICB3ZWJraXRfd2ViX3ZpZXdf c3RvcF9sb2FkaW5nKFdFQktJVF9XRUJfVklFVyhvYmplY3QpKTsKQEAgLTM3NSw2ICs0MDIsOCBA QAogCiBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfY2xhc3NfaW5pdChXZWJLaXRXZWJWaWV3 Q2xhc3MqIHdlYlZpZXdDbGFzcykKIHsKKyAgICBHdGtCaW5kaW5nU2V0ICpiaW5kaW5nX3NldDsK KwogICAgIGdfdHlwZV9jbGFzc19hZGRfcHJpdmF0ZSh3ZWJWaWV3Q2xhc3MsIHNpemVvZihXZWJL aXRXZWJWaWV3UHJpdmF0ZSkpOwogCiAgICAgLyoKQEAgLTU5MCw3ICs2MTksNjYgQEAKICAgICAg ICAgICAgIEdfVFlQRV9CT09MRUFOLCA0LAogICAgICAgICAgICAgR19UWVBFX09CSkVDVCwgR19U WVBFX1NUUklORywgR19UWVBFX1NUUklORywgR19UWVBFX1BPSU5URVIpOwogCisgICAgLyoqCisg ICAgICogV2ViS2l0V2ViVmlldzo6c2VsZWN0LWFsbDoKKyAgICAgKiBAd2ViX3ZpZXc6IHRoZSBv YmplY3Qgb24gd2hpY2ggdGhlIHNpZ25hbCBpcyBlbWl0dGVkCisgICAgICogQHJldHVybjogVFJV RSB0byBzdG9wIG90aGVyIGhhbmRsZXJzIGZyb20gYmVpbmcgaW52b2tlZCBmb3IgdGhlIGV2ZW50 LiBGQUxTRSB0byBwcm9wYWdhdGUgdGhlIGV2ZW50IGZ1cnRoZXIuCisgICAgICoKKyAgICAgKiBT ZWxlY3QgYWxsIHRleHQgaW4gdGhlIHdlYiB2aWV3LgorICAgICAqLworICAgIHdlYmtpdF93ZWJf dmlld19zaWduYWxzW1NFTEVDVF9BTExdID0gZ19zaWduYWxfbmV3KCJzZWxlY3RfYWxsIiwKKyAg ICAgICAgICAgIEdfVFlQRV9GUk9NX0NMQVNTKHdlYlZpZXdDbGFzcyksCisgICAgICAgICAgICAo R1NpZ25hbEZsYWdzKShHX1NJR05BTF9SVU5fTEFTVCB8IEdfU0lHTkFMX0FDVElPTiksCisgICAg ICAgICAgICBHX1NUUlVDVF9PRkZTRVQoV2ViS2l0V2ViVmlld0NsYXNzLCBzZWxlY3RfYWxsKSwK KyAJICAgIE5VTEwsIE5VTEwsCisgCSAgICBnX2NjbG9zdXJlX21hcnNoYWxfVk9JRF9fVk9JRCwK KwkgICAgR19UWVBFX05PTkUsIDApOwogCisgICAgLyoqCisgICAgICogV2ViS2l0V2ViVmlldzo6 Y29weS1jbGlwYm9hcmQ6CisgICAgICogQHdlYl92aWV3OiB0aGUgb2JqZWN0IG9uIHdoaWNoIHRo ZSBzaWduYWwgaXMgZW1pdHRlZAorICAgICAqIEByZXR1cm46IFRSVUUgdG8gc3RvcCBvdGhlciBo YW5kbGVycyBmcm9tIGJlaW5nIGludm9rZWQgZm9yIHRoZSBldmVudC4gRkFMU0UgdG8gcHJvcGFn YXRlIHRoZSBldmVudCBmdXJ0aGVyLgorICAgICAqCisgICAgICogVGV4dCBoYXMgYmVlbiBjb3Bp ZWQgZnJvbSB0aGUgd2lkZ2V0LgorICAgICAqLworICAgIHdlYmtpdF93ZWJfdmlld19zaWduYWxz W0NPUFlfQ0xJUEJPQVJEXSA9IGdfc2lnbmFsX25ldygiY29weV9jbGlwYm9hcmQiLAorICAgICAg ICAgICAgR19UWVBFX0ZST01fQ0xBU1Mod2ViVmlld0NsYXNzKSwKKyAgICAgICAgICAgIChHU2ln bmFsRmxhZ3MpKEdfU0lHTkFMX1JVTl9MQVNUIHwgR19TSUdOQUxfQUNUSU9OKSwKKyAgICAgICAg ICAgIEdfU1RSVUNUX09GRlNFVChXZWJLaXRXZWJWaWV3Q2xhc3MsIGNvcHlfY2xpcGJvYXJkKSwK KyAgICAgICAgICAgIE5VTEwsIE5VTEwsCisgICAgICAgICAgICBnX2NjbG9zdXJlX21hcnNoYWxf Vk9JRF9fVk9JRCwKKyAgICAgICAgICAgIEdfVFlQRV9OT05FLCAwKTsKKworICAgIC8qKgorICAg ICAqIFdlYktpdFdlYlZpZXc6OnBhc3RlLWNsaXBib2FyZDoKKyAgICAgKiBAd2ViX3ZpZXc6IHRo ZSBvYmplY3Qgb24gd2hpY2ggdGhlIHNpZ25hbCBpcyBlbWl0dGVkCisgICAgICogQHJldHVybjog VFJVRSB0byBzdG9wIG90aGVyIGhhbmRsZXJzIGZyb20gYmVpbmcgaW52b2tlZCBmb3IgdGhlIGV2 ZW50LiBGQUxTRSB0byBwcm9wYWdhdGUgdGhlIGV2ZW50IGZ1cnRoZXIuCisgICAgICoKKyAgICAg KiBQYXN0ZSBjbGlwYm9hcmQgY29udGVudHMgaW4gdGhlIHdpZGdldC4KKyAgICAgKi8KKyAgICB3 ZWJraXRfd2ViX3ZpZXdfc2lnbmFsc1tQQVNURV9DTElQQk9BUkRdID0gZ19zaWduYWxfbmV3KCJw YXN0ZV9jbGlwYm9hcmQiLAorICAgICAgICAgICAgR19UWVBFX0ZST01fQ0xBU1Mod2ViVmlld0Ns YXNzKSwKKyAgICAgICAgICAgIChHU2lnbmFsRmxhZ3MpKEdfU0lHTkFMX1JVTl9MQVNUIHwgR19T SUdOQUxfQUNUSU9OKSwKKyAgICAgICAgICAgIEdfU1RSVUNUX09GRlNFVChXZWJLaXRXZWJWaWV3 Q2xhc3MsIHBhc3RlX2NsaXBib2FyZCksCisgICAgICAgICAgICBOVUxMLCBOVUxMLAorICAgICAg ICAgICAgZ19jY2xvc3VyZV9tYXJzaGFsX1ZPSURfX1ZPSUQsCisgICAgICAgICAgICBHX1RZUEVf Tk9ORSwgMCk7CisKKyAgICAvKioKKyAgICAgKiBXZWJLaXRXZWJWaWV3OjpjdXQtY2xpcGJvYXJk OgorICAgICAqIEB3ZWJfdmlldzogdGhlIG9iamVjdCBvbiB3aGljaCB0aGUgc2lnbmFsIGlzIGVt aXR0ZWQKKyAgICAgKiBAcmV0dXJuOiBUUlVFIHRvIHN0b3Agb3RoZXIgaGFuZGxlcnMgZnJvbSBi ZWluZyBpbnZva2VkIGZvciB0aGUgZXZlbnQuIEZBTFNFIHRvIHByb3BhZ2F0ZSB0aGUgZXZlbnQg ZnVydGhlci4KKyAgICAgKgorICAgICAqIEN1dCBzZWxlY3RlZCB0ZXh0CisgICAgICovCisgICAg d2Via2l0X3dlYl92aWV3X3NpZ25hbHNbQ1VUX0NMSVBCT0FSRF0gPSBnX3NpZ25hbF9uZXcoImN1 dF9jbGlwYm9hcmQiLAorICAgICAgICAgICAgR19UWVBFX0ZST01fQ0xBU1Mod2ViVmlld0NsYXNz KSwKKyAgICAgICAgICAgIChHU2lnbmFsRmxhZ3MpKEdfU0lHTkFMX1JVTl9MQVNUIHwgR19TSUdO QUxfQUNUSU9OKSwKKyAgICAgICAgICAgIEdfU1RSVUNUX09GRlNFVChXZWJLaXRXZWJWaWV3Q2xh c3MsIGN1dF9jbGlwYm9hcmQpLAorICAgICAgICAgICAgTlVMTCwgTlVMTCwKKyAgICAgICAgICAg IGdfY2Nsb3N1cmVfbWFyc2hhbF9WT0lEX19WT0lELAorICAgICAgICAgICAgR19UWVBFX05PTkUs IDApOworCiAgICAgLyoKICAgICAgKiBpbXBsZW1lbnRhdGlvbnMgb2YgdmlydHVhbCBtZXRob2Rz CiAgICAgICovCkBAIC02MDIsNiArNjkwLDEwIEBACiAgICAgd2ViVmlld0NsYXNzLT5zY3JpcHRf Y29uZmlybSA9IHdlYmtpdF93ZWJfdmlld19yZWFsX3NjcmlwdF9jb25maXJtOwogICAgIHdlYlZp ZXdDbGFzcy0+c2NyaXB0X3Byb21wdCA9IHdlYmtpdF93ZWJfdmlld19yZWFsX3NjcmlwdF9wcm9t cHQ7CiAgICAgd2ViVmlld0NsYXNzLT5jb25zb2xlX21lc3NhZ2UgPSB3ZWJraXRfd2ViX3ZpZXdf cmVhbF9jb25zb2xlX21lc3NhZ2U7CisgICAgd2ViVmlld0NsYXNzLT5zZWxlY3RfYWxsID0gd2Vi a2l0X3dlYl92aWV3X3JlYWxfc2VsZWN0X2FsbDsKKyAgICB3ZWJWaWV3Q2xhc3MtPmNvcHlfY2xp cGJvYXJkID0gd2Via2l0X3dlYl92aWV3X3JlYWxfY29weV9jbGlwYm9hcmQ7CisgICAgd2ViVmll d0NsYXNzLT5wYXN0ZV9jbGlwYm9hcmQgPSB3ZWJraXRfd2ViX3ZpZXdfcmVhbF9wYXN0ZV9jbGlw Ym9hcmQ7CisgICAgd2ViVmlld0NsYXNzLT5jdXRfY2xpcGJvYXJkID0gd2Via2l0X3dlYl92aWV3 X3JlYWxfY3V0X2NsaXBib2FyZDsKIAogICAgIEdfT0JKRUNUX0NMQVNTKHdlYlZpZXdDbGFzcykt PmZpbmFsaXplID0gd2Via2l0X3dlYl92aWV3X2ZpbmFsaXplOwogCkBAIC02MzMsNiArNzI1LDE5 IEBACiAgICAgICAgICAgICB3ZWJraXRfbWFyc2hhbF9WT0lEX19PQkpFQ1RfT0JKRUNULAogICAg ICAgICAgICAgR19UWVBFX05PTkUsIDIsCiAgICAgICAgICAgICBHVEtfVFlQRV9BREpVU1RNRU5U LCBHVEtfVFlQRV9BREpVU1RNRU5UKTsKKworICAgIC8qCisgICAgICogS2V5IGJpbmRpbmdzCisg ICAgICovCisgICAgYmluZGluZ19zZXQgPSBndGtfYmluZGluZ19zZXRfYnlfY2xhc3MgKHdlYlZp ZXdDbGFzcyk7CisgICAgZ3RrX2JpbmRpbmdfZW50cnlfYWRkX3NpZ25hbCAoYmluZGluZ19zZXQs IEdES19hLCBHREtfQ09OVFJPTF9NQVNLLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJzZWxlY3RfYWxsIiwgMCk7CisgICAgZ3RrX2JpbmRpbmdfZW50cnlfYWRkX3NpZ25hbCAo YmluZGluZ19zZXQsIEdES19jLCBHREtfQ09OVFJPTF9NQVNLLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICJjb3B5X2NsaXBib2FyZCIsIDApOworICAgIGd0a19iaW5kaW5nX2Vu dHJ5X2FkZF9zaWduYWwgKGJpbmRpbmdfc2V0LCBHREtfdiwgR0RLX0NPTlRST0xfTUFTSywKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAicGFzdGVfY2xpcGJvYXJkIiwgMCk7Cisg ICAgZ3RrX2JpbmRpbmdfZW50cnlfYWRkX3NpZ25hbCAoYmluZGluZ19zZXQsIEdES194LCBHREtf Q09OVFJPTF9NQVNLLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJjdXRfY2xp cGJvYXJkIiwgMCk7CiB9CiAKIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19pbml0KFdlYktp dFdlYlZpZXcqIHdlYlZpZXcpCkBAIC02NDMsNiArNzQ4LDcgQEAKICAgICBTZXR0aW5ncyogc2V0 dGluZ3MgPSB3ZWJWaWV3RGF0YS0+Y29yZVBhZ2UtPnNldHRpbmdzKCk7CiAgICAgc2V0dGluZ3Mt PnNldExvYWRzSW1hZ2VzQXV0b21hdGljYWxseSh0cnVlKTsKICAgICBzZXR0aW5ncy0+c2V0TWlu aW11bUZvbnRTaXplKDUpOworICAgIHNldHRpbmdzLT5zZXRET01QYXN0ZUFsbG93ZWQodHJ1ZSk7 CiAgICAgc2V0dGluZ3MtPnNldE1pbmltdW1Mb2dpY2FsRm9udFNpemUoNSk7CiAgICAgc2V0dGlu Z3MtPnNldFNob3VsZFByaW50QmFja2dyb3VuZHModHJ1ZSk7CiAgICAgc2V0dGluZ3MtPnNldEph dmFTY3JpcHRFbmFibGVkKHRydWUpOwpJbmRleDogV2ViS2l0L2d0ay9XZWJWaWV3L3dlYmtpdHdl YnZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL1dlYlZpZXcvd2Via2l0d2Vidmlldy5o CShyZXZpc2lvbiAyODM4MykKKysrIFdlYktpdC9ndGsvV2ViVmlldy93ZWJraXR3ZWJ2aWV3LmgJ KHdvcmtpbmcgY29weSkKQEAgLTc4LDYgKzc4LDEwIEBACiAgICAgZ2Jvb2xlYW4gKCpzY3JpcHRf Y29uZmlybSkgKFdlYktpdFdlYlZpZXcqIHdlYl92aWV3LCBXZWJLaXRXZWJGcmFtZSogZnJhbWUs IGNvbnN0IGdjaGFyKiBjb25maXJtX21lc3NhZ2UsIGdib29sZWFuKiBkaWRfY29uZmlybSk7CiAg ICAgZ2Jvb2xlYW4gKCpzY3JpcHRfcHJvbXB0KSAoV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcsIFdl YktpdFdlYkZyYW1lKiBmcmFtZSwgY29uc3QgZ2NoYXIqIG1lc3NhZ2UsIGNvbnN0IGdjaGFyKiBk ZWZhdWx0X3ZhbHVlLCBnY2hhcioqIHZhbHVlKTsKICAgICBnYm9vbGVhbiAoKmNvbnNvbGVfbWVz c2FnZSkgKFdlYktpdFdlYlZpZXcqIHdlYl92aWV3LCBjb25zdCBnY2hhciogbWVzc2FnZSwgdW5z aWduZWQgaW50IGxpbmVfbnVtYmVyLCBjb25zdCBnY2hhciogc291cmNlX2lkKTsKKyAgICB2b2lk ICgqc2VsZWN0X2FsbCkgKFdlYktpdFdlYlZpZXcqIHdlYl92aWV3KTsKKyAgICB2b2lkICgqY29w eV9jbGlwYm9hcmQpIChXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldyk7CisgICAgdm9pZCAoKnBhc3Rl X2NsaXBib2FyZCkgKFdlYktpdFdlYlZpZXcqIHdlYl92aWV3KTsKKyAgICB2b2lkICgqY3V0X2Ns aXBib2FyZCkgKFdlYktpdFdlYlZpZXcqIHdlYl92aWV3KTsKIAogICAgIC8qCiAgICAgICogaW50 ZXJuYWwK