From d1984d89b8f399a838e8009c5777d7fb979a6ad5 Mon Sep 17 00:00:00 2001 From: Dany LE Date: Sat, 7 Jan 2023 14:51:15 +0100 Subject: [PATCH] RemoteDesktop: add toolbar for canvas control --- RemoteDesktop/README.md | 1 + RemoteDesktop/assets/main.css | 1 + RemoteDesktop/assets/scheme.html | 14 ++++++- RemoteDesktop/build/debug/README.md | 1 + RemoteDesktop/build/debug/main.css | 1 + RemoteDesktop/build/debug/main.js | 2 +- RemoteDesktop/build/debug/package.json | 2 +- RemoteDesktop/build/debug/scheme.html | 14 ++++++- RemoteDesktop/build/release/RemoteDesktop.zip | Bin 77778 -> 78100 bytes RemoteDesktop/coffees/main.coffee | 35 ++++++++++++++---- RemoteDesktop/package.json | 2 +- packages.json | 12 +----- 12 files changed, 60 insertions(+), 25 deletions(-) diff --git a/RemoteDesktop/README.md b/RemoteDesktop/README.md index c085aef..bc99cbc 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.14 - Add toolbar for canvas size control * v0.1.13 - support AntOS v2.0.x * v0.1.12 - improve UI handling * v0.1.11 - Support 16 bits per pixel diff --git a/RemoteDesktop/assets/main.css b/RemoteDesktop/assets/main.css index ecb3e43..4a806e6 100644 --- a/RemoteDesktop/assets/main.css +++ b/RemoteDesktop/assets/main.css @@ -1,6 +1,7 @@ afx-app-window[data-id="RemoteDesktop"] div[data-id="container"] { background-color: #272822; + overflow: hidden; } afx-app-window[data-id="RemoteDesktop"] canvas[data-id="screen"] { diff --git a/RemoteDesktop/assets/scheme.html b/RemoteDesktop/assets/scheme.html index 08bbe4c..d038277 100644 --- a/RemoteDesktop/assets/scheme.html +++ b/RemoteDesktop/assets/scheme.html @@ -1,7 +1,17 @@ - +
- + + +
+ +
+ + + + + + \ No newline at end of file diff --git a/RemoteDesktop/build/debug/README.md b/RemoteDesktop/build/debug/README.md index c085aef..bc99cbc 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.14 - Add toolbar for canvas size control * v0.1.13 - support AntOS v2.0.x * v0.1.12 - improve UI handling * v0.1.11 - Support 16 bits per pixel diff --git a/RemoteDesktop/build/debug/main.css b/RemoteDesktop/build/debug/main.css index ecb3e43..4a806e6 100644 --- a/RemoteDesktop/build/debug/main.css +++ b/RemoteDesktop/build/debug/main.css @@ -1,6 +1,7 @@ afx-app-window[data-id="RemoteDesktop"] div[data-id="container"] { background-color: #272822; + overflow: hidden; } 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 114a526..df412be 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.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("resize",e=>this.setScale()),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(){var e,t,n,s;if(this.client&&this.client.resolution)return s=$(this.container).width(),e=$(this.container).height(),(t=s/this.client.resolution.w)>(n=e/this.client.resolution.h)?this.client.setScale(n):this.client.setScale(t)}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)}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]),this.socket.send(this.buildCommand(4,1));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',(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)}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]),this.socket.send(this.buildCommand(4,1));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 d39faba..1f86f21 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.13-b", + "version":"0.1.14-b", "dependencies": [], "category":"Internet", "icon": "icon.png", diff --git a/RemoteDesktop/build/debug/scheme.html b/RemoteDesktop/build/debug/scheme.html index 08bbe4c..d038277 100644 --- a/RemoteDesktop/build/debug/scheme.html +++ b/RemoteDesktop/build/debug/scheme.html @@ -1,7 +1,17 @@ - +
- + + +
+ +
+ + + + + + \ No newline at end of file diff --git a/RemoteDesktop/build/release/RemoteDesktop.zip b/RemoteDesktop/build/release/RemoteDesktop.zip index 2b913a12d9c147e036715c2b28c80e51ba9c785d..e651d470ebaa77384a1693b719010bd8e6b5cb56 100644 GIT binary patch delta 5452 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 Lg9*FURM39`{$9?n delta 5062 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 rrSR~e(f?J#)fb @quit() @@ -83,6 +82,29 @@ class RemoteDesktop extends this.OS.application.BaseApplication main: () -> @canvas = @find "screen" @container = @find "container" + @zoom = @find "zoom" + @btreset = @find "btreset" + @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 + @btreset.onbtclick = (e) => + w = $(@container).width() + h = $(@container).height() + sx = w / @client.resolution.w + sy = h / @client.resolution.h + if sx > sy + @zoom.value = sy*100 + else + @zoom.value = sx*100 + @setScale() @client = new WVNC { element: @canvas } @@ -113,7 +135,7 @@ class RemoteDesktop extends this.OS.application.BaseApplication @openDialog new CredentialDialog, { title: __("User credential") } .then (d) -> r(d.username, d.password) - @on "resize", (e)=> @setScale() + # @on "resize", (e)=> @setScale() @on "focus", (e) => $(@canvas).focus() @client.init().then () => @showConnectionDialog() @@ -136,12 +158,11 @@ class RemoteDesktop extends this.OS.application.BaseApplication .catch (err) => @error err.toString(), err setScale: () -> + console.log "scale changed" return unless @client and @client.resolution - w = $(@container).width() - h = $(@container).height() - sx = w / @client.resolution.w - sy = h / @client.resolution.h - if sx > sy then @client.setScale sy else @client.setScale sx + @client.setScale @zoom.value / 100.0 + @container.scrollLeft = 0 + @container.scrollTop = 0 menu: () -> diff --git a/RemoteDesktop/package.json b/RemoteDesktop/package.json index d39faba..1f86f21 100644 --- a/RemoteDesktop/package.json +++ b/RemoteDesktop/package.json @@ -7,7 +7,7 @@ "author": "Dany LE", "email": "contact@iohub.dev" }, - "version":"0.1.13-b", + "version":"0.1.14-b", "dependencies": [], "category":"Internet", "icon": "icon.png", diff --git a/packages.json b/packages.json index da4cab1..5cd4088 100644 --- a/packages.json +++ b/packages.json @@ -69,16 +69,6 @@ "dependencies": ["Antunnel@0.2.0-b"], "download": "https://raw.githubusercontent.com/lxsang/antosdk-apps/2.0.x/AntunnelPlugins/build/release/AntunnelPlugins.zip" }, - { - "pkgname": "AntunnelTestClient", - "name": "AntunnelTestClient", - "description": "https://raw.githubusercontent.com/lxsang/antosdk-apps/2.0.x/AntunnelTestClient/README.md", - "category": "Development", - "author": "Dany LE", - "version": "0.1.0-a", - "dependencies": ["Antunnel@0.2.1-b"], - "download": "https://raw.githubusercontent.com/lxsang/antosdk-apps/2.0.x/AntunnelTestClient/build/release/AntunnelTestClient.zip" - }, { "pkgname": "Archive", "name": "Archive", @@ -365,7 +355,7 @@ "description": "https://raw.githubusercontent.com/lxsang/antosdk-apps/2.0.x/RemoteDesktop/README.md", "category": "Internet", "author": "Dany LE", - "version": "0.1.13-b", + "version": "0.1.14-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" },