From 8f8082d1704e4fb963fcf7f857428fd75fe4dc03 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Thu, 15 Jun 2017 16:48:12 -0700 Subject: [PATCH] Stop keyboard injection as soon as any real keyboard activity is detected --- docs/pcx86/examples/pcx86-dbg.js | 2 +- docs/pcx86/examples/pcx86.js | 2 +- modules/pcx86/lib/keyboard.js | 15 ++++++++++----- versions/pcx86/1.35.0/pcx86-dbg.js | 2 +- versions/pcx86/1.35.0/pcx86.js | 2 +- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/docs/pcx86/examples/pcx86-dbg.js b/docs/pcx86/examples/pcx86-dbg.js index 21d43966d..9a57d513f 100644 --- a/docs/pcx86/examples/pcx86-dbg.js +++ b/docs/pcx86/examples/pcx86-dbg.js @@ -508,7 +508,7 @@ function zq(a,b,c,d){if(O[b]){var e=Math.floor(b/1E3)&2;if(b=Hq[b]||0){!e||b&Iq| function uq(a,b,c){if((O[b]||O[b+=1E3])&&a.H&&a.H.ea.vb){Hq[b]&&a.C.length&&0e||(e==a.C.length&&(d={},d.ve=b,d.jc=a.jc,Dq(a,b,!0),e++),0b.vd){if(!b.rf){Bq(a,b.ve);return}b.rf=!1;c=a.da}else c=1==b.vd++?500:100;b.dl=setTimeout(function(a){return function(){Mq(a,b)}}(a),c)}} function Oq(a,b,c){var d=b;if(b>=n.de&&b<=n.fg)!(a.jc&(Pq|Qq|Rq))==c&&(d=b+(n.ee-n.de));else if(b>=n.ee&&b<=n.z)!!(a.jc&(Pq|Qq|Rq))==c&&(d=b-(n.ee-n.de));else if(!!(a.jc&(Pq|Qq))==c){if(a=na[b])d=a}else if(a=ma[b])d=a;return d}l.Cg=function(a){a||(this.jc&=~Kq)}; -function sq(a,b,c){var d=!0,e=!1,f=!1,g=b.keyCode,h=Oq(a,g,!0);a.eh&&h==n["`"]&&(g=h=27);if(O[g+1E3])if(h+=1E3,2==b.location&&(h+=2E3),zq(a,h,!1,c)){if(20==g||144==g||145==g)a.Z||(c=e=!0);if(!(c||91!=g&&93!=g))for(var k=0;k=n.de&&b<=n.fg||b>=n.ee&&b<=n.z;e>>>=8;){var g=0,h=e&255;f==ar||f==br?d.push(f|(c?0:$q)):(h==P?a.D&(Pq|Qq)||a.D&Rq&&b||(g=h):h==cr?a.D&(Sq|dr)||(g=h):h==er?a.D&(Tq|fr)||(g=h):d.push(f|(c?0:$q)),g&&(c?d.unshift(g):d.push(g|$q)))}for(c=0;ce||(e==a.A.length&&(d={},d.Td=b,d.Sb=a.Sb,so(a,b,!0),e++),0b.Zc){if(!b.Je){qo(a,b.Td);return}b.Je=!1;c=a.Z}else c=1==b.Zc++?500:100;b.Vj=setTimeout(function(a){return function(){Ao(a,b)}}(a),c)}} function Co(a,b,c){var d=b;if(b>=n.Cd&&b<=n.tf)!(a.Sb&(Do|Eo|Fo))==c&&(d=b+(n.Dd-n.Cd));else if(b>=n.Dd&&b<=n.z)!!(a.Sb&(Do|Eo|Fo))==c&&(d=b-(n.Dd-n.Cd));else if(!!(a.Sb&(Do|Eo))==c){if(a=p[b])d=a}else if(a=ma[b])d=a;return d}k.Sf=function(a){a||(this.Sb&=~yo)}; -function ho(a,b,c){var d=!0,e=!1,f=!1,g=b.keyCode,h=Co(a,g,!0);a.og&&h==n["`"]&&(g=h=27);if(V[g+1E3])if(h+=1E3,2==b.location&&(h+=2E3),oo(a,h,!1,c)){if(20==g||144==g||145==g)a.O||(c=e=!0);if(!(c||91!=g&&93!=g))for(var l=0;l=n.Cd&&b<=n.tf||b>=n.Dd&&b<=n.z;e>>>=8;){var g=0,h=e&255;f==Po||f==Qo?d.push(f|(c?0:Oo)):(h==W?a.C&(Do|Eo)||a.C&Fo&&b||(g=h):h==Ro?a.C&(Go|So)||(g=h):h==To?a.C&(Ho|Uo)||(g=h):d.push(f|(c?0:Oo)),g&&(c?d.unshift(g):d.push(g|Oo)))}for(c=0;ce||(e==a.C.length&&(d={},d.ve=b,d.jc=a.jc,Dq(a,b,!0),e++),0b.vd){if(!b.rf){Bq(a,b.ve);return}b.rf=!1;c=a.da}else c=1==b.vd++?500:100;b.dl=setTimeout(function(a){return function(){Mq(a,b)}}(a),c)}} function Oq(a,b,c){var d=b;if(b>=n.de&&b<=n.fg)!(a.jc&(Pq|Qq|Rq))==c&&(d=b+(n.ee-n.de));else if(b>=n.ee&&b<=n.z)!!(a.jc&(Pq|Qq|Rq))==c&&(d=b-(n.ee-n.de));else if(!!(a.jc&(Pq|Qq))==c){if(a=na[b])d=a}else if(a=ma[b])d=a;return d}l.Cg=function(a){a||(this.jc&=~Kq)}; -function sq(a,b,c){var d=!0,e=!1,f=!1,g=b.keyCode,h=Oq(a,g,!0);a.eh&&h==n["`"]&&(g=h=27);if(O[g+1E3])if(h+=1E3,2==b.location&&(h+=2E3),zq(a,h,!1,c)){if(20==g||144==g||145==g)a.Z||(c=e=!0);if(!(c||91!=g&&93!=g))for(var k=0;k=n.de&&b<=n.fg||b>=n.ee&&b<=n.z;e>>>=8;){var g=0,h=e&255;f==ar||f==br?d.push(f|(c?0:$q)):(h==P?a.D&(Pq|Qq)||a.D&Rq&&b||(g=h):h==cr?a.D&(Sq|dr)||(g=h):h==er?a.D&(Tq|fr)||(g=h):d.push(f|(c?0:$q)),g&&(c?d.unshift(g):d.push(g|$q)))}for(c=0;ce||(e==a.A.length&&(d={},d.Td=b,d.Sb=a.Sb,so(a,b,!0),e++),0b.Zc){if(!b.Je){qo(a,b.Td);return}b.Je=!1;c=a.Z}else c=1==b.Zc++?500:100;b.Vj=setTimeout(function(a){return function(){Ao(a,b)}}(a),c)}} function Co(a,b,c){var d=b;if(b>=n.Cd&&b<=n.tf)!(a.Sb&(Do|Eo|Fo))==c&&(d=b+(n.Dd-n.Cd));else if(b>=n.Dd&&b<=n.z)!!(a.Sb&(Do|Eo|Fo))==c&&(d=b-(n.Dd-n.Cd));else if(!!(a.Sb&(Do|Eo))==c){if(a=p[b])d=a}else if(a=ma[b])d=a;return d}k.Sf=function(a){a||(this.Sb&=~yo)}; -function ho(a,b,c){var d=!0,e=!1,f=!1,g=b.keyCode,h=Co(a,g,!0);a.og&&h==n["`"]&&(g=h=27);if(V[g+1E3])if(h+=1E3,2==b.location&&(h+=2E3),oo(a,h,!1,c)){if(20==g||144==g||145==g)a.O||(c=e=!0);if(!(c||91!=g&&93!=g))for(var l=0;l=n.Cd&&b<=n.tf||b>=n.Dd&&b<=n.z;e>>>=8;){var g=0,h=e&255;f==Po||f==Qo?d.push(f|(c?0:Oo)):(h==W?a.C&(Do|Eo)||a.C&Fo&&b||(g=h):h==Ro?a.C&(Go|So)||(g=h):h==To?a.C&(Ho|Uo)||(g=h):d.push(f|(c?0:Oo)),g&&(c?d.unshift(g):d.push(g|Oo)))}for(c=0;c