safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-676: Conversion to Guacamole.Display wasn't finished - "transfer" and others still directly used layer.

Browse Source
This commit is contained in:
Michael Jumper
2014-05-12 12:25:32 -07:00
parent 074e1cf3fa
commit 5a6623540f
1 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
guacamole-common-js/src/main/webapp/modules/Client.js
View File

@@ -934,7 +934,7 @@ Guacamole.Client = function(tunnel) {
var x = parseInt(parameters[1]); var x = parseInt(parameters[1]);
var y = parseInt(parameters[2]); var y = parseInt(parameters[2]);
layer.moveTo(x, y); display.moveTo(layer, x, y);
}, },
@@ -974,28 +974,13 @@ Guacamole.Client = function(tunnel) {
/* SRC */ /* SRC */
if (function_index === 0x3) if (function_index === 0x3)
dstL.put( display.put(srcL, srcX, srcY, srcWidth, srcHeight,
srcL, dstL, dstX, dstY);
srcX,
srcY,
srcWidth,
srcHeight,
dstX,
dstY
);
/* Anything else that isn't a NO-OP */ /* Anything else that isn't a NO-OP */
else if (function_index !== 0x5) else if (function_index !== 0x5)
dstL.transfer( display.transfer(srcL, srcX, srcY, srcWidth, srcHeight,
srcL, dstL, dstX, dstY, Guacamole.Client.DefaultTransferFunction[function_index]);
srcX,
srcY,
srcWidth,
srcHeight,
dstX,
dstY,
Guacamole.Client.DefaultTransferFunction[function_index]
);
}, },
@@ -1009,7 +994,7 @@ Guacamole.Client = function(tunnel) {
var e = parseFloat(parameters[5]); var e = parseFloat(parameters[5]);
var f = parseFloat(parameters[6]); var f = parseFloat(parameters[6]);
layer.transform(a, b, c, d, e, f); display.transform(layer, a, b, c, d, e, f);
}, },