From a2a602f5b2ffb4a00f66ca4287c4e0eca63a52d3 Mon Sep 17 00:00:00 2001 From: DanyLE Date: Sun, 8 Jan 2023 00:21:02 +0100 Subject: [PATCH] RemoteDesktop: v0.1.16 - Allow to enable/disable mouse capture in remote desktop, remove some unused toolbar buttons --- RemoteDesktop/README.md | 1 + RemoteDesktop/assets/main.css | 2 +- RemoteDesktop/assets/scheme.html | 7 +++---- RemoteDesktop/build/debug/README.md | 1 + RemoteDesktop/build/debug/main.css | 2 +- RemoteDesktop/build/debug/main.js | 2 +- RemoteDesktop/build/debug/package.json | 2 +- RemoteDesktop/build/debug/scheme.html | 7 +++---- RemoteDesktop/build/release/RemoteDesktop.zip | Bin 78160 -> 78238 bytes RemoteDesktop/coffees/WVNC.coffee | 5 +++++ RemoteDesktop/coffees/main.coffee | 13 +++++-------- RemoteDesktop/package.json | 2 +- packages.json | 2 +- 13 files changed, 24 insertions(+), 22 deletions(-) diff --git a/RemoteDesktop/README.md b/RemoteDesktop/README.md index f616122..d445657 100644 --- a/RemoteDesktop/README.md +++ b/RemoteDesktop/README.md @@ -7,6 +7,7 @@ Further information on **wvnc**: [https://blog.lxsang.me/post/id/23](https://blo ## Change logs +* v0.1.16 - Allow to enable/disable mouse capture in remote desktop, remove some unused toolbar buttons * v0.1.15 - Only send ACK command when finish rendering the received frame, this allows to vastly improve performance and bandwidth * v0.1.14 - Add toolbar for canvas size control * v0.1.13 - support AntOS v2.0.x diff --git a/RemoteDesktop/assets/main.css b/RemoteDesktop/assets/main.css index 4a806e6..5f6d1d6 100644 --- a/RemoteDesktop/assets/main.css +++ b/RemoteDesktop/assets/main.css @@ -1,7 +1,7 @@ afx-app-window[data-id="RemoteDesktop"] div[data-id="container"] { background-color: #272822; - overflow: hidden; + overflow: auto; } afx-app-window[data-id="RemoteDesktop"] canvas[data-id="screen"] { diff --git a/RemoteDesktop/assets/scheme.html b/RemoteDesktop/assets/scheme.html index d038277..f2c97ef 100644 --- a/RemoteDesktop/assets/scheme.html +++ b/RemoteDesktop/assets/scheme.html @@ -8,10 +8,9 @@
- - - - + + +
\ No newline at end of file diff --git a/RemoteDesktop/build/debug/README.md b/RemoteDesktop/build/debug/README.md index f616122..d445657 100644 --- a/RemoteDesktop/build/debug/README.md +++ b/RemoteDesktop/build/debug/README.md @@ -7,6 +7,7 @@ Further information on **wvnc**: [https://blog.lxsang.me/post/id/23](https://blo ## Change logs +* v0.1.16 - Allow to enable/disable mouse capture in remote desktop, remove some unused toolbar buttons * v0.1.15 - Only send ACK command when finish rendering the received frame, this allows to vastly improve performance and bandwidth * v0.1.14 - Add toolbar for canvas size control * v0.1.13 - support AntOS v2.0.x diff --git a/RemoteDesktop/build/debug/main.css b/RemoteDesktop/build/debug/main.css index 4a806e6..5f6d1d6 100644 --- a/RemoteDesktop/build/debug/main.css +++ b/RemoteDesktop/build/debug/main.css @@ -1,7 +1,7 @@ afx-app-window[data-id="RemoteDesktop"] div[data-id="container"] { background-color: #272822; - overflow: hidden; + overflow: auto; } afx-app-window[data-id="RemoteDesktop"] canvas[data-id="screen"] { diff --git a/RemoteDesktop/build/debug/main.js b/RemoteDesktop/build/debug/main.js index 41afa34..e8b2e74 100644 --- a/RemoteDesktop/build/debug/main.js +++ b/RemoteDesktop/build/debug/main.js @@ -1 +1 @@ -(function(){var e,t,n,s;(e=class e extends this.OS.GUI.BasicDialog{constructor(){super("ConnectionDialog",e.scheme)}main(){return super.main(),this.find("bbp").data=[{text:"16 bits",value:16,selected:!0},{text:"32 bits",value:32}],this.find("jq").value=40,this.find("bt-ok").onbtclick=e=>{var t;if(this.handle)return t={wvnc:this.find("txtWVNC").value,server:this.find("txtServer").value,bbp:this.find("bbp").selectedItem.data.value,quality:this.find("jq").value},this.handle(t),this.quit()},this.find("bt-cancel").onbtclick=e=>this.quit()}}).scheme='\n \n \n \n
\n \n \n
\n \n \n \n
\n \n \n
\n \n \n\n',(t=class e extends this.OS.GUI.BasicDialog{constructor(){super("CredentialDialog",e.scheme)}main(){return this.find("bt-ok").onbtclick=()=>{var e;return this.handle?(e={username:this.find("txtUser").value,password:this.find("txtPass").value},this.handle(e),this.quit()):this.quit()},this.find("bt-cancel").onbtclick=()=>this.quit()}}).scheme='\n \n \n \n \n
\n \n \n
\n \n \n',n=class extends this.OS.application.BaseApplication{constructor(e){super("RemoteDesktop",e)}main(){return this.canvas=this.find("screen"),this.container=this.find("container"),this.zoom=this.find("zoom"),this.btreset=this.find("btreset"),this.zoom.max=200,this.zoom.value=100,this.zoom.onvaluechange=e=>this.setScale(),this.find("scroll_down").onbtclick=e=>this.container.scrollTop+=20,this.find("scroll_up").onbtclick=e=>this.container.scrollTop-=20,this.find("scroll_left").onbtclick=e=>this.container.scrollLeft-=20,this.find("scroll_right").onbtclick=e=>this.container.scrollLeft+=20,this.btreset.onbtclick=e=>{var t,n,s,i;return i=$(this.container).width(),t=$(this.container).height(),n=i/this.client.resolution.w,s=t/this.client.resolution.h,this.zoom.value=n>s?100*s:100*n,this.setScale()},this.client=new s({element:this.canvas}),this.bindKey("CTRL-SHIFT-V",e=>this.pasteText()),this.client.ondisconnect=()=>this.showConnectionDialog(),this.client.onresize=()=>this.setScale(),this.client.onpassword=()=>new Promise((e,t)=>this.openDialog("PromptDialog",{title:__("VNC password"),label:__("VNC password"),value:"password",type:"password"}).then((function(t){return e(t)}))),this.client.oncopy=e=>this._api.setClipboard(e),this.client.oncredential=()=>new Promise((e,n)=>this.openDialog(new t,{title:__("User credential")}).then((function(t){return e(t.username,t.password)}))),this.on("focus",e=>$(this.canvas).focus()),this.client.init().then(()=>this.showConnectionDialog())}pasteText(){var e;if(this.client)return e=e=>{if(e&&""!==e)return this.client.sendTextAsClipboard(e)},this._api.getClipboard().then(t=>e(t)).catch(t=>(this.error(__("Unable to paste"),t),this.openDialog("TextDialog",{title:"Paste text"}).then(t=>e(t)).catch(e=>this.error(e.toString(),e))))}setScale(){if(console.log("scale changed"),this.client&&this.client.resolution)return this.client.setScale(this.zoom.value/100),this.container.scrollLeft=0,this.container.scrollTop=0}menu(){return[{text:"__(Connection)",nodes:[{text:"__(New Connection)",dataid:this.name+"-new"},{text:"__(Disconnect)",dataid:this.name+"-close"}],onchildselect:e=>{if(this.client)return this.client.disconnect(!1)}}]}showConnectionDialog(){if(this.client)return this.openDialog(new e,{title:__("Connection")}).then(e=>(this.client.ws=e.wvnc,this.client.connect(e.server,e)))}cleanup(){return this.client&&this.client.disconnect(!0),this.client=void 0}},this.OS.register("RemoteDesktop",n),s=class{constructor(e){var t,n;this.socket=void 0,this.ws=void 0,this.canvas=void 0,n="pkg://RemoteDesktop/decoder_asm.js".asFileHandle().getlink(),this.scale=1,e.ws&&(this.ws=e.ws),this.canvas=e.element,"string"==typeof this.canvas&&(this.canvas=document.getElementById(this.canvas)),this.decoder=new Worker(n),this.enableEvent=!1,this.pingto=!1,t=this,this.mouseMask=0,this.decoder.onmessage=function(e){return t.process(e.data)}}init(){var e;return e=this,new Promise((function(t,n){return e.canvas?($(e.canvas).attr("tabindex","1"),$(e.canvas).on("focus",()=>e.resetModifierKeys()),e.initInputEvent(),t()):n("Canvas is not set")}))}initInputEvent(){var e,t,n,s;if(n=this,this.canvas&&(t=function(e){var t;return t=n.canvas.getBoundingClientRect(),{x:Math.floor((e.clientX-t.left)/n.scale),y:Math.floor((e.clientY-t.top)/n.scale)}},s=function(e){var s;if(n.enableEvent)return s=t(e),n.sendPointEvent(s.x,s.y,n.mouseMask)},n.canvas))return n.canvas.oncontextmenu=function(e){return e.preventDefault(),!1},n.canvas.onmousemove=function(e){return s(e)},n.canvas.onmousedown=function(e){var t;return t=1<this.disconnect(!0),window.addEventListener("unload",e),window.addEventListener("beforeunload",e)}initCanvas(e,t,n){return this.canvas.width=e,this.canvas.height=t,this.resolution={w:e,h:t},this.decoder.postMessage(this.resolution),this.setScale(this.scale)}process(e){var t,n,s;if(this.socket)return n=new Uint8Array(e.pixels),(s=(t=this.canvas.getContext("2d",{alpha:!1})).createImageData(e.w,e.h)).data.set(n),t.putImageData(s,e.x,e.y),this.socket.send(this.buildCommand(4,1));this.socket.send(this.buildCommand(4,1))}setScale(e){if(this.scale=e,this.canvas)return this.canvas.style.transformOrigin="0 0",this.canvas.style.transform="scale("+e+")"}connect(e,t){var n;if(n=this,this.disconnect(!1),this.ws)return this.socket=new WebSocket(this.ws),this.socket.binaryType="arraybuffer",this.socket.onopen=function(){return console.log("socket opened"),n.initConnection(e,t)},this.socket.onmessage=function(e){return n.consume(e)},this.socket.onerror=e=>n.onerror("Websocket error"),this.socket.onclose=function(){return n.socket=null,n.canvas.style.cursor="auto",n.canvas&&n.resolution&&n.canvas.getContext("2d").clearRect(0,0,n.resolution.w,n.resolution.h),n.pingto&&clearTimeout(n.pingto),n.pingto=void 0,n.ondisconnect(),console.log("socket closed")}}disconnect(e){return this.socket&&this.socket.close(),this.socket=void 0,e&&this.decoder.terminate(),this.enableEvent=!1}initConnection(e,t){var n;return(n=new Uint8Array(e.length+2))[0]=16,n[1]=50,t&&(t.bbp&&(n[0]=t.bbp),t.quality&&(n[1]=t.quality)),n.set((new TextEncoder).encode(e),2),this.socket.send(this.buildCommand(1,n))}resetModifierKeys(){if(this.socket&&this.enableEvent)return this.sendKeyEvent(65511,0),this.sendKeyEvent(65512,0),this.sendKeyEvent(65505,0),this.sendKeyEvent(65507,0),this.sendKeyEvent(65513,0)}sendPointEvent(e,t,n){var s;if(this.socket&&this.enableEvent)return(s=new Uint8Array(5))[0]=255&e,s[1]=e>>8,s[2]=255&t,s[3]=t>>8,s[4]=n,this.socket.send(this.buildCommand(5,s))}sendKeyEvent(e,t){var n;if(this.socket&&this.enableEvent)return(n=new Uint8Array(3))[0]=255&e,n[1]=e>>8&255,n[2]=t,this.socket.send(this.buildCommand(6,n))}sendPing(){if(this.socket)return this.socket.send(this.buildCommand(8,"PING WVNC"))}buildCommand(e,t){var n,s;switch(s=void 0,typeof t){case"string":s=(new TextEncoder).encode(t);break;case"number":s=new Uint8Array([t]);break;default:s=t}return(n=new Uint8Array(s.length+3))[0]=e,n[2]=s.length>>8,n[1]=15&s.length,n.set(s,3),n.buffer}oncopy(e){return console.log("Get clipboard text: "+e)}onpassword(){return new Promise((function(e,t){return t("onpassword is not implemented")}))}sendTextAsClipboard(e){var t;if(this.socket)return this.socket.send(this.buildCommand(7,e)),t="v".charCodeAt(0),this.sendKeyEvent(65507,1),this.sendKeyEvent(t,1),this.sendKeyEvent(t,0),this.sendKeyEvent(65507,0)}oncredential(){return new Promise((function(e,t){return t("oncredential is not implemented")}))}onerror(e){return console.log("Error",e)}onresize(){return console.log("resize")}ondisconnect(){return console.log("disconnect")}consume(e){var t,n,s,i,a,o,r;switch(t=(n=new Uint8Array(e.data))[0],o=this,t){case 254:return n=n.subarray(1,n.length-1),s=new TextDecoder("utf-8"),this.onerror(s.decode(n));case 129:return console.log("Request for password"),this.enableEvent=!1,this.onpassword().then((function(e){return o.socket.send(o.buildCommand(2,e)),o.enableEvent=!0}));case 130:return console.log("Request for login"),this.enableEvent=!1,this.oncredential().then((function(e,t){var n;return(n=new Uint8Array(e.length+t.length+1)).set((new TextEncoder).encode(e),0),n.set(["\0"],e.length),n.set((new TextEncoder).encode(t),e.length+1),o.socket.send(o.buildCommand(3,n)),o.enableEvent=!0}));case 131:if(r=n[1]|n[2]<<8,a=n[3]|n[4]<<8,this.initCanvas(r,a),this.socket.send(this.buildCommand(4,1)),this.enableEvent=!0,this.onresize(),this.pingto)return;return i=()=>(this.sendPing(),this.pingto=setTimeout(i,5e3)),this.pingto=setTimeout(i,5e3);case 132:return this.decoder.postMessage(n.buffer,[n.buffer]);case 133:return n=n.subarray(1),s=new TextDecoder("utf-8"),this.oncopy(s.decode(n)),this.socket.send(this.buildCommand(4,1));default:return console.log(t)}}},window.WVNC=s}).call(this); \ No newline at end of file +(function(){var e,t,n,s;(e=class e extends this.OS.GUI.BasicDialog{constructor(){super("ConnectionDialog",e.scheme)}main(){return super.main(),this.find("bbp").data=[{text:"16 bits",value:16,selected:!0},{text:"32 bits",value:32}],this.find("jq").value=40,this.find("bt-ok").onbtclick=e=>{var t;if(this.handle)return t={wvnc:this.find("txtWVNC").value,server:this.find("txtServer").value,bbp:this.find("bbp").selectedItem.data.value,quality:this.find("jq").value},this.handle(t),this.quit()},this.find("bt-cancel").onbtclick=e=>this.quit()}}).scheme='\n \n \n \n
\n \n \n
\n \n \n
\n \n
\n \n \n
\n \n \n\n',(t=class e extends this.OS.GUI.BasicDialog{constructor(){super("CredentialDialog",e.scheme)}main(){return this.find("bt-ok").onbtclick=()=>{var e;return this.handle?(e={username:this.find("txtUser").value,password:this.find("txtPass").value},this.handle(e),this.quit()):this.quit()},this.find("bt-cancel").onbtclick=()=>this.quit()}}).scheme='\n \n \n \n
\n \n
\n \n \n
\n \n \n',n=class extends this.OS.application.BaseApplication{constructor(e){super("RemoteDesktop",e)}main(){return this.canvas=this.find("screen"),this.container=this.find("container"),this.zoom=this.find("zoom"),this.btreset=this.find("btreset"),this.zoom.max=200,this.zoom.value=100,this.zoom.onvaluechange=e=>this.setScale(),this.switch=this.find("capture_mouse"),this.switch.onswchange=e=>this.client.mouseCapture=this.switch.swon,this.btreset.onbtclick=e=>{var t,n,s,i;return i=$(this.container).width(),t=$(this.container).height(),n=i/this.client.resolution.w,s=t/this.client.resolution.h,this.zoom.value=n>s?100*s:100*n,this.setScale()},this.client=new s({element:this.canvas}),this.bindKey("CTRL-SHIFT-V",e=>this.pasteText()),this.client.ondisconnect=()=>this.showConnectionDialog(),this.client.onresize=()=>this.setScale(),this.client.onpassword=()=>new Promise((e,t)=>this.openDialog("PromptDialog",{title:__("VNC password"),label:__("VNC password"),value:"password",type:"password"}).then((function(t){return e(t)}))),this.client.oncopy=e=>this._api.setClipboard(e),this.client.oncredential=()=>new Promise((e,n)=>this.openDialog(new t,{title:__("User credential")}).then((function(t){return e(t.username,t.password)}))),this.on("focus",e=>$(this.canvas).focus()),this.client.init().then(()=>this.showConnectionDialog())}pasteText(){var e;if(this.client)return e=e=>{if(e&&""!==e)return this.client.sendTextAsClipboard(e)},this._api.getClipboard().then(t=>e(t)).catch(t=>(this.error(__("Unable to paste"),t),this.openDialog("TextDialog",{title:"Paste text"}).then(t=>e(t)).catch(e=>this.error(e.toString(),e))))}setScale(){if(console.log("scale changed"),this.client&&this.client.resolution)return this.client.setScale(this.zoom.value/100),this.container.scrollLeft=0,this.container.scrollTop=0}menu(){return[{text:"__(Connection)",nodes:[{text:"__(New Connection)",dataid:this.name+"-new"},{text:"__(Disconnect)",dataid:this.name+"-close"}],onchildselect:e=>{if(this.client)return this.client.disconnect(!1)}}]}showConnectionDialog(){if(this.client)return this.openDialog(new e,{title:__("Connection")}).then(e=>(this.client.ws=e.wvnc,this.client.connect(e.server,e)))}cleanup(){return this.client&&this.client.disconnect(!0),this.client=void 0}},this.OS.register("RemoteDesktop",n),s=class{constructor(e){var t,n;this.socket=void 0,this.ws=void 0,this.canvas=void 0,n="pkg://RemoteDesktop/decoder_asm.js".asFileHandle().getlink(),this.scale=1,e.ws&&(this.ws=e.ws),this.canvas=e.element,"string"==typeof this.canvas&&(this.canvas=document.getElementById(this.canvas)),this.decoder=new Worker(n),this.enableEvent=!1,this.mouseCapture=!0,this.pingto=!1,t=this,this.mouseMask=0,this.decoder.onmessage=function(e){return t.process(e.data)}}init(){var e;return e=this,new Promise((function(t,n){return e.canvas?($(e.canvas).attr("tabindex","1"),$(e.canvas).on("focus",()=>e.resetModifierKeys()),e.initInputEvent(),t()):n("Canvas is not set")}))}initInputEvent(){var e,t,n,s;if(n=this,this.canvas&&(t=function(e){var t;return t=n.canvas.getBoundingClientRect(),{x:Math.floor((e.clientX-t.left)/n.scale),y:Math.floor((e.clientY-t.top)/n.scale)}},s=function(e){var s;if(n.enableEvent)return s=t(e),n.sendPointEvent(s.x,s.y,n.mouseMask)},n.canvas))return n.canvas.oncontextmenu=function(e){return e.preventDefault(),!1},n.canvas.onmousemove=function(e){if(n.mouseCapture)return s(e)},n.canvas.onmousedown=function(e){var t;if(n.mouseCapture)return t=1<this.disconnect(!0),window.addEventListener("unload",e),window.addEventListener("beforeunload",e)}initCanvas(e,t,n){return this.canvas.width=e,this.canvas.height=t,this.resolution={w:e,h:t},this.decoder.postMessage(this.resolution),this.setScale(this.scale)}process(e){var t,n,s;if(this.socket)return n=new Uint8Array(e.pixels),(s=(t=this.canvas.getContext("2d",{alpha:!1})).createImageData(e.w,e.h)).data.set(n),t.putImageData(s,e.x,e.y),this.socket.send(this.buildCommand(4,1));this.socket.send(this.buildCommand(4,1))}setScale(e){if(this.scale=e,this.canvas)return this.canvas.style.transformOrigin="0 0",this.canvas.style.transform="scale("+e+")"}connect(e,t){var n;if(n=this,this.disconnect(!1),this.ws)return this.socket=new WebSocket(this.ws),this.socket.binaryType="arraybuffer",this.socket.onopen=function(){return console.log("socket opened"),n.initConnection(e,t)},this.socket.onmessage=function(e){return n.consume(e)},this.socket.onerror=e=>n.onerror("Websocket error"),this.socket.onclose=function(){return n.socket=null,n.canvas.style.cursor="auto",n.canvas&&n.resolution&&n.canvas.getContext("2d").clearRect(0,0,n.resolution.w,n.resolution.h),n.pingto&&clearTimeout(n.pingto),n.pingto=void 0,n.ondisconnect(),console.log("socket closed")}}disconnect(e){return this.socket&&this.socket.close(),this.socket=void 0,e&&this.decoder.terminate(),this.enableEvent=!1}initConnection(e,t){var n;return(n=new Uint8Array(e.length+2))[0]=16,n[1]=50,t&&(t.bbp&&(n[0]=t.bbp),t.quality&&(n[1]=t.quality)),n.set((new TextEncoder).encode(e),2),this.socket.send(this.buildCommand(1,n))}resetModifierKeys(){if(this.socket&&this.enableEvent)return this.sendKeyEvent(65511,0),this.sendKeyEvent(65512,0),this.sendKeyEvent(65505,0),this.sendKeyEvent(65507,0),this.sendKeyEvent(65513,0)}sendPointEvent(e,t,n){var s;if(this.socket&&this.enableEvent)return(s=new Uint8Array(5))[0]=255&e,s[1]=e>>8,s[2]=255&t,s[3]=t>>8,s[4]=n,this.socket.send(this.buildCommand(5,s))}sendKeyEvent(e,t){var n;if(this.socket&&this.enableEvent)return(n=new Uint8Array(3))[0]=255&e,n[1]=e>>8&255,n[2]=t,this.socket.send(this.buildCommand(6,n))}sendPing(){if(this.socket)return this.socket.send(this.buildCommand(8,"PING WVNC"))}buildCommand(e,t){var n,s;switch(s=void 0,typeof t){case"string":s=(new TextEncoder).encode(t);break;case"number":s=new Uint8Array([t]);break;default:s=t}return(n=new Uint8Array(s.length+3))[0]=e,n[2]=s.length>>8,n[1]=15&s.length,n.set(s,3),n.buffer}oncopy(e){return console.log("Get clipboard text: "+e)}onpassword(){return new Promise((function(e,t){return t("onpassword is not implemented")}))}sendTextAsClipboard(e){var t;if(this.socket)return this.socket.send(this.buildCommand(7,e)),t="v".charCodeAt(0),this.sendKeyEvent(65507,1),this.sendKeyEvent(t,1),this.sendKeyEvent(t,0),this.sendKeyEvent(65507,0)}oncredential(){return new Promise((function(e,t){return t("oncredential is not implemented")}))}onerror(e){return console.log("Error",e)}onresize(){return console.log("resize")}ondisconnect(){return console.log("disconnect")}consume(e){var t,n,s,i,a,o,r;switch(t=(n=new Uint8Array(e.data))[0],o=this,t){case 254:return n=n.subarray(1,n.length-1),s=new TextDecoder("utf-8"),this.onerror(s.decode(n));case 129:return console.log("Request for password"),this.enableEvent=!1,this.onpassword().then((function(e){return o.socket.send(o.buildCommand(2,e)),o.enableEvent=!0}));case 130:return console.log("Request for login"),this.enableEvent=!1,this.oncredential().then((function(e,t){var n;return(n=new Uint8Array(e.length+t.length+1)).set((new TextEncoder).encode(e),0),n.set(["\0"],e.length),n.set((new TextEncoder).encode(t),e.length+1),o.socket.send(o.buildCommand(3,n)),o.enableEvent=!0}));case 131:if(r=n[1]|n[2]<<8,a=n[3]|n[4]<<8,this.initCanvas(r,a),this.socket.send(this.buildCommand(4,1)),this.enableEvent=!0,this.onresize(),this.pingto)return;return i=()=>(this.sendPing(),this.pingto=setTimeout(i,5e3)),this.pingto=setTimeout(i,5e3);case 132:return this.decoder.postMessage(n.buffer,[n.buffer]);case 133:return n=n.subarray(1),s=new TextDecoder("utf-8"),this.oncopy(s.decode(n)),this.socket.send(this.buildCommand(4,1));default:return console.log(t)}}},window.WVNC=s}).call(this); \ No newline at end of file diff --git a/RemoteDesktop/build/debug/package.json b/RemoteDesktop/build/debug/package.json index d1c46be..bc2fab3 100644 --- a/RemoteDesktop/build/debug/package.json +++ b/RemoteDesktop/build/debug/package.json @@ -7,7 +7,7 @@ "author": "Dany LE", "email": "contact@iohub.dev" }, - "version":"0.1.15-b", + "version":"0.1.16-b", "dependencies": [], "category":"Internet", "icon": "icon.png", diff --git a/RemoteDesktop/build/debug/scheme.html b/RemoteDesktop/build/debug/scheme.html index d038277..f2c97ef 100644 --- a/RemoteDesktop/build/debug/scheme.html +++ b/RemoteDesktop/build/debug/scheme.html @@ -8,10 +8,9 @@
- - - - + + +
\ No newline at end of file diff --git a/RemoteDesktop/build/release/RemoteDesktop.zip b/RemoteDesktop/build/release/RemoteDesktop.zip index 770dbd88dab89263b831a895509fcac2169cc8c9..e4e35c6e88b796992c5360cc88046fafc49c6804 100644 GIT binary patch delta 5369 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 PjSslF>k1jcy9Mws|1zFp diff --git a/RemoteDesktop/coffees/WVNC.coffee b/RemoteDesktop/coffees/WVNC.coffee index f547327..5f2d0f2 100644 --- a/RemoteDesktop/coffees/WVNC.coffee +++ b/RemoteDesktop/coffees/WVNC.coffee @@ -10,6 +10,7 @@ class WVNC @canvas = document.getElementById @canvas if typeof @canvas is 'string' @decoder = new Worker worker @enableEvent = false + @mouseCapture = true @pingto = false me = @ @mouseMask = 0 @@ -47,15 +48,18 @@ class WVNC return false me.canvas.onmousemove = (e) -> + return unless me.mouseCapture sendMouseLocation e me.canvas.onmousedown = (e) -> + return unless me.mouseCapture state = 1 << e.button me.mouseMask = me.mouseMask | state sendMouseLocation e #e.preventDefault() me.canvas.onmouseup = (e) -> + return unless me.mouseCapture state = 1 << e.button me.mouseMask = me.mouseMask & (~state) sendMouseLocation e @@ -109,6 +113,7 @@ class WVNC # mouse wheel event @canvas.addEventListener 'wheel', (e) -> return unless me.enableEvent + return unless me.mouseCapture #if (e.deltaY < 0) # up p = getMousePos e e.preventDefault() diff --git a/RemoteDesktop/coffees/main.coffee b/RemoteDesktop/coffees/main.coffee index 2c67497..1682182 100644 --- a/RemoteDesktop/coffees/main.coffee +++ b/RemoteDesktop/coffees/main.coffee @@ -34,6 +34,7 @@ ConnectionDialog.scheme = """

+
@@ -65,6 +66,7 @@ CredentialDialog.scheme = """ +
@@ -87,14 +89,9 @@ class RemoteDesktop extends this.OS.application.BaseApplication @zoom.max = 200 @zoom.value = 100 @zoom.onvaluechange = (e) => @setScale() - @find("scroll_down").onbtclick = (e) => - @container.scrollTop += 20 - @find("scroll_up").onbtclick = (e) => - @container.scrollTop -= 20 - @find("scroll_left").onbtclick = (e) => - @container.scrollLeft -= 20 - @find("scroll_right").onbtclick = (e) => - @container.scrollLeft += 20 + @switch = @find "capture_mouse" + @switch.onswchange = (e) => + @client.mouseCapture = @switch.swon @btreset.onbtclick = (e) => w = $(@container).width() h = $(@container).height() diff --git a/RemoteDesktop/package.json b/RemoteDesktop/package.json index d1c46be..bc2fab3 100644 --- a/RemoteDesktop/package.json +++ b/RemoteDesktop/package.json @@ -7,7 +7,7 @@ "author": "Dany LE", "email": "contact@iohub.dev" }, - "version":"0.1.15-b", + "version":"0.1.16-b", "dependencies": [], "category":"Internet", "icon": "icon.png", diff --git a/packages.json b/packages.json index d74ea52..c48ce06 100644 --- a/packages.json +++ b/packages.json @@ -365,7 +365,7 @@ "description": "https://raw.githubusercontent.com/lxsang/antosdk-apps/2.0.x/RemoteDesktop/README.md", "category": "Internet", "author": "Dany LE", - "version": "0.1.15-b", + "version": "0.1.16-b", "dependencies": [],"category":"Internet","icon":"icon.png","mimes":["none"], "download": "https://raw.githubusercontent.com/lxsang/antosdk-apps/2.0.x/RemoteDesktop/build/release/RemoteDesktop.zip" },