20458 2008-08-20 06:19:28 -0700 Support stylus pressure info in mouse events 2024-03-15 04:31:27 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Mac OS X 10.5 RESOLVED WONTFIX http://nerget.com/Scrije/scrije.html P2 Normal --- 1 oliver oliver annevk ap eric.carlson hyatt kbr keishi mitz mjs scottmg oldest_to_newest 88915 0 oliver 2008-08-20 06:19:28 -0700 Styluses commonly provide a variety of data, including pressure, tilt, and rotation. Given almost all tablet/stylus sets now provide pressure information it seems useful to provide it to the dom. This is especially helpful for drawing applications that use the canvas. 88916 1 22893 oliver 2008-08-20 06:28:25 -0700 Created attachment 22893 Initial implementation of pressure support This patch provides pressure information in the mouse event. The MouseEvent.pressure property is an double value from 0 to 1, where 0 indicates no pressure, and 1 indicates max pressure. We use a float rather than an integer value as different styluses have different pressure precision, so a float range from 0 to 1 effectively normalises this. A mouse is considered to have binary pressure levels, with pressure of 1 indicating a mouse is down, and pressure 0 indicating no button. I haven't looked into providing tilt info, etc as I am not sure how commonly such information is provided, ditto for rotation information which seems even less common. One other issue is that many styluses provide an "eraser" and it would be nice if we had a mechanism to allow a webpage to identify when the eraser was being used, as this would further increase the fidelity of the browser image processing experience. 88919 2 mitz 2008-08-20 07:27:22 -0700 See also bug 10598. 93134 3 oliver 2008-09-28 02:05:50 -0700 roc pointed me at the moz tracking bug https://bugzilla.mozilla.org/show_bug.cgi?id=428988 and noted that we should be using vendor prefixes on the pressure property (whoops) 104123 4 oliver 2009-01-02 11:07:26 -0800 Okay, I've been looking at the windows mechanisms for getting stylus information. It is worse than the IME APIs. There are multiple halfway there APIs. The most complete is the WinTab API, but afaict that's not actually part of windows, but that's okay because it also doesn't interact with the event queue. It looks like Vista may have some APIs that make this more feasible but on XP there appears to be no such luck. On XP the best we seem to be able to detect is whether an event is from a pen and even that code is unbelievably ugly -- and it only gives us the mouse vs. pen distinction, nothing more. In all honesty I'm leaning towards supporting pressure information on Mac and Gtk, seriously trying to support this on windows seems to be an exercise in futility. 2021289 5 annevk 2024-03-15 04:31:27 -0700 As I understand it this now happens through pointer events. 22893 2008-08-20 06:28:25 -0700 2010-06-10 16:25:27 -0700 Initial implementation of pressure support pressure.patch text/plain 11665 oliver ZGlmZiAtLWdpdCBhL1dlYkNvcmUvV2ViQ29yZS5iYXNlLmV4cCBiL1dlYkNvcmUvV2ViQ29yZS5i YXNlLmV4cAppbmRleCBjMzdjZWU3Li4yNGU5ZTA4IDEwMDY0NAotLS0gYS9XZWJDb3JlL1dlYkNv cmUuYmFzZS5leHAKKysrIGIvV2ViQ29yZS9XZWJDb3JlLmJhc2UuZXhwCkBAIC0xMjgsNyArMTI4 LDcgQEAgX19aTjdXZWJDb3JlMTBDYWNoZWRQYWdlMjJjYWNoZWRQYWdlUGxhdGZvcm1EYXRhRXYK IF9fWk43V2ViQ29yZTEwQ2FjaGVkUGFnZTI1c2V0Q2FjaGVkUGFnZVBsYXRmb3JtRGF0YUVQTlNf MjJDYWNoZWRQYWdlUGxhdGZvcm1EYXRhRQogX19aTjdXZWJDb3JlMTBFdmVudE5hbWVzMTBjbGlj a0V2ZW50RQogX19aTjdXZWJDb3JlMTBFdmVudE5hbWVzMTJrZXlkb3duRXZlbnRFCi1fX1pON1dl YkNvcmUxME1vdXNlRXZlbnRDMUVSS05TXzEyQXRvbWljU3RyaW5nRWJiTjNXVEYxMFBhc3NSZWZQ dHJJTlNfOURPTVdpbmRvd0VFRWlpaWlpYmJiYnROUzVfSU5TXzE1RXZlbnRUYXJnZXROb2RlRUVF TlM1X0lOU185Q2xpcGJvYXJkRUVFYgorX19aTjdXZWJDb3JlMTBNb3VzZUV2ZW50QzFFUktOU18x MkF0b21pY1N0cmluZ0ViYk4zV1RGMTBQYXNzUmVmUHRySU5TXzlET01XaW5kb3dFRUVpaWlpaWJi YmJ0ZE5TNV9JTlNfMTVFdmVudFRhcmdldE5vZGVFRUVOUzVfSU5TXzlDbGlwYm9hcmRFRUViCiBf X1pON1dlYkNvcmUxMFN0cmluZ0ltcGw3cmVwbGFjZUV0dAogX19aTjdXZWJDb3JlMTBTdHJpbmdJ bXBsRDFFdgogX19aTjdXZWJDb3JlMTBTdHJpbmdJbXBsY3ZQOE5TU3RyaW5nRXYKZGlmZiAtLWdp dCBhL1dlYkNvcmUvZG9tL0V2ZW50VGFyZ2V0Tm9kZS5jcHAgYi9XZWJDb3JlL2RvbS9FdmVudFRh cmdldE5vZGUuY3BwCmluZGV4IDc2NjE3YzYuLjcxNmExZGEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv ZG9tL0V2ZW50VGFyZ2V0Tm9kZS5jcHAKKysrIGIvV2ViQ29yZS9kb20vRXZlbnRUYXJnZXROb2Rl LmNwcApAQCAtMjIwLDcgKzIyMCw3IEBAIGJvb2wgRXZlbnRUYXJnZXROb2RlOjpkaXNwYXRjaE1v dXNlRXZlbnQoY29uc3QgUGxhdGZvcm1Nb3VzZUV2ZW50JiBldmVudCwgY29uc3QKIAogICAgIEFT U0VSVChldmVudC5ldmVudFR5cGUoKSA9PSBNb3VzZUV2ZW50TW92ZWQgfHwgYnV0dG9uICE9IE5v QnV0dG9uKTsKICAgICAKLSAgICByZXR1cm4gZGlzcGF0Y2hNb3VzZUV2ZW50KGV2ZW50VHlwZSwg YnV0dG9uLCBkZXRhaWwsCisgICAgcmV0dXJuIGRpc3BhdGNoTW91c2VFdmVudChldmVudFR5cGUs IGJ1dHRvbiwgZXZlbnQucHJlc3N1cmUoKSwgZGV0YWlsLAogICAgICAgICBjb250ZW50c1Bvcy54 KCksIGNvbnRlbnRzUG9zLnkoKSwgZXZlbnQuZ2xvYmFsWCgpLCBldmVudC5nbG9iYWxZKCksCiAg ICAgICAgIGV2ZW50LmN0cmxLZXkoKSwgZXZlbnQuYWx0S2V5KCksIGV2ZW50LnNoaWZ0S2V5KCks IGV2ZW50Lm1ldGFLZXkoKSwKICAgICAgICAgZmFsc2UsIHJlbGF0ZWRUYXJnZXQpOwpAQCAtMjQ0 LDcgKzI0NCw3IEBAIHZvaWQgRXZlbnRUYXJnZXROb2RlOjpkaXNwYXRjaFNpbXVsYXRlZE1vdXNl RXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUsCiAKICAgICAvLyBMaWtlIEdlY2tv LCB3ZSBqdXN0IHBhc3MgMCBmb3IgZXZlcnl0aGluZyB3aGVuIHdlIG1ha2UgYSBmYWtlIG1vdXNl IGV2ZW50LgogICAgIC8vIEludGVybmV0IEV4cGxvcmVyIGluc3RlYWQgZ2l2ZXMgdGhlIGN1cnJl bnQgbW91c2UgcG9zaXRpb24gYW5kIHN0YXRlLgotICAgIGRpc3BhdGNoTW91c2VFdmVudChldmVu dFR5cGUsIDAsIDAsIDAsIDAsIDAsIDAsCisgICAgZGlzcGF0Y2hNb3VzZUV2ZW50KGV2ZW50VHlw ZSwgMCwgMCwgMCwgMCwgMCwgMCwgMCwKICAgICAgICAgY3RybEtleSwgYWx0S2V5LCBzaGlmdEtl eSwgbWV0YUtleSwgdHJ1ZSwgMCwgdW5kZXJseWluZ0V2ZW50KTsKIH0KIApAQCAtMjcxLDcgKzI3 MSw3IEBAIHZvaWQgRXZlbnRUYXJnZXROb2RlOjpkaXNwYXRjaFNpbXVsYXRlZENsaWNrKFBhc3NS ZWZQdHI8RXZlbnQ+IGV2ZW50LCBib29sIHNlbmRNCiAgICAgZ05vZGVzRGlzcGF0Y2hpbmdTaW11 bGF0ZWRDbGlja3MtPnJlbW92ZSh0aGlzKTsKIH0KIAotYm9vbCBFdmVudFRhcmdldE5vZGU6OmRp c3BhdGNoTW91c2VFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwgaW50IGJ1dHRv biwgaW50IGRldGFpbCwKK2Jvb2wgRXZlbnRUYXJnZXROb2RlOjpkaXNwYXRjaE1vdXNlRXZlbnQo Y29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUsIGludCBidXR0b24sIGRvdWJsZSBwcmVzc3Vy ZSwgaW50IGRldGFpbCwKICAgICBpbnQgcGFnZVgsIGludCBwYWdlWSwgaW50IHNjcmVlblgsIGlu dCBzY3JlZW5ZLAogICAgIGJvb2wgY3RybEtleSwgYm9vbCBhbHRLZXksIGJvb2wgc2hpZnRLZXks IGJvb2wgbWV0YUtleSwgCiAgICAgYm9vbCBpc1NpbXVsYXRlZCwgTm9kZSogcmVsYXRlZFRhcmdl dEFyZywgUGFzc1JlZlB0cjxFdmVudD4gdW5kZXJseWluZ0V2ZW50KQpAQCAtMzEwLDcgKzMxMCw3 IEBAIGJvb2wgRXZlbnRUYXJnZXROb2RlOjpkaXNwYXRjaE1vdXNlRXZlbnQoY29uc3QgQXRvbWlj U3RyaW5nJiBldmVudFR5cGUsIGludCBidXR0CiAgICAgUmVmUHRyPEV2ZW50PiBtb3VzZUV2ZW50 ID0gTW91c2VFdmVudDo6Y3JlYXRlKGV2ZW50VHlwZSwKICAgICAgICAgdHJ1ZSwgY2FuY2VsYWJs ZSwgZG9jdW1lbnQoKS0+ZGVmYXVsdFZpZXcoKSwKICAgICAgICAgZGV0YWlsLCBzY3JlZW5YLCBz Y3JlZW5ZLCBwYWdlWCwgcGFnZVksCi0gICAgICAgIGN0cmxLZXksIGFsdEtleSwgc2hpZnRLZXks IG1ldGFLZXksIGJ1dHRvbiwKKyAgICAgICAgY3RybEtleSwgYWx0S2V5LCBzaGlmdEtleSwgbWV0 YUtleSwgYnV0dG9uLCBwcmVzc3VyZSwKICAgICAgICAgcmVsYXRlZFRhcmdldCwgMCwgaXNTaW11 bGF0ZWQpOwogICAgIG1vdXNlRXZlbnQtPnNldFVuZGVybHlpbmdFdmVudCh1bmRlcmx5aW5nRXZl bnQuZ2V0KCkpOwogICAgIApAQCAtMzI3LDcgKzMyNyw3IEBAIGJvb2wgRXZlbnRUYXJnZXROb2Rl OjpkaXNwYXRjaE1vdXNlRXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUsIGludCBi dXR0CiAgICAgICAgIFJlZlB0cjxFdmVudD4gZG91YmxlQ2xpY2tFdmVudCA9IE1vdXNlRXZlbnQ6 OmNyZWF0ZShkYmxjbGlja0V2ZW50LAogICAgICAgICAgICAgdHJ1ZSwgY2FuY2VsYWJsZSwgZG9j dW1lbnQoKS0+ZGVmYXVsdFZpZXcoKSwKICAgICAgICAgICAgIGRldGFpbCwgc2NyZWVuWCwgc2Ny ZWVuWSwgcGFnZVgsIHBhZ2VZLAotICAgICAgICAgICAgY3RybEtleSwgYWx0S2V5LCBzaGlmdEtl eSwgbWV0YUtleSwgYnV0dG9uLAorICAgICAgICAgICAgY3RybEtleSwgYWx0S2V5LCBzaGlmdEtl eSwgbWV0YUtleSwgYnV0dG9uLCBwcmVzc3VyZSwKICAgICAgICAgICAgIHJlbGF0ZWRUYXJnZXQs IDAsIGlzU2ltdWxhdGVkKTsKICAgICAgICAgZG91YmxlQ2xpY2tFdmVudC0+c2V0VW5kZXJseWlu Z0V2ZW50KHVuZGVybHlpbmdFdmVudC5nZXQoKSk7CiAgICAgICAgIGlmIChkZWZhdWx0SGFuZGxl ZCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL0V2ZW50VGFyZ2V0Tm9kZS5oIGIvV2ViQ29yZS9k b20vRXZlbnRUYXJnZXROb2RlLmgKaW5kZXggMDI4MmY4Ny4uMDMwNTA2ZSAxMDA2NDQKLS0tIGEv V2ViQ29yZS9kb20vRXZlbnRUYXJnZXROb2RlLmgKKysrIGIvV2ViQ29yZS9kb20vRXZlbnRUYXJn ZXROb2RlLmgKQEAgLTU5LDcgKzU5LDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlzcGF0Y2hXaGVl bEV2ZW50KFBsYXRmb3JtV2hlZWxFdmVudCYpOwogICAgIGJvb2wgZGlzcGF0Y2hNb3VzZUV2ZW50 KGNvbnN0IFBsYXRmb3JtTW91c2VFdmVudCYsIGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBl LAogICAgICAgICBpbnQgY2xpY2tDb3VudCA9IDAsIE5vZGUqIHJlbGF0ZWRUYXJnZXQgPSAwKTsK LSAgICBib29sIGRpc3BhdGNoTW91c2VFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlw ZSwgaW50IGJ1dHRvbiwgaW50IGNsaWNrQ291bnQsCisgICAgYm9vbCBkaXNwYXRjaE1vdXNlRXZl bnQoY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUsIGludCBidXR0b24sIGRvdWJsZSBwcmVz c3VyZSwgaW50IGNsaWNrQ291bnQsCiAgICAgICAgIGludCBwYWdlWCwgaW50IHBhZ2VZLCBpbnQg c2NyZWVuWCwgaW50IHNjcmVlblksCiAgICAgICAgIGJvb2wgY3RybEtleSwgYm9vbCBhbHRLZXks IGJvb2wgc2hpZnRLZXksIGJvb2wgbWV0YUtleSwKICAgICAgICAgYm9vbCBpc1NpbXVsYXRlZCA9 IGZhbHNlLCBOb2RlKiByZWxhdGVkVGFyZ2V0ID0gMCwgUGFzc1JlZlB0cjxFdmVudD4gdW5kZXJs eWluZ0V2ZW50ID0gMCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9Nb3VzZUV2ZW50LmNwcCBi L1dlYkNvcmUvZG9tL01vdXNlRXZlbnQuY3BwCmluZGV4IGM1NTA5M2MuLjBhMWFhOGYgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvZG9tL01vdXNlRXZlbnQuY3BwCisrKyBiL1dlYkNvcmUvZG9tL01vdXNl RXZlbnQuY3BwCkBAIC0zMiwxOCArMzIsMjAgQEAgdXNpbmcgbmFtZXNwYWNlIEV2ZW50TmFtZXM7 CiBNb3VzZUV2ZW50OjpNb3VzZUV2ZW50KCkKICAgICA6IG1fYnV0dG9uKDApCiAgICAgLCBtX2J1 dHRvbkRvd24oZmFsc2UpCisgICAgLCBtX3ByZXNzdXJlKDApCiB7CiB9CiAKIE1vdXNlRXZlbnQ6 Ok1vdXNlRXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUsIGJvb2wgY2FuQnViYmxl LCBib29sIGNhbmNlbGFibGUsIFBhc3NSZWZQdHI8QWJzdHJhY3RWaWV3PiB2aWV3LAogICAgICAg ICAgICAgICAgICAgICAgICBpbnQgZGV0YWlsLCBpbnQgc2NyZWVuWCwgaW50IHNjcmVlblksIGlu dCBwYWdlWCwgaW50IHBhZ2VZLAogICAgICAgICAgICAgICAgICAgICAgICBib29sIGN0cmxLZXks IGJvb2wgYWx0S2V5LCBib29sIHNoaWZ0S2V5LCBib29sIG1ldGFLZXksCi0gICAgICAgICAgICAg ICAgICAgICAgIHVuc2lnbmVkIHNob3J0IGJ1dHRvbiwgUGFzc1JlZlB0cjxFdmVudFRhcmdldE5v ZGU+IHJlbGF0ZWRUYXJnZXQsCisgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIHNob3J0 IGJ1dHRvbiwgZG91YmxlIHByZXNzdXJlLCBQYXNzUmVmUHRyPEV2ZW50VGFyZ2V0Tm9kZT4gcmVs YXRlZFRhcmdldCwKICAgICAgICAgICAgICAgICAgICAgICAgUGFzc1JlZlB0cjxDbGlwYm9hcmQ+ IGNsaXBib2FyZCwgYm9vbCBpc1NpbXVsYXRlZCkKICAgICA6IE1vdXNlUmVsYXRlZEV2ZW50KGV2 ZW50VHlwZSwgY2FuQnViYmxlLCBjYW5jZWxhYmxlLCB2aWV3LCBkZXRhaWwsIHNjcmVlblgsIHNj cmVlblksCiAgICAgICAgICAgICAgICAgICAgICAgICBwYWdlWCwgcGFnZVksIGN0cmxLZXksIGFs dEtleSwgc2hpZnRLZXksIG1ldGFLZXksIGlzU2ltdWxhdGVkKQogICAgICwgbV9idXR0b24oYnV0 dG9uID09ICh1bnNpZ25lZCBzaG9ydCktMSA/IDAgOiBidXR0b24pCiAgICAgLCBtX2J1dHRvbkRv d24oYnV0dG9uICE9ICh1bnNpZ25lZCBzaG9ydCktMSkKKyAgICAsIG1fcHJlc3N1cmUocHJlc3N1 cmUpCiAgICAgLCBtX3JlbGF0ZWRUYXJnZXQocmVsYXRlZFRhcmdldCkKICAgICAsIG1fY2xpcGJv YXJkKGNsaXBib2FyZCkKIHsKQEAgLTcxLDYgKzczLDcgQEAgdm9pZCBNb3VzZUV2ZW50Ojppbml0 TW91c2VFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIHR5cGUsIGJvb2wgY2FuQnViYmxlLCBib29s IGMKICAgICBtX21ldGFLZXkgPSBtZXRhS2V5OwogICAgIG1fYnV0dG9uID0gYnV0dG9uID09ICh1 bnNpZ25lZCBzaG9ydCktMSA/IDAgOiBidXR0b247CiAgICAgbV9idXR0b25Eb3duID0gYnV0dG9u ICE9ICh1bnNpZ25lZCBzaG9ydCktMTsKKyAgICBtX3ByZXNzdXJlID0gMDsKICAgICBtX3JlbGF0 ZWRUYXJnZXQgPSByZWxhdGVkVGFyZ2V0OwogCiAgICAgaW5pdENvb3JkaW5hdGVzKGNsaWVudFgs IGNsaWVudFkpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9kb20vTW91c2VFdmVudC5oIGIvV2ViQ29y ZS9kb20vTW91c2VFdmVudC5oCmluZGV4IGFhM2VlZTUuLjBhNjE1ZjggMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvZG9tL01vdXNlRXZlbnQuaAorKysgYi9XZWJDb3JlL2RvbS9Nb3VzZUV2ZW50LmgKQEAg LTM5LDExICszOSwxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIH0KICAgICAgICAg c3RhdGljIFBhc3NSZWZQdHI8TW91c2VFdmVudD4gY3JlYXRlKGNvbnN0IEF0b21pY1N0cmluZyYg dHlwZSwgYm9vbCBjYW5CdWJibGUsIGJvb2wgY2FuY2VsYWJsZSwgUGFzc1JlZlB0cjxBYnN0cmFj dFZpZXc+IHZpZXcsCiAgICAgICAgICAgICBpbnQgZGV0YWlsLCBpbnQgc2NyZWVuWCwgaW50IHNj cmVlblksIGludCBwYWdlWCwgaW50IHBhZ2VZLAotICAgICAgICAgICAgYm9vbCBjdHJsS2V5LCBi b29sIGFsdEtleSwgYm9vbCBzaGlmdEtleSwgYm9vbCBtZXRhS2V5LCB1bnNpZ25lZCBzaG9ydCBi dXR0b24sCisgICAgICAgICAgICBib29sIGN0cmxLZXksIGJvb2wgYWx0S2V5LCBib29sIHNoaWZ0 S2V5LCBib29sIG1ldGFLZXksIHVuc2lnbmVkIHNob3J0IGJ1dHRvbiwgZG91YmxlIHByZXNzdXJl LAogICAgICAgICAgICAgUGFzc1JlZlB0cjxFdmVudFRhcmdldE5vZGU+IHJlbGF0ZWRUYXJnZXQs IFBhc3NSZWZQdHI8Q2xpcGJvYXJkPiBjbGlwYm9hcmQgPSAwLCBib29sIGlzU2ltdWxhdGVkID0g ZmFsc2UpCiAgICAgICAgIHsKICAgICAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgTW91c2VF dmVudCh0eXBlLCBjYW5CdWJibGUsIGNhbmNlbGFibGUsIHZpZXcsIGRldGFpbCwgc2NyZWVuWCwg c2NyZWVuWSwgcGFnZVgsIHBhZ2VZLAotICAgICAgICAgICAgICAgIGN0cmxLZXksIGFsdEtleSwg c2hpZnRLZXksIG1ldGFLZXksIGJ1dHRvbiwgcmVsYXRlZFRhcmdldCwgY2xpcGJvYXJkLCBpc1Np bXVsYXRlZCkpOworICAgICAgICAgICAgICAgIGN0cmxLZXksIGFsdEtleSwgc2hpZnRLZXksIG1l dGFLZXksIGJ1dHRvbiwgcHJlc3N1cmUsIHJlbGF0ZWRUYXJnZXQsIGNsaXBib2FyZCwgaXNTaW11 bGF0ZWQpKTsKICAgICAgICAgfQogICAgICAgICB2aXJ0dWFsIH5Nb3VzZUV2ZW50KCk7CiAKQEAg LTU2LDYgKzU2LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAvLyBidXQgd2Ugd2ls bCBtYXRjaCB0aGUgc3RhbmRhcmQgRE9NLgogICAgICAgICB1bnNpZ25lZCBzaG9ydCBidXR0b24o KSBjb25zdCB7IHJldHVybiBtX2J1dHRvbjsgfQogICAgICAgICBib29sIGJ1dHRvbkRvd24oKSBj b25zdCB7IHJldHVybiBtX2J1dHRvbkRvd247IH0KKyAgICAgICAgZG91YmxlIHByZXNzdXJlKCkg Y29uc3QgeyByZXR1cm4gbV9wcmVzc3VyZTsgfQogICAgICAgICBFdmVudFRhcmdldE5vZGUqIHJl bGF0ZWRUYXJnZXQoKSBjb25zdCB7IHJldHVybiBtX3JlbGF0ZWRUYXJnZXQuZ2V0KCk7IH0KIAog ICAgICAgICBDbGlwYm9hcmQqIGNsaXBib2FyZCgpIGNvbnN0IHsgcmV0dXJuIG1fY2xpcGJvYXJk LmdldCgpOyB9CkBAIC03MywxMSArNzQsMTIgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAg ICBNb3VzZUV2ZW50KCk7CiAgICAgICAgIE1vdXNlRXZlbnQoY29uc3QgQXRvbWljU3RyaW5nJiB0 eXBlLCBib29sIGNhbkJ1YmJsZSwgYm9vbCBjYW5jZWxhYmxlLCBQYXNzUmVmUHRyPEFic3RyYWN0 Vmlldz4sCiAgICAgICAgICAgICAgICAgICAgaW50IGRldGFpbCwgaW50IHNjcmVlblgsIGludCBz Y3JlZW5ZLCBpbnQgcGFnZVgsIGludCBwYWdlWSwKLSAgICAgICAgICAgICAgICAgICBib29sIGN0 cmxLZXksIGJvb2wgYWx0S2V5LCBib29sIHNoaWZ0S2V5LCBib29sIG1ldGFLZXksIHVuc2lnbmVk IHNob3J0IGJ1dHRvbiwKKyAgICAgICAgICAgICAgICAgICBib29sIGN0cmxLZXksIGJvb2wgYWx0 S2V5LCBib29sIHNoaWZ0S2V5LCBib29sIG1ldGFLZXksIHVuc2lnbmVkIHNob3J0IGJ1dHRvbiwg ZG91YmxlIHByZXNzdXJlLAogICAgICAgICAgICAgICAgICAgIFBhc3NSZWZQdHI8RXZlbnRUYXJn ZXROb2RlPiByZWxhdGVkVGFyZ2V0LCBQYXNzUmVmUHRyPENsaXBib2FyZD4gY2xpcGJvYXJkLCBi b29sIGlzU2ltdWxhdGVkKTsKIAogICAgICAgICB1bnNpZ25lZCBzaG9ydCBtX2J1dHRvbjsKICAg ICAgICAgYm9vbCBtX2J1dHRvbkRvd247CisgICAgICAgIGRvdWJsZSBtX3ByZXNzdXJlOwogICAg ICAgICBSZWZQdHI8RXZlbnRUYXJnZXROb2RlPiBtX3JlbGF0ZWRUYXJnZXQ7CiAgICAgICAgIFJl ZlB0cjxDbGlwYm9hcmQ+IG1fY2xpcGJvYXJkOwogICAgIH07CmRpZmYgLS1naXQgYS9XZWJDb3Jl L2RvbS9Nb3VzZUV2ZW50LmlkbCBiL1dlYkNvcmUvZG9tL01vdXNlRXZlbnQuaWRsCmluZGV4IDMx OTVhN2EuLjAzZGE4ZjggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL01vdXNlRXZlbnQuaWRsCisr KyBiL1dlYkNvcmUvZG9tL01vdXNlRXZlbnQuaWRsCkBAIC0zMiw2ICszMiw3IEBAIG1vZHVsZSBl dmVudHMgewogICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUgYm9vbGVhbiAgICAgICAgICBhbHRL ZXk7CiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBib29sZWFuICAgICAgICAgIG1ldGFLZXk7 CiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25lZCBzaG9ydCAgIGJ1dHRvbjsKKyAg ICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIGRvdWJsZSAgICAgICAgICAgcHJlc3N1cmU7CiAgICAg ICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBFdmVudFRhcmdldCAgICAgIHJlbGF0ZWRUYXJnZXQ7CiAg ICAgICAgIAogICAgICAgICBbT2xkU3R5bGVPYmpDXSB2b2lkIGluaXRNb3VzZUV2ZW50KGluIERP TVN0cmluZyB0eXBlLCAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3Bw IGIvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKaW5kZXggYTQyZmUwZC4uZGM5Y2ExOSAx MDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKKysrIGIvV2ViQ29yZS9w YWdlL0V2ZW50SGFuZGxlci5jcHAKQEAgLTEyNTUsNyArMTI1NSw3IEBAIGJvb2wgRXZlbnRIYW5k bGVyOjpkaXNwYXRjaERyYWdFdmVudChjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwgTm9k ZSogZHJhZ1RhCiAgICAgICAgIHRydWUsIHRydWUsIG1fZnJhbWUtPmRvY3VtZW50KCktPmRlZmF1 bHRWaWV3KCksCiAgICAgICAgIDAsIGV2ZW50Lmdsb2JhbFgoKSwgZXZlbnQuZ2xvYmFsWSgpLCBj b250ZW50c1Bvcy54KCksIGNvbnRlbnRzUG9zLnkoKSwKICAgICAgICAgZXZlbnQuY3RybEtleSgp LCBldmVudC5hbHRLZXkoKSwgZXZlbnQuc2hpZnRLZXkoKSwgZXZlbnQubWV0YUtleSgpLAotICAg ICAgICAwLCAwLCBjbGlwYm9hcmQpOworICAgICAgICAwLCBldmVudC5wcmVzc3VyZSgpLCAwLCBj bGlwYm9hcmQpOwogCiAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7CiAgICAgRXZlbnRUYXJnZXRO b2RlQ2FzdChkcmFnVGFyZ2V0KS0+ZGlzcGF0Y2hFdmVudChtZS5nZXQoKSwgZWMsIHRydWUpOwpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9QbGF0Zm9ybU1vdXNlRXZlbnQuaCBiL1dlYkNv cmUvcGxhdGZvcm0vUGxhdGZvcm1Nb3VzZUV2ZW50LmgKaW5kZXggOTI1MjczOC4uYzljYjM5YSAx MDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9QbGF0Zm9ybU1vdXNlRXZlbnQuaAorKysgYi9X ZWJDb3JlL3BsYXRmb3JtL1BsYXRmb3JtTW91c2VFdmVudC5oCkBAIC0xMTEsNyArMTExLDcgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIGFsdEtleSgpIGNvbnN0IHsgcmV0dXJu IG1fYWx0S2V5OyB9CiAgICAgICAgIGJvb2wgbWV0YUtleSgpIGNvbnN0IHsgcmV0dXJuIG1fbWV0 YUtleTsgfQogICAgICAgICB1bnNpZ25lZCBtb2RpZmllckZsYWdzKCkgY29uc3QgeyByZXR1cm4g bV9tb2RpZmllckZsYWdzOyB9Ci0gICAgICAgIAorICAgICAgICBkb3VibGUgcHJlc3N1cmUoKSBj b25zdCB7IHJldHVybiBtX3ByZXNzdXJlOyB9CiAgICAgICAgIC8vdGltZSBpbiBzZWNvbmRzCiAg ICAgICAgIGRvdWJsZSB0aW1lc3RhbXAoKSBjb25zdCB7IHJldHVybiBtX3RpbWVzdGFtcDsgfQog CkBAIC0xNDgsNiArMTQ4LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIG1f YWx0S2V5OwogICAgICAgICBib29sIG1fbWV0YUtleTsKICAgICAgICAgZG91YmxlIG1fdGltZXN0 YW1wOyAvLyB1bml0OiBzZWNvbmRzCisgICAgICAgIGRvdWJsZSBtX3ByZXNzdXJlOwogICAgICAg ICB1bnNpZ25lZCBtX21vZGlmaWVyRmxhZ3M7CiAjaWYgUExBVEZPUk0oTUFDKQogICAgICAgICBp bnQgbV9ldmVudE51bWJlcjsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1BsYXRm b3JtTW91c2VFdmVudE1hYy5tbSBiL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1BsYXRmb3JtTW91c2VF dmVudE1hYy5tbQppbmRleCBhZjc0MTVkLi5iMjI1MTc1IDEwMDY0NAotLS0gYS9XZWJDb3JlL3Bs YXRmb3JtL21hYy9QbGF0Zm9ybU1vdXNlRXZlbnRNYWMubW0KKysrIGIvV2ViQ29yZS9wbGF0Zm9y bS9tYWMvUGxhdGZvcm1Nb3VzZUV2ZW50TWFjLm1tCkBAIC0xNjksNiArMTY5LDcgQEAgUGxhdGZv cm1Nb3VzZUV2ZW50OjpQbGF0Zm9ybU1vdXNlRXZlbnQoTlNFdmVudCogZXZlbnQpCiAgICAgLCBt X2FsdEtleShbZXZlbnQgbW9kaWZpZXJGbGFnc10gJiBOU0FsdGVybmF0ZUtleU1hc2spCiAgICAg LCBtX21ldGFLZXkoW2V2ZW50IG1vZGlmaWVyRmxhZ3NdICYgTlNDb21tYW5kS2V5TWFzaykKICAg ICAsIG1fdGltZXN0YW1wKFtldmVudCB0aW1lc3RhbXBdKQorICAgICwgbV9wcmVzc3VyZShbZXZl bnQgcHJlc3N1cmVdKQogICAgICwgbV9tb2RpZmllckZsYWdzKFtldmVudCBtb2RpZmllckZsYWdz XSkKICAgICAsIG1fZXZlbnROdW1iZXIoW2V2ZW50IGV2ZW50TnVtYmVyXSkKIHsKZGlmZiAtLWdp dCBhL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQREZWaWV3Lm1tIGIvV2ViS2l0L21hYy9XZWJWaWV3 L1dlYlBERlZpZXcubW0KaW5kZXggYzZiODgxYi4uNWNhN2Y5ZiAxMDA2NDQKLS0tIGEvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlBERlZpZXcubW0KKysrIGIvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlBE RlZpZXcubW0KQEAgLTk0OCw3ICs5NDgsNyBAQCBzdGF0aWMgQk9PTCBfUERGU2VsZWN0aW9uc0Fy ZUVxdWFsKFBERlNlbGVjdGlvbiAqc2VsZWN0aW9uQSwgUERGU2VsZWN0aW9uICpzZWxlYwogICAg ICAgICAgICAgW25zRXZlbnQgbW9kaWZpZXJGbGFnc10gJiBOU0FsdGVybmF0ZUtleU1hc2ssCiAg ICAgICAgICAgICBbbnNFdmVudCBtb2RpZmllckZsYWdzXSAmIE5TU2hpZnRLZXlNYXNrLAogICAg ICAgICAgICAgW25zRXZlbnQgbW9kaWZpZXJGbGFnc10gJiBOU0NvbW1hbmRLZXlNYXNrLAotICAg ICAgICAgICAgYnV0dG9uLCAwLCAwLCB0cnVlKTsKKyAgICAgICAgICAgIGJ1dHRvbiwgW25zRXZl bnQgcHJlc3N1cmVdLCAwLCAwLCB0cnVlKTsKIAogICAgIC8vIENhbGwgdG8gdGhlIGZyYW1lIGxv YWRlciBiZWNhdXNlIHRoaXMgaXMgd2hlcmUgb3VyIHNlY3VyaXR5IGNoZWNrcyBhcmUgbWFkZS4K ICAgICBjb3JlKFtkYXRhU291cmNlIHdlYkZyYW1lXSktPmxvYWRlcigpLT5sb2FkRnJhbWVSZXF1 ZXN0V2l0aEZvcm1BbmRWYWx1ZXMoUmVzb3VyY2VSZXF1ZXN0KFVSTCksIGZhbHNlLCBldmVudC5n ZXQoKSwgMCwgSGFzaE1hcDxTdHJpbmcsIFN0cmluZz4oKSk7Cg==