safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 21:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-250: Export client state asynchronously (display state may not match protocol state otherwise).

Browse Source
This commit is contained in:
Michael Jumper
2017-04-13 20:41:12 -07:00
parent 95968016c2
commit 9ba6a5f69b
1 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,16 +133,18 @@ Guacamole.Client = function(tunnel) {
} }
/** /**
* Returns an opaque representation of Guacamole.Client state which can be * Produces an opaque representation of Guacamole.Client state which can be
* later imported through a call to importState(). This object is * later imported through a call to importState(). This object is
* effectively an independent, compressed snapshot of protocol and display * effectively an independent, compressed snapshot of protocol and display
* state. * state. Invoking this function implicitly flushes the display.
* *
* @returns {Object} * @param {function} callback
* An opaque representation of Guacamole.Client state which can be * Callback which should be invoked once the state object is ready. The
* imported through a call to importState(). * state object will be passed to the callback as the sole parameter.
* This callback may be invoked immediately, or later as the display
* finishes rendering and becomes ready.
*/ */
this.exportState = function exportState() { this.exportState = function exportState(callback) {
// Start with empty state // Start with empty state
var state = { var state = {
@@ -151,39 +153,53 @@ Guacamole.Client = function(tunnel) {
'layers' : {} 'layers' : {}
}; };
// Export each defined layer/buffer var layersSnapshot = {};
// Make a copy of all current layers (protocol state)
for (var key in layers) { for (var key in layers) {
layersSnapshot[key] = layers[key];
var index = parseInt(key);
var layer = layers[key];
var canvas = layer.toCanvas();
// Store layer/buffer dimensions
var exportLayer = {
'width' : layer.width,
'height' : layer.height
};
// Store layer/buffer image data, if it can be generated
if (layer.width && layer.height)
exportLayer.url = canvas.toDataURL('image/png');
// Add layer properties if not a buffer nor the default layer
if (index > 0) {
exportLayer.x = layer.x;
exportLayer.y = layer.y;
exportLayer.z = layer.z;
exportLayer.alpha = layer.alpha;
exportLayer.matrix = layer.matrix;
exportLayer.parent = getLayerIndex(layer.parent);
}
// Store exported layer
state.layers[key] = exportLayer;
} }
return state; // Populate layers once data is available (display state, requires flush)
display.flush(function populateLayers() {
// Export each defined layer/buffer
for (var key in layersSnapshot) {
var index = parseInt(key);
var layer = layersSnapshot[key];
var canvas = layer.toCanvas();
// Store layer/buffer dimensions
var exportLayer = {
'width' : layer.width,
'height' : layer.height
};
// Store layer/buffer image data, if it can be generated
if (layer.width && layer.height)
exportLayer.url = canvas.toDataURL('image/png');
// Add layer properties if not a buffer nor the default layer
if (index > 0) {
exportLayer.x = layer.x;
exportLayer.y = layer.y;
exportLayer.z = layer.z;
exportLayer.alpha = layer.alpha;
exportLayer.matrix = layer.matrix;
exportLayer.parent = getLayerIndex(layer.parent);
}
// Store exported layer
state.layers[key] = exportLayer;
}
// Invoke callback now that the state is ready
if (callback)
callback(state);
});
}; };