24878 2009-03-27 01:43:21 -0700 [GTK] Use GtkBinding system to handle key events in WebView 2009-03-30 08:49:00 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 xan.lopez webkit-unassigned oldest_to_newest 115511 0 xan.lopez 2009-03-27 01:43:21 -0700 Patch coming. 115512 1 29005 xan.lopez 2009-03-27 01:47:15 -0700 Created attachment 29005 webviewbindings.patch 115794 2 29005 zecke 2009-03-30 06:04:45 -0700 Comment on attachment 29005 webviewbindings.patch > + case GTK_MOVEMENT_VISUAL_POSITIONS: > + if (count == 1) > + view->scrollBy(IntSize(cScrollbarPixelsPerLineStep, 0)); > + else if (count == -1) > + view->scrollBy(IntSize(-cScrollbarPixelsPerLineStep, 0)); > + break; wrongly placed. yeah!!! 115821 3 xan.lopez 2009-03-30 08:49:00 -0700 Thanks, committed as r42102. 29005 2009-03-27 01:47:15 -0700 2009-03-30 06:04:45 -0700 webviewbindings.patch webviewbindings.patch text/plain 13369 xan.lopez RnJvbSAyNTE0ODgyODM0MjdkNDk5NzM1NWUzYTI0ZjVkNDM2ZmRmMjRhODc5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBG cmksIDI3IE1hciAyMDA5IDEwOjQ0OjE4ICswMjAwClN1YmplY3Q6IFtQQVRDSF0gMjAwOS0wMy0y NyAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CgogICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjQ4NzgKICAgICAgICBbR1RLXSBVc2UgR3RrQmluZGluZyBzeXN0ZW0gdG8gaGFuZGxl IGtleSBldmVudHMgaW4gV2ViVmlldwoKICAgICAgICBVc2UgR3RrQmluZGluZyBzeXN0ZW0gZm9y IGtleSBldmVudHMgaW4gV2ViS2l0V2ViVmlldy4gQWxsb3dzIHRoZQogICAgICAgIHVzZXIgdG8g cmVjb25maWd1cmUgdGhlIGJpbmRpbmdzIGFuZCBmaXhlcyBhIGJ1bmNoIG9mIGJ1Z3MgYWxvbmcK ICAgICAgICB0aGUgd2F5ICh3ZSB3ZXJlIG5vdCBjaGVja2luZyBtb2RpZmllciBrZXlzIGluIG1v c3QgYWN0aW9ucykuCgogICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwOgogICAgICAg ICh3ZWJraXRfd2ViX3ZpZXdfbW92ZV9jdXJzb3IpOgogICAgICAgICogd2Via2l0L3dlYmtpdHdl YnZpZXcuaDoKICAgICAgICAqIHdlYmtpdG1hcnNoYWwubGlzdDoKLS0tCiBXZWJLaXQvZ3RrL0No YW5nZUxvZyAgICAgICAgICAgICAgICB8ICAgMTYgKysrCiBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJr aXR3ZWJ2aWV3LmNwcCB8ICAxNzUgKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0K IFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuaCAgIHwgICAgOSArKy0KIFdlYktpdC9n dGsvd2Via2l0bWFyc2hhbC5saXN0ICAgICAgIHwgICAgMSArCiA0IGZpbGVzIGNoYW5nZWQsIDE1 OCBpbnNlcnRpb25zKCspLCA0MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3Rr L0NoYW5nZUxvZyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IDM2OTFiNGIuLjU5YmVhM2Yg MTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9ndGsvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDktMDMtMjcgIFhhbiBMb3BleiAgPHhsb3BlekBpZ2Fs aWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDg3OAorICAgICAgICBb R1RLXSBVc2UgR3RrQmluZGluZyBzeXN0ZW0gdG8gaGFuZGxlIGtleSBldmVudHMgaW4gV2ViVmll dworCisgICAgICAgIFVzZSBHdGtCaW5kaW5nIHN5c3RlbSBmb3Iga2V5IGV2ZW50cyBpbiBXZWJL aXRXZWJWaWV3LiBBbGxvd3MgdGhlCisgICAgICAgIHVzZXIgdG8gcmVjb25maWd1cmUgdGhlIGJp bmRpbmdzIGFuZCBmaXhlcyBhIGJ1bmNoIG9mIGJ1Z3MgYWxvbmcKKyAgICAgICAgdGhlIHdheSAo d2Ugd2VyZSBub3QgY2hlY2tpbmcgbW9kaWZpZXIga2V5cyBpbiBtb3N0IGFjdGlvbnMpLgorCisg ICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwOgorICAgICAgICAod2Via2l0X3dlYl92 aWV3X21vdmVfY3Vyc29yKToKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5oOgorICAg ICAgICAqIHdlYmtpdG1hcnNoYWwubGlzdDoKKwogMjAwOS0wMy0yNSAgR3VzdGF2byBOb3Jvbmhh IFNpbHZhICA8Z25zQGdub21lLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBIb2xnZXIgRnJl eXRoZXIuCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcCBi L1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IGQ2YTBkNTQuLjNiMzA3 MzQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCisrKyBi L1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC0xMzcsNiArMTM3LDcgQEAg ZW51bSB7CiAgICAgUEFTVEVfQ0xJUEJPQVJELAogICAgIENVVF9DTElQQk9BUkQsCiAgICAgRE9X TkxPQURfUkVRVUVTVEVELAorICAgIE1PVkVfQ1VSU09SLAogICAgIExBU1RfU0lHTkFMCiB9Owog CkBAIC00MzcsNDggKzQzOCw2IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfa2V5 X3ByZXNzX2V2ZW50KEd0a1dpZGdldCogd2lkZ2V0LCBHZGtFdmVudEtleSoKICAgICBpZiAoZnJh bWUtPmV2ZW50SGFuZGxlcigpLT5rZXlFdmVudChrZXlib2FyZEV2ZW50KSkKICAgICAgICAgcmV0 dXJuIFRSVUU7CiAKLSAgICBGcmFtZVZpZXcqIHZpZXcgPSBmcmFtZS0+dmlldygpOwotICAgIFNl bGVjdGlvbkNvbnRyb2xsZXI6OkVBbHRlcmF0aW9uIGFsdGVyYXRpb247Ci0gICAgaWYgKGV2ZW50 LT5zdGF0ZSAmIEdES19TSElGVF9NQVNLKQotICAgICAgICBhbHRlcmF0aW9uID0gU2VsZWN0aW9u Q29udHJvbGxlcjo6RVhURU5EOwotICAgIGVsc2UKLSAgICAgICAgYWx0ZXJhdGlvbiA9IFNlbGVj dGlvbkNvbnRyb2xsZXI6Ok1PVkU7Ci0KLSAgICAvLyBUT0RPOiBXZSBwcm9iYWJseSB3YW50IHRv IHVzZSBHVEsrIGtleSBiaW5kaW5ncyBoZXJlIGFuZCBwZXJoYXBzIHRha2UgYW4KLSAgICAvLyBh cHByb2FjaCBtb3JlIGxpa2UgdGhlIFdpbiBhbmQgTWFjIHBvcnRzIGZvciBrZXkgaGFuZGxpbmcu Ci0gICAgc3dpdGNoIChldmVudC0+a2V5dmFsKSB7Ci0gICAgY2FzZSBHREtfRG93bjoKLSAgICAg ICAgdmlldy0+c2Nyb2xsQnkoSW50U2l6ZSgwLCBjU2Nyb2xsYmFyUGl4ZWxzUGVyTGluZVN0ZXAp KTsKLSAgICAgICAgcmV0dXJuIFRSVUU7Ci0gICAgY2FzZSBHREtfVXA6Ci0gICAgICAgIHZpZXct PnNjcm9sbEJ5KEludFNpemUoMCwgLWNTY3JvbGxiYXJQaXhlbHNQZXJMaW5lU3RlcCkpOwotICAg ICAgICByZXR1cm4gVFJVRTsKLSAgICBjYXNlIEdES19SaWdodDoKLSAgICAgICAgdmlldy0+c2Ny b2xsQnkoSW50U2l6ZShjU2Nyb2xsYmFyUGl4ZWxzUGVyTGluZVN0ZXAsIDApKTsKLSAgICAgICAg cmV0dXJuIFRSVUU7Ci0gICAgY2FzZSBHREtfTGVmdDoKLSAgICAgICAgdmlldy0+c2Nyb2xsQnko SW50U2l6ZSgtY1Njcm9sbGJhclBpeGVsc1BlckxpbmVTdGVwLCAwKSk7Ci0gICAgICAgIHJldHVy biBUUlVFOwotICAgIGNhc2UgR0RLX3NwYWNlOgotICAgICAgICBpZiAoKGV2ZW50LT5zdGF0ZSAm IEdES19TSElGVF9NQVNLKSA9PSBHREtfU0hJRlRfTUFTSykKLSAgICAgICAgICAgIHZpZXctPnNj cm9sbEJ5KEludFNpemUoMCwgLXZpZXctPnZpc2libGVIZWlnaHQoKSkpOwotICAgICAgICBlbHNl Ci0gICAgICAgICAgICB2aWV3LT5zY3JvbGxCeShJbnRTaXplKDAsIHZpZXctPnZpc2libGVIZWln aHQoKSkpOwotICAgICAgICByZXR1cm4gVFJVRTsKLSAgICBjYXNlIEdES19QYWdlX1VwOgotICAg ICAgICB2aWV3LT5zY3JvbGxCeShJbnRTaXplKDAsIC12aWV3LT52aXNpYmxlSGVpZ2h0KCkpKTsK LSAgICAgICAgcmV0dXJuIFRSVUU7Ci0gICAgY2FzZSBHREtfUGFnZV9Eb3duOgotICAgICAgICB2 aWV3LT5zY3JvbGxCeShJbnRTaXplKDAsIHZpZXctPnZpc2libGVIZWlnaHQoKSkpOwotICAgICAg ICByZXR1cm4gVFJVRTsKLSAgICBjYXNlIEdES19Ib21lOgotICAgICAgICB2aWV3LT5zY3JvbGxC eShJbnRTaXplKDAsIC12aWV3LT5jb250ZW50c0hlaWdodCgpKSk7Ci0gICAgICAgIHJldHVybiBU UlVFOwotICAgIGNhc2UgR0RLX0VuZDoKLSAgICAgICAgdmlldy0+c2Nyb2xsQnkoSW50U2l6ZSgw LCB2aWV3LT5jb250ZW50c0hlaWdodCgpKSk7Ci0gICAgICAgIHJldHVybiBUUlVFOwotICAgIH0K LQogICAgIC8qIENoYWluIHVwIHRvIG91ciBwYXJlbnQgY2xhc3MgZm9yIGJpbmRpbmcgYWN0aXZh dGlvbiAqLwogICAgIHJldHVybiBHVEtfV0lER0VUX0NMQVNTKHdlYmtpdF93ZWJfdmlld19wYXJl bnRfY2xhc3MpLT5rZXlfcHJlc3NfZXZlbnQod2lkZ2V0LCBldmVudCk7CiB9CkBAIC04NDcsNiAr ODA2LDUwIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19yZWFsX2NvcHlfY2xpcGJvYXJk KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiAgICAgZnJhbWUtPmVkaXRvcigpLT5jb21tYW5kKCJD b3B5IikuZXhlY3V0ZSgpOwogfQogCitzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X3Jl YWxfbW92ZV9jdXJzb3IgKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIEd0a01vdmVtZW50U3RlcCBz dGVwLCBnaW50IGNvdW50KQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19X RUJfVklFVyAod2ViVmlldyksIEZBTFNFKTsKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChzdGVw ID09IEdUS19NT1ZFTUVOVF9WSVNVQUxfUE9TSVRJT05TIHx8CisgICAgICAgICAgICAgICAgICAg ICAgICAgc3RlcCA9PSBHVEtfTU9WRU1FTlRfRElTUExBWV9MSU5FUyB8fAorICAgICAgICAgICAg ICAgICAgICAgICAgIHN0ZXAgPT0gR1RLX01PVkVNRU5UX1BBR0VTIHx8CisgICAgICAgICAgICAg ICAgICAgICAgICAgc3RlcCA9PSBHVEtfTU9WRU1FTlRfQlVGRkVSX0VORFMsIEZBTFNFKTsKKyAg ICBnX3JldHVybl92YWxfaWZfZmFpbChjb3VudCA9PSAxIHx8IGNvdW50ID09IC0xLCBGQUxTRSk7 CisKKyAgICBGcmFtZSogZnJhbWUgPSBjb3JlKHdlYlZpZXcpLT5mb2N1c0NvbnRyb2xsZXIoKS0+ Zm9jdXNlZE9yTWFpbkZyYW1lKCk7CisgICAgRnJhbWVWaWV3KiB2aWV3ID0gZnJhbWUtPnZpZXco KTsKKworICAgIHN3aXRjaCAoc3RlcCkgeworICAgIGNhc2UgR1RLX01PVkVNRU5UX0RJU1BMQVlf TElORVM6CisgICAgICAgIGlmIChjb3VudCA9PSAxKQorICAgICAgICAgICAgdmlldy0+c2Nyb2xs QnkoSW50U2l6ZSgwLCBjU2Nyb2xsYmFyUGl4ZWxzUGVyTGluZVN0ZXApKTsKKyAgICAgICAgZWxz ZSBpZiAoY291bnQgPT0gLTEpCisgICAgICAgICAgICB2aWV3LT5zY3JvbGxCeShJbnRTaXplKDAs IC1jU2Nyb2xsYmFyUGl4ZWxzUGVyTGluZVN0ZXApKTsKKyAgICAgICAgYnJlYWs7CisgICAgY2Fz ZSBHVEtfTU9WRU1FTlRfVklTVUFMX1BPU0lUSU9OUzoKKyAgICAgICAgaWYgKGNvdW50ID09IDEp CisgICAgICAgICAgICB2aWV3LT5zY3JvbGxCeShJbnRTaXplKGNTY3JvbGxiYXJQaXhlbHNQZXJM aW5lU3RlcCwgMCkpOworICAgICAgICBlbHNlIGlmIChjb3VudCA9PSAtMSkKKyAgICAgICAgICAg IHZpZXctPnNjcm9sbEJ5KEludFNpemUoLWNTY3JvbGxiYXJQaXhlbHNQZXJMaW5lU3RlcCwgMCkp OworICAgICAgYnJlYWs7CisgICAgY2FzZSBHVEtfTU9WRU1FTlRfUEFHRVM6CisgICAgICAgIGlm IChjb3VudCA9PSAxKQorICAgICAgICAgICAgdmlldy0+c2Nyb2xsQnkoSW50U2l6ZSgwLCB2aWV3 LT52aXNpYmxlSGVpZ2h0KCkpKTsKKyAgICAgICAgZWxzZSBpZiAoY291bnQgPT0gLTEpCisgICAg ICAgICAgICB2aWV3LT5zY3JvbGxCeShJbnRTaXplKDAsIC12aWV3LT52aXNpYmxlSGVpZ2h0KCkp KTsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBHVEtfTU9WRU1FTlRfQlVGRkVSX0VORFM6Cisg ICAgICAgIGlmIChjb3VudCA9PSAxKQorICAgICAgICAgICAgdmlldy0+c2Nyb2xsQnkoSW50U2l6 ZSgwLCB2aWV3LT5jb250ZW50c0hlaWdodCgpKSk7CisgICAgICAgIGVsc2UgaWYgKGNvdW50ID09 IC0xKQorICAgICAgICAgICAgdmlldy0+c2Nyb2xsQnkoSW50U2l6ZSgwLCAtdmlldy0+Y29udGVu dHNIZWlnaHQoKSkpOworICAgICAgICBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICBnX2Fz c2VydF9ub3RfcmVhY2hlZCgpOworICAgIH0KKyAgCisgICAgcmV0dXJuIFRSVUU7Cit9CisKIHN0 YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19yZWFsX3Bhc3RlX2NsaXBib2FyZChXZWJLaXRXZWJW aWV3KiB3ZWJWaWV3KQogewogICAgIEZyYW1lKiBmcmFtZSA9IGNvcmUod2ViVmlldyktPmZvY3Vz Q29udHJvbGxlcigpLT5mb2N1c2VkT3JNYWluRnJhbWUoKTsKQEAgLTE1MDEsNiArMTUwNCwyOCBA QCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfY2xhc3NfaW5pdChXZWJLaXRXZWJWaWV3Q2xh c3MqIHdlYlZpZXdDbGFzcykKICAgICAgICAgICAgIGdfY2Nsb3N1cmVfbWFyc2hhbF9WT0lEX19W T0lELAogICAgICAgICAgICAgR19UWVBFX05PTkUsIDApOwogCisgICAgLyoqCisgICAgICogV2Vi S2l0V2ViVmlldzo6bW92ZS1jdXJzb3I6CisgICAgICogQHdlYl92aWV3OiB0aGUgb2JqZWN0IHdo aWNoIHJlY2VpdmVkIHRoZSBzaWduYWwKKyAgICAgKiBAc3RlcDogdGhlIHR5cGUgb2YgbW92ZW1l bnQsIG9uZSBvZiAjR3RrTW92ZW1lbnRTdGVwCisgICAgICogQGNvdW50OiBhbiBpbnRlZ2VyIGlu ZGljYXRpbmcgdGhlIHN1YnR5cGUgb2YgbW92ZW1lbnQuIEFzIG9mCisgICAgICogICAgICAgICAx LjEuNCB0aGUgcGVybWl0dGVkIHZhbHVlcyBhcmUgJzEnID0gZm9yd2FyZCwgJy0xJyA9IGJhY2t3 YXJkcy4KKyAgICAgKgorICAgICAqIFRoZSAjV2ViS2l0V2ViVmlldzo6bW92ZS1jdXJzb3Igd2ls bCBiZSBlbWl0dGVkIHRvIGFwcGx5IHRoZQorICAgICAqIGN1cnNvciBtb3ZlbWVudCBkZXNjcmli ZWQgYnkgaXRzIHBhcmFtZXRlcnMgdG8gdGhlIEB2aWV3LgorICAgICAqIAorICAgICAqIFNpbmNl OiAxLjEuNAorICAgICAqLworICAgIHdlYmtpdF93ZWJfdmlld19zaWduYWxzW01PVkVfQ1VSU09S XSA9IGdfc2lnbmFsX25ldygibW92ZS1jdXJzb3IiLAorICAgICAgICAgICAgR19UWVBFX0ZST01f Q0xBU1Mod2ViVmlld0NsYXNzKSwKKyAgICAgICAgICAgIChHU2lnbmFsRmxhZ3MpKEdfU0lHTkFM X1JVTl9MQVNUIHwgR19TSUdOQUxfQUNUSU9OKSwKKyAgICAgICAgICAgIEdfU1RSVUNUX09GRlNF VChXZWJLaXRXZWJWaWV3Q2xhc3MsIG1vdmVfY3Vyc29yKSwKKyAgICAgICAgICAgIE5VTEwsIE5V TEwsCisgICAgICAgICAgICB3ZWJraXRfbWFyc2hhbF9CT09MRUFOX19FTlVNX0lOVCwKKyAgICAg ICAgICAgIEdfVFlQRV9CT09MRUFOLCAyLAorICAgICAgICAgICAgR1RLX1RZUEVfTU9WRU1FTlRf U1RFUCwKKyAgICAgICAgICAgIEdfVFlQRV9JTlQpOworCiAgICAgLyoKICAgICAgKiBpbXBsZW1l bnRhdGlvbnMgb2YgdmlydHVhbCBtZXRob2RzCiAgICAgICovCkBAIC0xNTE3LDYgKzE1NDIsNyBA QCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfY2xhc3NfaW5pdChXZWJLaXRXZWJWaWV3Q2xh c3MqIHdlYlZpZXdDbGFzcykKICAgICB3ZWJWaWV3Q2xhc3MtPmN1dF9jbGlwYm9hcmQgPSB3ZWJr aXRfd2ViX3ZpZXdfcmVhbF9jdXRfY2xpcGJvYXJkOwogICAgIHdlYlZpZXdDbGFzcy0+Y29weV9j bGlwYm9hcmQgPSB3ZWJraXRfd2ViX3ZpZXdfcmVhbF9jb3B5X2NsaXBib2FyZDsKICAgICB3ZWJW aWV3Q2xhc3MtPnBhc3RlX2NsaXBib2FyZCA9IHdlYmtpdF93ZWJfdmlld19yZWFsX3Bhc3RlX2Ns aXBib2FyZDsKKyAgICB3ZWJWaWV3Q2xhc3MtPm1vdmVfY3Vyc29yID0gd2Via2l0X3dlYl92aWV3 X3JlYWxfbW92ZV9jdXJzb3I7CiAKICAgICBHT2JqZWN0Q2xhc3MqIG9iamVjdENsYXNzID0gR19P QkpFQ1RfQ0xBU1Mod2ViVmlld0NsYXNzKTsKICAgICBvYmplY3RDbGFzcy0+ZGlzcG9zZSA9IHdl YmtpdF93ZWJfdmlld19kaXNwb3NlOwpAQCAtMTU4Miw2ICsxNjA4LDQ5IEBAIHN0YXRpYyB2b2lk IHdlYmtpdF93ZWJfdmlld19jbGFzc19pbml0KFdlYktpdFdlYlZpZXdDbGFzcyogd2ViVmlld0Ns YXNzKQogICAgIGd0a19iaW5kaW5nX2VudHJ5X2FkZF9zaWduYWwoYmluZGluZ19zZXQsIEdES19J bnNlcnQsIEdES19TSElGVF9NQVNLLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg InBhc3RlX2NsaXBib2FyZCIsIDApOwogCisgICAgLyogTW92ZW1lbnQgKi8KKyAgICAKKyAgICBn dGtfYmluZGluZ19lbnRyeV9hZGRfc2lnbmFsKGJpbmRpbmdfc2V0LCBHREtfRG93biwgc3RhdGlj X2Nhc3Q8R2RrTW9kaWZpZXJUeXBlPigwKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJtb3ZlLWN1cnNvciIsIDIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBH X1RZUEVfRU5VTSwgR1RLX01PVkVNRU5UX0RJU1BMQVlfTElORVMsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBHX1RZUEVfSU5ULCAxKTsKKyAgICBndGtfYmluZGluZ19lbnRyeV9h ZGRfc2lnbmFsKGJpbmRpbmdfc2V0LCBHREtfVXAsIHN0YXRpY19jYXN0PEdka01vZGlmaWVyVHlw ZT4oMCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAibW92ZS1jdXJzb3IiLCAy LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR19UWVBFX0VOVU0sIEdUS19NT1ZF TUVOVF9ESVNQTEFZX0xJTkVTLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR19U WVBFX0lOVCwgLTEpOworICAgIGd0a19iaW5kaW5nX2VudHJ5X2FkZF9zaWduYWwoYmluZGluZ19z ZXQsIEdES19SaWdodCwgc3RhdGljX2Nhc3Q8R2RrTW9kaWZpZXJUeXBlPigwKSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICJtb3ZlLWN1cnNvciIsIDIsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBHX1RZUEVfRU5VTSwgR1RLX01PVkVNRU5UX1ZJU1VBTF9QT1NJ VElPTlMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHX1RZUEVfSU5ULCAxKTsK KyAgICBndGtfYmluZGluZ19lbnRyeV9hZGRfc2lnbmFsKGJpbmRpbmdfc2V0LCBHREtfTGVmdCwg c3RhdGljX2Nhc3Q8R2RrTW9kaWZpZXJUeXBlPigwKSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICJtb3ZlLWN1cnNvciIsIDIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBHX1RZUEVfRU5VTSwgR1RLX01PVkVNRU5UX1ZJU1VBTF9QT1NJVElPTlMsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBHX1RZUEVfSU5ULCAtMSk7CisgICAgZ3RrX2JpbmRp bmdfZW50cnlfYWRkX3NpZ25hbChiaW5kaW5nX3NldCwgR0RLX3NwYWNlLCBzdGF0aWNfY2FzdDxH ZGtNb2RpZmllclR5cGU+KDApLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIm1v dmUtY3Vyc29yIiwgMiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdfVFlQRV9F TlVNLCBHVEtfTU9WRU1FTlRfUEFHRVMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBHX1RZUEVfSU5ULCAxKTsKKyAgICBndGtfYmluZGluZ19lbnRyeV9hZGRfc2lnbmFsKGJpbmRp bmdfc2V0LCBHREtfc3BhY2UsIEdES19TSElGVF9NQVNLLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIm1vdmUtY3Vyc29yIiwgMiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIEdfVFlQRV9FTlVNLCBHVEtfTU9WRU1FTlRfUEFHRVMsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBHX1RZUEVfSU5ULCAtMSk7CisgICAgZ3RrX2JpbmRpbmdfZW50cnlf YWRkX3NpZ25hbChiaW5kaW5nX3NldCwgR0RLX1BhZ2VfRG93biwgc3RhdGljX2Nhc3Q8R2RrTW9k aWZpZXJUeXBlPigwKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJtb3ZlLWN1 cnNvciIsIDIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHX1RZUEVfRU5VTSwg R1RLX01PVkVNRU5UX1BBR0VTLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR19U WVBFX0lOVCwgMSk7CisgICAgZ3RrX2JpbmRpbmdfZW50cnlfYWRkX3NpZ25hbChiaW5kaW5nX3Nl dCwgR0RLX1BhZ2VfVXAsIHN0YXRpY19jYXN0PEdka01vZGlmaWVyVHlwZT4oMCksCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAibW92ZS1jdXJzb3IiLCAyLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgR19UWVBFX0VOVU0sIEdUS19NT1ZFTUVOVF9QQUdFUywKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdfVFlQRV9JTlQsIC0xKTsKKyAgICBndGtf YmluZGluZ19lbnRyeV9hZGRfc2lnbmFsKGJpbmRpbmdfc2V0LCBHREtfRW5kLCBzdGF0aWNfY2Fz dDxHZGtNb2RpZmllclR5cGU+KDApLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Im1vdmUtY3Vyc29yIiwgMiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdfVFlQ RV9FTlVNLCBHVEtfTU9WRU1FTlRfQlVGRkVSX0VORFMsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBHX1RZUEVfSU5ULCAxKTsKKyAgICBndGtfYmluZGluZ19lbnRyeV9hZGRfc2ln bmFsKGJpbmRpbmdfc2V0LCBHREtfSG9tZSwgc3RhdGljX2Nhc3Q8R2RrTW9kaWZpZXJUeXBlPigw KSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJtb3ZlLWN1cnNvciIsIDIsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHX1RZUEVfRU5VTSwgR1RLX01PVkVNRU5U X0JVRkZFUl9FTkRTLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR19UWVBFX0lO VCwgLTEpOworCiAgICAgLyoKICAgICAgKiBwcm9wZXJ0aWVzCiAgICAgICovCkBAIC0zMDUwLDMg KzMxMTksMjUgQEAgY29uc3QgY2hhciogd2Via2l0X3dlYl92aWV3X2dldF9jdXN0b21fZW5jb2Rp bmcoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICB9IGVsc2UKICAgICAgIHJldHVybiBOVUxM OwogfQorCisvKioKKyAqIHdlYmtpdF93ZWJfdmlld19tb3ZlX2N1cnNvcjoKKyAqIEB3ZWJfdmll dzogYSAjV2ViS2l0V2ViVmlldworICogQHN0ZXA6IGEgI0d0a01vdmVtZW50U3RlcAorICogQGNv dW50OiBpbnRlZ2VyIGRlc2NyaWJpbmcgdGhlIGRpcmVjdGlvbiBvZiB0aGUgbW92ZW1lbnQuIDEg Zm9yIGZvcndhcmQsIC0xIGZvciBiYWNrd2FyZHMuCisgKgorICogTW92ZSB0aGUgY3Vyc29yIGlu IEB2aWV3IGFzIGRlc2NyaWJlZCBieSBAc3RlcCBhbmQgQGNvdW50LgorICoKKyAqIFNpbmNlOiAx LjEuNAorICovCit2b2lkIHdlYmtpdF93ZWJfdmlld19tb3ZlX2N1cnNvcihXZWJLaXRXZWJWaWV3 KiB3ZWJWaWV3LCBHdGtNb3ZlbWVudFN0ZXAgc3RlcCwgZ2ludCBjb3VudCkKK3sKKyAgICBnX3Jl dHVybl9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3KSk7CisgICAgZ19yZXR1cm5f aWZfZmFpbChzdGVwID09IEdUS19NT1ZFTUVOVF9WSVNVQUxfUE9TSVRJT05TIHx8CisgICAgICAg ICAgICAgICAgICAgICBzdGVwID09IEdUS19NT1ZFTUVOVF9ESVNQTEFZX0xJTkVTIHx8CisgICAg ICAgICAgICAgICAgICAgICBzdGVwID09IEdUS19NT1ZFTUVOVF9QQUdFUyB8fAorICAgICAgICAg ICAgICAgICAgICAgc3RlcCA9PSBHVEtfTU9WRU1FTlRfQlVGRkVSX0VORFMpOworICAgIGdfcmV0 dXJuX2lmX2ZhaWwoY291bnQgPT0gMSB8fCBjb3VudCA9PSAtMSk7CisKKyAgICBnX3NpZ25hbF9l bWl0KHdlYlZpZXcsIHdlYmtpdF93ZWJfdmlld19zaWduYWxzW01PVkVfQ1VSU09SXSwgMCwgc3Rl cCwgY291bnQpOworfQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmll dy5oIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5oCmluZGV4IDE0NTVhNzkuLjYx MTU0NGQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuaAorKysg Yi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmgKQEAgLTEwMyw2ICsxMDMsOSBAQCBz dHJ1Y3QgX1dlYktpdFdlYlZpZXdDbGFzcyB7CiAgICAgdm9pZCAgICAgICAgICAgICAgICAgICAg ICAgKCogY3V0X2NsaXBib2FyZCkgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICp3ZWJf dmlldyk7CiAgICAgdm9pZCAgICAgICAgICAgICAgICAgICAgICAgKCogY29weV9jbGlwYm9hcmQp ICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICp3ZWJfdmlldyk7CiAgICAgdm9pZCAgICAg ICAgICAgICAgICAgICAgICAgKCogcGFzdGVfY2xpcGJvYXJkKSAgICAgICAgKFdlYktpdFdlYlZp ZXcgICAgICAgICp3ZWJfdmlldyk7CisgICAgZ2Jvb2xlYW4gICAgICAgICAgICAgICAgICAgKCog bW92ZV9jdXJzb3IpICAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICp3ZWJfdmlldywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgR3RrTW92ZW1lbnRTdGVwICAgICAgIHN0ZXAsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdpbnQgICAgICAgICAgICAgICAgICBj b3VudCk7CiAKICAgICAvKgogICAgICAqIGludGVybmFsCkBAIC0xMTgsNyArMTIxLDYgQEAgc3Ry dWN0IF9XZWJLaXRXZWJWaWV3Q2xhc3MgewogICAgIHZvaWQgKCpfd2Via2l0X3Jlc2VydmVkNCkg KHZvaWQpOwogICAgIHZvaWQgKCpfd2Via2l0X3Jlc2VydmVkNSkgKHZvaWQpOwogICAgIHZvaWQg KCpfd2Via2l0X3Jlc2VydmVkNikgKHZvaWQpOwotICAgIHZvaWQgKCpfd2Via2l0X3Jlc2VydmVk NykgKHZvaWQpOwogfTsKIAogV0VCS0lUX0FQSSBHVHlwZQpAQCAtMzI0LDYgKzMyNiwxMSBAQCB3 ZWJraXRfd2ViX3ZpZXdfc2V0X2N1c3RvbV9lbmNvZGluZyAgICAgICAgICAgICAoV2ViS2l0V2Vi VmlldyAgICAgICAgKiB3ZWJWaWV3LAogV0VCS0lUX0FQSSBjb25zdCBjaGFyKgogd2Via2l0X3dl Yl92aWV3X2dldF9jdXN0b21fZW5jb2RpbmcgICAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAg ICAgICogd2ViVmlldyk7CiAKK1dFQktJVF9BUEkgdm9pZAord2Via2l0X3dlYl92aWV3X21vdmVf Y3Vyc29yICAgICAgICAgICAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICogd2ViVmll dywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHdGtN b3ZlbWVudFN0ZXAgICAgICAgIHN0ZXAsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZ2ludCAgICAgICAgICAgICAgICAgICBjb3VudCk7CisKIEdfRU5E X0RFQ0xTCiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXRtYXJzaGFsLmxp c3QgYi9XZWJLaXQvZ3RrL3dlYmtpdG1hcnNoYWwubGlzdAppbmRleCBiNzE0YTdjLi5mNmFlZDBk IDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdG1hcnNoYWwubGlzdAorKysgYi9XZWJLaXQv Z3RrL3dlYmtpdG1hcnNoYWwubGlzdApAQCAtMSwzICsxLDQgQEAKK0JPT0xFQU46RU5VTSxJTlQK IEJPT0xFQU46SU5ULElOVCxTVFJJTkcKIEJPT0xFQU46T0JKRUNUCiBCT09MRUFOOk9CSkVDVCxP QkpFQ1QsT0JKRUNULE9CSkVDVAotLSAKMS42LjIKCg==