safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-28 07:33:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Added busy handlers for layer, implemented ready instruction handling in client"

Browse Source 
This reverts commit 7c3ceb1245a5e2a838811c10599b47b1578a5cf9.
This commit is contained in:
Michael Jumper
2011-03-06 17:02:18 -08:00
parent de352e7dff
commit 4f656c2e94
2 changed files with 3 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
guacamole-common-js/src/main/resources/guacamole.js
View File

@@ -143,42 +143,6 @@ function GuacamoleClient(display, tunnel) {
clipboardHandler = handler; clipboardHandler = handler;
}; };
var readyCallback = null;
var busyLayers = 0;
function layerBusy() { busyLayers++; }
function layerReady() {
busyLayers--;
if (readyCallback != null)
readyCallback();
}
function sendReady() {
// If ready, send ready message
if (busyLayers == 0) {
tunnel.sendMessage("ready;");
}
// If not ready, queue message for when ready
else if (readyCallback == null) {
readyCallback = function() {
tunnel.sendMessage("ready;");
readyCallback = null;
}
}
}
function getTrackedLayer(w, h) {
var layer = new Layer(w, h);
layer.setBusyHandler(layerBusy);
layer.setReadyHandler(layerReady);
return layer;
}
// Layers // Layers
var displayWidth = 0; var displayWidth = 0;
var displayHeight = 0; var displayHeight = 0;
@@ -201,7 +165,7 @@ function GuacamoleClient(display, tunnel) {
// Create buffer if necessary // Create buffer if necessary
if (buffer == null) { if (buffer == null) {
buffer = new Layer(0, 0); // Untracked buffer = new Layer(0, 0);
buffer.setAutosize(1); buffer.setAutosize(1);
buffers[index] = buffer; buffers[index] = buffer;
} }
@@ -216,7 +180,7 @@ function GuacamoleClient(display, tunnel) {
if (layer == null) { if (layer == null) {
// Add new layer // Add new layer
layer = getTrackedLayer(displayWidth, displayHeight); layer = new Layer(displayWidth, displayHeight);
layers[index] = layer; layers[index] = layer;
// (Re)-add existing layers in order // (Re)-add existing layers in order
@@ -256,10 +220,6 @@ function GuacamoleClient(display, tunnel) {
if (errorHandler) errorHandler(tunnel.unescapeGuacamoleString(parameters[0])); if (errorHandler) errorHandler(tunnel.unescapeGuacamoleString(parameters[0]));
}, },
"ready": function(parameters) {
sendReady();
},
"name": function(parameters) { "name": function(parameters) {
if (nameHandler) nameHandler(tunnel.unescapeGuacamoleString(parameters[0])); if (nameHandler) nameHandler(tunnel.unescapeGuacamoleString(parameters[0]));
}, },
@@ -332,7 +292,7 @@ function GuacamoleClient(display, tunnel) {
var data = parameters[2]; var data = parameters[2];
if (cursor == null) { if (cursor == null) {
cursor = getTrackedLayer(displayWidth, displayHeight); cursor = new Layer(displayWidth, displayHeight);
display.appendChild(cursor); display.appendChild(cursor);
} }

11
guacamole-common-js/src/main/resources/layer.js
View File

@@ -68,9 +68,7 @@ function Layer(width, height) {
resize(width, height); resize(width, height);
var busyHandler = null;
var readyHandler = null; var readyHandler = null;
var updates = new Array(); var updates = new Array();
var autosize = 0; var autosize = 0;
@@ -133,10 +131,6 @@ function Layer(width, height) {
readyHandler = handler; readyHandler = handler;
}; };
display.setBusyHandler = function(handler) {
busyHandler = handler;
};
display.drawImage = function(x, y, image) { display.drawImage = function(x, y, image) {
reserveJob(function() { reserveJob(function() {
@@ -147,11 +141,6 @@ function Layer(width, height) {
display.draw = function(x, y, url) { display.draw = function(x, y, url) {
// If about to become busy, call busy handler
if (display.isReady() && busyHandler != null)
busyHandler();
var update = reserveJob(null); var update = reserveJob(null);
var image = new Image(); var image = new Image();